From 5abbc0c71d36fa4bf555fca2611aa95d0f8ae731 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:46:17 +0530 Subject: [PATCH 01/24] session master changes done --- Apollo/api/application/config/routes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 66feaa01..b4f80fef 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -242,9 +242,9 @@ $route['updateSubjectDetails'] = 'Subject_Controller/updateSubjectDetails'; $route['addSubjectDetails'] = 'Subject_Controller/addSubjectDetails'; // session mater -$route['addSessionMaterDetails'] = 'SessionMater_Controller/addSessionMaterDetails'; -$route['getSessionMaterDetails'] = 'SessionMater_Controller/getSessionMaterDetails'; -$route['updateSessionMaterDetails'] = 'SessionMater_Controller/updateSessionMaterDetails'; +$route['addSessionMasterDetails'] = 'SessionMater_Controller/addSessionMasterDetails'; +$route['getSessionMasterDetails'] = 'SessionMater_Controller/getSessionMasterDetails'; +$route['updateSessionMasterDetails'] = 'SessionMater_Controller/updateSessionMasterDetails'; // session schedule $route['addSessionScheduleDetails'] = 'SessionSchedule_Controller/addSessionScheduleDetails'; From ce3090a34a65f56ff4482f4d0805319b01cc6fe2 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:46:38 +0530 Subject: [PATCH 02/24] session master changes done --- Apollo/assets/js/controllers/sessionMasterCtrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/js/controllers/sessionMasterCtrl.js b/Apollo/assets/js/controllers/sessionMasterCtrl.js index 29c3e35f..903d78f6 100755 --- a/Apollo/assets/js/controllers/sessionMasterCtrl.js +++ b/Apollo/assets/js/controllers/sessionMasterCtrl.js @@ -89,7 +89,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", var addSession = { method: 'POST', - url: apiPoint.url + 'addSessionMaterDetails/', + url: apiPoint.url + 'addSessionMasterDetails/', headers: { 'Content-Type': 'application/json' }, @@ -154,7 +154,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", var update = { method: 'POST', - url: apiPoint.url + 'updateSessionMaterDetails/', + url: apiPoint.url + 'updateSessionMasterDetails/', headers: { 'Content-Type': 'application/json' }, @@ -197,7 +197,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.universityList = []; var getSession = { method: 'POST', - url: apiPoint.url + 'getSessionMaterDetails/', + url: apiPoint.url + 'getSessionMasterDetails/', headers: { 'Content-Type': 'application/json' }, From 78a42d0468a05acb57343f0fd6850f5eb2c805f1 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:46:48 +0530 Subject: [PATCH 03/24] session master changes done --- .../api/application/controllers/SessionMater_Controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/controllers/SessionMater_Controller.php b/Apollo/api/application/controllers/SessionMater_Controller.php index b54e3493..4f0b0913 100755 --- a/Apollo/api/application/controllers/SessionMater_Controller.php +++ b/Apollo/api/application/controllers/SessionMater_Controller.php @@ -14,9 +14,9 @@ class SessionMater_Controller extends REST_Controller { // Configure limits on our controller methods // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php - $this->methods['addSessionMaterDetails_post']['limit'] = 100; // 50 requests per hour per user/key - $this->methods['getSessionMaterDetails_post']['limit'] = 500; // 50 requests per hour per user/key - $this->methods['updateSessionMaterDetails_post']['limit'] = 500;// 500 requests per hour per user/key + $this->methods['addSessionMasterDetails_post']['limit'] = 100; // 50 requests per hour per user/key + $this->methods['getSessionMasterDetails_post']['limit'] = 500; // 50 requests per hour per user/key + $this->methods['updateSessionMasterDetails_post']['limit'] = 500;// 500 requests per hour per user/key // load the model $this->load->model('SeesionMaster_model', 'sessionM_model'); From 6d003394767327f3b2ed287469ef2fd21fd4fe81 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:49:22 +0530 Subject: [PATCH 04/24] session master changes done --- .../api/application/controllers/SessionMater_Controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/controllers/SessionMater_Controller.php b/Apollo/api/application/controllers/SessionMater_Controller.php index 4f0b0913..bab038c3 100755 --- a/Apollo/api/application/controllers/SessionMater_Controller.php +++ b/Apollo/api/application/controllers/SessionMater_Controller.php @@ -27,7 +27,7 @@ class SessionMater_Controller extends REST_Controller { * created by kms * */ - public function addSessionMaterDetails_post() + public function addSessionMasterDetails_post() { $now = new DateTime(); $now->setTimezone(new DateTimezone('Asia/Kolkata')); @@ -61,7 +61,7 @@ class SessionMater_Controller extends REST_Controller { * get session master details * created by kms * */ - public function getSessionMaterDetails_post() + public function getSessionMasterDetails_post() { $requestedBy = $this->post('requestedBy'); $branchCode = $this->post('branchCode'); @@ -87,7 +87,7 @@ class SessionMater_Controller extends REST_Controller { * update the session master details * created by kms * */ - public function updateSessionMaterDetails_post() + public function updateSessionMasterDetails_post() { $now = new DateTime(); $now->setTimezone(new DateTimezone('Asia/Kolkata')); From cb14937d07f45e23ee192987d2caeaa9b96913a5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:57:30 +0530 Subject: [PATCH 05/24] session master file name changed --- Apollo/api/application/config/routes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index b4f80fef..509d4208 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -242,9 +242,9 @@ $route['updateSubjectDetails'] = 'Subject_Controller/updateSubjectDetails'; $route['addSubjectDetails'] = 'Subject_Controller/addSubjectDetails'; // session mater -$route['addSessionMasterDetails'] = 'SessionMater_Controller/addSessionMasterDetails'; -$route['getSessionMasterDetails'] = 'SessionMater_Controller/getSessionMasterDetails'; -$route['updateSessionMasterDetails'] = 'SessionMater_Controller/updateSessionMasterDetails'; +$route['addSessionMasterDetails'] = 'SessionMaster_Controller/addSessionMasterDetails'; +$route['getSessionMasterDetails'] = 'SessionMaster_Controller/getSessionMasterDetails'; +$route['updateSessionMasterDetails'] = 'SessionMaster_Controller/updateSessionMasterDetails'; // session schedule $route['addSessionScheduleDetails'] = 'SessionSchedule_Controller/addSessionScheduleDetails'; From 4084fd16e0c3ac8153a8736a598b7f87d2cf8c57 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:57:40 +0530 Subject: [PATCH 06/24] session master file name changed --- Apollo/api/application/models/SeesionMaster_model.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Apollo/api/application/models/SeesionMaster_model.php b/Apollo/api/application/models/SeesionMaster_model.php index 623a6d5d..dadbe11e 100755 --- a/Apollo/api/application/models/SeesionMaster_model.php +++ b/Apollo/api/application/models/SeesionMaster_model.php @@ -7,8 +7,7 @@ */ defined('BASEPATH') OR exit('No direct script access allowed'); -class SeesionMaster_model extends CI_Model { - +class SessionMaster_model extends CI_Model { /* * Add session master details From a17c83818c1f1a50e843895fe709c436a9f4efb1 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:58:00 +0530 Subject: [PATCH 07/24] session master file name changed --- ...SessionMater_Controller.php => SessionMaster_Controller.php} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Apollo/api/application/controllers/{SessionMater_Controller.php => SessionMaster_Controller.php} (98%) diff --git a/Apollo/api/application/controllers/SessionMater_Controller.php b/Apollo/api/application/controllers/SessionMaster_Controller.php similarity index 98% rename from Apollo/api/application/controllers/SessionMater_Controller.php rename to Apollo/api/application/controllers/SessionMaster_Controller.php index bab038c3..ac548ce2 100755 --- a/Apollo/api/application/controllers/SessionMater_Controller.php +++ b/Apollo/api/application/controllers/SessionMaster_Controller.php @@ -5,7 +5,7 @@ * Date: 2/7/18 * Time: 10:37 AM */ -class SessionMater_Controller extends REST_Controller { +class SessionMaster_Controller extends REST_Controller { function __construct() { From 2e44603722327ce5e042d2e2c727aedd29e88c28 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:58:54 +0530 Subject: [PATCH 08/24] session master file name changed --- Apollo/api/application/controllers/SessionMaster_Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/controllers/SessionMaster_Controller.php b/Apollo/api/application/controllers/SessionMaster_Controller.php index ac548ce2..6cfcb908 100755 --- a/Apollo/api/application/controllers/SessionMaster_Controller.php +++ b/Apollo/api/application/controllers/SessionMaster_Controller.php @@ -18,7 +18,7 @@ class SessionMaster_Controller extends REST_Controller { $this->methods['getSessionMasterDetails_post']['limit'] = 500; // 50 requests per hour per user/key $this->methods['updateSessionMasterDetails_post']['limit'] = 500;// 500 requests per hour per user/key // load the model - $this->load->model('SeesionMaster_model', 'sessionM_model'); + $this->load->model('SessionMaster_model', 'sessionM_model'); } From faa85990e0be66e5d4d749ae986a5eb0aeb5dbd9 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 10:59:16 +0530 Subject: [PATCH 09/24] session master file name changed --- .../models/{SeesionMaster_model.php => SessionMaster_model.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Apollo/api/application/models/{SeesionMaster_model.php => SessionMaster_model.php} (100%) diff --git a/Apollo/api/application/models/SeesionMaster_model.php b/Apollo/api/application/models/SessionMaster_model.php similarity index 100% rename from Apollo/api/application/models/SeesionMaster_model.php rename to Apollo/api/application/models/SessionMaster_model.php From 45122988b5c98a000339579fad486b402a2be4a6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 12:31:21 +0530 Subject: [PATCH 10/24] date filter changes service --- Apollo/assets/js/directives/convert-words.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Apollo/assets/js/directives/convert-words.js b/Apollo/assets/js/directives/convert-words.js index e84107bd..53674596 100755 --- a/Apollo/assets/js/directives/convert-words.js +++ b/Apollo/assets/js/directives/convert-words.js @@ -169,4 +169,19 @@ app.filter('ucfirst', function() { return function(input) { return (!!input) ? input.charAt(0).toUpperCase() + input.substr(1).toLowerCase() : ''; } +}); +/* +* service for session date +* filter +* */ +app.service('dateListDescService', function() { + + this.getOrderByList = function(list) { + var listDetails = list.sort(function(a, b) { + a = new Date(a.givenDateObject); + b = new Date(b.givenDateObject); + return a >b ? -1 : a < b ? 1 : 0; + }); + return listDetails; + } }); \ No newline at end of file From bf1f76c72ae3e24274cde30748492a0d9aa07e2b Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 12:31:51 +0530 Subject: [PATCH 11/24] session master changes for date desc order --- .../assets/js/controllers/sessionMasterCtrl.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Apollo/assets/js/controllers/sessionMasterCtrl.js b/Apollo/assets/js/controllers/sessionMasterCtrl.js index 903d78f6..85d87c97 100755 --- a/Apollo/assets/js/controllers/sessionMasterCtrl.js +++ b/Apollo/assets/js/controllers/sessionMasterCtrl.js @@ -4,7 +4,7 @@ * Simple table with sorting and filtering on AngularJS */ -app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) { +app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state" , "dateListDescService", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, dateListDescService) { $scope.myModel = { "sessionName": "", "switchsetting": true @@ -213,19 +213,19 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.emptyData=true; $scope.loader=true; - $scope.data = response.data.details; + angular.forEach(response.data.details,function (value,key) { + var parts = value.SessionDate.split("-"); + // console.log(new Date(parts[2], parts[1] - 1, parts[0])); + value.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); - // $scope.university=response.data.universityDetails; - - - + }); + // call service for order by date in desc + $scope.data=dateListDescService.getOrderByList($scope.data); } else { $scope.emptyData=false; $scope.loader=true; - // $scope.university=response.data.universityDetails; - } angular.forEach(response.data.universityDetails, function (values, keys) { $scope.arrayData = { From 6b6202000715545c07ab5c518dfce9df43b23b47 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 12:44:06 +0530 Subject: [PATCH 12/24] session master changes --- Apollo/assets/js/controllers/sessionMasterCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/sessionMasterCtrl.js b/Apollo/assets/js/controllers/sessionMasterCtrl.js index 85d87c97..1ac9c770 100755 --- a/Apollo/assets/js/controllers/sessionMasterCtrl.js +++ b/Apollo/assets/js/controllers/sessionMasterCtrl.js @@ -214,7 +214,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.emptyData=true; $scope.loader=true; $scope.data = response.data.details; - angular.forEach(response.data.details,function (value,key) { + angular.forEach($scope.data,function (value,key) { var parts = value.SessionDate.split("-"); // console.log(new Date(parts[2], parts[1] - 1, parts[0])); value.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); From 4ad702d21eef56331f2dcd39a79d3d96edb22c1b Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 12:44:33 +0530 Subject: [PATCH 13/24] fees status session master changes order by desc --- Apollo/assets/js/controllers/feesStatusCtrl.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index dd1ce883..17874d2a 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -3,7 +3,7 @@ * controllers for ng-table * Simple table with sorting and filtering on AngularJS */ -app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", "installmentService", "SweetAlert", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,installmentService,SweetAlert) { +app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", "installmentService", "SweetAlert", "dateListDescService", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,installmentService,SweetAlert,dateListDescService) { $scope.myModel = { "studentName": "", "mobileNumber": "", @@ -818,6 +818,14 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.masterSessionDetails = response.data.sessionDetails; + // service call for session master list in desc order based on date + angular.forEach($scope.masterSessionDetails,function (fvalue,fkey) { + var parts = fvalue.SessionDate.split("-"); + fvalue.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + }); + $scope.masterSessionDetails=dateListDescService.getOrderByList($scope.masterSessionDetails); + // end for service call + $scope.feesStructureInfo=response.data.feesDetails; $scope.setModel = { "feesType": $scope.feesStructureInfo[0], @@ -910,7 +918,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } } - }); $scope.setModel.feesType.SessionName=$scope.feesStructureInfo[0].SessionName; From fc365157ff7dbbef65c34ff3eee6279926a4481c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 13:03:37 +0530 Subject: [PATCH 14/24] batch changes desc order --- Apollo/assets/js/controllers/batchCtrl.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/js/controllers/batchCtrl.js b/Apollo/assets/js/controllers/batchCtrl.js index 31400e69..9ef5ac69 100755 --- a/Apollo/assets/js/controllers/batchCtrl.js +++ b/Apollo/assets/js/controllers/batchCtrl.js @@ -4,7 +4,7 @@ * Simple table with sorting and filtering on AngularJS */ -app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) { +app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", "dateListDescService", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, dateListDescService) { $scope.myModel = { "batchCode": "", "batchName": "", @@ -259,13 +259,18 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl $scope.emptyData=true; $scope.loader=true; - $scope.data = response.data.details; + // call service for make list in desc order based on date + angular.forEach($scope.data,function (value,key) { + var parts = value.BatchDate.split("-"); + value.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + + }); + // end service call + $scope.data=dateListDescService.getOrderByList($scope.data); $scope.university=response.data.universityDetails; - - } else { $scope.emptyData=false; $scope.loader=true; From 65100d39612b4f157b1cf4e65dff98b699ada0db Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 13:55:21 +0530 Subject: [PATCH 15/24] btach list desc order changes in fees --- Apollo/assets/js/controllers/feesStatusCtrl.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 17874d2a..de8fd070 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -831,12 +831,16 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n "feesType": $scope.feesStructureInfo[0], }; angular.forEach($scope.feesStructureInfo[0].batchDetails,function (values,key) { + var parts = values.BatchDate.split("-"); $scope.BatchDetails.push({ "BatchCode":values.BatchCode, "BatchName":values.BatchName + '('+ values.BatchCode + ')', - "BatchDate":values.BatchDate + "BatchDate":values.BatchDate, + "givenDateObject":new Date(parts[2], parts[1] - 1, parts[0]) }) }); + // call service for make a list in desc order based on date + $scope.BatchDetails=dateListDescService.getOrderByList($scope.BatchDetails); $scope.setTotalAmount=$scope.feesStructureInfo[0].PayableFees; $rootScope.updateMoreItems=[]; @@ -1063,12 +1067,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.BatchDetails=[]; $rootScope.updateMoreItems=[]; angular.forEach(model.batchDetails,function (values,key) { + var parts1 = values.BatchDate.split("-"); $scope.BatchDetails.push({ "BatchCode":values.BatchCode, "BatchName":values.BatchName + '('+ values.BatchCode + ')', - "BatchDate":values.BatchDate - }) + "BatchDate":values.BatchDate, + "givenDateObject":new Date(parts1[2], parts1[1] - 1, parts1[0]) + + }) }); + $scope.BatchDetails=dateListDescService.getOrderByList($scope.BatchDetails); + if(model.InstallmentDetails != ''){ /*$scope.myModelInstallemt.ID=model.InstallmentDetails[model.InstallmentDetails.length-1].ID; From 5a1c2ffc53dfab929f628f4b571a49cdca013513 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 14:15:42 +0530 Subject: [PATCH 16/24] status update batch date desc order list changes --- Apollo/api/application/models/StatusUpdation_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 11904813..08ffc84e 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -500,7 +500,7 @@ class StatusUpdation_model extends CI_Model { $courseDetails = $courDetails->result(); $resultArr['Course'] = $courseDetails; // Batch Details - $this->db->select('t3.BatchName, t3.BatchCode'); + $this->db->select('t3.BatchName, t3.BatchCode,t3.BatchDate'); $this->db->from('' . BATCH . ' as t3'); $this->db->where('t3.UniversityID', $clip->UniversityID); $this->db->where('t3.IsActive', 1); From 67f5c02f0ba57c7906b814fc0d5e740d0b741022 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 14:16:04 +0530 Subject: [PATCH 17/24] study material status update batch date desc order list changes --- .../assets/js/controllers/studyMaterialStatusCtrl.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index f24a2233..1fe1295d 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -1,7 +1,7 @@ 'use strict'; /*** controller for Wizard Form example***/ -app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window', - function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window) { +app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window', "dateListDescService", + function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService) { /** * Study material status update search @@ -106,6 +106,13 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.searchData.Batch = ''; $scope.courseData = name.Course; $scope.batchData = name.Batch; + //call service for array list in desc order based on date + angular.forEach($scope.batchData,function (values,key) { + var parts = values.BatchDate.split("-"); + values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + }); + $scope.batchData=dateListDescService.getOrderByList($scope.batchData); + // end $scope.OpenWindowStatus = false; $scope.getSearch(); }; From 644d5cedc6d2039aa30d1cd53378f46ce3685a80 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 14:21:42 +0530 Subject: [PATCH 18/24] batch list in decs order changes --- Apollo/assets/js/controllers/certificationStatusCtrl.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index 51dc8e99..3f3871aa 100755 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -1,6 +1,6 @@ 'use strict'; /*** controller for Wizard Form example***/ -app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) { +app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) { /** * Certification status update search / Mark card status update @@ -131,6 +131,13 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.searchData.Batch = ''; $scope.courseData = name.Course; $scope.batchData = name.Batch; + //call service for array list in desc order based on date + angular.forEach($scope.batchData,function (values,key) { + var parts = values.BatchDate.split("-"); + values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + }); + $scope.batchData=dateListDescService.getOrderByList($scope.batchData); + // end $scope.OpenWindowStatus = false; $scope.getSearch(); }; From eb936b5e2c6f33f80a07d3316f65a8029778633f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 14:22:00 +0530 Subject: [PATCH 19/24] batch list in decs order changes --- Apollo/assets/js/controllers/applicationStatusCtrl.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index 114a58fe..ec1204eb 100755 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -1,6 +1,6 @@ 'use strict'; /*** controller for Wizard Form example***/ -app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) { +app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) { /** * Application status update search / Document status update @@ -135,6 +135,13 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.searchData.Batch = ''; $scope.courseData = name.Course; $scope.batchData = name.Batch; + //call service for array list in desc order based on date + angular.forEach($scope.batchData,function (values,key) { + var parts = values.BatchDate.split("-"); + values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + }); + $scope.batchData=dateListDescService.getOrderByList($scope.batchData); + // end $scope.OpenWindowStatus = false; $scope.getSearch(); }; From 5fa56711523497fb442d4ad4d4d0082f3ff44663 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 14:22:14 +0530 Subject: [PATCH 20/24] batch list in decs order changes --- Apollo/assets/js/controllers/answerBookletStatusCtrl.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index ae7db6e4..cc5cd31a 100755 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -1,6 +1,6 @@ 'use strict'; /*** controller for Wizard Form example***/ -app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) { +app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) { /** * Answer Booklet status update search @@ -105,6 +105,13 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.searchData.Batch = ''; $scope.courseData = name.Course; $scope.batchData = name.Batch; + //call service for array list in desc order based on date + angular.forEach($scope.batchData,function (values,key) { + var parts = values.BatchDate.split("-"); + values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + }); + $scope.batchData=dateListDescService.getOrderByList($scope.batchData); + // end $scope.OpenWindowStatus = false; $scope.getSearch(); }; From dc94e2f0ce797c930f2ba96f577dc390eb03b075 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 14:26:46 +0530 Subject: [PATCH 21/24] batch list desc in broad cast --- Apollo/api/application/models/Broadcast_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Broadcast_model.php b/Apollo/api/application/models/Broadcast_model.php index fa2d9a82..cd1aadd8 100755 --- a/Apollo/api/application/models/Broadcast_model.php +++ b/Apollo/api/application/models/Broadcast_model.php @@ -104,7 +104,7 @@ class Broadcast_model extends CI_Model { $courseDetails = $courDetails->result(); $resultArr['Course'] = $courseDetails; // Batch Details - $this->db->select('t3.BatchName, t3.BatchCode'); + $this->db->select('t3.BatchName, t3.BatchCode,t3.BatchDate'); $this->db->from('' . BATCH . ' as t3'); $this->db->where('t3.UniversityID', $clip->UniversityID); $this->db->where('t3.IsActive', 1); From 53bd34d5baaeefe4531b40e512a0d8d9dac5c8bf Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 14:26:56 +0530 Subject: [PATCH 22/24] batch list desc in broad cast --- Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 09f15466..59b95e16 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -1,6 +1,6 @@ 'use strict'; /*** controller for Wizard Form example***/ -app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) { +app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) { /** * Send SMS Functionality @@ -73,6 +73,13 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", " $scope.searchData.Batch = ''; $scope.courseData = name.Course; $scope.batchData = name.Batch; + //call service for array list in desc order based on date + angular.forEach($scope.batchData,function (values,key) { + var parts = values.BatchDate.split("-"); + values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + }); + $scope.batchData=dateListDescService.getOrderByList($scope.batchData); + // end $scope.OpenWindowStatus = false; $scope.getSearch(); }; From 6594ce03ed2f96bb03fa0ee84f98fde13c274127 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 15:39:37 +0530 Subject: [PATCH 23/24] update fees pdf changes --- Apollo/assets/views/status-update/updateFeesStatus.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index 3ff5d19a..93e9c042 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -537,7 +537,7 @@
- {{BranchAddr}} + {{BranchAddr}} From 0dfaf60ae2a4473e98ee05a98eda2e2cfb7de89e Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 26 May 2018 17:05:27 +0530 Subject: [PATCH 24/24] call track comments alignment changes --- Apollo/assets/views/callTrackingFollowup.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Apollo/assets/views/callTrackingFollowup.html b/Apollo/assets/views/callTrackingFollowup.html index a8ab3bb3..3418eba6 100755 --- a/Apollo/assets/views/callTrackingFollowup.html +++ b/Apollo/assets/views/callTrackingFollowup.html @@ -385,10 +385,8 @@
{{message.FirstName}}    On   {{message.CreatedOn}}
+ {{message.FollowupComments}} -

- {{message.FollowupComments}} -