From f3189b37a286d23b10cd294bb93e693c75cc8bf9 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 10:54:11 +0530 Subject: [PATCH 01/35] course details changes done --- Apollo/assets/views/student/studentView.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html index 463c6994..e3641fee 100755 --- a/Apollo/assets/views/student/studentView.html +++ b/Apollo/assets/views/student/studentView.html @@ -358,7 +358,7 @@ - + From 72b2030a84dbc58d7a692215a242985576d71508 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 10:54:21 +0530 Subject: [PATCH 02/35] course details changes done --- Apollo/api/application/models/Studentview_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 776172a0..216d1fd2 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -273,7 +273,7 @@ class Studentview_model extends CI_Model * get student application details * created by kms*/ public function getStudentApplicationDetails($studentID=null,$courseID=null){ - $this->db->select('AS.CourseID,AS.AppDate,AS.Comments,CF.Sem_Year,PLD.ListName'); + $this->db->select('AS.CourseID,AS.CertificationType,AS.AppDate,AS.Comments,CF.Sem_Year,PLD.ListName'); $this->db->from(APPLICATION_STATUS.' as AS'); $this->db->join(COURSE_FEES.' as CF','CF.ID = AS.CourseID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID'); From 29767bebe0fed062dc1b11e617064e491c827029 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 16:26:42 +0530 Subject: [PATCH 03/35] course details changes done --- Apollo/assets/js/controllers/studentViewCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/studentViewCtrl.js b/Apollo/assets/js/controllers/studentViewCtrl.js index b2447f5e..76ff3bdf 100755 --- a/Apollo/assets/js/controllers/studentViewCtrl.js +++ b/Apollo/assets/js/controllers/studentViewCtrl.js @@ -20,7 +20,7 @@ app.controller('studentViewCtrl', ["$scope","$rootScope", "toaster", "$filter", }, data: { requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - + requestedFrom: 2 } }; $http(getcourse).then(function (response) { From ccafe81776230b75762493b99adbba925df1809c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 17:52:22 +0530 Subject: [PATCH 04/35] course details changes done --- .../application/models/Studentview_model.php | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 216d1fd2..dca06a32 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -16,23 +16,43 @@ class Studentview_model extends CI_Model * */ // get student list based on login user - public function getStudentInfo($requestedBy=null) + public function getStudentInfo($requestedBy=null,$requestFrom=null) { - $this->db->select('ST.*'); - $this->db->from( LOGIN . ' as LO'); - $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); - $this->db->where('LO.ID', $requestedBy); - $studentDetails = $this->db->get()->first_row(); - if($studentDetails){ - $result['studentStatus'] = true; - $result['studentDetails'] = $studentDetails; - // get student course details - $result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID); + if($requestFrom !='1'){ + $this->db->select('ST.*'); + $this->db->from( LOGIN . ' as LO'); + $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); + $this->db->where('LO.ID', $requestedBy); + $studentDetails = $this->db->get()->first_row(); + if($studentDetails){ + $result['studentStatus'] = true; + $result['studentDetails'] = $studentDetails; + // get student course details + $result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID); + } + else{ + $result['studentStatus'] = false; + $result['studentInfo'] = ""; + } } else{ - $result['studentStatus'] = false; - $result['studentInfo'] = ""; + $this->db->select('ST.*'); + $this->db->from( LOGIN . ' as LO'); + $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); + $this->db->where('ST.StudentID', $requestedBy); + $studentDetails = $this->db->get()->first_row(); + if($studentDetails){ + $result['studentStatus'] = true; + $result['studentDetails'] = $studentDetails; + // get student course details + $result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID); + } + else{ + $result['studentStatus'] = false; + $result['studentInfo'] = ""; + } } + return $result; } @@ -273,7 +293,7 @@ class Studentview_model extends CI_Model * get student application details * created by kms*/ public function getStudentApplicationDetails($studentID=null,$courseID=null){ - $this->db->select('AS.CourseID,AS.CertificationType,AS.AppDate,AS.Comments,CF.Sem_Year,PLD.ListName'); + $this->db->select('AS.CourseID,AS.AppDate,AS.Comments,CF.Sem_Year,PLD.ListName'); $this->db->from(APPLICATION_STATUS.' as AS'); $this->db->join(COURSE_FEES.' as CF','CF.ID = AS.CourseID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID'); From 4c90107610ccceb568eaa5d7361bbd2f08fac004 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 17:52:36 +0530 Subject: [PATCH 05/35] course details changes done --- Apollo/api/application/controllers/StudentView_Controller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/controllers/StudentView_Controller.php b/Apollo/api/application/controllers/StudentView_Controller.php index 687cea79..0f995206 100755 --- a/Apollo/api/application/controllers/StudentView_Controller.php +++ b/Apollo/api/application/controllers/StudentView_Controller.php @@ -44,8 +44,9 @@ class StudentView_Controller extends REST_Controller public function getStudentInfo_post() { $requestedBy = $this->post('requestedBy'); + $requestedFrom = $this->post('requestedFrom'); - $studentListDetails = $this->studentview_model->getStudentInfo($requestedBy);// Check if the employee exist + $studentListDetails = $this->studentview_model->getStudentInfo($requestedBy,$requestedFrom);// Check if the employee exist if ($studentListDetails) { $studentListDetails['status'] = REST_Controller::HTTP_OK; // Set the response and exit From 9466c106f97a717e33ed7fdf70e670ab438274d8 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 17:53:08 +0530 Subject: [PATCH 06/35] course details changes done --- .../student/student_details_SuperAdmin.html | 61 +++++++++++-------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html index 7cca453f..62abb0db 100644 --- a/Apollo/assets/views/student/student_details_SuperAdmin.html +++ b/Apollo/assets/views/student/student_details_SuperAdmin.html @@ -10,7 +10,7 @@
- +
-
-
+
+
- +
Loading...
-
-
+
+

- +
@@ -111,7 +111,7 @@


- +
@@ -196,7 +196,13 @@ {{p.MobileNumber}} - {{p.Firstname}} {{p.Lastname}} + + + + {{p.Firstname}} {{p.Lastname}} + + + {{p.Fathername}} ACTIVE DEACTIVE @@ -213,6 +219,9 @@ + + + @@ -468,7 +477,7 @@
From d56a872d7a81b106d0683957e57d28b9d82bc019 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 17:53:29 +0530 Subject: [PATCH 07/35] course details changes done --- Apollo/assets/js/controllers/studentCtrl.js | 130 +++++++++++++++++++- 1 file changed, 128 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index b8fad21b..c3bc61a9 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -1057,9 +1057,11 @@ $scope.myUnivSearch = ""; $scope.editId = -1; $scope.editCourseId = -1; + $scope.studentViewPage=-1; $scope.setEditId = function (id) { $scope.editId = id; $scope.editCourseId = -1; + $scope.studentViewPage=-1; } $scope.setEditCourseId = function (id) { @@ -1069,6 +1071,20 @@ $scope.myUnivSearch = ""; // $scope.getStudentCourseDetails(id); $scope.editCourseId = id; $scope.editId = -1; + $scope.studentViewPage=-1; + $scope.courseEditLoading = true; + } + /* + * view student page + * created by kms + * */ + $scope.viewStudentPage = function (id) { + $scope.list = false; + $scope.getStudentPageDetails(id); + $scope.currentStudentId = id; + $scope.studentViewPage = id; + $scope.editId = -1; + $scope.editCourseId = -1; $scope.courseEditLoading = true; } @@ -1076,6 +1092,7 @@ $scope.myUnivSearch = ""; $scope.getStudentList(); $scope.editId = -1; $scope.editCourseId = -1; + $scope.studentViewPage = -1; } $scope.cancelCourseDetails = function () { @@ -1779,6 +1796,40 @@ $scope.myUnivSearch = ""; } } } + /* + * get student view details in management + * created by kms + * + * */ + $scope.getStudentPageDetails = function (id) { + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy :id, + requestedFrom: 1 + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus== true) { + $scope.courseEditLoading = false; + $scope.studentDetails = response.data.studentDetails; + $scope.courseDetails = response.data.courseDetails; + + + } else { + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + }; }]); @@ -1813,6 +1864,81 @@ app.directive('fileUploadEdit', function () { scope.$emit("fileSelectedEdit", { file: files[i] }); } }); - } - }; + + + +} +}; }); +/*modal controller +* */ +app.controller('FeesModalDemoCtrl', ["$scope", "$modal", "$log", function ($scope, $modal, $log) { + //Tooltip for print button + $scope.dynamicTooltip = 'Click to View Bill Details'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.FeesName="" ; + $scope.open = function (values) { + + $scope.FeesName = values; + + var modalInstance = $modal.open({ + templateUrl: 'myModalContent.html', + controller: 'ModalInstanceCtrl', +// size: size, + resolve: { + items: function () { + return $scope.FeesName; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.filter('unique', function() { + return function(collection, primaryKey, secondaryKey) { //optional secondary key + var output = [], + keys = []; + + angular.forEach(collection, function(item) { + var key; + secondaryKey === undefined ? key = item[primaryKey] : key = item[primaryKey][secondaryKey]; + + if(keys.indexOf(key) === -1) { + keys.push(key); + output.push(item); + } + }); + + return output; + }; +}); \ No newline at end of file From 92427c0f5b0ad4a5fc13f07920489ff8107d084e Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 17:53:42 +0530 Subject: [PATCH 08/35] course details changes done --- .../student/studentViewInManagement.html | 642 ++++++++++++++++++ 1 file changed, 642 insertions(+) create mode 100644 Apollo/assets/views/student/studentViewInManagement.html diff --git a/Apollo/assets/views/student/studentViewInManagement.html b/Apollo/assets/views/student/studentViewInManagement.html new file mode 100644 index 00000000..63e5fec3 --- /dev/null +++ b/Apollo/assets/views/student/studentViewInManagement.html @@ -0,0 +1,642 @@ + + + + + + + +
+
+
+ + + + + + + + + +
+
+
+ +

Fetching ...

+
+
+ +
+ + Student Status Details + +
+
+
+
+
+ +
+ + + {{course.UniversityName}} + +
+
+ + Course  : {{course.CourseName}} + +
+
+ + Enrollment ID  : {{course.EnrollmentID}} + +
+
+ + Batch Name  : {{course.BatchName}} + +
+ + +
+ + + +
+ + + +
+
+ + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Fees NameSession NameRoll NumberTotal Payable FeesPaid FeesBalance Fees
+ {{fees.FeesName}} + {{fees.SessionName}} + {{fees.RollNo}} + {{fees.PayableAmount}} + {{fees.PaidBillAmount}} + {{fees.BalanceAmount}} + + + +
+ + + +
+ + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
Document NameStatusComments
+ {{cert.CertificateName}} + + {{cert.ListName}}   ON   {{cert.AppDate}} + + {{cert.Comments}} +
+ + + +
+ + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
TypeStatusComments
+ {{mark.Sem_Year}} + + {{mark.ListName}}   ON   {{mark.CDate}} + + {{mark.Comments}} +
+ + + +
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
TypeStatusComments
+ {{study.Sem_Year}} + {{study.ListName}}   ON   {{study.SDate}} + + {{study.Comments}}
+ + + +
+ + + + +
+
+
+
+
+
+
+
+ + +
+
+
+ + + + +
+
+
+
\ No newline at end of file From 76d2870c3c11c536b94f3096ab9018d42658a489 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 17:58:07 +0530 Subject: [PATCH 09/35] course details changes done --- Apollo/assets/views/student/studentViewInManagement.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/assets/views/student/studentViewInManagement.html b/Apollo/assets/views/student/studentViewInManagement.html index 63e5fec3..f105f53d 100644 --- a/Apollo/assets/views/student/studentViewInManagement.html +++ b/Apollo/assets/views/student/studentViewInManagement.html @@ -380,6 +380,7 @@
+ From 47ce0da619fe39b28d06d236b5993d7faf817f8b Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 18:03:44 +0530 Subject: [PATCH 10/35] course details changes done --- Apollo/assets/views/student/studentViewInManagement.html | 1 - 1 file changed, 1 deletion(-) diff --git a/Apollo/assets/views/student/studentViewInManagement.html b/Apollo/assets/views/student/studentViewInManagement.html index f105f53d..63e5fec3 100644 --- a/Apollo/assets/views/student/studentViewInManagement.html +++ b/Apollo/assets/views/student/studentViewInManagement.html @@ -380,7 +380,6 @@
- From aa78d52b95f5f602fde8e6740751b21ba65c26f1 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 18:14:55 +0530 Subject: [PATCH 11/35] course details changes done --- Apollo/assets/js/controllers/studentCtrl.js | 50 +++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index c3bc61a9..d0568b18 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -182,6 +182,7 @@ $scope.studentListLength = 0; $scope.setEditId = function (id) { $scope.editId = id; $scope.editCourseId = -1; + $scope.studentViewPage=-1; } $scope.setEditCourseId = function (id) { @@ -191,6 +192,20 @@ $scope.studentListLength = 0; // $scope.getStudentCourseDetails(id); $scope.editCourseId = id; $scope.editId = -1; + $scope.studentViewPage=-1; + $scope.courseEditLoading = true; + } + /* + * view student page + * created by kms + * */ + $scope.viewStudentPage = function (id) { + $scope.list = false; + $scope.getStudentPageDetails(id); + $scope.currentStudentId = id; + $scope.studentViewPage = id; + $scope.editId = -1; + $scope.editCourseId = -1; $scope.courseEditLoading = true; } @@ -198,6 +213,7 @@ $scope.studentListLength = 0; $scope.getStudentList(); $scope.editId = -1; $scope.editCourseId = -1; + $scope.studentViewPage=-1; } $scope.cancelCourseDetails = function () { @@ -836,6 +852,40 @@ $scope.studentListLength = 0; } } } + /* + * get student view details in management + * created by kms + * + * */ + $scope.getStudentPageDetails = function (id) { + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy :id, + requestedFrom: 1 + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus== true) { + $scope.courseEditLoading = false; + $scope.studentDetails = response.data.studentDetails; + $scope.courseDetails = response.data.courseDetails; + + + } else { + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + }; }]); From 6380682ca3f3bf7b12dd3757cbffbc7116510afc Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 18:15:21 +0530 Subject: [PATCH 12/35] course details changes done --- Apollo/assets/views/student/student_details.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index 0da7d287..73c27887 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -171,8 +171,16 @@ {{p.MobileNumber}} - {{p.Firstname}} {{p.Lastname}} + + + + + {{p.Firstname}} {{p.Lastname}} + + + {{p.Fathername}} + ACTIVE DEACTIVE
{{p.Comments}}
@@ -188,6 +196,9 @@ + + + From 48b8535e0c2588d16048a69a74c8675526719508 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 18:31:43 +0530 Subject: [PATCH 13/35] course details changes done --- Apollo/assets/views/callTrackingDetails.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index 37634aa5..95867bb2 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -521,9 +521,10 @@ Submit --> +
From 742e7d8e96196d7763ad3f5f43fa57380e6d7d57 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 18:33:55 +0530 Subject: [PATCH 14/35] course details changes done --- Apollo/assets/views/student/student_details_SuperAdmin.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html index 62abb0db..5ca17dba 100644 --- a/Apollo/assets/views/student/student_details_SuperAdmin.html +++ b/Apollo/assets/views/student/student_details_SuperAdmin.html @@ -195,7 +195,11 @@ - {{p.MobileNumber}} + + + {{p.MobileNumber}} + + From 3dfffd5a7abd8c095870999b9272918b92ff9839 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 22 Jan 2018 18:34:34 +0530 Subject: [PATCH 15/35] course details changes done --- Apollo/assets/views/student/student_details.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index 73c27887..c513375e 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -170,7 +170,11 @@ - {{p.MobileNumber}} + + + {{p.MobileNumber}} + + From c54935a92585158a076462509d04028fd4e32dd4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 23 Jan 2018 10:37:19 +0530 Subject: [PATCH 16/35] course details changes done --- .../assets/js/controllers/feesStatusCtrl.js | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 02f6558b..7108913c 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -360,6 +360,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.myModelInstallemt.amount=""; $scope.myModelInstallemt.date=""; $rootScope.updateMoreItems=[]; + $scope.setTotalAmount=''; form.$setPristine(true); } else { @@ -566,10 +567,44 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.myModelInstallemt.date=""; $rootScope.lastInstallemtDate=""; } + $scope.setFeesTotalAmount(model); form.$setPristine(true); } + $scope.setTotalAmount=''; + /* + * get set fees total amount + * */ + $scope.setFeesTotalAmount = function (values) { + if(values.ActualFees=='' || values.ActualFees==null || values.ActualFees==undefined){ + $scope.actFees=0; + } + else{ + $scope.actFees=values.ActualFees; + } + if(values.Others=='' || values.Others==null || values.Others==undefined){ + $scope.othersFees=0; + } + else{ + $scope.othersFees=values.Others; + } + if(values.STFOrWR=='' || values.STFOrWR==null || values.STFOrWR==undefined){ + $scope.stfFees=0; + } + else{ + $scope.stfFees=values.STFOrWR; + } + if(values.Waiver=='' || values.Waiver==null || values.Waiver==undefined){ + $scope.wiverFees=0; + } + else{ + $scope.wiverFees=values.Waiver; + } + + $scope.setTotalAmount= parseInt($scope.actFees) + parseInt($scope.stfFees) + parseInt($scope.othersFees) - parseInt($scope.wiverFees); + + } From 12b15eef7c079c130a8120e540fe341e9c6d6b68 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 23 Jan 2018 10:37:42 +0530 Subject: [PATCH 17/35] course details changes done --- .../status-update/setFeesForStudent.html | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index f4d0a368..18b93cba 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -89,7 +89,7 @@ + ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/> STF/WR amount is required @@ -105,7 +105,7 @@ + ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/> Others amount is required @@ -114,22 +114,7 @@
- - + {{p.statusName}} @@ -411,12 +418,6 @@
- - - - - -
@@ -466,6 +467,7 @@ Enter a valid phone number +
From 3d9108c58da253eb7b140cafcd72c13ca4eb421a Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 23 Jan 2018 15:53:00 +0530 Subject: [PATCH 21/35] course details changes done --- .../controllers/Call_Tracking_Controller.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 9b765e3f..9520db1b 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -42,6 +42,8 @@ class Call_Tracking_Controller extends REST_Controller { $this->methods['getRecentLeadDetails_post']['limit'] = 1000; // 50 requests per hour per user/key $this->methods['getRecentCloseDetails_post']['limit'] = 1000; // 50 requests per hour per user/key $this->methods['getRecentPendingDetails_post']['limit'] = 1000; // 50 requests per hour per user/key + $this->methods['callAsImportantFlag_post']['limit'] = 1000; // 50 requests per hour per user/key + // load the model $this->load->model('Calltracking_model', 'Calltracking_model'); @@ -368,6 +370,32 @@ class Call_Tracking_Controller extends REST_Controller { } + /* + * mark as important for call + * created by kms + * */ + public function callAsImportantFlag_post(){ + $trackID = $this->post('trackId'); + $flagStatus = $this->post('flag'); + $updateFlag = $this->Calltracking_model->updateFlagStatus($trackID,$flagStatus); + + if ($updateFlag) + { + $updateFlag['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($updateFlag, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } From e89a663f9e371a3a6b5dc2f99f67cd3241536c80 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 23 Jan 2018 15:53:16 +0530 Subject: [PATCH 22/35] course details changes done --- .../application/models/Calltracking_model.php | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index d3ec1b95..8af8fd51 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -258,7 +258,7 @@ class Calltracking_model extends CI_Model { public function getTrackingDetails($search=null) { - $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); + $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF'); $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID'); @@ -312,6 +312,7 @@ class Calltracking_model extends CI_Model { $tracking_array["LeadName"]=$row->LeadName; $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; + $tracking_array["Flag"]=$row->Flag; $tracking_array["TrackingID"]=$row->TrackingID; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; @@ -348,7 +349,7 @@ class Calltracking_model extends CI_Model { public function getPrevPendingTrackingDetails($search=null) { - $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); + $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF'); $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID'); @@ -383,6 +384,7 @@ class Calltracking_model extends CI_Model { $tracking_array["LeadName"]=$row->LeadName; $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; + $tracking_array["Flag"]=$row->Flag; $tracking_array["TrackingID"]=$row->TrackingID; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; @@ -1147,5 +1149,24 @@ class Calltracking_model extends CI_Model { return $result_array; } + /* + * update call track as important + * created by kms + * */ + public function updateFlagStatus($trackID=null,$flagStatus=null){ + $updateDetails['Flag']= $flagStatus; + $this->db->where('TrackingID',$trackID); + $this->db->update(LEAD_TRACKING, $updateDetails); + if($this->db->affected_rows() > '0') { + $result['updatedStatus']=true; + + } + else{ + $result['updatedStatus']=false; + + } + return $result; + + } } \ No newline at end of file From 3b7222fea831ac7c98d3c5b4e524ab0732f9c538 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 23 Jan 2018 18:20:53 +0530 Subject: [PATCH 23/35] course details changes done --- .../assets/js/controllers/callTrackingCtrl.js | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index 5543b593..b4a7d451 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -6,6 +6,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) { localStorage.setItem('searchName',''); localStorage.setItem('searchMobile',''); + $scope.myModel = { "studentName": "", "mobileNumber": "", @@ -33,8 +34,27 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.modifyDate.add(30, 'days'); $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); $scope.myModel.date=$scope.currentDate; - $scope.myModel.search=$filter('date')(new Date(), 'yyyy-MM-dd'); - $scope.myModel.searchDate=$scope.currentDate; + + if(localStorage.getItem('searchObj') !='' && localStorage.getItem('searchObj') !=null && localStorage.getItem('searchObj') !=undefined){ + $scope.myModel.search=JSON.parse(localStorage.getItem('searchObj')).fromDate; + $scope.myModel.searchDate=JSON.parse(localStorage.getItem('searchObj')).fromDate; + $scope.myModel.dateTo = JSON.parse(localStorage.getItem('searchObj')).toDate; + $scope.search2 = JSON.parse(localStorage.getItem('searchObj')).searchName; + $scope.search3 = { + "ActivityName" :JSON.parse(localStorage.getItem('searchObj')).serachActivity + }; + $scope.search4 = { "Firstname": JSON.parse(localStorage.getItem('searchObj')).searchAssignTo + }; + $scope.search5 = { "statusName" : JSON.parse(localStorage.getItem('searchObj')).searchStatus + }; + localStorage.setItem('searchObj',''); + } + else{ + $scope.myModel.search=$filter('date')(new Date(), 'yyyy-MM-dd'); + $scope.myModel.searchDate=$scope.currentDate; + } + + $scope.toMinDate = $filter('date')($scope.modifyMinDate, 'MM-dd-yyyy'); @@ -43,7 +63,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.myModel.search=''; $scope.toMinDate = ''; - $scope.myModel.dateTo=''; + $scope.myModel.dateTo=''; } else{ if(type=='2'){ @@ -153,7 +173,6 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", }); - } /* * check to date while marking @@ -178,14 +197,16 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", * edit track details * created by kms * */ - $scope.setEditId = function (p,search1,search2,search3,search4,search5) { + $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate,toDate) { $scope.searchData = { "searchDate": search1, "searchName": search2, 'serachActivity': search3, 'searchAssignTo': search4, 'searchStatus': search5, - 'callFrom':"details" + 'callFrom':"details", + "fromDate": fromDate, + "toDate": toDate, } localStorage.setItem('searchObj', JSON.stringify($scope.searchData)); From d243c069705650b367aaf9ca3aafda370a5a4a66 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 23 Jan 2018 18:21:28 +0530 Subject: [PATCH 24/35] course details changes done --- Apollo/assets/views/callTrackingDetails.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index 29d9ebad..0533a24b 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -127,7 +127,7 @@ - + - + @@ -178,13 +178,13 @@ From 4982e5829367235a3abd943ce036b38d32d42edb Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 24 Jan 2018 14:53:31 +0530 Subject: [PATCH 25/35] course details changes done --- Apollo/api/application/models/Calltracking_model.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 8af8fd51..77ee765e 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -945,7 +945,7 @@ class Calltracking_model extends CI_Model { public function getRecentleadDetails($search=null) { - $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); + $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); @@ -978,6 +978,7 @@ class Calltracking_model extends CI_Model { $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; $tracking_array["TrackingID"]=$row->TrackingID; + $tracking_array["Flag"]=$row->Flag; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; $tracking_array["Firstname"]=$row->Firstname; @@ -1014,7 +1015,7 @@ class Calltracking_model extends CI_Model { * */ public function getRecentCloseDetails($search=null) { - $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); + $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); @@ -1048,6 +1049,7 @@ class Calltracking_model extends CI_Model { $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; $tracking_array["TrackingID"]=$row->TrackingID; + $tracking_array["Flag"]=$row->Flag; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; $tracking_array["Firstname"]=$row->Firstname; @@ -1084,7 +1086,7 @@ class Calltracking_model extends CI_Model { * */ public function getRecentPendingDetails($search=null) { - $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); + $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); @@ -1119,6 +1121,7 @@ class Calltracking_model extends CI_Model { $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; $tracking_array["TrackingID"]=$row->TrackingID; + $tracking_array["Flag"]=$row->Flag; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; $tracking_array["Firstname"]=$row->Firstname; From b7a238dbcd462d37d0bece8d30edb01144f93dd1 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 24 Jan 2018 16:12:07 +0530 Subject: [PATCH 26/35] call track lead details new changes done --- .../assets/views/callTrackingLeadDetails.html | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Apollo/assets/views/callTrackingLeadDetails.html b/Apollo/assets/views/callTrackingLeadDetails.html index 98e1af6a..8b07844a 100755 --- a/Apollo/assets/views/callTrackingLeadDetails.html +++ b/Apollo/assets/views/callTrackingLeadDetails.html @@ -32,13 +32,13 @@ -
+
- + close-text="Close" ng-change="checkDate(myModel)"/> +
-
+
@@ -68,6 +68,7 @@
Tracking ID @@ -160,7 +160,7 @@ {{p.TrackingID}}{{p.TrackingID}} {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - + {{p.statusName}} - + {{p.statusName}}
+ @@ -93,8 +94,14 @@ - - + + + + @@ -142,4 +149,3 @@ - From 390fb05793954eb296a0c0958e917c1b8ca83268 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 24 Jan 2018 16:13:05 +0530 Subject: [PATCH 27/35] course details changes done --- Apollo/assets/views/callTrackingLeadDetails.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/views/callTrackingLeadDetails.html b/Apollo/assets/views/callTrackingLeadDetails.html index 8b07844a..9d20316c 100755 --- a/Apollo/assets/views/callTrackingLeadDetails.html +++ b/Apollo/assets/views/callTrackingLeadDetails.html @@ -120,13 +120,13 @@ From 93491fbcd8a133721843d84f0a1f28b4ac1484db Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 24 Jan 2018 16:23:54 +0530 Subject: [PATCH 28/35] course details changes done --- .../views/callTrackingCloseDetails.html | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Apollo/assets/views/callTrackingCloseDetails.html b/Apollo/assets/views/callTrackingCloseDetails.html index 201e08d9..5b79a9f2 100755 --- a/Apollo/assets/views/callTrackingCloseDetails.html +++ b/Apollo/assets/views/callTrackingCloseDetails.html @@ -32,7 +32,7 @@ -
+
@@ -51,8 +51,8 @@ datepicker-options="dateOptions" placeholder="Select Date" max-date="maxDate" - close-text="Close" ng-change="init(viewForm,myModel)"/> - + close-text="Close" ng-change="checkDate(myModel)"/> +
@@ -68,6 +68,7 @@
Tracking ID
{{p.TrackingID}}
+ + + + {{p.TrackingID}} {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - + {{p.statusName}} - + {{p.statusName}}
+ @@ -93,8 +94,16 @@ - - + + + + + + @@ -113,13 +122,13 @@ From bbb625aacd5f00ac095bbaa571168c248da40fd5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 24 Jan 2018 16:30:07 +0530 Subject: [PATCH 29/35] course details changes done --- .../views/callTrackingPendingDetails.html | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Apollo/assets/views/callTrackingPendingDetails.html b/Apollo/assets/views/callTrackingPendingDetails.html index 1df26425..5a177085 100755 --- a/Apollo/assets/views/callTrackingPendingDetails.html +++ b/Apollo/assets/views/callTrackingPendingDetails.html @@ -32,7 +32,7 @@ -
+
@@ -51,8 +51,8 @@ datepicker-options="dateOptions" placeholder="Select Date" max-date="maxDate" - close-text="Close" ng-change="init(viewForm,myModel)"/> - + close-text="Close" ng-change="checkDate(myModel)"/> +
@@ -68,6 +68,7 @@
Tracking ID
{{p.TrackingID}}
+ + + + {{p.TrackingID}} {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - + {{p.statusName}} - + {{p.statusName}}
+ @@ -93,8 +94,14 @@ - - + + + + @@ -113,13 +120,13 @@ - From 7f93c9f9a3417b77d082c72a8e363291c4dbbaf3 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 24 Jan 2018 16:30:17 +0530 Subject: [PATCH 30/35] course details changes done --- .../assets/js/controllers/callTrackingCtrl.js | 221 +++++++++++++++--- 1 file changed, 194 insertions(+), 27 deletions(-) diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index b4a7d451..d1c2c80d 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -497,11 +497,6 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", } - - - - - }]); /* @@ -512,7 +507,10 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte localStorage.setItem('searchMobile',''); $scope.myModel = { "leadDate": new Date(), - }; + "search":$filter('date')(new Date(), 'yyyy-MM-dd') + +}; + $scope.hideDateSearch=true; //get current date @@ -522,21 +520,33 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte $scope.modifyDate = moment(); $scope.modifyDate.add(30, 'days'); $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); + if(localStorage.getItem('searchObj') !='' && localStorage.getItem('searchObj') !=null && localStorage.getItem('searchObj') !=undefined){ + $scope.myModel.leadDate = $filter('date')(JSON.parse(localStorage.getItem('searchObj')).fromDate, 'dd-MM-yyyy'); + + $scope.myModel.search = JSON.parse(localStorage.getItem('searchObj')).fromDate; + localStorage.setItem('searchObj',''); + } + else{ + $scope.myModel.leadDate=$scope.currentDate; + } - $scope.myModel.leadDate=$scope.currentDate; /* * edit track details * created by kms * */ - $scope.setEditId = function (p,search1,search2,search3,search4,search5) { + $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate) { + + $scope.changeFromDate= $filter('date')(fromDate, 'yyyy-MM-dd'); + $scope.searchData = { "searchDate": search1, "searchName": search2, 'serachActivity': search3, 'searchAssignTo': search4, 'searchStatus': search5, - 'callFrom': "lead" + 'callFrom': "lead", + 'fromDate':$scope.changeFromDate } @@ -561,13 +571,58 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte } + /* + * mark call as important + * created by kms + * */ + $scope.markAsImportant = function (trackID,flag) { + + var markas = { + method: 'POST', + url: apiPoint.url + 'callAsImportantFlag/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + flag:flag, + trackId:trackID, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(markas).then(function (response) { + if (response.data.status==200 && response.data.updatedStatus) { + $scope.init($scope.myModel); + + } else { + $scope.init($scope.myModel); + + } + }); + + + } + + //from date change + $scope.checkDate = function (value) { + + + $scope.myModel.search = $filter('date')(value.leadDate, 'yyyy-MM-dd'); + + + $scope.init($scope.myModel); + + } + + + /* *get tracking list * created by kms * */ - $scope.init = function (form,myModel) { + $scope.init = function (myModel) { - if(isNaN(myModel.leadDate)){ + /* if(isNaN(myModel.leadDate)){ $scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd'); } @@ -578,7 +633,9 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte $scope.getdate=new Date(myModel.leadDate).toDateString(); $scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd'); - } + + }*/ + $scope.loader = true; var getRecentlead = { @@ -588,7 +645,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte 'Content-Type': 'application/json' }, data: { - loadDate:$scope.loadDate, + loadDate:myModel.search, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID @@ -639,7 +696,9 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt localStorage.setItem('searchMobile',''); $scope.myModel = { "closeDate": new Date(), + "search":$filter('date')(new Date(), 'yyyy-MM-dd') }; + $scope.hideDateSearch=true; //get current date @@ -650,23 +709,34 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt $scope.modifyDate.add(30, 'days'); $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); - $scope.myModel.closeDate=$scope.currentDate; + if(localStorage.getItem('searchObj') !='' && localStorage.getItem('searchObj') !=null && localStorage.getItem('searchObj') !=undefined){ + $scope.myModel.closeDate = $filter('date')(JSON.parse(localStorage.getItem('searchObj')).fromDate, 'dd-MM-yyyy'); + $scope.myModel.search = JSON.parse(localStorage.getItem('searchObj')).fromDate; + localStorage.setItem('searchObj',''); + } + else{ + $scope.myModel.closeDate=$scope.currentDate; + } /* * edit track details * created by kms * */ - $scope.setEditId = function (p,search1,search2,search3,search4,search5) { + $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate) { + $scope.changeFromDate= $filter('date')(fromDate, 'yyyy-MM-dd'); + $scope.searchData = { "searchDate": search1, "searchName": search2, 'serachActivity': search3, 'searchAssignTo': search4, 'searchStatus': search5, - 'callFrom': "close" + 'callFrom': "close", + 'fromDate':$scope.changeFromDate } + localStorage.setItem('searchObj', JSON.stringify($scope.searchData)); localStorage.setItem('trackID', p.TrackingID); localStorage.setItem('count', 0); @@ -685,6 +755,48 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt $scope.sortKey = keyname; //set the sortKey to the param passed $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + //from date change + $scope.checkDate = function (value) { + + + $scope.myModel.search = $filter('date')(value.closeDate, 'yyyy-MM-dd'); + + + $scope.init($scope.myModel); + + } + + /* + * mark call as important + * created by kms + * */ + $scope.markAsImportant = function (trackID,flag) { + + var markas = { + method: 'POST', + url: apiPoint.url + 'callAsImportantFlag/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + flag:flag, + trackId:trackID, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(markas).then(function (response) { + if (response.data.status==200 && response.data.updatedStatus) { + $scope.init($scope.myModel); + + } else { + $scope.init($scope.myModel); + + } + }); + + } @@ -692,9 +804,9 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt *get tracking list * created by kms * */ - $scope.init = function (form,myModel) { + $scope.init = function (myModel) { - if(isNaN(myModel.closeDate)){ + /* if(isNaN(myModel.closeDate)){ $scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd'); } @@ -705,7 +817,7 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt $scope.getdate=new Date(myModel.closeDate).toDateString(); $scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd'); - } + }*/ $scope.loader = true; var getRecentclose = { @@ -715,7 +827,7 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt 'Content-Type': 'application/json' }, data: { - loadDate:$scope.loadDate, + loadDate:myModel.search, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID @@ -767,7 +879,9 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi localStorage.setItem('searchMobile',''); $scope.myModel = { "pendingDate": new Date(), + "search":$filter('date')(new Date(), 'yyyy-MM-dd') }; + $scope.hideDateSearch=true; //get current date @@ -778,20 +892,32 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi $scope.modifyDate.add(30, 'days'); $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); - $scope.myModel.pendingDate=$scope.currentDate; + + if(localStorage.getItem('searchObj') !='' && localStorage.getItem('searchObj') !=null && localStorage.getItem('searchObj') !=undefined){ + $scope.myModel.pendingDate = $filter('date')(JSON.parse(localStorage.getItem('searchObj')).fromDate, 'dd-MM-yyyy'); + + $scope.myModel.search = JSON.parse(localStorage.getItem('searchObj')).fromDate; + localStorage.setItem('searchObj',''); + } + else{ + $scope.myModel.pendingDate=$scope.currentDate; + } /* * edit track details * created by kms * */ - $scope.setEditId = function (p,search1,search2,search3,search4,search5) { + $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate) { + $scope.changeFromDate= $filter('date')(fromDate, 'yyyy-MM-dd'); + $scope.searchData = { "searchDate": search1, "searchName": search2, 'serachActivity': search3, 'searchAssignTo': search4, 'searchStatus': search5, - 'callFrom': "pending" + 'callFrom': "pending", + 'fromDate':$scope.changeFromDate } @@ -814,15 +940,56 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi $scope.reverse = !$scope.reverse; //if true make it false and vice versa } + /* + * mark call as important + * created by kms + * */ + $scope.markAsImportant = function (trackID,flag) { + + var markas = { + method: 'POST', + url: apiPoint.url + 'callAsImportantFlag/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + flag:flag, + trackId:trackID, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(markas).then(function (response) { + if (response.data.status==200 && response.data.updatedStatus) { + $scope.init($scope.myModel); + + } else { + $scope.init($scope.myModel); + + } + }); + + + } + //from date change + $scope.checkDate = function (value) { + + + $scope.myModel.search = $filter('date')(value.pendingDate, 'yyyy-MM-dd'); + + + $scope.init($scope.myModel); + + } /* *get tracking list * created by kms * */ - $scope.init = function (form,myModel) { + $scope.init = function (myModel) { - if(isNaN(myModel.pendingDate)){ + /* if(isNaN(myModel.pendingDate)){ $scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd'); } @@ -833,7 +1000,7 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi $scope.getdate=new Date(myModel.pendingDate).toDateString(); $scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd'); - } + }*/ $scope.loader = true; var getRecentclose = { @@ -843,7 +1010,7 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi 'Content-Type': 'application/json' }, data: { - loadDate:$scope.loadDate, + loadDate:myModel.search, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID From 836681520af49d0f6110794e839bfbadfdf748e3 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 25 Jan 2018 10:26:09 +0530 Subject: [PATCH 31/35] course details changes done --- .../application/models/Calltracking_model.php | 58 ++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 77ee765e..a253999b 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -177,6 +177,8 @@ class Calltracking_model extends CI_Model { public function getStaff($status=null,$branchID=null,$userType=null,$requestedBy) { + if($userType != SUPER_ADMIN){ + $this->db->select('LO.ID,ST.StaffID,ST.Firstname'); $this->db->from(LOGIN.' as LO'); $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); @@ -202,10 +204,63 @@ class Calltracking_model extends CI_Model { else{ $result_staff[]=""; } + } + else{ + $this->db->select('BR.BranchCode,BR.BranchName'); + $this->db->from(BRANCH.' as BR'); + //$this->db->where('BR.IsActive',$status); + $branchDetails=$this->db->get(); + + if($branchDetails->result()){ + foreach ($branchDetails->result() as $branchRow){ + $branch_array['BranchCode'] = $branchRow->BranchCode; + $branch_array['BranchName'] = $branchRow->BranchName.'-'.$branchRow->BranchCode; + $branch_array['staffDetails'] = $this->superAdminBranch($branchRow->BranchCode,$status); + $result_staff[]=$branch_array; + } + + } + else{ + $result_staff[]=""; + } + + + } return $result_staff; } + /* + * get staff details based on branch id + * created by kms + * */ + public function superAdminBranch($branchID,$status){ + + $this->db->select('LO.ID,ST.StaffID,ST.Firstname'); + $this->db->from(LOGIN.' as LO'); + $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); + $this->db->where('ST.IsActive',$status); + + $this->db->where('ST.BranchCode',$branchID); + $staffDetails=$this->db->get(); + if($staffDetails){ + $result_staff = array(); + foreach ($staffDetails->result() as $row) + { + $university_array['loginId'] = $row->ID; + $university_array['staffName'] = $row->Firstname.'-'.$row->StaffID; + $result_staff[]=$university_array; + } + + } + else{ + $result_staff[]=""; + } + + return $result_staff; + + } + /* * add lead details @@ -500,7 +555,7 @@ class Calltracking_model extends CI_Model { public function getLoadFollowupDetails($trackingID) { - $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); + $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.CreatedBranch,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); @@ -534,6 +589,7 @@ class Calltracking_model extends CI_Model { $tracking_array["TrackingID"]=$row->TrackingID; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; + $tracking_array["CreatedBranch"]=$row->CreatedBranch; $tracking_array["Firstname"]=$row->Firstname; $tracking_array["StatusCode"]=$row->StatusCode; $tracking_array["statusName"]=$row->statusListName; From 08cc45d97bc844684e93514ef9115d2f9d77ab2e Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 25 Jan 2018 10:26:22 +0530 Subject: [PATCH 32/35] course details changes done --- Apollo/assets/views/callTrackingDetails.html | 74 +++++++++++++++++++- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index 0533a24b..5e7131d8 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -418,7 +418,7 @@ -
+
-
+ +
+ +
+ +
Please Wait...
+ + +
+
+ + + + Branch is required + + +
+ +
+ + + + +
+ + + + Assigned to is required + + +
+
- + + + + + + + + + +
Tracking ID
{{p.TrackingID}}
+ + + + {{p.TrackingID}} {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - + {{p.statusName}} - + + {{p.statusName}}
Assigned To
Select Branch + +
Assigned To + +
Status