diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php index a5f829fe..58344f96 100755 --- a/Apollo/api/application/models/Login_model.php +++ b/Apollo/api/application/models/Login_model.php @@ -30,11 +30,12 @@ class Login_model extends CI_Model $this->db->where('t1.IsActive', 1); //$this->db->where('t2.IsActive', 1); $loginDetails = $this->db->get(LOGIN)->first_row(); - $mobileno= $loginDetails->MobileNumber; + // print_r($loginDetails); if($loginDetails) { + $mobileno= $loginDetails->MobileNumber; if ($mobile == $loginDetails->MobileNumber || $mobile == $loginDetails->StaffID) { if ($password == $loginDetails->Password) { diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 5dd5b57e..11904813 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -453,7 +453,7 @@ class StatusUpdation_model extends CI_Model { SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University' AND S.IsActive = '1' AND SC.BranchID = '$branch' - AND SC.IsActive = '1'"; + AND SC.IsActive = '1' GROUP BY SFS.StudentID "; $queryDetails = $this->db->query($subQuery); $results['searchResult'] = true; $results['search_result_details'] = $queryDetails->result(); @@ -462,12 +462,12 @@ class StatusUpdation_model extends CI_Model { FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode - LEFT JOIN " . STUDENTS_FEES_STATUS . " as SFS ON SFS.StudentID = SC.StudentID AND SC.BranchID = SFS.BranchCode + LEFT JOIN " . STUDENTS_FEES_STATUS . " as SFS ON SFS.StudentID = SC.StudentID AND SC.BranchID = SFS.BranchCode AND SFS.CourseID = C.CourseID WHERE SFS.CourseID = SC.CourseID AND SFS.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' AND S.IsActive = '1' AND SC.BranchID = '$branch' - AND SC.IsActive = '1'"; + AND SC.IsActive = '1' GROUP BY SFS.StudentID"; $queryDetails = $this->db->query($subQuery); $results['searchResult'] = true; $results['search_result_details'] = $queryDetails->result(); diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index f55a81c7..55bd2128 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -573,7 +573,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", transformRequest: angular.identity, headers: { 'Content-Type': undefined, 'Process-Data': false }, }).success(function (data) { - if (data.addStudentStatus == true) { + if (data.addStudentStatus === true) { swal(" ", "Student added successfully.", "success"); $scope.disableButton = false; $state.go($state.current, {}, { reload: true }); @@ -598,7 +598,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", } }; $http(req).then(function (response) { - if (response.data.addStudentStatus == true) { + if (response.data.addStudentStatus === true) { swal(" ", "Student added successfully.", "success"); $scope.disableButton = false; $state.go($state.current, {}, { reload: true }); @@ -2398,7 +2398,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl swal(" ", "Student added successfully.", "success"); $scope.disableButton = false; $scope.viewStudentDetailsPage = false; - // $state.go($state.current, {}, { reload: true }); + $state.go($state.current, {}, { reload: true }); $scope.myActivateDiv(); // $scope.tabactive2 = false; // $scope.viewStudentDetailsPage = false; @@ -2424,11 +2424,11 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl } }; $http(req).then(function (response) { - if (response.data.addStudentStatus == true) { + if (response.data.addStudentStatus === true) { swal("", "Student added successfully.", "success"); $scope.disableButton = false; $scope.viewStudentDetailsPage = false; - // $state.go($state.current, {}, { reload: true }); + $state.go($state.current, {}, { reload: true }); $scope.myActivateDiv(); // $scope.tabactive1 = true; // $scope.tabactive2 = false; diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index 8d1a1a34..7852425e 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -180,6 +180,14 @@ background-color: #5fba7d; text-align: center; } + .containersPara { + display: flex; + flex-direction: column; + max-height: 220px; + max-width: 140px; + overflow: auto; + background: #ddd; + }
@@ -215,6 +223,21 @@ Description/Comments + Sem + + + Course + + + University + + + + Receipt No + + + Comments + Type @@ -247,6 +270,13 @@
+ {{p.FeePaymentDetails}} + {{p.CourseName}} + {{p.UniversityName}} + {{p.ReceiptNo}} + +
{{p.ReceiptNoComments}}
+ {{p.TypeName}} {{p.Amount}} - - - Sem/Course/University - - - - Description/Comments + Description/Comments + + Sem + + + Course + University + + Receipt No + + + Comments + + Type @@ -250,16 +265,20 @@ {{p.ListName}} {{p.VoucherNumber}} {{p.PaidTo}} - {{p.FeePaymentDetails}} - {{p.CourseName}} - {{p.UniversityName}} - +
{{p.PaidDescription}} / {{p.Description}}
+ {{p.FeePaymentDetails}} + {{p.CourseName}} + {{p.UniversityName}} + {{p.ReceiptNo}} + +
{{p.ReceiptNoComments}}
+ {{p.TypeName}} {{p.Amount}} + + Receipt No + + + Comments + Mode of Payment @@ -161,6 +175,10 @@ {{p.TypeName}} {{p.TypeName}} + {{p.ReceiptNo}} + +
{{p.ReceiptNoComments}}
+ {{p.ModeOfPayment}} {{p.Amount}} {{p.Balance}} diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 71b3150e..831c3dbd 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -91,6 +91,14 @@ background-color: #5fba7d; text-align: center; } + .containersPara { + display: flex; + flex-direction: column; + max-height: 220px; + max-width: 140px; + overflow: auto; + background: #ddd; + }
@@ -131,6 +139,12 @@ Type + + + Receipt No + + + Comments Mode of Payment @@ -162,6 +176,9 @@ {{p.TypeName}} {{p.TypeName}} + {{p.ReceiptNo}} + +
{{p.ReceiptNoComments}}
{{p.ModeOfPayment}} {{p.Amount}} {{p.Balance}} diff --git a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html index 1ad8d601..8c515710 100755 --- a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html +++ b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html @@ -162,6 +162,14 @@ background-color: #5fba7d; text-align: center; } + .containersPara { + display: flex; + flex-direction: column; + max-height: 220px; + max-width: 140px; + overflow: auto; + background: #ddd; + }
@@ -194,17 +202,21 @@ Paid To / Received From - - + Description/Comments + + Sem Course University - - Description/Comments - - + + Receipt No + + + Comments + + Type @@ -230,16 +242,23 @@ {{p.ListName}} {{p.VoucherNumber}} {{p.PaidTo}} - - {{p.FeePaymentDetails}}
{{p.CourseName}}
{{p.UniversityName}} - - -
+ +
{{p.PaidDescription}} / {{p.Description}}
+ {{p.FeePaymentDetails}} + {{p.CourseName}} {{p.UniversityName}} + {{p.ReceiptNo}} + +
+
{{p.ReceiptNoComments}} +
+
+ + {{p.TypeName}} {{p.Amount}} + + + Receipt No + + + Comments Mode of Payment @@ -138,6 +152,9 @@ {{p.TypeName}} {{p.TypeName}} + {{p.ReceiptNo}} + +
{{p.ReceiptNoComments}}
{{p.ModeOfPayment}} {{p.Amount}} {{p.Balance}}