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

day book details update admin: kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-04-17 17:07:19 +05:30
parent a6c5889506
commit d2ca4dbcea
9 changed files with 265 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/config/routes.php
View File

@ -202,6 +202,7 @@ $route['updateCertificateDetails'] = 'Certificate_Controller/updateCertificateDe
$route['deleteDayBookDetails'] = 'DayBook_Controller/deleteDayBookDetails'; $route['deleteDayBookDetails'] = 'DayBook_Controller/deleteDayBookDetails';
$route['updateDayBookDetails'] = 'DayBook_Controller/updateDayBookDetails'; $route['updateDayBookDetails'] = 'DayBook_Controller/updateDayBookDetails';
$route['getDayBookDetails'] = 'DayBook_Controller/getDayBookDetails'; $route['getDayBookDetails'] = 'DayBook_Controller/getDayBookDetails';
$route['getDayBookApprovalDetails'] = 'DayBook_Controller/getDayBookApprovalDetails';
$route['getIncomeExpenseTypeState'] = 'DayBook_Controller/getIncomeExpenseTypeState'; $route['getIncomeExpenseTypeState'] = 'DayBook_Controller/getIncomeExpenseTypeState';
$route['addDayBook'] = 'DayBook_Controller/adddaybook'; $route['addDayBook'] = 'DayBook_Controller/adddaybook';
$route['updateDayBookStatusAdmin'] = 'DayBook_Controller/updateDayBookStatusAdmin'; $route['updateDayBookStatusAdmin'] = 'DayBook_Controller/updateDayBookStatusAdmin';

20
Apollo/api/application/controllers/DayBook_Controller.php
View File

