Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

daybook updates: kdk

Browse Source
This commit is contained in:
resicovenba 2018-03-15 18:24:33 +05:30
parent 6b57550938
commit 696973b7fc
11 changed files with 64 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Apollo/api/application/models/Fees_status_model.php
View File

@ -1704,9 +1704,16 @@ class Fees_status_model extends CI_Model
$sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE BranchCode = '$branch' $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE BranchCode = '$branch'
ORDER BY CreatedOn DESC ORDER BY CreatedOn DESC
LIMIT 1"; LIMIT 1";
$prevBalance = 0;
$latestUpdate = $this->db->query($sql); $latestUpdate = $this->db->query($sql);
$latestUpdateDetails = $latestUpdate->result(); $latestUpdateDetails = $latestUpdate->result();
If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0)
{
$prevBalance = $latestUpdateDetails[0]->Balance; $prevBalance = $latestUpdateDetails[0]->Balance;
}else{
}
if($Arr['Name'] == 'I002') { if($Arr['Name'] == 'I002') {
//Income //Income
$Arr['Balance'] = $prevBalance + $Arr['Amount']; $Arr['Balance'] = $prevBalance + $Arr['Amount'];
@ -1719,8 +1726,8 @@ class Fees_status_model extends CI_Model
$this->db->insert(DAYBOOKMASTER, $Arr); $this->db->insert(DAYBOOKMASTER, $Arr);
if ($this->db->affected_rows() == '1') { if ($this->db->affected_rows() == '1') {
$result['addDayBookStatus'] = true; $result['addDayBookStatus'] = true;
$result['message'] = "Successfully DayBook Details Added"; $result['message'] = "Successfully DayBook Details Added";
} else { } else {
$result['addDayBookStatus'] = false; $result['addDayBookStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";

13
Apollo/assets/js/controllers/daybookCtrl.js
View File

@ -8,12 +8,14 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
// get local client details // get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); var localDetails = ipCookie('cookiechk');
$scope.disableAddButton = false;
$scope.disableEditButton = false;
$scope.searchData = { $scope.searchData = {
"date": "", "date": "",
"dateTo": "" "dateTo": ""
} }
// get the data while page loading functions goes here // get the data while page loading functions goes here
$scope.init = function () { $scope.init = function () {
const LOCALTYPE = localDetail.localType; const LOCALTYPE = localDetail.localType;
@ -331,7 +333,7 @@ $scope.dayBookApprovalAccess = '';
angular.element('.ng-invalid[name=' + firstError + ']').focus(); angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else { } else {
$scope.disableAddButton = true;
var formate = "dd-MM-yyyy"; var formate = "dd-MM-yyyy";
$scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate); $scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
$scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved'; $scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved';
@ -352,8 +354,10 @@ $scope.dayBookApprovalAccess = '';
if (response.data.addDayBookStatus) { if (response.data.addDayBookStatus) {
swal(" ", "Income/Expense added successfully.", "success"); swal(" ", "Income/Expense added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
$scope.disableAddButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableAddButton = false;
} }
}); });
} }
@ -395,6 +399,7 @@ $scope.dayBookApprovalAccess = '';
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else { } else {
// alert(JSON.stringify($scope.myModel));exit(); // alert(JSON.stringify($scope.myModel));exit();
$scope.disableEditButton = true;
var updateDayBookDetails = { var updateDayBookDetails = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateDayBookDetails/', url: apiPoint.url + 'updateDayBookDetails/',
@ -412,8 +417,10 @@ $scope.dayBookApprovalAccess = '';
// for success state // for success state
$scope.editId = -1; $scope.editId = -1;
$scope.getDayBookList(); $scope.getDayBookList();
$scope.disableEditButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableEditButton = false;
} }
}); });
} }

10
Apollo/assets/js/controllers/daybookadminCtrl.js
View File

@ -9,6 +9,9 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); var localDetails = ipCookie('cookiechk');
$scope.disableAddButton = false;
$scope.disableEditButton = false;
$scope.searchData = { $scope.searchData = {
"date": "", "date": "",
"dateTo": "" "dateTo": ""
@ -331,7 +334,7 @@ $scope.dayBookApprovalAccess = '';
angular.element('.ng-invalid[name=' + firstError + ']').focus(); angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else { } else {
$scope.disableAddButton = true;
var formate = "dd-MM-yyyy"; var formate = "dd-MM-yyyy";
$scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate); $scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
$scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved'; $scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved';
@ -352,8 +355,10 @@ $scope.dayBookApprovalAccess = '';
if (response.data.addDayBookStatus) { if (response.data.addDayBookStatus) {
swal(" ", "Income/Expense added successfully.", "success"); swal(" ", "Income/Expense added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
$scope.disableAddButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableAddButton = false;
} }
}); });
} }
@ -395,6 +400,7 @@ $scope.dayBookApprovalAccess = '';
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else { } else {
// alert(JSON.stringify($scope.myModel));exit(); // alert(JSON.stringify($scope.myModel));exit();
$scope.disableEditButton = true;
var updateDayBookDetails = { var updateDayBookDetails = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateDayBookDetails/', url: apiPoint.url + 'updateDayBookDetails/',
@ -412,8 +418,10 @@ $scope.dayBookApprovalAccess = '';
// for success state // for success state
$scope.editId = -1; $scope.editId = -1;
$scope.getDayBookList(); $scope.getDayBookList();
$scope.disableEditButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableEditButton = false;
} }
}); });
} }

