From ba45cb5e36b3dd086e19f648fa644ce9f268c528 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 29 Nov 2017 10:02:24 +0530 Subject: [PATCH 1/7] changes in course --- Apollo/api/application/models/Course_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Course_model.php b/Apollo/api/application/models/Course_model.php index 5cf1b980..27f37a63 100644 --- a/Apollo/api/application/models/Course_model.php +++ b/Apollo/api/application/models/Course_model.php @@ -71,7 +71,7 @@ class Course_model extends CI_Model { $this->db->select('CU.CourseID,CU.CourseName,CU.FeesType,CU.PC,CU.DC,CU.TC,CU.MC,CU.OtherFees,CU.IsActive,US.UniversityID,US.UniversityName'); $this->db->from(COURSE.' as CU'); $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID'); - $this->db->order_by('CU.CreatedOn','DESC'); + $this->db->order_by('CU.CourseID','ASC'); $courseDetails = $this->db->get(); if($courseDetails->result()){ From 3805ac40c308bddab402689a20e3f8866d76deae Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 29 Nov 2017 10:29:12 +0530 Subject: [PATCH 2/7] add edit batch file --- Apollo/assets/views/editBatchDetails.html | 102 ++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 Apollo/assets/views/editBatchDetails.html diff --git a/Apollo/assets/views/editBatchDetails.html b/Apollo/assets/views/editBatchDetails.html new file mode 100644 index 00000000..6a121de5 --- /dev/null +++ b/Apollo/assets/views/editBatchDetails.html @@ -0,0 +1,102 @@ +
+
+
+
+
+ + Update Batch Details + + +
+
+ + + + Batch Code is required + Invalid batch Code + +
+ + +
+ + + + Batch Code is required + Invalid Batch Code + +
+ +
+ + + University is required +
+ +
+ +
+ + + +
+
+ + +
+ +
+ +
+ +
+
+
+
+ + + + + +
+
+
+ +
+
+ + +
+ + + + + \ No newline at end of file From b71a52f22d24185f1f2dc726845dba82900ba514 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 29 Nov 2017 10:39:26 +0530 Subject: [PATCH 3/7] changes in course --- Apollo/api/application/models/Course_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Course_model.php b/Apollo/api/application/models/Course_model.php index 27f37a63..5cf1b980 100644 --- a/Apollo/api/application/models/Course_model.php +++ b/Apollo/api/application/models/Course_model.php @@ -71,7 +71,7 @@ class Course_model extends CI_Model { $this->db->select('CU.CourseID,CU.CourseName,CU.FeesType,CU.PC,CU.DC,CU.TC,CU.MC,CU.OtherFees,CU.IsActive,US.UniversityID,US.UniversityName'); $this->db->from(COURSE.' as CU'); $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID'); - $this->db->order_by('CU.CourseID','ASC'); + $this->db->order_by('CU.CreatedOn','DESC'); $courseDetails = $this->db->get(); if($courseDetails->result()){ From 86c6b95dafd5b6272b4a95e3564aeddc84e4ec12 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 29 Nov 2017 12:49:54 +0530 Subject: [PATCH 4/7] changes in course --- Apollo/assets/js/controllers/courseCtrl.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index 291c8016..44103141 100644 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -157,7 +157,6 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab * created by kms * */ $scope.updateCourse = function (myModel, form, loading) { - console.log(form); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -223,7 +222,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab $rootScope.init = function () { $scope.loader=''; - var getBranch = { + var getCourse = { method: 'POST', url: apiPoint.url + 'getCourseDetails/', headers: { @@ -233,7 +232,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID } }; - $http(getBranch).then(function (response) { + $http(getCourse).then(function (response) { if (response.data.status==200 && response.data.courseStatus) { $scope.emptyData=true; $scope.loader=true; @@ -246,9 +245,13 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab } else { + $scope.emptyData=false; - $scope.loader=false; + $scope.loader=true; $scope.university=response.data.universityDetails; + $scope.feesDetails=response.data.feesDetails; + $scope.myModel.ListName=$scope.feesDetails[0]; + $scope.myModel.programListName=$scope.myModel.ListName.programType[0].ListCode; } }); From c46a703ab559e809de82b1470f627273fa667e09 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 29 Nov 2017 12:53:38 +0530 Subject: [PATCH 5/7] changes in course --- Apollo/assets/js/controllers/branchCtrl.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/branchCtrl.js b/Apollo/assets/js/controllers/branchCtrl.js index defe2582..597a85a7 100644 --- a/Apollo/assets/js/controllers/branchCtrl.js +++ b/Apollo/assets/js/controllers/branchCtrl.js @@ -218,7 +218,6 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A $scope.loader=true; // var data = response.data.details; $scope.data = response.data.details; - console.log(data); // this for search box // $scope.search = {BranchCode: ''}; // $scope.tableParams = new ngTableParams({ @@ -235,7 +234,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A // }); } else { $scope.emptyData=false; - $scope.loader=false; + $scope.loader=true; $scope.branchInfo=''; From b6a3e874930aa0f21fdc9f991ecdc671b988862a Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 29 Nov 2017 13:22:46 +0530 Subject: [PATCH 6/7] changes in course --- Apollo/assets/js/controllers/batchCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/batchCtrl.js b/Apollo/assets/js/controllers/batchCtrl.js index 3dc68394..a517b823 100644 --- a/Apollo/assets/js/controllers/batchCtrl.js +++ b/Apollo/assets/js/controllers/batchCtrl.js @@ -195,7 +195,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl } else { $scope.emptyData=false; - $scope.loader=false; + $scope.loader=true; $scope.university=response.data.universityDetails; } From d3969dd741afcb806518a0546b372e1ecdf117bb Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 29 Nov 2017 14:45:21 +0530 Subject: [PATCH 7/7] commited the router page --- Apollo/assets/js/config.router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 6cf50f12..dc1ce976 100644 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -59,7 +59,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.dashboard', { url: "/dashboard", templateUrl: "assets/views/dashboard.html", - resolve: loadSequence('jquery-sparkline', 'dashboardCtrl'), + resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'dashboardCtrl','ngTable'), title: 'Dashboard', ncyBreadcrumb: { label: 'Dashboard'