diff --git a/Apollo/api/application/controllers/Course_Controller.php b/Apollo/api/application/controllers/Course_Controller.php index b7cf973a..f5ddac64 100755 --- a/Apollo/api/application/controllers/Course_Controller.php +++ b/Apollo/api/application/controllers/Course_Controller.php @@ -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; diff --git a/Apollo/api/application/models/Course_model.php b/Apollo/api/application/models/Course_model.php index fb8b796c..84f77f1f 100755 --- a/Apollo/api/application/models/Course_model.php +++ b/Apollo/api/application/models/Course_model.php @@ -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); diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index bb3e67d3..d49a0e5b 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -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){ diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index 5d0612b5..8a6ee0ee 100755 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -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 } diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index 90179b77..a5f27653 100755 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -125,7 +125,7 @@
-
+
@@ -329,6 +329,26 @@
+ + +
+ + + + + + Enter a valid number + + + + + +
+