From 385898bef27f5b2cd7473e348edd1400f2bd5539 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Fri, 26 Oct 2018 12:45:04 +0530 Subject: [PATCH 1/8] BulkSms --- Apollo/assets/js/controllers/report_app_pendingCtrl.js | 1 + Apollo/assets/js/controllers/report_balfeeCtrl.js | 1 + Apollo/assets/js/controllers/report_certificateCtrl.js | 1 + Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 61f43dbe..b6d87d62 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -192,6 +192,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod { $scope.selectedStudentsID.push($scope.filteredItems[i]); + $rootScope.selectedStudentMN.push($scope.filteredItems[i].Phone_number); } } } diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 0251281b..003da88c 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -242,6 +242,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", { $scope.selectedStudentsID.push($scope.filteredItems[i]); + $rootScope.selectedStudentbalfeesMN.push($scope.filteredItems[i].Phone_number); } } } diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index aa6cb650..2999989c 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -188,6 +188,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod { $scope.selectedStudentsID.push($scope.filteredItems[i]); + $rootScope.selectedStudentcertificateMN.push($scope.filteredItems[i].Phone_number); } } } diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 9fdfe250..b297e21d 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -509,7 +509,11 @@ $scope.disableSendButton = true; // } // }); } + $rootScope.selectedStudentMN=''; + $rootScope.selectedStudentcertificateMN=''; + $rootScope.selectedStudentbalfeesMN=''; }, + reset: function (form) { } From 2274dd9d7a4de553101840823a64bce57b8961fc Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 26 Oct 2018 13:51:42 +0530 Subject: [PATCH 2/8] call tracking --- Apollo/assets/js/controllers/callTrackingCtrl.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index a2c418bd..19c2b0a3 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -427,7 +427,7 @@ if(checkresult != -1) -$scope.trackingTodayno=''; +$scope.trackingTodayno=0; /* *get tracking list @@ -492,12 +492,13 @@ $scope.trackingTodayno=''; } }; $http(getTrackDetails).then(function (response) { + $scope.trackingTodayno=response.data.TotalCallToday; if(response.data.pendingTrackingDetails.trackingStatus && response.data.trackingDetails.length > 0){ $scope.loader = false; - $scope.trackingTodayno=response.data.TotalCallToday; - // console.log($scope.trackingTodayno); - // console.log(response.data) + + //console.log(response.data.TotalCallToday); + //console.log(response.data) //$scope.currentDate1=$filter('date')(new Date(), 'dd-MM-yyyy'); $scope.tillPendingDetails = response.data.pendingTrackingDetails.trackingDetails; angular.forEach($scope.tillPendingDetails, function (value, key) { From 2b29cbd9f0704d7b8de3df228b65850f24b12444 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 26 Oct 2018 15:17:36 +0530 Subject: [PATCH 3/8] daybook feecollected by --- Apollo/api/application/models/DayBook_model.php | 12 ++++++++---- Apollo/assets/views/daybook/daybooksuperadmin.html | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 166322c9..6d8863bc 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -65,12 +65,12 @@ class DayBook_model extends CI_Model $toDate = $dTo->format('Y-m-d'); $reqpayType = $reqDataBy['localBranchID']; - $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName , t5.Firstname as Approved_by_name , + $querys = "SELECT t5.Firstname as Fname,t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName , t5.Firstname as Approved_by_name , t7.UniversityName as UniversityName, t6.CourseName as CourseName,t7.UniversityID,t8.Lastname,t8.MobileNumber FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type AND t3.BranchCode = t1.BranchCode - LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By + LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.CreatedBy LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode @@ -93,12 +93,12 @@ class DayBook_model extends CI_Model // $this->db->order_by('CreatedOn', 'DESC'); // $this->db->where('t1.BranchCode', $reqDataBy['localBranchID']); $reqpayType = $reqDataBy['localBranchID']; - $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name , + $querys = "SELECT t5.Firstname,t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name , t7.UniversityName as UniversityName, t6.CourseName as CourseName,t7.UniversityID,t8.Lastname,t8.MobileNumber FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type AND t3.BranchCode = t1.BranchCode - LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By + LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.CreatedBy LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode @@ -106,12 +106,16 @@ class DayBook_model extends CI_Model WHERE t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; } + + + // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT'); $dayBookDetails = $this->db->query($querys); $dayBookDetailsList = $dayBookDetails->result(); $results['dayBookListStatus'] = true; $results['dayBookListDetails'] = $dayBookDetailsList; + //print_r($this->db->last_query());die; return $results; } diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 0a71bf0e..822ef44b 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -169,6 +169,8 @@ Comments Reason + + Fee Collected by Status @@ -200,6 +202,7 @@
{{p.ReceiptNoComments}}{{p.Description}}
{{p.Reason}} + {{p.Fname}} {{p.Status}} From 8680ffcc9d9785072f154238874be4693e2ad442 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 26 Oct 2018 15:23:33 +0530 Subject: [PATCH 4/8] daybook --- Apollo/assets/views/daybook/daybook.html | 3 +++ Apollo/assets/views/daybook/daybookadmin.html | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 39eb1d7a..13366c82 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -187,6 +187,8 @@ Reason + + Fee Collected by Status @@ -220,6 +222,7 @@
{{p.ReceiptNoComments}}{{p.Description}}
{{p.Reason}} + {{p.Fname}} {{p.Status}} diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index dc024214..143f8556 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -182,6 +182,8 @@ Reason + + Fee Collected by Status @@ -215,6 +217,8 @@
{{p.ReceiptNoComments}}{{p.Description}}
{{p.Reason}} + + {{p.Fname}} {{p.Status}} From 7b3d06e60a21695fb4625899b6adf8b3db471251 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 26 Oct 2018 16:23:19 +0530 Subject: [PATCH 5/8] day book excel --- Apollo/assets/js/controllers/daybookCtrl.js | 2 +- Apollo/assets/js/controllers/daybookadminCtrl.js | 2 +- Apollo/assets/js/controllers/daybooksuperadminCtrl.js | 2 +- Apollo/assets/js/controllers/feesStatusCtrl.js | 10 +++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 6f8559cf..625b0173 100644 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -831,7 +831,7 @@ else $scope.exportData = function () { - alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber,concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, ReceiptNoComments as Comments, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]); + alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber,concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, ReceiptNoComments as Comments, Reason,Fname as FeeCollectedBy ,Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]); }; //Modal for bill details $rootScope.bill_Details = ''; diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 9a866796..9e577ad2 100644 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -818,7 +818,7 @@ else } $scope.exportData = function () { - alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance,ReceiptNoComments as Comments, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]); + alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance,ReceiptNoComments as Comments, Reason,Fname as FeeCollectedBy ,Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]); }; //Modal for bill details $rootScope.bill_Details = ''; diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 24538eeb..3a35c493 100644 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -990,7 +990,7 @@ else return mystyle; } $scope.exportData = function () { - alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, ReceiptNoComments as Comments, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?', [styleXl(), $scope.data]); + alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, ReceiptNoComments as Comments, Reason,Fname as FeeCollectedBy ,Activity INTO XLS("daybook_details.xls",?) FROM ?', [styleXl(), $scope.data]); }; //Modal for bill details diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index ed38f803..b7f032a8 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -1026,7 +1026,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n //$scope.setModel.feesType = $scope.feesStructureInfo[lastval]; - //console.log($scope.lastsetfee); + console.log($scope.lastsetfee); $scope.setModel = { "feesType": $scope.feesStructureInfo[$scope.lastsetfee], @@ -1282,7 +1282,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * */ $scope.changeInstallemt = function (model,form) { - + if(model.Sem_Year!='TC' && model.Sem_Year!='PPC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){ @@ -1302,6 +1302,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.BatchDetails=dateListDescService.getOrderByList($scope.BatchDetails); + + if(model.InstallmentDetails != ''){ /*$scope.myModelInstallemt.ID=model.InstallmentDetails[model.InstallmentDetails.length-1].ID; @@ -1350,6 +1352,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $rootScope.lastInstallemtDate="";*/ $rootScope.updateMoreItems=[]; } + + $scope.setFeesTotalAmount(model,'1',model,'1'); } @@ -1364,7 +1368,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n // form.$setPristine(true); - // console.log($scope.setfeedetails) + //console.log($scope.setfeedetails) //console.log('im'); From 2440de0e31a9d21aab3bcf066e5085f2d384dd01 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 29 Oct 2018 11:57:47 +0530 Subject: [PATCH 6/8] fee session change --- .../application/models/Fees_status_model.php | 2 +- .../assets/js/controllers/feesStatusCtrl.js | 42 ++++++++++++++----- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index e2b73356..bb3e67d3 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1869,7 +1869,7 @@ $REGID=''; $this->db->join(COURSE.' as CU', 'CU.UniversityID = US.UniversityID'); // $this->db->where('SD.IsActive','1'); // $this->db->order_by('CU.CreatedOn','DESC'); - $this->db->order_by('SM.SessionID','ASC'); + $this->db->order_by('SM.SessionID','DESC'); $this->db->where('CU.CourseID',$details['CourseID']); $this->db->where('US.BranchCode',$details['BranchCode']); $this->db->where('SM.BranchCode',$details['BranchCode']); diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index b7f032a8..6f411b6a 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -378,7 +378,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else if(details.ProgramType=='Y001' && details.SNo!='1') { - // console.log('if else1') + // console.log('if else1') if($scope.feesStructureInfo[0].SessionName!='') { @@ -434,7 +434,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else { - // console.log('else') + console.log('else') // get session details var found = $filter('getById')($scope.masterSessionDetails, details.SessionName); $scope.ExistSessionDate = new Date(found.SessionDate.substring(6,10)+'-'+found.SessionDate.substring(3,5)+'-'+found.SessionDate.substring(0,2)); @@ -466,11 +466,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else { - // console.log('function else') + console.log('function else') + + //console.log(details.ProgramType); // alert("function else"); if(details.ProgramType=='Y001' && details.SNo!='1') { - // console.log('else if') + //console.log('else if') // alert("else if"); $scope.sessionDetails=[]; $scope.sessionDetailsTo=[]; @@ -498,11 +500,20 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); - - $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; + + + // console.log($scope.sessionDetails.length); + + var len = $scope.sessionDetails.length-1; + + + $scope.setModel.feesType.SessionName = $scope.sessionDetails[len].SessionID; + // $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; } else{ +//console.log('else') + angular.forEach($scope.masterSessionDetails,function (svalues,skey) { if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID){ @@ -524,14 +535,14 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else { - // console.log('else else') + console.log('else else') //alert("else else"); $scope.sessionDetails=[]; $scope.sessionDetailsTo=[]; if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined) { - //console.log('else else if') + console.log('else else if') angular.forEach($scope.masterSessionDetails,function (svalues,skey) { if(svalues.IsActive=='1' ){ @@ -545,12 +556,21 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); - $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; + var len = $scope.sessionDetails.length-1; + + + $scope.setModel.feesType.SessionName = $scope.sessionDetails[len].SessionID; + + $scope.setModel.feesType.ToSessionName = $scope.sessionDetails[len-1].SessionID; + + // console.log($scope.sessionDetails[len-1].SessionID) + + //$scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; } else { - //console.log('else else else') + // console.log('else else else') // get session details var found = $filter('getById')($scope.masterSessionDetails, details.SessionName); $scope.ExistSessionDate = new Date(found.SessionDate.substring(6,10)+'-'+found.SessionDate.substring(3,5)+'-'+found.SessionDate.substring(0,2)); @@ -1026,7 +1046,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n //$scope.setModel.feesType = $scope.feesStructureInfo[lastval]; - console.log($scope.lastsetfee); + //console.log($scope.lastsetfee);return false; $scope.setModel = { "feesType": $scope.feesStructureInfo[$scope.lastsetfee], From 0823463b19efb12bd0463cb97e4a95a59df05f35 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 30 Oct 2018 14:27:12 +0530 Subject: [PATCH 7/8] phone history --- Apollo/api/application/config/routes.php | 2 + .../controllers/Student_Controller.php | 236 ++++++++++++++ .../api/application/models/Student_model.php | 52 +++ .../assets/js/controllers/feesStatusCtrl.js | 6 +- Apollo/assets/js/controllers/studentCtrl.js | 295 +++++++++++++++++- .../views/student/editStudentDetails.html | 27 ++ .../assets/views/student/student_details.html | 2 +- .../student/student_details_SuperAdmin.html | 2 +- 8 files changed, 612 insertions(+), 10 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 190c084f..a47d030f 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -216,6 +216,8 @@ $route['update_DayBookDetails'] = 'DayBook_Controller/update_DayBookDetailsData' $route['Getnotificcations'] = 'Student_Controller/Getnotificcations'; +$route['GetPhoneHistory'] = 'Student_Controller/GetPhoneHistory'; + $route['AllgetUniversity'] = 'Report/getAllUniversity'; diff --git a/Apollo/api/application/controllers/Student_Controller.php b/Apollo/api/application/controllers/Student_Controller.php index 36a3839c..0ccb8af5 100755 --- a/Apollo/api/application/controllers/Student_Controller.php +++ b/Apollo/api/application/controllers/Student_Controller.php @@ -385,6 +385,10 @@ class Student_Controller extends REST_Controller { } public function updateStudentExistDetail_post() { + + // $mobile = $this->post('OldPhone'); + $olddata= $this->post('OldDetails'); + $data = $this->post('data'); $updatedBy = $this->post('updatedBy'); $updateStudent = $data['StudentID']; @@ -426,6 +430,216 @@ class Student_Controller extends REST_Controller { $date = date('Y-m-d H:i:s'); $req['UpdatedOn'] = $date; $studentUpdate = $this->student_model->update_student($req, $updateStudent, $imagename, $imageSource, $size); // Check if the employee exist + + // if($mobile!= $req['MobileNumber']) + // { + + // $mobileHistory['StudentID'] = $data['StudentID']; + // $mobileHistory['Previous_No'] = $mobile; + // $mobileHistory['Current_No'] = $req['MobileNumber']; + // $mobileHistory['UpdateBy'] = $req['UpdatedBy']; + // $date = date('Y-m-d H:i:s'); + // $mobileHistory['UpdatedOn'] = $date; + // $mobileHistory['branch']=$data['BranchCode']; + + // $updatemobilehistory = $this->student_model->UpdateMobileHistory($mobileHistory); + + + // } + + $changed = 0; + + if($olddata['AadharNumber'] != $req['AadharNumber']) + { + $mobileHistory['AadharNumber'] = $olddata['AadharNumber']; + $changed =1; + } + + if($olddata['AdmittedBy'] != $req['AdmittedBy']) + { + $mobileHistory['AdmittedBy'] = $olddata['AdmittedBy']; + $changed =1; + } + + if($olddata['AlternateNumber'] != $req['AlternateNumber']) + { + $mobileHistory['AlternateNumber'] = $olddata['AlternateNumber']; + $changed =1; + } + + if($olddata['Caste'] != $req['Caste']) + { + $mobileHistory['Caste'] = $olddata['Caste']; + $changed =1; + } + + if($olddata['Category'] != $req['Category']) + { + $mobileHistory['Category'] = $olddata['Category']; + $changed =1; + } + + if($olddata['Comments'] != $req['Comments']) + { + $mobileHistory['Comments'] = $olddata['Comments']; + $changed =1; + } + + if($olddata['Companyname'] != $req['Companyname']) + { + $mobileHistory['Companyname'] = $olddata['Companyname']; + $changed =1; + } + + if($olddata['DOB'] != $req['DOB']) + { + $mobileHistory['DOB'] = $olddata['DOB']; + $changed =1; + } + + if($olddata['Designation'] != $req['Designation']) + { + $mobileHistory['Designation'] = $olddata['Designation']; + $changed =1; + } + + if($olddata['EmailID'] != $req['EmailID']) + { + $mobileHistory['EmailID'] = $olddata['EmailID']; + $changed =1; + } + + if($olddata['Fathername'] != $req['Fathername']) + { + $mobileHistory['Fathername'] = $olddata['Fathername']; + $changed =1; + } + + if($olddata['Firstname'] != $req['Firstname']) + { + $mobileHistory['Firstname'] = $olddata['Firstname']; + $changed =1; + } + + if($olddata['Gender'] != $req['Gender']) + { + $mobileHistory['Gender'] = $olddata['Gender']; + $changed =1; + } + + if($olddata['Lastname'] != $req['Lastname']) + { + $mobileHistory['Lastname'] = $olddata['Lastname']; + $changed =1; + } + + if($olddata['MobileNumber'] != $req['MobileNumber']) + { + $mobileHistory['Previous_No'] = $olddata['MobileNumber']; + $changed =1; + } + + if($olddata['MotherName'] != $req['MotherName']) + { + $mobileHistory['MotherName'] = $olddata['MotherName']; + $changed =1; + } + + + if($olddata['Nationality'] != $req['Nationality']) + { + $mobileHistory['Nationality'] = $olddata['Nationality']; + $changed =1; + } + + if($olddata['Occupation'] != $req['Occupation']) + { + $mobileHistory['Occupation'] = $olddata['Occupation']; + $changed =1; + } + + if($olddata['OtherID'] != $req['OtherID']) + { + $mobileHistory['OtherID'] = $olddata['OtherID']; + $changed =1; + } + + if($olddata['OtherIDDetails'] != $req['OtherIDDetails']) + { + $mobileHistory['OtherIDDetails'] = $olddata['OtherIDDetails']; + $changed =1; + } + + + if($olddata['PermanentAddress'] != $req['PermanentAddress']) + { + $mobileHistory['PermanentAddress'] = $olddata['PermanentAddress']; + $changed =1; + } + + + if($olddata['PreQualification'] != $req['PreQualification']) + { + $mobileHistory['PreQualification'] = $olddata['PreQualification']; + $changed =1; + } + + + if($olddata['PresentAddress'] != $req['PresentAddress']) + { + $mobileHistory['PresentAddress'] = $olddata['PresentAddress']; + $changed =1; + } + + + if($olddata['Qualification'] != $req['Qualification']) + { + $mobileHistory['Qualification'] = $olddata['Qualification']; + $changed =1; + } + + + + if($olddata['ReferersMobileNumber'] != $req['ReferersMobileNumber']) + { + $mobileHistory['ReferersMobileNumber'] = $olddata['ReferersMobileNumber']; + $changed =1; + } + + + if($olddata['ReferredBy'] != $req['ReferredBy']) + { + $mobileHistory['ReferredBy'] = $olddata['ReferredBy']; + $changed =1; + } + + + if($olddata['Religion'] != $req['Religion']) + { + $mobileHistory['Religion'] = $olddata['Religion']; + $changed =1; + } + + + if($changed == 1) + { + $mobileHistory['StudentID'] = $data['StudentID']; + + $mobileHistory['Current_No'] = $req['MobileNumber']; + $mobileHistory['UpdateBy'] = $req['UpdatedBy']; + $date = date('Y-m-d H:i:s'); + $mobileHistory['UpdatedOn'] = $date; + $mobileHistory['branch']=$data['BranchCode']; + + $updatemobilehistory = $this->student_model->UpdateMobileHistory($mobileHistory); + } + + + + + + + if ($studentUpdate) { $studentUpdate['status'] = REST_Controller::HTTP_OK; // Set the response and exit @@ -716,4 +930,26 @@ class Student_Controller extends REST_Controller { } + + public function GetPhoneHistory_post() + { + $get['studentID'] = $this->post('StudentID'); + $get['loginBranch'] = $this->post('loginBranch'); + + $phonenumberdetails = $this->student_model->GetPhoneDetails($get); + + if ($phonenumberdetails) + { + $phonenumberdetails['status'] = REST_Controller::HTTP_OK; + $this->response($phonenumberdetails, REST_Controller::HTTP_OK); + } + else { + + $this->response(['message' => 'No data found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); + } + + + + } + } \ No newline at end of file diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index 7e01a3e0..45eeb16e 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -1844,4 +1844,56 @@ class Student_model extends CI_Model { } + + + public function UpdateMobileHistory($mobileHistory) + { + + $this->db->insert('T_Student_PhoneHistory',$mobileHistory); + $r = $this->db->affected_rows(); + if(count($r)>0) + { + return $r; + } + else + { + return false; + } + + } + + + public function GetPhoneDetails($get) + { + + $this->db->select('Current_No,Previous_No,DATE_FORMAT(UpdatedOn,"%d-%m-%Y") as Date'); + $this->db->from('T_Student_PhoneHistory'); + $this->db->where('StudentID',$get['studentID']); + $this->db->where('branch',$get['loginBranch']); + $this->db->where('Previous_No !=',null); + $this->db->group_by('Previous_No'); + + $studentMobile = $this->db->get(); + + + if($studentMobile ->result()) + { + + $result_array['stuidStatus'] = true; + $result_array['Mobiledetails'] = $studentMobile->result(); + } + + else + { + $result_array['stuidStatus'] = false; + $result_array['Mobiledetails'] = 'No Records Found'; + } + + // print_r($this->db->last_query());die(); + + return $result_array; + + + } + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 6f411b6a..255998ac 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -302,7 +302,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * */ $scope.changeSessions = function (details,type) { - //console.log(details.Sem_Year);return false; + // console.log(details.Sem_Year);return false; // console.log($scope.setfeedetails);return false; @@ -318,7 +318,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n if(role=='R002' || role == 'R005') { - //console.log('if') + console.log('if') $scope.readonlycheck =true; } @@ -326,7 +326,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else { - //console.log('ses'); + console.log('ses'); $scope.readonlycheck =false; } } diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 5afdbc5c..ba096f55 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -53,7 +53,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", // load when html page load $scope.init = function () { - + // alert('dsc'); var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; @@ -752,16 +752,149 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", //======================================================================> + +$scope.CopyModel={ + +'AadharNumber':'', +'AdmittedBy':'', +'AlternateNumber':'', +'BranchCode': '', +'Caste':'', +'Category':'', +'Comments': '', +'Companyname':'', +'CourseCode': '', +'CourseID':'', +'CourseName': '', +'CreatedBy': '', +'CreatedOn':'', +'DOB': '', +'DeactiveComments':'', +'Designation':'', +'EmailID':'', +'Fathername':'', +'Firstname':'', +'Gender': '', +'IsActive':'', +'Lastname': '', +'MobileNumber':'', +'MotherName': '', +'Nationality':'', +'Occupation':'', +'OtherID':'', +'OtherIDDetails':'', +'PermanentAddress':'', +'PreQualification':'', +'PresentAddress':'', +'ProfilePicPath':'', +'Qualification':'', +'ReferersMobileNumber':'', +'ReferredBy':'', +'Religion':'', +'StudentID':'', +'Student_Course_id':'', +'UniversityID':'', +'UniversityName':'', + +}; + + + + $scope.editId = -1; $scope.editCourseId = -1; - $scope.setEditId = function (unique_id, id) { + $scope.OldPhone=''; + $scope.setEditId = function (unique_id, id,k) { // alert() + + + $scope.CopyModel.Fathername=k.Fathername; + $scope.CopyModel.AadharNumber=k.AadharNumber; + $scope.CopyModel.AdmittedBy=k.AdmittedBy; + $scope.CopyModel.AlternateNumber = k.AlternateNumber; + $scope.CopyModel.Caste = k.Caste; + $scope.CopyModel.Category = k.Category; + $scope.CopyModel.Comments=k.Comments; + $scope.CopyModel.Companyname=k.Companyname; + $scope.CopyModel.CourseCode= k.CourseCode; + $scope.CopyModel.CourseID=k.CourseID; + $scope.CopyModel.CourseName=k.CourseName; + $scope.CopyModel.DOB = k.DOB; + $scope.CopyModel.DeactiveComments = k.DeactiveComments; + $scope.CopyModel.EmailID=k.EmailID; + $scope.CopyModel.Firstname=k.Firstname; + $scope.CopyModel.Gender=k.Gender; + $scope.CopyModel.IsActive=k.IsActive; + $scope.CopyModel.Lastname=k.Lastname; + $scope.CopyModel.MobileNumber=k.MobileNumber; + $scope.CopyModel.MotherName=k.MotherName; + $scope.CopyModel.Nationality=k.Nationality; + $scope.CopyModel.Occupation=k.Occupation; + $scope.CopyModel.OtherID=k.OtherID; + $scope.CopyModel.OtherIDDetails=k.OtherIDDetails; + $scope.CopyModel.PermanentAddress=k.PermanentAddress; + $scope.CopyModel.PreQualification=k.PreQualification; + $scope.CopyModel.PresentAddress=k.PresentAddress; + $scope.CopyModel.ReferersMobileNumber=k.ReferersMobileNumber; + $scope.CopyModel.ReferredBy=k.ReferredBy; + $scope.CopyModel.Religion=k.Religion; + $scope.CopyModel.StudentID=k.StudentID; + + $scope.editId = unique_id; $scope.editCourseId = -1; $scope.studentViewPage = -1; + $scope.OldPhone=mobile; + + $scope.OldPhone=k.MobileNumber; + + + } +$scope.PreviousPhoneDetails =''; +$scope.Changecheck = false; +$scope.getPhoneNoHistoy = function(studentId) +{ + + // alert('fn') + var getphonehistory = { + method: 'POST', + url: apiPoint.url + 'GetPhoneHistory/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + + StudentID:studentId, + loginBranch: localDetails.localBranchID, + createdBy: localDetails.localUserID, + } + }; + + + $http(getphonehistory).then(function (response) + { + + //console.log(response.data) + if(response.data.stuidStatus == true) + { + $scope.PreviousPhoneDetails= response.data.Mobiledetails; + $scope.Changecheck= true; + } + else + { + $scope.PreviousPhoneDetails= ''; + $scope.Changecheck= false; + } + + console.log($scope.PreviousPhoneDetails) + }); +} + + + $scope.setEditCourseId = function (unique_id,id) { $scope.list = false; @@ -1567,6 +1700,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", // update student details $scope.updateStuDetails = function (form, p, hidedob) { + + // console.log($scope.OldPhone);return false; var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -1602,6 +1737,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", data: { data: p, updatedBy: localDetails.localUserID, + OldPhone: $scope.OldPhone, + OldDetails:$scope.CopyModel } }; $http(req).then(function (response) { @@ -1668,6 +1805,9 @@ $scope.allcourselist =''; // load when html page load $scope.init = function () { $scope.che='123'; + +//console.log($scope.che); + $scope.localUserType = localDetails.localType; if (localDetail != null) { if (localDetails.localType === 'R004') { @@ -1961,19 +2101,157 @@ $scope.allcourselist =''; }); } + + +$scope.CopyModel={ + +'AadharNumber':'', +'AdmittedBy':'', +'AlternateNumber':'', +'BranchCode': '', +'Caste':'', +'Category':'', +'Comments': '', +'Companyname':'', +'CourseCode': '', +'CourseID':'', +'CourseName': '', +'CreatedBy': '', +'CreatedOn':'', +'DOB': '', +'DeactiveComments':'', +'Designation':'', +'EmailID':'', +'Fathername':'', +'Firstname':'', +'Gender': '', +'IsActive':'', +'Lastname': '', +'MobileNumber':'', +'MotherName': '', +'Nationality':'', +'Occupation':'', +'OtherID':'', +'OtherIDDetails':'', +'PermanentAddress':'', +'PreQualification':'', +'PresentAddress':'', +'ProfilePicPath':'', +'Qualification':'', +'ReferersMobileNumber':'', +'ReferredBy':'', +'Religion':'', +'StudentID':'', +'Student_Course_id':'', +'UniversityID':'', +'UniversityName':'', + +}; + + $scope.editId = -1; $scope.editCourseId = -1; $scope.editTrackingId=-1; $scope.msgdetID = -1; - $scope.setEditId = function (uniqe_id ,id) { + $scope.OldPhone=''; + $scope.setEditId = function (uniqe_id ,id,k) { - // alert() + //alert() + //console.log(k); + $scope.CopyModel.Fathername=k.Fathername; + $scope.CopyModel.AadharNumber=k.AadharNumber; + $scope.CopyModel.AdmittedBy=k.AdmittedBy; + $scope.CopyModel.AlternateNumber = k.AlternateNumber; + $scope.CopyModel.Caste = k.Caste; + $scope.CopyModel.Category = k.Category; + $scope.CopyModel.Comments=k.Comments; + $scope.CopyModel.Companyname=k.Companyname; + $scope.CopyModel.CourseCode= k.CourseCode; + $scope.CopyModel.CourseID=k.CourseID; + $scope.CopyModel.CourseName=k.CourseName; + $scope.CopyModel.DOB = k.DOB; + $scope.CopyModel.DeactiveComments = k.DeactiveComments; + $scope.CopyModel.EmailID=k.EmailID; + $scope.CopyModel.Firstname=k.Firstname; + $scope.CopyModel.Gender=k.Gender; + $scope.CopyModel.IsActive=k.IsActive; + $scope.CopyModel.Lastname=k.Lastname; + $scope.CopyModel.MobileNumber=k.MobileNumber; + $scope.CopyModel.MotherName=k.MotherName; + $scope.CopyModel.Nationality=k.Nationality; + $scope.CopyModel.Occupation=k.Occupation; + $scope.CopyModel.OtherID=k.OtherID; + $scope.CopyModel.OtherIDDetails=k.OtherIDDetails; + $scope.CopyModel.PermanentAddress=k.PermanentAddress; + $scope.CopyModel.PreQualification=k.PreQualification; + $scope.CopyModel.PresentAddress=k.PresentAddress; + $scope.CopyModel.ReferersMobileNumber=k.ReferersMobileNumber; + $scope.CopyModel.ReferredBy=k.ReferredBy; + $scope.CopyModel.Religion=k.Religion; + $scope.CopyModel.StudentID=k.StudentID; + + + //console.log($scope.CopyModel) + + // console.log(id) $scope.editId = uniqe_id; $scope.editCourseId = -1; $scope.editTrackingId=-1; $scope.msgdetID = -1; + + $scope.OldPhone=k.MobileNumber; + + + } + + +$scope.PreviousPhoneDetails =''; +$scope.Changecheck = false; +$scope.getPhoneNoHistoy = function(studentId) +{ + + // alert('fn') + var getphonehistory = { + method: 'POST', + url: apiPoint.url + 'GetPhoneHistory/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + + StudentID:studentId, + loginBranch: localDetails.localBranchID, + createdBy: localDetails.localUserID, + } + }; + + + $http(getphonehistory).then(function (response) + { + + //console.log(response.data) + if(response.data.stuidStatus == true) + { + $scope.PreviousPhoneDetails= response.data.Mobiledetails; + $scope.Changecheck= true; + + console.log($scope.PreviousPhoneDetails) + } + else + { + $scope.PreviousPhoneDetails= ''; + $scope.Changecheck= false; + } + + console.log($scope.PreviousPhoneDetails) + }); +} + + + + $scope.setEditCourseId = function (uniqe_id ,id) { //alert('1'); @@ -3324,6 +3602,12 @@ $scope.allcourselist =''; // update student details $scope.updateStuDetails = function (form, p, hidedob) { var firstError = null; + + + // console.log($scope.OldPhone); + + + // console.log($scope.CopyModel);return false; if (form.$invalid) { var field = null, firstError = null; @@ -3360,6 +3644,8 @@ $scope.allcourselist =''; data: { data: p, updatedBy: localDetails.localUserID, + OldPhone: $scope.OldPhone, + OldDetails:$scope.CopyModel } }; $http(req).then(function (response) { @@ -3488,7 +3774,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", $scope.open = function (studentDetails) { - // get student view details var getcourse = { method: 'POST', diff --git a/Apollo/assets/views/student/editStudentDetails.html b/Apollo/assets/views/student/editStudentDetails.html index e7e9c957..b98e088b 100755 --- a/Apollo/assets/views/student/editStudentDetails.html +++ b/Apollo/assets/views/student/editStudentDetails.html @@ -453,6 +453,33 @@ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + +
Previous NumberPresent NumberUpdated On
{{ph.Previous_No}}{{ph.Current_No}}{{ph.Date}}
+
+
+
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index 43c7bed8..9fda468e 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -243,7 +243,7 @@ - + diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html index 7c2772fc..ae920ef0 100755 --- a/Apollo/assets/views/student/student_details_SuperAdmin.html +++ b/Apollo/assets/views/student/student_details_SuperAdmin.html @@ -275,7 +275,7 @@ - + From 4a96ff5225c343d7ce5b8e1dc7ea3cb7af7e6889 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 30 Oct 2018 16:04:20 +0530 Subject: [PATCH 8/8] pc to ppc change in student view --- Apollo/api/application/models/Studentview_model.php | 11 +++++++++-- Apollo/assets/views/student/studentDetailsModal.html | 1 - 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 49a074a0..3bc3e112 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -262,6 +262,8 @@ class Studentview_model extends CI_Model * created by kms * */ public function getStudentFeesDetails($studentID=null,$courseID=null){ + + $serachArray=[WAIVER,REFERRAL]; $this->db->distinct(); @@ -382,7 +384,7 @@ class Studentview_model extends CI_Model * created by kms * */ public function getDefaultCourseFees($studentID=null,$courseID=null){ - $serachArray = ["PC","TC","DC","MC","OTHER"]; + $serachArray = ["PPC","TC","DC","MC","OTHER"]; $this->db->distinct(); $this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others'); $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); @@ -491,9 +493,12 @@ class Studentview_model extends CI_Model * created by kms * */ public function getStudentCertificateDetails($studentID=null,$courseID=null){ + $this->db->select('AS.CertificationNo,AS.AppDate,AS.Comments,CM.CertificateName,PLD.ListName'); $this->db->from(APPLICATION_STATUS.' as AS'); - $this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificationID = AS.CertificationType'); + // $this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificationID = AS.CertificationType'); + + $this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificateName = AS.CertificationType'); //$this->db->join(COURSE_FEES.' as CF','CF.ID = AS.CourseID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = AS.CourseID'); $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = AS.ListCode'); @@ -503,6 +508,8 @@ class Studentview_model extends CI_Model $this->db->order_by('AS.ID', 'DESC'); $getCertDetails = $this->db->get(); + // print_r($this->db->last_query());die(); + if($getCertDetails->result()){ return $getCertDetails->result(); } diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 6c3cff62..67a967fa 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -232,7 +232,6 @@
-