From 9dbbad29ddbc6e4f1d433ec96055846235066618 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 8 Jan 2018 11:55:13 +0530 Subject: [PATCH 1/4] course details changes done --- Apollo/assets/views/editCourseDetails.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/views/editCourseDetails.html b/Apollo/assets/views/editCourseDetails.html index e8643410..bab131f6 100755 --- a/Apollo/assets/views/editCourseDetails.html +++ b/Apollo/assets/views/editCourseDetails.html @@ -17,7 +17,7 @@ + ng-model="p.CourseID" ng-pattern="/^[a-zA-Z0-9-\s]*$/" readonly required/> Course id is required
-
{{myModelRegular1.FeesName}} +
Single
-
+
@@ -115,7 +115,7 @@ ng-if="Form.regularFees.$error.maxlength || Form.regularFees.$error.pattern">Enter a valid amount
-
+
From 3cb942f83bf25a3ccd2d1aa308182c6a8680b66e Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 8 Jan 2018 11:56:21 +0530 Subject: [PATCH 2/4] course details changes done --- Apollo/assets/js/controllers/courseCtrl.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index 79baf2e3..9cc99d85 100755 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -31,6 +31,8 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab $rootScope.updateMoreItems = []; $scope.editId = -1; $rootScope.setEditId = function (pid,p) { + $rootScope.myModelRegular1=""; + $rootScope.myModelLateral1=""; $rootScope.updateMoreItems=[]; // find index for fees type drop down list @@ -272,6 +274,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab $scope.emptyData=''; $rootScope.init = function () { + $scope.loader=''; var getCourse = { method: 'POST', @@ -305,6 +308,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab "FeesAmount":"", }; + // single sitting lateral course details in model $scope.myModelLateral = { @@ -315,6 +319,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab "FeesAmount":"", }; + // single sitting Sem_Year course details in model $scope.myModelSemYear = { From d609bc9ae9a832e361ce6f794e401ccee5279bb9 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 8 Jan 2018 11:56:38 +0530 Subject: [PATCH 3/4] course details changes done --- Apollo/assets/views/courseDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index bff82cb8..85af9f54 100755 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -158,7 +158,7 @@ + ng-model="myModel.courseCode" ng-pattern="/^[a-zA-Z0-9-\s]*$/" required/> Course id is required Date: Mon, 8 Jan 2018 11:56:47 +0530 Subject: [PATCH 4/4] course details changes done --- .../controllers/Course_Controller.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Apollo/api/application/controllers/Course_Controller.php b/Apollo/api/application/controllers/Course_Controller.php index 8bf24541..99170bb3 100755 --- a/Apollo/api/application/controllers/Course_Controller.php +++ b/Apollo/api/application/controllers/Course_Controller.php @@ -49,8 +49,12 @@ class Course_Controller extends REST_Controller { $jsonLateralFeesData=$this->post('lateralFeesAmounts'); $jsonSemFeesData=$this->post('semFeesAmounts'); // push regular,lateral fees into same array - array_push($jsonSemFeesData,$jsonRegularFeesData); - array_push($jsonSemFeesData,$jsonLateralFeesData); + if($jsonRegularFeesData['FeesAmount'] != 0 AND $jsonRegularFeesData['FeesAmount'] != '' AND $jsonRegularFeesData['FeesAmount'] != 'undefined'){ + array_push($jsonSemFeesData,$jsonRegularFeesData); + } + if($jsonLateralFeesData['FeesAmount'] != 0 AND $jsonLateralFeesData['FeesAmount'] != '' AND $jsonLateralFeesData['FeesAmount'] != 'undefined'){ + array_push($jsonSemFeesData,$jsonLateralFeesData); + } $courseDetails = $this->course_model->addCourse($details,$jsonSemFeesData);// Check if the users data store contains users (in case the database result returns NULL) if ($courseDetails) { @@ -117,8 +121,14 @@ class Course_Controller extends REST_Controller { $jsonLateralFeesData=$this->post('lateralFeesAmounts'); $jsonSemFeesData=$this->post('semFeesAmounts'); // push regular,lateral fees into same array - array_push($jsonSemFeesData,$jsonRegularFeesData); - array_push($jsonSemFeesData,$jsonLateralFeesData); + if($jsonRegularFeesData != '' AND $jsonRegularFeesData != null AND $jsonRegularFeesData != 'undefined'){ + array_push($jsonSemFeesData,$jsonRegularFeesData); + + } + if($jsonLateralFeesData != '' AND $jsonLateralFeesData != null AND $jsonLateralFeesData != 'undefined'){ + array_push($jsonSemFeesData,$jsonLateralFeesData); + + } $updateDetails = $this->course_model->updateCourse($details,$jsonSemFeesData);// Check if the users data store contains users (in case the database result returns NULL) if ($updateDetails)