Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sem set for regular

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-11-03 18:11:01 +05:30
parent 9a8793d432
commit 2a0a85e797
5 changed files with 72 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Apollo/api/application/controllers/Course_Controller.php
View File

@ -40,6 +40,9 @@ class Course_Controller extends REST_Controller {
$details['Specilization2'] = $this->post('specilization2');
$details['BranchCode'] = $this->post('branchCode');
$coursedetails = $this->post('numberofsem');
//$details['FeesType'] = $this->post('feesType');
$details['PC'] = $this->post('provFess');
$details['DC'] = $this->post('degreeAmount');
@ -50,6 +53,7 @@ class Course_Controller extends REST_Controller {
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
$details['IsActive'] = $this->post('status');
$jsonRegularFeesData=$this->post('regularFeesAmounts');
// print_r($jsonRegularFeesData);die();
$jsonLateralFeesData=$this->post('lateralFeesAmounts');
$jsonSemFeesData=$this->post('semFeesAmounts');
// push regular,lateral fees into same array
@ -62,7 +66,7 @@ class Course_Controller extends REST_Controller {
// get subject details
//$subjectDetails=$this->post('subjects');
$courseDetails = $this->course_model->addCourse($details,$jsonSemFeesData);// $subjectDetails Check if the users data store contains users (in case the database result returns NULL)
$courseDetails = $this->course_model->addCourse($details,$jsonSemFeesData,$coursedetails);// $subjectDetails Check if the users data store contains users (in case the database result returns NULL)
if ($courseDetails)
{
$courseDetails['status'] = REST_Controller::HTTP_OK;

3
Apollo/api/application/models/Course_model.php
View File

@ -15,7 +15,7 @@ class Course_model extends CI_Model {
* created by kms
* */
public function addCourse($arrayDetails=null,$jsonSemFeesData=null) //$subjectDetails=null
public function addCourse($arrayDetails=null,$jsonSemFeesData=null,$coursedetails=null) //$subjectDetails=null
{
$this->db->select('CourseCode');
$this->db->where('CourseCode', $arrayDetails['CourseCode']);
@ -36,6 +36,7 @@ class Course_model extends CI_Model {
$insertFeesArray['FeesType'] =$row['FeesType'];
$insertFeesArray['FeesAmount'] =$row['FeesAmount'];
$insertFeesArray['Sem_Year'] =$row['programName'];
$insertFeesArray['semnumber'] =$coursedetails;
$insertFeesArray['UpdatedOn'] =$arrayDetails['CreatedOn'];
$insertFeesArray['UpdatedBy'] =$arrayDetails['CreatedBy'];
$this->db->insert(COURSE_FEES, $insertFeesArray);

28
Apollo/api/application/models/Fees_status_model.php
View File

@ -490,6 +490,9 @@ class Fees_status_model extends CI_Model
public function updateFees($feesPaidDetails=null,$courseID=null,$feesName=null,$smsDetails=null)
{
if($feesPaidDetails['UpdatedBy']=='All'){
$this->db->select('BranchID');
$this->db->where('FeesID', $feesPaidDetails['FeesId']);
@ -1889,7 +1892,30 @@ $REGID='';
* created by kms
* */
public function entryForAllStatus($feesDetails=null,$courseID=null,$feesName=null){
$singleFeesDetails=["SEM 1","SEM 2","SEM 3","SEM 4","SEM 5","SEM 6","SEM 7","SEM 8"];
//$singleFeesDetails=["SEM 1","SEM 2","SEM 3","SEM 4","SEM 5","SEM 6","SEM 7","SEM 8"];
$this->db->select('semnumber');
$this->db->from('T_Course_Fees_Details');
$this->db->where('CourseID',$courseID);
$Details = $this->db->get();
$results = $Details->result();
$semnum = $results[0]->semnumber;
//echo $semnum;die();
$i=$semnum;
for($j=0;$j<$i;$j++)
{
$k=$j+1;
$singleFeesDetails[$j] = 'SEM '.$k.'';
}
//print_r($singleFeesDetails);die();
// get pick list expected status
$this->db->select('ListCode,ListName');
if(strtoupper($feesName)==DMC_CONST){

18
Apollo/assets/js/controllers/courseCtrl.js
View File

@ -48,6 +48,9 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
"ListName": "",
"programListName":""
};
/*
* edit course details
* created by kms
@ -172,9 +175,21 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
* @params myModel
* created by kms
* */
$scope.MyModelsem={
"numberofsem":'',
};
$scope.courseForm = {
submit: function (form, myModel,regularModel,lateralModel,semYearModel,loading,addMoreItems) {
submit: function (form, myModel,MyModelsem,regularModel,lateralModel,semYearModel,loading,addMoreItems) {
var firstError = null;
//console.log(MyModelsem.numberofsem);return false;
if (form.$invalid) {
var field = null, firstError = null;
for (field in form) {
@ -250,6 +265,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
specilization1:myModel.specilization1,
specilization2:myModel.specilization2,
numberofsem:MyModelsem.numberofsem,
// subjects:myModel.subject,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}

22
Apollo/assets/views/courseDetails.html
View File

@ -125,7 +125,7 @@
<tab heading="Add Course" id="addcourse">
<div>
<form name="Form" id="form" novalidate ng-submit="courseForm.submit(Form, myModel,myModelRegular,myModelLateral,myModelSemYear, 'zoom-in',addMoreItems)" method="post">
<form name="Form" id="form" novalidate ng-submit="courseForm.submit(Form, myModel,MyModelsem,myModelRegular,myModelLateral,myModelSemYear, 'zoom-in',addMoreItems)" method="post">
<div class="row">
<div class="col-md-12">
@ -329,6 +329,26 @@
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.numberofsem.$dirty && Form.numberofsem.$invalid}">
<label>Number of Semesters</label>
<input type="text" placeholder="Enter Number of Semesters"
autofocus tabindex="8" class="form-control" name="numberofsem" id="numberofsem" ng-maxlength="8"
ng-model="MyModelsem.numberofsem" ng-pattern="/^[0-9]*$/"
ng-disabled="myModelSemYear.programName!='' || myModelSemYear.FeesAmount!='' || addMoreItems.length!=0" />
<span class="error text-small block"
ng-if="Form.numberofsem.$dirty && Form.numberofsem.$error.maxlength || Form.numberofsem.$error.pattern">Enter a valid number</span>
</div>
</div>