@ -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() { public function deleteDayBookDetails_post() {
$reqData = $this->post('data'); $reqData = $this->post('data');
$reqbyData = $this->post('localReqDetails'); $reqbyData = $this->post('localReqDetails');

132
Apollo/api/application/models/DayBook_model.php
View File

@ -98,6 +98,32 @@ class DayBook_model extends CI_Model
return $results; 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 // delete the daybook details
public function delete_dayBookDetails($id) { public function delete_dayBookDetails($id) {
// echo $id;exit(); // echo $id;exit();
@ -181,7 +207,10 @@ class DayBook_model extends CI_Model
$currID = $latestUpdateDetails[0]->ID; $currID = $latestUpdateDetails[0]->ID;
}else{ }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 // update branch to staff_branch table
if ($this->db->query($sql1) == '1') { if ($this->db->query($sql1) == '1') {
@ -390,7 +419,7 @@ class DayBook_model extends CI_Model
$branch = $updateDataDetails[0]->BranchCode; $branch = $updateDataDetails[0]->BranchCode;
$Amount = 0; $Amount = 0;
$Amount = $updateDataDetails[0]->Amount; $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') $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$updateFor')
@ -432,58 +461,57 @@ class DayBook_model extends CI_Model
$result['addStatus'] = false; $result['addStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
} }
} else if($updateDataDetails[0]->PaymentStatus === '0') { }
$currentVoucheNumber = $updateDataDetails[0]->VoucherNumber; // else if($updateDataDetails[0]->PaymentStatus === '0') {
$mySql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND VoucherNumber = '$currentVoucheNumber') // $currentVoucheNumber = $updateDataDetails[0]->VoucherNumber;
ORDER BY ID ASC // $mySql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND VoucherNumber = '$currentVoucheNumber')
LIMIT 1 "; // ORDER BY ID ASC
$mySqlUpdate = $this->db->query($mySql); // LIMIT 1 ";
$mySqlUpdateDetails = $mySqlUpdate->result(); // $mySqlUpdate = $this->db->query($mySql);
$mySqlUpdateDetailsID = $mySqlUpdateDetails[0]->ID; // $mySqlUpdateDetails = $mySqlUpdate->result();
// $mySqlUpdateDetailsID = $mySqlUpdateDetails[0]->ID;
$sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$mySqlUpdateDetailsID') // $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$mySqlUpdateDetailsID')
ORDER BY ID DESC // ORDER BY ID DESC
LIMIT 1 "; // LIMIT 1 ";
$currBalance = 0; // $currBalance = 0;
$latestUpdate = $this->db->query($sql); // $latestUpdate = $this->db->query($sql);
$latestUpdateDetails = $latestUpdate->result(); // $latestUpdateDetails = $latestUpdate->result();
If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0) // If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0)
{ // {
$currBalance = $latestUpdateDetails[0]->Balance; // $currBalance = $latestUpdateDetails[0]->Balance;
}else{ // }else{
} // }
$sql = "UPDATE ".DAYBOOKMASTER." // $sql = "UPDATE ".DAYBOOKMASTER."
SET Status = '$status', Approval_By = '$Approval_By' , // SET Status = '$status', Approval_By = '$Approval_By' ,
Approval_Comments = '$Approval_Comments', UpdatedBy = '$UpdatedBy' , UpdatedOn = '$UpdatedOn' , Balance = '$currBalance' // Approval_Comments = '$Approval_Comments', UpdatedBy = '$UpdatedBy' , UpdatedOn = '$UpdatedOn' , Balance = '$currBalance'
WHERE VoucherNumber = '$currentVoucheNumber' "; // WHERE VoucherNumber = '$currentVoucheNumber' ";
$mBranchDetails = $this->db->query($sql); // $mBranchDetails = $this->db->query($sql);
// echo $mBranchDetails; // if ($this->db->affected_rows() >= 1) {
// echo $this->db->affected_rows(); exit(); // $sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$updateFor')
if ($this->db->affected_rows() >= 1) { // ORDER BY ID ASC";
$sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$updateFor') // $latestUpdate2 = $this->db->query($sql2);
ORDER BY ID ASC"; // $latestUpdateDetails2 = $latestUpdate2->result();
$latestUpdate2 = $this->db->query($sql2); // foreach( $latestUpdateDetails2 as $clip){
$latestUpdateDetails2 = $latestUpdate2->result(); // if($clip->Name == 'I002' && ($clip->Status == "Pending" || $clip->Status == "Approved" || $clip->Status == "approved" || $clip->Status == "pending")) {
foreach( $latestUpdateDetails2 as $clip){ // //Income
if($clip->Name == 'I002' && ($clip->Status == "Pending" || $clip->Status == "Approved" || $clip->Status == "approved" || $clip->Status == "pending")) { // $currBalance = $currBalance + $clip->Amount;
//Income // }else if ($clip->Name == 'I001' && ($clip->Status == "Pending" || $clip->Status == "Approved" || $clip->Status == "approved" || $clip->Status == "pending")) {
$currBalance = $currBalance + $clip->Amount; // //Expense
}else if ($clip->Name == 'I001' && ($clip->Status == "Pending" || $clip->Status == "Approved" || $clip->Status == "approved" || $clip->Status == "pending")) { // $currBalance = $currBalance - $clip->Amount;
//Expense // } else {
$currBalance = $currBalance - $clip->Amount; // }
} else { // $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'";
} // $this->db->query($updateSql);
$updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'"; // }
$this->db->query($updateSql); // $result['addStatus'] = true;
} // $result['message'] = "Successfully Details Updated";
$result['addStatus'] = true; // } else {
$result['message'] = "Successfully Details Updated"; // $result['addStatus'] = false;
} else { // $result['message'] = "Something went wrong.please try again";
$result['addStatus'] = false; // }
$result['message'] = "Something went wrong.please try again";
}
} // }
} }
return $result; return $result;
} }

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

