From 00c676381fa16e628a51529cf8284491b818a6ab Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 24 Apr 2018 13:13:40 +0530 Subject: [PATCH 01/12] batch master changes --- Apollo/api/application/models/Batch_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Batch_model.php b/Apollo/api/application/models/Batch_model.php index 62d49ffa..9d4121d3 100755 --- a/Apollo/api/application/models/Batch_model.php +++ b/Apollo/api/application/models/Batch_model.php @@ -117,7 +117,6 @@ class Batch_model extends CI_Model { * */ public function updateDefaultBatch($details=null){ - $setDefaultBatch['IsDefault']=false; $setDefaultBatch['UpdatedBy'] = $details['UpdatedBy']; $setDefaultBatch['UpdatedOn'] = $details['UpdatedOn']; @@ -128,6 +127,7 @@ class Batch_model extends CI_Model { if($upateStatus){ $this->db->where('BatchCode',$details['BatchCode']); $this->db->where('UniversityID',$details['UniversityID']); + $this->db->where('BranchCode',$details['BranchCode']); $upateAfterStatus=$this->db->update(BATCH, $details); $result['batchStatus'] = true; $result['message'] = "Successfully Batch details updated"; From b9bae71513d772766a5ba6b393c86f0f6f447947 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 24 Apr 2018 15:12:02 +0530 Subject: [PATCH 02/12] student fees status changes --- Apollo/api/application/models/Fees_status_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 8e514810..3f3723f6 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -262,6 +262,7 @@ class Fees_status_model extends CI_Model $this->db->where('SFP.StudentID', $student['StudentID']); $this->db->where('SFP.IsActive','1'); $this->db->where('US.BranchCode',$student['BranchCode']); + $this->db->where('BA.BranchCode',$student['BranchCode']); $this->db->order_by('SFP.ID', 'DESC'); $getFeeDetails = $this->db->get(); if($getFeeDetails->result()){ From c01f383357a2de6da9927fb257b7cba6e539cc96 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 24 Apr 2018 15:17:26 +0530 Subject: [PATCH 03/12] student fees status changes --- Apollo/api/application/models/Fees_status_model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 3f3723f6..c9671e7c 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1588,18 +1588,18 @@ class Fees_status_model extends CI_Model * */ public function studentInfoForFeesStatus($studentID=null,$courseID=null){ // this sub query for avoid university duplicate id - $this->db->select('BranchID')->from(STUDENTCOURSE); + /* $this->db->select('BranchID')->from(STUDENTCOURSE); $this->db->where('StudentID',$studentID); - $subQuery = $this->db->get_compiled_select(); + $subQuery = $this->db->get_compiled_select();*/ // subquery end $this->db->select('ST.Firstname,ST.MobileNumber,US.UniversityName,CU.CourseName,STC.BranchID'); $this->db->from(STUDENTCOURSE.' as STC'); $this->db->join(STUDENTS.' as ST', 'ST.StudentID = STC.StudentID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID'); - $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = STC.UniversityID'); + $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = STC.UniversityID AND STC.BranchID=US.BranchCode'); $this->db->where('ST.StudentID',$studentID); $this->db->where('STC.CourseID',$courseID); - $this->db->where('US.BranchCode IN('. $subQuery.')', NULL, FALSE); + // $this->db->where('US.BranchCode IN('. $subQuery.')', NULL, FALSE); $leadDet=$this->db->get()->last_row(); if($leadDet){ return $leadDet; From 49bd353ea57e65e9c96114272dbb50a74623c7b6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 24 Apr 2018 15:40:43 +0530 Subject: [PATCH 04/12] fees status changes --- Apollo/assets/js/controllers/feesStatusCtrl.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index bf6c46b1..b96beab5 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -2674,7 +2674,9 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }, data: { requestedBy :studentDetails.MobileNumber, - requestedFrom: 3 + requestedFrom: 3, + branchCode : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; $http(getcourse).then(function (response) { From e2b3cd50abe4254dd536554c982adc3bff69b0c4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 24 Apr 2018 18:19:51 +0530 Subject: [PATCH 05/12] call tracking changes --- .../assets/js/controllers/callTrackingCtrl.js | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index 5e9194c4..5d2f8b05 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -263,6 +263,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.ldloading1 = {}; $scope.ldloading1[loading.replace('-', '_')] = true; + /* hide this fun after branch level changes if($scope.userType !='R004'){ $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID; $scope.updateAssignTo = myModel.assignedTo; @@ -272,7 +273,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.updateBranchID = myModel.branch.BranchCode; $scope.updateAssignTo = myModel.assignedTo; - } + }*/ var addLead = { method: 'POST', @@ -287,8 +288,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", courseName: myModel.courseName, date: $scope.nextFollowupDate, activity: myModel.activity.activityID, - assignedTo: $scope.updateAssignTo, - + assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, comments:myModel.comments, @@ -296,10 +296,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", address:myModel.address, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - branchId: $scope.updateBranchID - - - + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID } }; @@ -1469,7 +1466,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", - if($scope.userType !='R004'){ + /* if($scope.userType !='R004'){ $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID; @@ -1478,7 +1475,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", $scope.updateBranchID = myModel1.branch; - } + }*/ $rootScope.ldloading2 = {}; $rootScope.ldloading2[loading.replace('-', '_')] = true; @@ -1497,7 +1494,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", assignedTo: myModel1.assignStaff, comments: myModel1.comments, updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - branchId: $scope.updateBranchID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID, address: myModel1.Address, alternateMobile: myModel1.AlternateMobile, referredBy: myModel1.ReferredBy, @@ -1560,7 +1557,10 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", $rootScope.myModel1.ReferredBy=$rootScope.followupDetails.ReferredBy; $rootScope.staffArray=''; $rootScope.staffDetails=response.data.staffDetails; - if($scope.userType =='R004'){ + + /* hide this fun after branch level changes + + if($scope.userType =='R004'){ // get deactive branch list $scope.checkBranchData = { BranchCode: $rootScope.followupDetails.CreatedBranch, @@ -1622,7 +1622,28 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", } - } + }*/ + + // ref1 start after branch level changes + // get deactive staff details list + $scope.checkEmpData = { + loginId: $rootScope.followupDetails.AssignedTo, + staffName: $rootScope.followupDetails.Firstname +'-'+$rootScope.followupDetails.StaffID + }; + + if($rootScope.staffDetails){ + var empresult = $filter('filter')($rootScope.staffDetails, $scope.checkEmpData); + if(empresult.length==0){ + + $rootScope.staffDetails.push($scope.checkEmpData); + } + } + else{ + $rootScope.staffDetails=[]; + $rootScope.staffDetails.push($scope.checkEmpData); + } + + // ref1end after branch level changes @@ -1732,7 +1753,8 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }, data: { requestedBy :studentDetails.MobileNumber, - requestedFrom: 3 + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID } }; $http(getcourse).then(function (response) { From 0a1de753a2d5f3d5127f4ee4b5219549c55b84af Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 24 Apr 2018 18:20:08 +0530 Subject: [PATCH 06/12] call tracking changes --- Apollo/assets/views/callTrackingDetails.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index 7265d3ca..89917d86 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -428,7 +428,8 @@ -
+
-
+ <!–Thank You–> +
--> @@ -499,7 +500,7 @@ --> -
+ <!–Thank You–> + -->
From ee7bad935da28e804637930d5246e65708c29b85 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 24 Apr 2018 18:20:20 +0530 Subject: [PATCH 07/12] call tracking changes --- Apollo/assets/views/callTrackingFollowup.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Apollo/assets/views/callTrackingFollowup.html b/Apollo/assets/views/callTrackingFollowup.html index 1176f047..6394c1e2 100755 --- a/Apollo/assets/views/callTrackingFollowup.html +++ b/Apollo/assets/views/callTrackingFollowup.html @@ -180,7 +180,8 @@ - + + Assigned To - + --> - + + <!– –> - + --> Status