5
Apollo/assets/js/controllers/daybookadminapprovalCtrl.js
View File

@ -11,6 +11,8 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
$scope.localTypeViewAdmin = false; $scope.localTypeViewAdmin = false;
$scope.localTypeViewSuperAdmin = false; $scope.localTypeViewSuperAdmin = false;
$scope.disableStatusUpdateButton = false;
$scope.searchData = { $scope.searchData = {
"date": "", "date": "",
"dateTo": "" "dateTo": ""
@ -238,6 +240,7 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
this.comments = $scope.myStatusModel.description; this.comments = $scope.myStatusModel.description;
} }
if(selectedItems.length > 0) { if(selectedItems.length > 0) {
$scope.disableStatusUpdateButton = true;
var updateStudyMaterial = { var updateStudyMaterial = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateDayBookStatusAdmin/', url: apiPoint.url + 'updateDayBookStatusAdmin/',
@ -261,8 +264,10 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
} }
$scope.allSelected('undefined'); $scope.allSelected('undefined');
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
$scope.disableStatusUpdateButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableStatusUpdateButton = false;
} }
}); });
} else { } else {

6
Apollo/assets/js/controllers/daybookapprovalCtrl.js
View File

@ -11,6 +11,8 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt
$scope.localTypeViewAdmin = false; $scope.localTypeViewAdmin = false;
$scope.localTypeViewSuperAdmin = false; $scope.localTypeViewSuperAdmin = false;
$scope.disableStatusUpdateButton = false;
$scope.searchData = { $scope.searchData = {
"date": "", "date": "",
"dateTo": "" "dateTo": ""
@ -224,6 +226,7 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt
} }
angular.element('.ng-invalid[name=' + firstError + ']').focus(); angular.element('.ng-invalid[name=' + firstError + ']').focus();
} else { } else {
var selectedItems = []; var selectedItems = [];
var ItemsSelected = $scope.searchResultDetails.filter(function (item) { var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
if (item.Selected === true && item.Status === 'Pending' ) { if (item.Selected === true && item.Status === 'Pending' ) {
@ -238,6 +241,7 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt
this.comments = $scope.myStatusModel.description; this.comments = $scope.myStatusModel.description;
} }
if(selectedItems.length > 0) { if(selectedItems.length > 0) {
$scope.disableStatusUpdateButton = true;
var updateStudyMaterial = { var updateStudyMaterial = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateDayBookStatusAdmin/', url: apiPoint.url + 'updateDayBookStatusAdmin/',
@ -261,8 +265,10 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt
} }
$scope.allSelected('undefined'); $scope.allSelected('undefined');
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
$scope.disableStatusUpdateButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableStatusUpdateButton = false;
} }
}); });
} else { } else {

11
Apollo/assets/js/controllers/daybooksuperadminCtrl.js
View File

@ -8,6 +8,8 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
// get local client details // get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); var localDetails = ipCookie('cookiechk');
$scope.disableAddButton = false;
$scope.disableEditButton = false;
$scope.searchData = { $scope.searchData = {
"date": "", "date": "",
@ -59,7 +61,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
} }
function getDetails() { function getDetails() {
const LOCALTYPE = localDetail.localType; const LOCALTYPE = localDetail.localType;
if(LOCALTYPE === 'R004') { if(LOCALTYPE === 'R004') {
$scope.currentDate = new Date(); $scope.currentDate = new Date();
var d = new Date(); var d = new Date();
@ -396,7 +398,7 @@ $scope.dayBookApprovalAccess = '';
angular.element('.ng-invalid[name=' + firstError + ']').focus(); angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else { } else {
$scope.disableAddButton = true;
var formate = "dd-MM-yyyy"; var formate = "dd-MM-yyyy";
$scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate); $scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
$scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved'; $scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved';
@ -419,8 +421,10 @@ $scope.dayBookApprovalAccess = '';
// $state.go($state.current, {}, { reload: true }); // $state.go($state.current, {}, { reload: true });
$scope.viewStudentDetailsPage = false; $scope.viewStudentDetailsPage = false;
$scope.myActivateDiv(); $scope.myActivateDiv();
$scope.disableAddButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableAddButton = false;
} }
}); });
} }
@ -484,6 +488,7 @@ $scope.dayBookApprovalAccess = '';
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else { } else {
// alert(JSON.stringify($scope.myModel));exit(); // alert(JSON.stringify($scope.myModel));exit();
$scope.disableEditButton = true;
var updateDayBookDetails = { var updateDayBookDetails = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateDayBookDetails/', url: apiPoint.url + 'updateDayBookDetails/',
@ -501,8 +506,10 @@ $scope.dayBookApprovalAccess = '';
// for success state // for success state
$scope.editId = -1; $scope.editId = -1;
$scope.getDayBookList(); $scope.getDayBookList();
$scope.disableEditButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableEditButton = false;
} }
}); });
} }

