From 4250a1ce4880a243d91691066acddacd75baa1cc Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 8 Sep 2018 11:11:07 +0530 Subject: [PATCH 1/2] data correction --- .../application/models/Data_correction.php | 5 +++ .../js/controllers/entrycorrectionCtrl.js | 43 ++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Data_correction.php b/Apollo/api/application/models/Data_correction.php index 4f912ab3..179d3bd6 100644 --- a/Apollo/api/application/models/Data_correction.php +++ b/Apollo/api/application/models/Data_correction.php @@ -136,7 +136,12 @@ group by Student_id,cid"; $coursearr['IsActive'] = $search['IsActive']; $coursearr['DeactiveComments'] =$search['Reason']; + + if( $search['IsActive'] ==0) + { $coursearr['Deactive'] = '0'; + } + $this->db->where('StudentID', $search['studentId']); $this->db->where('UniversityID', $search['University']); $this->db->where('CourseID', $search['courseId']); diff --git a/Apollo/assets/js/controllers/entrycorrectionCtrl.js b/Apollo/assets/js/controllers/entrycorrectionCtrl.js index 5188cdec..63cdf1a3 100644 --- a/Apollo/assets/js/controllers/entrycorrectionCtrl.js +++ b/Apollo/assets/js/controllers/entrycorrectionCtrl.js @@ -76,6 +76,8 @@ $scope.universitySearchData = ''; $scope.studentInfo=""; + $scope.mobileNo=''; + $scope.student_Name=''; $scope.getStudentDetails = function (form,myModel) { @@ -85,6 +87,8 @@ $scope.universitySearchData = ''; var studentName = myModel.studentName; var receipt = myModel.receipt; $scope.universityId = myModel.myUnivSearch; + $scope.mobileNo=myModel.mobileNumber; + $scope.student_Name=myModel.studentName; // console.log($scope.universityId); // return false; @@ -249,7 +253,44 @@ $scope.universitySearchData = ''; $http(updatecourse).then(function (response) { swal('Change Saved Successfully', response.data.message, "success"); $scope.close(); - $scope.getStudentDetails(form,myModel); + // $scope.getStudentDetails(form,myModel); + + $scope.isLoaderShow= false + + var getdetail = { + method: 'POST', + url: apiPoint.url + 'getAllstudentcoursedetail/', + headers: { + 'Content-Type': 'application/json' + }, + data :{ + studentName: $scope.student_Name, + mobileNumber: $scope.mobileNo, + receipt: myModel.receipt, + University:$scope.universityId, + requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID, + requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, + } + + }; + + $http(getdetail).then(function (response) { + + //console.log(response) + if (response.data.status==200 && response.data.studentStatus) { + $scope.studentInfo=response.data.details; + console.log($scope.studentInfo); + + } else { + $scope.studentInfo=""; + + $scope.isLoaderShow = true; + $scope.load = "No Records Found"; + + } + + }); }); From d554f01d185a3f822527b94b2a4b53faef3cc34d Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 8 Sep 2018 11:37:25 +0530 Subject: [PATCH 2/2] daybook correction --- .../api/application/models/DayBook_model.php | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 606a2096..418324c6 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -760,7 +760,7 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can { //if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='') //{ - $this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo'); + $this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments as Reason,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo'); $this->db->from('T_Students_Fees_PaidDetails'); $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left'); @@ -814,30 +814,33 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can $time = date('Y-m-d H:i:s'); $dateTime = $time; - // echo $dateTime; - // die(); + // echo $dateTime; + //die(); //$daybookarr['ID'] = $up_details['ID']; - // $daybookarr['IsActive'] = $up_details['IsActive']; - // $daybookarr['Reason'] = $up_details['Reason']; - // $daybookarr['UpdatedOn'] = $dateTime; - // $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; + $daybookarr['IsActive'] = $up_details['IsActive']; + $daybookarr['Reason'] = $up_details['Reason']; + $daybookarr['UpdatedOn'] = $dateTime; + $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; - // if($up_details['IsActive'] == 0) - // { - // $daybookarr['Status'] = 'Cancel'; - // } + if($up_details['IsActive'] == 0) + { + $daybookarr['Status'] = 'Cancel'; + } - // else - // { - // $daybookarr['Status'] = 'Approved'; - // } + else + { + $daybookarr['Status'] = 'Approved'; + } + +//print_r($daybookarr); +//die(); - // $this->db->where('ID', $daybookarr['ID']); - // $this->db->update('T_DayBookMaster', $daybookarr); + $this->db->where('FeesPaymentID', $up_details['ID']); + $this->db->update('T_DayBookMaster', $daybookarr); //$feearr['ID'] = $up_details['FeesPaymentID'];