From bf7bfd40846fdeac51096dafab05cbac307df64f Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Wed, 18 Apr 2018 16:10:49 +0530 Subject: [PATCH] daybook details Update : kdk --- .../api/application/models/DayBook_model.php | 25 +++- Apollo/assets/js/controllers/daybookCtrl.js | 1 + .../assets/js/controllers/daybookadminCtrl.js | 2 +- .../js/controllers/daybookapprovalCtrl.js | 36 +++-- .../js/controllers/daybooksuperadminCtrl.js | 1 + .../daybooksuperadminapprovalCtrl.js | 67 +++++---- .../assets/views/daybook/dayBookApproval.html | 132 ++++++++++++++---- .../views/daybook/dayBookadminApproval.html | 2 +- Apollo/assets/views/daybook/daybook.html | 45 ++++-- Apollo/assets/views/daybook/daybookadmin.html | 8 ++ .../daybook/daybooksuperAdminApproval.html | 108 ++++++++++++-- .../views/daybook/daybooksuperadmin.html | 54 ++++--- 12 files changed, 363 insertions(+), 118 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index ed511354..cc01e1dd 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -64,8 +64,15 @@ 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 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 + $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 + 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 + LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID + LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; // echo $querys;exit(); @@ -84,8 +91,15 @@ 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 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 + $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 + 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 + LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID + LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID WHERE t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; } @@ -190,7 +204,8 @@ class DayBook_model extends CI_Model $branch = $typeStateDetails[0]->BranchCode; // echo $id;exit(); try { - $sql1 = " DELETE FROM ".STUDENTS_FEES_PAID." WHERE ID ='$getID'"; + // $sql1 = " DELETE FROM ".STUDENTS_FEES_PAID." WHERE ID ='$getID'"; + $sql1 = "UPDATE ".STUDENTS_FEES_PAID." SET IsActive ='0' WHERE ID ='$getID'"; $this->db->query($sql1); } catch(Exception $e) { echo 'error'; diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 6628cee0..0d028740 100755 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -18,6 +18,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng // get the data while page loading functions goes here $scope.init = function () { + $scope.todayDate = new Date(); const LOCALTYPE = localDetail.localType; if(LOCALTYPE === 'R002') { $scope.currentDate = new Date(); diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 59cc5b25..7a1c0d9a 100755 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -32,7 +32,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter" $scope.getDayBookList(); $scope.getIncomeExpenseType_Status(); - }else {alert(); + }else { ipCookie.remove('cookiechk'); $window.localStorage.clear(); $state.go('login.signin'); diff --git a/Apollo/assets/js/controllers/daybookapprovalCtrl.js b/Apollo/assets/js/controllers/daybookapprovalCtrl.js index 6a4d288a..0e7b7062 100755 --- a/Apollo/assets/js/controllers/daybookapprovalCtrl.js +++ b/Apollo/assets/js/controllers/daybookapprovalCtrl.js @@ -139,7 +139,7 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt $scope.noRecordFoundSearch = false; var getDatBookListDetails = { method: 'POST', - url: apiPoint.url + 'getDayBookDetails/', + url: apiPoint.url + 'getDayBookApprovalDetails/', headers: { 'Content-Type': 'application/json' }, @@ -208,6 +208,29 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt } } + + $scope.myStatusModel = { + 'staus': '', + 'description': '', + 'ID':'' + } + + + $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':'' + } + } + // update the status details $scope.statusUpdate = { submit: function (form, myStatusModel) { @@ -256,16 +279,9 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt $http(updateStudyMaterial).then(function (response) { if (response.data.addStatus) { 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; diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 4caa5c91..aaa50beb 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -61,6 +61,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi } function getDetails() { + $scope.todayDate = new Date(); const LOCALTYPE = localDetail.localType; if(LOCALTYPE === 'R004') { $scope.currentDate = new Date(); diff --git a/Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js index e9319e27..ef98c5eb 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js @@ -176,7 +176,7 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste $scope.noRecordFoundSearch = false; var getDatBookListDetails = { method: 'POST', - url: apiPoint.url + 'getDayBookDetails/', + url: apiPoint.url + 'getDayBookApprovalDetails/', headers: { 'Content-Type': 'application/json' }, @@ -189,14 +189,15 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste 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 = filterAddSelect; + $scope.searchResultDetails = response.data.dayBookListDetails; + $scope.searchResultDetailsCopy = response.data.dayBookListDetails; } else { $scope.loadingsearch = false; } @@ -221,11 +222,29 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste $scope.openUpdateWind(); } - $scope.myStatusModel = { + $scope.myStatusModel = { 'staus': '', 'description': '', + 'ID':'' } + + $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':'' + } + } + + // End: select all or individual functionality $scope.OpenWindowStatus = false; @@ -264,15 +283,17 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste 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; } @@ -294,12 +315,7 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste swal(" ", "Updated successfully,", "success"); // for success state $scope.getDayBookList(); - $scope.unSelect(); - $scope.myStatusModel = { - 'staus': '', - 'description': '', - } - $scope.allSelected('undefined'); + $scope.updateStatusClose(); $scope.OpenWindowStatus = false; $scope.disableStatusUpdateButton = false; } else { @@ -315,9 +331,10 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste }, reset: function (form) { form.$setPristine(true); - $scope.myStatusModel = { + $scope.myStatusModel = { 'staus': '', 'description': '', + 'ID':'' } } } diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index b97692db..8d1a1a34 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.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 + +
+ +
+
+
+
+ + +