4
Apollo/assets/views/daybook/dayBookApproval.html
View File

@ -323,8 +323,8 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="center"> <div class="center">
<button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" data-style="zoom-in"> <button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" data-style="zoom-in" ng-disabled="disableStatusUpdateButton">
Update <i class='fa fa-spinner fa-spin' ng-if="disableStatusUpdateButton"> </i> Update
</button> </button>
<!--<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)"> <!--<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset Reset

4
Apollo/assets/views/daybook/dayBookadminApproval.html
View File

@ -323,8 +323,8 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="center"> <div class="center">
<button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" data-style="zoom-in"> <button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" data-style="zoom-in" ng-disabled="disableStatusUpdateButton">
Update <i class='fa fa-spinner fa-spin' ng-if="disableStatusUpdateButton"> </i> Update
</button> </button>
<!--<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)"> <!--<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset Reset

8
Apollo/assets/views/daybook/daybook.html
View File

@ -238,9 +238,9 @@
</div> </div>
<div class="row"> <div class="row">
<div class="center"> <div class="center">
<button type="submit" ng-disabled="disableButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" <button type="submit" ng-disabled="disableEditButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in"> data-style="zoom-in">
Submit <i class='fa fa-spinner fa-spin' ng-if="disableEditButton"> </i> Submit
</button> </button>
<button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)"> <button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Cancel Cancel
@ -364,9 +364,9 @@
</div> </div>
<div class="row"> <div class="row">
<div class="pull-right"> <div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" <button type="submit" ng-disabled="disableAddButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in"> data-style="zoom-in">
Submit <i class='fa fa-spinner fa-spin' ng-if="disableAddButton"> </i> Submit
</button> </button>
<button type="cancel" ng-click="daybookAdd.reset(Form)" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)"> <button type="cancel" ng-click="daybookAdd.reset(Form)" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Reset Reset

8
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -239,9 +239,9 @@
</div> </div>
<div class="row"> <div class="row">
<div class="center"> <div class="center">
<button type="submit" ng-disabled="disableButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" <button type="submit" ng-disabled="disableEditButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in"> data-style="zoom-in">
Submit <i class='fa fa-spinner fa-spin' ng-if="disableEditButton"> </i> Submit
</button> </button>
<button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)"> <button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Cancel Cancel
@ -365,9 +365,9 @@
</div> </div>
<div class="row"> <div class="row">
<div class="pull-right"> <div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" <button type="submit" ng-disabled="disableAddButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in"> data-style="zoom-in">
Submit <i class='fa fa-spinner fa-spin' ng-if="disableAddButton"> </i> Submit
</button> </button>
<button type="cancel" ng-click="daybookAdd.reset(Form)" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)"> <button type="cancel" ng-click="daybookAdd.reset(Form)" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Reset Reset

8
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -263,9 +263,9 @@
</div> </div>
<div class="row"> <div class="row">
<div class="center"> <div class="center">
<button type="submit" ng-disabled="disableButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" <button type="submit" ng-disabled="disableEditButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in"> data-style="zoom-in">
Submit <i class='fa fa-spinner fa-spin' ng-if="disableEditButton"> </i> Submit
</button> </button>
<button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)"> <button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Cancel Cancel
@ -389,9 +389,9 @@
</div> </div>
<div class="row"> <div class="row">
<div class="pull-right"> <div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" <button type="submit" ng-disabled="disableAddButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in"> data-style="zoom-in">
Submit <i class='fa fa-spinner fa-spin' ng-if="disableAddButton"> </i> Submit
</button> </button>
<button type="cancel" ng-click="daybookAdd.reset(Form)" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)"> <button type="cancel" ng-click="daybookAdd.reset(Form)" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Reset Reset