diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 5d3258e9..166322c9 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -254,10 +254,7 @@ class DayBook_model extends CI_Model WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') - and t1.Type='$exptype' - - AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL) - 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,t7.UniversityName as UniversityName, t6.CourseName as CourseName @@ -270,16 +267,48 @@ class DayBook_model extends CI_Model LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode WHERE t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') - and t1.Type='$exptype' - AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL) - ORDER BY ORDER_ID DESC"; + "; } + + + if($exptype != '') + { + $querys.="and t1.Type='$exptype'"; + } + + if($ModeOfPayment !='') + { + $querys.= "AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL)"; + } + + $querys.="ORDER BY ORDER_ID DESC"; + + + // $this->db->select('t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name,t7.UniversityName as UniversityName, t6.CourseName as CourseName'); + // $this->db->from('T_DayBookMaster t1'); + // $this->db->join('T_PickListDetails t2','t2.ListCode = t1.Name','left'); + // $this->db->join('T_Income_Outcome_Master t3','t3.ID = t1.Type AND t3.BranchCode = t1.BranchCode','left'); + // $this->db->join('T_Login t4','t4 ON t4.ID = t1.Approval_By','left'); + // $this->db->join('T_StaffDetails t5','t5.StaffID = t4.StaffID','left'); + // $this-> + + + + + + + + + + + + $dayBookDetails = $this->db->query($querys); $dayBookDetailsList = $dayBookDetails->result(); $results['dayBookListStatus'] = true; $results['dayBookListDetails'] = $dayBookDetailsList; -// print_r($this->db->last_query()); -// die(); + //print_r($this->db->last_query()); + // die(); return $results; } diff --git a/Apollo/assets/js/controllers/daybookadminapprovalCtrl.js b/Apollo/assets/js/controllers/daybookadminapprovalCtrl.js index 53a6c338..c0483418 100755 --- a/Apollo/assets/js/controllers/daybookadminapprovalCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminapprovalCtrl.js @@ -127,7 +127,115 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", " } else { } }); + + + + var getExpenseType = { + method: 'POST', + url: apiPoint.url + 'getExpenseType/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + branch: localDetails.localBranchID, + + } + }; + $http(getExpenseType).then(function (response) { + + if(response.data.status='200') + { + $scope.ExpenseType= response.data.details; + } + + else + { + + } + + }); + + + } + + + + + + + + $scope.searchData = { + "modeofpayment": "", + "exptype": "" + } + + + $scope.getfilterDetails=function(p) + { + // alert() + //console.log(p) + // return false; + // console.log(p.paymentOn.paymentOn) + + if((p.expensetype != undefined)||(p.paymentOn != undefined)) + { + + var getDayBookfilterDetails = { + method: 'POST', + url: apiPoint.url + 'getDayBookfilterDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: $scope.searchData, + localReqDetails: localDetails, + exptype:p.expensetype, + modeofpayment:p.paymentOn, + fdate:$scope.searchData.date, + tdate:$scope.searchData.dateTo + } + }; + $http(getDayBookfilterDetails).then(function (response) { + if (response.data.dayBookListStatus) { + $scope.loadingsearch = false; + + $scope.searchResultDetails = response.data.dayBookListDetails; + $scope.searchResultDetailsCopy = response.data.dayBookListDetails; + } else { + $scope.loadingsearch = false; + } + }); + + } + + else + { + $scope.getDayBookList(); + } + + + } + + + + + + + + + + + + + + + + + + + + $scope.loadingsearch = false; $scope.noRecordFound = true; diff --git a/Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js index 28231778..99dc4f51 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js @@ -237,10 +237,11 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste $scope.getfilterDetails=function(p) { // alert() - //console.log(p.expensetype) + // console.log(p) + // return false; // console.log(p.paymentOn.paymentOn) - if((p.expensetype != undefined)&&(p.paymentOn.paymentOn != undefined)) + if((p.expensetype != undefined)||(p.paymentOn != undefined)) { var getDayBookfilterDetails = { @@ -253,7 +254,7 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste data: $scope.searchData, localReqDetails: localDetails, exptype:p.expensetype, - modeofpayment:p.paymentOn.paymentOn, + modeofpayment:p.paymentOn, fdate:$scope.searchData.date, tdate:$scope.searchData.dateTo } diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index f29c84d6..8095274a 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -86,6 +86,82 @@ --> + + + + + + + +
+ + +
+ + + +
+ +
+ + + +
+ + +
+ +
+ + + +
+ + +
+ +
+
+
+ + + + + + + + + + + + + + + +
+ + +
+ + + +
+ +
+ + + +
+ + +
+ +
+ + + +
+ + +
+ +
+
+
+ + + + + + + + + + + + + +
- + + + + + +