diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index e9e8487d..15ed7b05 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -202,6 +202,7 @@ $route['updateCertificateDetails'] = 'Certificate_Controller/updateCertificateDe $route['deleteDayBookDetails'] = 'DayBook_Controller/deleteDayBookDetails'; $route['updateDayBookDetails'] = 'DayBook_Controller/updateDayBookDetails'; $route['getDayBookDetails'] = 'DayBook_Controller/getDayBookDetails'; +$route['getDayBookApprovalDetails'] = 'DayBook_Controller/getDayBookApprovalDetails'; $route['getIncomeExpenseTypeState'] = 'DayBook_Controller/getIncomeExpenseTypeState'; $route['addDayBook'] = 'DayBook_Controller/adddaybook'; $route['updateDayBookStatusAdmin'] = 'DayBook_Controller/updateDayBookStatusAdmin'; diff --git a/Apollo/api/application/controllers/DayBook_Controller.php b/Apollo/api/application/controllers/DayBook_Controller.php index 04f5e6c8..94074346 100755 --- a/Apollo/api/application/controllers/DayBook_Controller.php +++ b/Apollo/api/application/controllers/DayBook_Controller.php @@ -98,6 +98,26 @@ class DayBook_Controller extends REST_Controller { } + public function getDayBookApprovalDetails_post() { + $reqData = $this->post('data'); + $reqDataBy = $this->post('localReqDetails'); + $getDayBookApprovalDetails = $this->daybook_model->get_Daybook_Approval_Details_List($reqData, $reqDataBy);// Check if the employee exist + if ($getDayBookApprovalDetails) + { + $getDayBookApprovalDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getDayBookApprovalDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No list were found', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + } + public function deleteDayBookDetails_post() { $reqData = $this->post('data'); $reqbyData = $this->post('localReqDetails'); diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 55a7ffed..7713f0b4 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -98,6 +98,32 @@ class DayBook_model extends CI_Model return $results; } + public function get_Daybook_Approval_Details_List($reqData, $reqDataBy) { + if($reqData['date'] != '' && $reqData['dateTo'] != '') { + $d = new DateTime($reqData['date']); + $dTo = new DateTime($reqData['dateTo']); + $fromDate = $d->format('Y-m-d'); + $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 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 + LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID + WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' + AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC"; + } + else { $reqpayType = $reqDataBy['localBranchID']; + $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name 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 + LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID + WHERE t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC"; + + } + $dayBookDetails = $this->db->query($querys); + $dayBookDetailsList = $dayBookDetails->result(); + $results['dayBookListStatus'] = true; + $results['dayBookListDetails'] = $dayBookDetailsList; + return $results; + } + // delete the daybook details public function delete_dayBookDetails($id) { // echo $id;exit(); @@ -181,7 +207,10 @@ class DayBook_model extends CI_Model $currID = $latestUpdateDetails[0]->ID; }else{ } - $sql1 = " DELETE FROM ".DAYBOOKMASTER." WHERE FeesPaymentID ='$getID'"; + // $sql1 = " DELETE FROM ".DAYBOOKMASTER." WHERE FeesPaymentID ='$getID'"; + // $sql1 = " DELETE FROM ".DAYBOOKMASTER." WHERE FeesPaymentID ='$getID'"; + $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel' WHERE FeesPaymentID ='$getID'"; + // update branch to staff_branch table if ($this->db->query($sql1) == '1') { @@ -390,7 +419,7 @@ class DayBook_model extends CI_Model $branch = $updateDataDetails[0]->BranchCode; $Amount = 0; $Amount = $updateDataDetails[0]->Amount; - if($updateDataDetails[0]->PaymentStatus === '1' ){ + if($updateDataDetails[0]->PaymentStatus === '1' || $updateDataDetails[0]->PaymentStatus === '0'){ $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$updateFor') @@ -432,58 +461,57 @@ class DayBook_model extends CI_Model $result['addStatus'] = false; $result['message'] = "Something went wrong.please try again"; } - } else if($updateDataDetails[0]->PaymentStatus === '0') { - $currentVoucheNumber = $updateDataDetails[0]->VoucherNumber; - $mySql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND VoucherNumber = '$currentVoucheNumber') - ORDER BY ID ASC - LIMIT 1 "; - $mySqlUpdate = $this->db->query($mySql); - $mySqlUpdateDetails = $mySqlUpdate->result(); - $mySqlUpdateDetailsID = $mySqlUpdateDetails[0]->ID; + } + // else if($updateDataDetails[0]->PaymentStatus === '0') { + // $currentVoucheNumber = $updateDataDetails[0]->VoucherNumber; + // $mySql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND VoucherNumber = '$currentVoucheNumber') + // ORDER BY ID ASC + // LIMIT 1 "; + // $mySqlUpdate = $this->db->query($mySql); + // $mySqlUpdateDetails = $mySqlUpdate->result(); + // $mySqlUpdateDetailsID = $mySqlUpdateDetails[0]->ID; - $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$mySqlUpdateDetailsID') - ORDER BY ID DESC - LIMIT 1 "; - $currBalance = 0; - $latestUpdate = $this->db->query($sql); - $latestUpdateDetails = $latestUpdate->result(); - If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0) - { - $currBalance = $latestUpdateDetails[0]->Balance; - }else{ - } - $sql = "UPDATE ".DAYBOOKMASTER." - SET Status = '$status', Approval_By = '$Approval_By' , - Approval_Comments = '$Approval_Comments', UpdatedBy = '$UpdatedBy' , UpdatedOn = '$UpdatedOn' , Balance = '$currBalance' - WHERE VoucherNumber = '$currentVoucheNumber' "; - $mBranchDetails = $this->db->query($sql); - // echo $mBranchDetails; - // echo $this->db->affected_rows(); exit(); - if ($this->db->affected_rows() >= 1) { - $sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$updateFor') - ORDER BY ID ASC"; - $latestUpdate2 = $this->db->query($sql2); - $latestUpdateDetails2 = $latestUpdate2->result(); - foreach( $latestUpdateDetails2 as $clip){ - if($clip->Name == 'I002' && ($clip->Status == "Pending" || $clip->Status == "Approved" || $clip->Status == "approved" || $clip->Status == "pending")) { - //Income - $currBalance = $currBalance + $clip->Amount; - }else if ($clip->Name == 'I001' && ($clip->Status == "Pending" || $clip->Status == "Approved" || $clip->Status == "approved" || $clip->Status == "pending")) { - //Expense - $currBalance = $currBalance - $clip->Amount; - } else { - } - $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'"; - $this->db->query($updateSql); - } - $result['addStatus'] = true; - $result['message'] = "Successfully Details Updated"; - } else { - $result['addStatus'] = false; - $result['message'] = "Something went wrong.please try again"; - } + // $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$mySqlUpdateDetailsID') + // ORDER BY ID DESC + // LIMIT 1 "; + // $currBalance = 0; + // $latestUpdate = $this->db->query($sql); + // $latestUpdateDetails = $latestUpdate->result(); + // If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0) + // { + // $currBalance = $latestUpdateDetails[0]->Balance; + // }else{ + // } + // $sql = "UPDATE ".DAYBOOKMASTER." + // SET Status = '$status', Approval_By = '$Approval_By' , + // Approval_Comments = '$Approval_Comments', UpdatedBy = '$UpdatedBy' , UpdatedOn = '$UpdatedOn' , Balance = '$currBalance' + // WHERE VoucherNumber = '$currentVoucheNumber' "; + // $mBranchDetails = $this->db->query($sql); + // if ($this->db->affected_rows() >= 1) { + // $sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$updateFor') + // ORDER BY ID ASC"; + // $latestUpdate2 = $this->db->query($sql2); + // $latestUpdateDetails2 = $latestUpdate2->result(); + // foreach( $latestUpdateDetails2 as $clip){ + // if($clip->Name == 'I002' && ($clip->Status == "Pending" || $clip->Status == "Approved" || $clip->Status == "approved" || $clip->Status == "pending")) { + // //Income + // $currBalance = $currBalance + $clip->Amount; + // }else if ($clip->Name == 'I001' && ($clip->Status == "Pending" || $clip->Status == "Approved" || $clip->Status == "approved" || $clip->Status == "pending")) { + // //Expense + // $currBalance = $currBalance - $clip->Amount; + // } else { + // } + // $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'"; + // $this->db->query($updateSql); + // } + // $result['addStatus'] = true; + // $result['message'] = "Successfully Details Updated"; + // } else { + // $result['addStatus'] = false; + // $result['message'] = "Something went wrong.please try again"; + // } - } + // } } return $result; } diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index eaef3d8a..59cc5b25 100755 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -19,6 +19,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter" // get the data while page loading functions goes here $scope.init = function () { + $scope.todayDate = new Date(); const LOCALTYPE = localDetail.localType; if(LOCALTYPE === 'R003') { $scope.currentDate = new Date(); diff --git a/Apollo/assets/js/controllers/daybookadminapprovalCtrl.js b/Apollo/assets/js/controllers/daybookadminapprovalCtrl.js index c4518911..53a6c338 100755 --- a/Apollo/assets/js/controllers/daybookadminapprovalCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminapprovalCtrl.js @@ -20,6 +20,7 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", " // load functionality when page get loaded $scope.init = function () { + $scope.todayDate = new Date(); const LOCALTYPE = localDetail.localType; if (LOCALTYPE === 'R003') { // getFinanceModuleAccess(); @@ -139,7 +140,7 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", " $scope.noRecordFoundSearch = false; var getDatBookListDetails = { method: 'POST', - url: apiPoint.url + 'getDayBookDetails/', + url: apiPoint.url + 'getDayBookApprovalDetails/', headers: { 'Content-Type': 'application/json' }, @@ -152,62 +153,42 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", " if (response.data.dayBookListStatus) { $scope.loadingsearch = false; // $scope.data = response.data.dayBookListDetails; - $scope.datas = response.data.dayBookListDetails; + // $scope.datas = response.data.dayBookListDetails; - const filterAddSelect = $scope.datas.filter(val => { - val['Selected'] = false; - return val; - }); - $scope.searchResultDetails = filterAddSelect; - $scope.searchResultDetailsCopy = filterAddSelect; + // const filterAddSelect = $scope.datas.filter(val => { + // val['Selected'] = false; + // return val; + // }); + $scope.searchResultDetails = response.data.dayBookListDetails; + $scope.searchResultDetailsCopy = response.data.dayBookListDetails; } else { $scope.loadingsearch = false; } }); } - // Select one row in a table once - $scope.setOneSelect = function (value) { - angular.forEach($scope.searchResultDetails, function (item) { - item.Selected = false; - }); - value.Selected = true; - $scope.OpenWindowStatus = true; - $scope.openUpdateWind(); - } - - $scope.unSelect = function () { - // alert(value.Selected); - angular.forEach($scope.searchResultDetails, function (item) { - item.Selected = false; - }); - $scope.openUpdateWind(); - } - $scope.myStatusModel = { 'staus': '', 'description': '', + 'ID':'' } - // End: select all or individual functionality - $scope.OpenWindowStatus = false; - // open popup window when checkbox get selected / close popup window uncheck the selected items - $scope.openUpdateWind = function () { - var ItemsSelected = $scope.searchResultDetails.filter(function (item) { - if (item.Selected === true) { return true; } - }); - if (ItemsSelected.length) { - $scope.myStatusModel = { + $scope.editId = ''; + $scope.updateStatus = function(p) { + $scope.editId = p.ORDER_ID; + $scope.myStatusModel.ID = p.ID; + } + + $scope.updateStatusClose = function() { + $scope.editId = ''; + $scope.myStatusModel = { 'staus': '', 'description': '', + 'ID':'' } - $scope.OpenWindowStatus = true; - } else { - $scope.OpenWindowStatus = false; - } } - + // update the status details $scope.statusUpdate = { submit: function (form, myStatusModel) { @@ -227,20 +208,22 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", " angular.element('.ng-invalid[name=' + firstError + ']').focus(); } else { var selectedItems = []; - var ItemsSelected = $scope.searchResultDetails.filter(function (item) { - if (item.Selected === true && item.Status === 'Pending' ) { - let itemGetID = new getUpdateDetails(item.ID); - selectedItems.push(itemGetID); - return true; - } - }); - function getUpdateDetails(id) { - this.dabookListId = id; + // var ItemsSelected = $scope.searchResultDetails.filter(function (item) { + // if (item.Selected === true && item.Status === 'Pending' ) { + // let itemGetID = new getUpdateDetails(item.ID); + // selectedItems.push(itemGetID); + // return true; + // } + // }); + let itemGetID = new getUpdateDetails(); + selectedItems.push(itemGetID); + function getUpdateDetails() { + this.dabookListId = $scope.myStatusModel.ID; this.ListCodeStatus = $scope.myStatusModel.staus; this.comments = $scope.myStatusModel.description; } if(selectedItems.length > 0) { - $scope.disableStatusUpdateButton = true; + $scope.disableStatusUpdateButton = true; var updateStudyMaterial = { method: 'POST', url: apiPoint.url + 'updateDayBookStatusAdmin/', @@ -257,14 +240,8 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", " swal(" ", "Updated successfully,", "success"); // for success state $scope.getDayBookList(); - $scope.unSelect(); - $scope.myStatusModel = { - 'staus': '', - 'description': '', - } - $scope.allSelected('undefined'); - $scope.OpenWindowStatus = false; - $scope.disableStatusUpdateButton = false; + $scope.disableStatusUpdateButton = false; + $scope.updateStatusClose(); } else { swal(" ", response.data.message, "error"); $scope.disableStatusUpdateButton = false; @@ -281,6 +258,7 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", " $scope.myStatusModel = { 'staus': '', 'description': '', + 'ID':'' } } } diff --git a/Apollo/assets/js/controllers/daybookapprovalCtrl.js b/Apollo/assets/js/controllers/daybookapprovalCtrl.js index 01eb2b56..6a4d288a 100755 --- a/Apollo/assets/js/controllers/daybookapprovalCtrl.js +++ b/Apollo/assets/js/controllers/daybookapprovalCtrl.js @@ -134,7 +134,7 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt $scope.dataLengthIncome = 0; $scope.dataLengthExpense = 0; // day book entry list - $scope.getDayBookList = function () { + $scope.getDayBookList = function () { $scope.loadingsearch = true; $scope.noRecordFoundSearch = false; var getDatBookListDetails = { @@ -152,14 +152,14 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt if (response.data.dayBookListStatus) { $scope.loadingsearch = false; // $scope.data = response.data.dayBookListDetails; - $scope.datas = response.data.dayBookListDetails; + // $scope.datas = response.data.dayBookListDetails; - const filterAddSelect = $scope.datas.filter(val => { - val['Selected'] = false; - return val; - }); - $scope.searchResultDetails = filterAddSelect; - $scope.searchResultDetailsCopy = filterAddSelect; + // const filterAddSelect = $scope.datas.filter(val => { + // val['Selected'] = false; + // return val; + // }); + $scope.searchResultDetails = response.data.dayBookListDetails; + $scope.searchResultDetailsCopy = response.data.dayBookListDetails; } else { $scope.loadingsearch = false; } diff --git a/Apollo/assets/views/daybook/dayBookadminApproval.html b/Apollo/assets/views/daybook/dayBookadminApproval.html index 23b28049..26e7b6c8 100755 --- a/Apollo/assets/views/daybook/dayBookadminApproval.html +++ b/Apollo/assets/views/daybook/dayBookadminApproval.html @@ -25,9 +25,9 @@ /*overflow-x: scroll;*/ color: rgba(7, 21, 176, 0.7); overflow: auto; - display: flex; - justify-content: center; - flex-direction: column; + display: flex; + justify-content: center; + flex-direction: column; } /*.square { background-color: #00b; @@ -44,9 +44,9 @@
- +
-
+
@@ -58,7 +58,7 @@
-
+
@@ -73,7 +73,7 @@ - + + + + Status is Required + +
+ +
+
+
+
+ + +