@ -19,6 +19,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
// get the data while page loading functions goes here // get the data while page loading functions goes here
$scope.init = function () { $scope.init = function () {
$scope.todayDate = new Date();
const LOCALTYPE = localDetail.localType; const LOCALTYPE = localDetail.localType;
if(LOCALTYPE === 'R003') { if(LOCALTYPE === 'R003') {
$scope.currentDate = new Date(); $scope.currentDate = new Date();

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

@ -20,6 +20,7 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
// load functionality when page get loaded // load functionality when page get loaded
$scope.init = function () { $scope.init = function () {
$scope.todayDate = new Date();
const LOCALTYPE = localDetail.localType; const LOCALTYPE = localDetail.localType;
if (LOCALTYPE === 'R003') { if (LOCALTYPE === 'R003') {
// getFinanceModuleAccess(); // getFinanceModuleAccess();
@ -139,7 +140,7 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
$scope.noRecordFoundSearch = false; $scope.noRecordFoundSearch = false;
var getDatBookListDetails = { var getDatBookListDetails = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'getDayBookDetails/', url: apiPoint.url + 'getDayBookApprovalDetails/',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
@ -152,59 +153,39 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
if (response.data.dayBookListStatus) { if (response.data.dayBookListStatus) {
$scope.loadingsearch = false; $scope.loadingsearch = false;
// $scope.data = response.data.dayBookListDetails; // $scope.data = response.data.dayBookListDetails;
$scope.datas = response.data.dayBookListDetails; // $scope.datas = response.data.dayBookListDetails;
const filterAddSelect = $scope.datas.filter(val => { // const filterAddSelect = $scope.datas.filter(val => {
val['Selected'] = false; // val['Selected'] = false;
return val; // return val;
}); // });
$scope.searchResultDetails = filterAddSelect; $scope.searchResultDetails = response.data.dayBookListDetails;
$scope.searchResultDetailsCopy = filterAddSelect; $scope.searchResultDetailsCopy = response.data.dayBookListDetails;
} else { } else {
$scope.loadingsearch = false; $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 = { $scope.myStatusModel = {
'staus': '', 'staus': '',
'description': '', 'description': '',
'ID':''
} }
// End: select all or individual functionality
$scope.OpenWindowStatus = false; $scope.editId = '';
// open popup window when checkbox get selected / close popup window uncheck the selected items $scope.updateStatus = function(p) {
$scope.openUpdateWind = function () { $scope.editId = p.ORDER_ID;
var ItemsSelected = $scope.searchResultDetails.filter(function (item) { $scope.myStatusModel.ID = p.ID;
if (item.Selected === true) { return true; } }
});
if (ItemsSelected.length) { $scope.updateStatusClose = function() {
$scope.editId = '';
$scope.myStatusModel = { $scope.myStatusModel = {
'staus': '', 'staus': '',
'description': '', 'description': '',
} 'ID':''
$scope.OpenWindowStatus = true;
} else {
$scope.OpenWindowStatus = false;
} }
} }
@ -227,15 +208,17 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
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' ) {
let itemGetID = new getUpdateDetails(item.ID); // let itemGetID = new getUpdateDetails(item.ID);
// selectedItems.push(itemGetID);
// return true;
// }
// });
let itemGetID = new getUpdateDetails();
selectedItems.push(itemGetID); selectedItems.push(itemGetID);
return true; function getUpdateDetails() {
} this.dabookListId = $scope.myStatusModel.ID;
});
function getUpdateDetails(id) {
this.dabookListId = id;
this.ListCodeStatus = $scope.myStatusModel.staus; this.ListCodeStatus = $scope.myStatusModel.staus;
this.comments = $scope.myStatusModel.description; this.comments = $scope.myStatusModel.description;
} }
@ -257,14 +240,8 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
swal(" ", "Updated successfully,", "success"); swal(" ", "Updated successfully,", "success");
// for success state // for success state
$scope.getDayBookList(); $scope.getDayBookList();
$scope.unSelect();
$scope.myStatusModel = {
'staus': '',
'description': '',
}
$scope.allSelected('undefined');
$scope.OpenWindowStatus = false;
$scope.disableStatusUpdateButton = false; $scope.disableStatusUpdateButton = false;
$scope.updateStatusClose();
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableStatusUpdateButton = false; $scope.disableStatusUpdateButton = false;
@ -281,6 +258,7 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
$scope.myStatusModel = { $scope.myStatusModel = {
'staus': '', 'staus': '',
'description': '', 'description': '',
'ID':''
} }
} }
} }

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

@ -152,14 +152,14 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt
if (response.data.dayBookListStatus) { if (response.data.dayBookListStatus) {
$scope.loadingsearch = false; $scope.loadingsearch = false;
// $scope.data = response.data.dayBookListDetails; // $scope.data = response.data.dayBookListDetails;
$scope.datas = response.data.dayBookListDetails; // $scope.datas = response.data.dayBookListDetails;
const filterAddSelect = $scope.datas.filter(val => { // const filterAddSelect = $scope.datas.filter(val => {
val['Selected'] = false; // val['Selected'] = false;
return val; // return val;
}); // });
$scope.searchResultDetails = filterAddSelect; $scope.searchResultDetails = response.data.dayBookListDetails;
$scope.searchResultDetailsCopy = filterAddSelect; $scope.searchResultDetailsCopy = response.data.dayBookListDetails;
} else { } else {
$scope.loadingsearch = false; $scope.loadingsearch = false;
} }

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

@ -106,7 +106,6 @@
text-align: center; text-align: center;
} }
</style> </style>
<div class="row" ng-if="dataLengthIncome > 0"> <div class="row" ng-if="dataLengthIncome > 0">
<div class="pull-right"> <div class="pull-right">
<div style="margin: 8px;"> <div style="margin: 8px;">
@ -140,12 +139,10 @@
</th> </th>
<th>Amount <th>Amount
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in IncomeData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10"> <tbody dir-paginate="p in IncomeData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td>{{p.Date}}</td> <td>{{p.Date}}</td>
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td> <td>{{p.VoucherNumber}}</td>
@ -197,10 +194,9 @@
<table style="width: 100%;" class="table table-hover"> <table style="width: 100%;" class="table table-hover">
<thead> <thead>
<tr> <tr>
<th ng-if="dayBookApprovalAccess == '1'"> <!--<th ng-if="dayBookApprovalAccess == '1'">
<!--<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
/>--> </th>-->
</th>
<th ng-click="sort('Date')">Date <th ng-click="sort('Date')">Date
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>--> <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
@ -226,17 +222,17 @@
<th ng-click="sort('Status')">Status <th ng-click="sort('Status')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in searchResultDetails|itemsPerPage:10"> <tbody dir-paginate="p in searchResultDetails|itemsPerPage:10">
<tr> <tr>
<td> <!--<td>
<label ng-if="dayBookApprovalAccess == '1' && p.Status == 'Pending'"> <label ng-if="dayBookApprovalAccess == '1'">
<input type="checkbox" ng-model="p.Selected" ng-change="setOneSelect(p)" /> <input type="checkbox" ng-model="p.Selected" ng-change="setOneSelect(p)" />
<!--{{p.StudentID}}-->
</label> </label>
</td> </td>-->
<td>{{p.Date}}</td> <td>{{p.Date}}</td>
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td> <td>{{p.VoucherNumber}}</td>
@ -261,18 +257,12 @@
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
</td> </td>
<td ng-if="p.ListName == 'Expense'">
<i class="ti-write" tooltip="Update Status" ng-click="updateStatus(p);"></i>
</td>
</tr> </tr>
</tbody> <tr ng-show="p.ORDER_ID == editId">
</table> <td colspan="8">
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>
</div>
</div>
</div>
<div ng-if="OpenWindowStatus">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post"> <form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -341,7 +331,82 @@
</div> </div>
</div> </div>
</form> </form>
</td>
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>
</div>
</div>
</div>
<div ng-if="OpenWindowStatus">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
<div class="container">
<div class="row">
<div class="col-md-4">
</div>
<div class="col-md-4">
<fieldset style="background-color: #eaeaea;">
<legend>
Update Status
</legend>
<div class="row">
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
<div class="col-md-2">
</div>
<div class="col-md-8 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
<label for="form-field-select-2">
Status <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
required>
<option value="" disabled selected>Select Status</option>
<option ng-repeat="itemStatus in statusList" value="{{itemStatus.name}}">{{itemStatus.name}}</option>
</select>
<span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
</div>
</div>
<div>
<div class="row">
<div class="col-md-12 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
<label>
Comments
</label>
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description"
maxlength="100" />
<span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="center">
<button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success" data-style="zoom-in" ng-disabled="disableStatusUpdateButton">
<i class='fa fa-spinner fa-spin' ng-if="disableStatusUpdateButton"> </i> Update
</button>
<!--<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset
</button>-->
</div>
</div>
</div>
</fieldset>
</div>
<div class="col-md-4">
</div>
</div>
</div>
</form>
</div> </div>
</tab> </tab>
</tabset> </tabset>

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

@ -148,15 +148,16 @@
<td class="center" tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span> <td class="center" tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
<span ng-if="p.Status == 'Cancel'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 99, 15); color: rgba(236, 28, 28, 0.98823529);">{{p.Status}}</span>
</td> </td>
<td class="center" ng-if="p.Status != 'Pending' && p.ListName != 'Income' ">-</td> <td class="center" ng-if="p.Status != 'Pending' && p.ListName != 'Income' && p.Status == 'Cancel' ">-</td>
<td class="center" ng-if="p.ListName == 'Income' "> <td class="center" ng-if="p.ListName == 'Income' && p.Status != 'Cancel' ">
<span ng-if=" p.PaymentStatus == 1 "> <i tooltip="EDIT" class="glyphicon glyphicon-pencil" ng-click="setEditId(p.ID)"></i> </span> <span ng-if=" p.PaymentStatus == 1 "> <i tooltip="EDIT" class="glyphicon glyphicon-pencil" ng-click="setEditId(p.ID)"></i> </span>
<span ng-if=" p.PaymentStatus == 0 "> <span ng-if=" p.PaymentStatus == 0 ">
<i tooltip="DELETE" class="glyphicon glyphicon-remove" ng-click="deleteFeePayableEntry(p.ID)"></i> <i tooltip="DELETE" class="glyphicon glyphicon-remove" ng-click="deleteFeePayableEntry(p.ID)"></i>
</span> </span>
</td> </td>
<td class="center" ng-if="p.Status == 'Pending'"> <td class="center" ng-if="p.Status == 'Pending' && p.Status != 'Cancel'">
<span ng-if=" p.PaymentStatus == 1 "> <span ng-if=" p.PaymentStatus == 1 ">
<span> <i tooltip="EDIT" class="glyphicon glyphicon-pencil" ng-click="setEditId(p.ID)"></i> </span> <span> <i tooltip="EDIT" class="glyphicon glyphicon-pencil" ng-click="setEditId(p.ID)"></i> </span>
<span> <i tooltip="DELETE" class="glyphicon glyphicon-remove" ng-click="deleEditEntry(p.ID)"></i> </span> <span> <i tooltip="DELETE" class="glyphicon glyphicon-remove" ng-click="deleEditEntry(p.ID)"></i> </span>
@ -278,14 +279,14 @@
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAdd.date" <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAdd.date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)" placeholder="Select Date" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
show-button-bar="true" /> show-button-bar="true" max-date="todayDate" />
<span class="error text-small block" ng-if="Form.addDate.$dirty && Form.addDate.$invalid" ng-hide="Form.addDate.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.addDate.$dirty && Form.addDate.$invalid" ng-hide="Form.addDate.$error.maxlength">Date is required.</span>
<span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span> <span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
</div> </div>
</div> </div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}"> <div class="col-md-6 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<label for="form-field-select-2"> <label for="form-field-select-2">
Income/Expense <span class="symbol required"></span> Income/Expense <span class="symbol required"></span>
</label> </label>
@ -299,29 +300,29 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 form-group"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
<label> <label>
Voucher Number Voucher Number <span class="symbol required"></span>
</label> </label>
<input type="text" name="voucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModelAdd.voucherNumber" <input type="text" name="voucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModelAdd.voucherNumber"
/> required/>
<span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span> <span class="error text-small block" ng-if="Form.voucherNumber.$dirty && Form.voucherNumber.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span>
</div> </div>
<div class="col-md-4 form-group"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.paidTo.$dirty && Form.paidTo.$invalid , 'has-success':Form.paidTo.$valid}">
<label> <label>
Paid To / Received From Paid To / Received From <span class="symbol required"></span>
</label> </label>
<input type="text" name="paidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModelAdd.paidTo" <input type="text" name="paidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModelAdd.paidTo"
/> required/>
<span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span> <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span>
</div> </div>
<div class="col-md-4"> <div class="col-md-4" ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
<label> <label>
Description Description <span class="symbol required"></span>
</label> </label>
<textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid" <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid"
maxlength="100" /> maxlength="100" required/>
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span> <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span> <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>

4
Apollo/assets/views/status.html
View File

@ -89,7 +89,7 @@
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>
</tab> </tab>
<tab heading="Status Branch Access" id="statusViewBranchRelation"> <!--<tab heading="Status Branch Access" id="statusViewBranchRelation">
<pre>{{ branchList }}</pre> <pre>{{ branchList }}</pre>
<div class="row"> <div class="row">
<div class="col-lg-4"></div> <div class="col-lg-4"></div>
@ -110,7 +110,7 @@
</div> </div>
<div class="col-lg-4"></div> <div class="col-lg-4"></div>
</div> </div>
</tab> </tab>-->
</tabset> </tabset>
</div> </div>
</div> </div>