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

daybook details Update : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-04-18 16:10:49 +05:30
parent c5d8698beb
commit bf7bfd4084
12 changed files with 363 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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';

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

@ -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();

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

@ -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');

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

@ -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;

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

@ -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();

67
Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js
View File

@ -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':''
}
}
}

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

@ -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 @@
<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-4">
<div data-ng-controller="DatepickerDemoCtrl">
<div data-ng-controller="DatepickerDemoCtrl">
<label>
From Date
</label>
@ -58,7 +58,7 @@
</div>
</div>
<div class="col-md-4">
<div data-ng-controller="DatepickerDemoCtrl">
<div data-ng-controller="DatepickerDemoCtrl">
<label>
To Date
</label>
@ -73,7 +73,7 @@
<label for="form-field-select-2">
Income/Expense
</label>
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(showTheRefValue)"
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(showTheRefValue)"
required>
<option value="" selected>Select</option>
<option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
@ -82,16 +82,16 @@
</div>
</div>
<div>
<div ng-show="loadingsearch" class="center">
<span style="color: #007AFF;
<div>
<div ng-show="loadingsearch" class="center">
<span style="color: #007AFF;
font-size: 16px;">Loading...</span>
</div>
</div>
<div class="center" ng-show="noRecordFoundSearch">
<p style="color: red;" align="center"><strong><h3 class="text-center">No
</div>
<div class="center" ng-show="noRecordFoundSearch">
<p style="color: red;" align="center"><strong><h3 class="text-center">No
records found... </h3></strong></p>
</div>
</div>
<!--<div ng-if="showTheRefValue == 'I002'">
<style>
.listCoutShow {
@ -183,7 +183,7 @@
</style>
<div class="row">
<div class="pull-right" ng-if="dataLengthExpense > 0">
<div class="pull-right" ng-if="dataLengthExpense > 0">
<div style="margin: 8px;">
<div style="width: 45px; display: initial;">
<span style="font-size: 14px;
@ -197,17 +197,16 @@
<table style="width: 100%;" class="table table-hover">
<thead>
<tr>
<th ng-if="dayBookApprovalAccess == '1'">
<!--<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
/>-->
</th>
<!--<th ng-if="dayBookApprovalAccess == '1'">
</th>-->
<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>-->
</th>
<th ng-click="sort('ListName')">Income/Expense
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Voucher Number/Bill Number
<th>Voucher Number /Bill Number
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th ng-click="sort('PaidTo')">Paid To / Received From
@ -222,21 +221,21 @@
<th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<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>
</th>
<th></th>
</tr>
</thead>
<tbody dir-paginate="p in searchResultDetails|itemsPerPage:10">
<tbody dir-paginate="p in searchResultDetails| filter:search:strict |itemsPerPage:10">
<tr>
<td>
<label ng-if="dayBookApprovalAccess == '1' && p.Status == 'Pending'">
<!--<td>
<label ng-if="dayBookApprovalAccess == '1'">
<input type="checkbox" ng-model="p.Selected" ng-change="setOneSelect(p)" />
<!--{{p.StudentID}}-->
</label>
</td>
</label>
</td>-->
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
@ -261,6 +260,81 @@
<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>
</td>
<td ng-if="p.ListName == 'Expense'">
<i class="ti-write" tooltip="Update Status" ng-click="updateStatus(p);"></i>
</td>
</tr>
<tr ng-show="p.ORDER_ID == editId">
<td colspan="8">
<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="updateStatusClose()" 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>
</td>
</tr>
</tbody>
</table>
@ -276,7 +350,7 @@
<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>
@ -286,7 +360,7 @@
Update Status
</legend>
<div class="row">
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
<div class="col-md-2">

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

@ -283,7 +283,7 @@
Update Status
</legend>
<div class="row">
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<a id="cancel_button" ng-click="updateStatusClose()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
<div class="col-md-2">

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

@ -67,6 +67,13 @@
</div>
</div>
<div class="col-md-4">
<label for="form-field-select-2">
Search
</label>
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>
</div>
<!--<div class="col-md-12" ng-if="noRecordFound == true" style="min-height: 281px;">
<p style="color: red;" align="center"><strong><h3 class="text-center">No
@ -113,9 +120,15 @@
<th>Paid To / Received From
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Sem/Course/University
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Mode of Payment
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -130,15 +143,17 @@
</th>
</tr>
</thead>
<tbody dir-paginate="p in data|itemsPerPage:10">
<tbody dir-paginate="p in data | filter:search:strict |itemsPerPage:10">
<tr>
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td>
<td> {{p.FeePaymentDetails}}<br>{{p.CourseName}} <br> {{p.UniversityName}}</td>
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>
@ -264,7 +279,7 @@
</tab>
<tab heading="Add" id="addDayBook">
<!--<pre>{{myModelAdd}}</pre>-->
<div>
<div>
<form name="Form" id="form" novalidate ng-submit="daybookAdd.submit(Form, myModelAdd)" method="post">
<div>
<div class="row">
@ -277,14 +292,14 @@
<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"
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.$error.maxlength">Enter a Valid Date </span>
</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">
Income/Expense <span class="symbol required"></span>
</label>
@ -298,29 +313,29 @@
</div>
</div>
<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>
Voucher Number
Voucher Number <span class="symbol required"></span>
</label>
<input type="text" name="voucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModelAdd.voucherNumber"
/>
<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>
required/>
<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 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>
Paid To / Received From
Paid To / Received From <span class="symbol required"></span>
</label>
<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>
</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>
Description
Description <span class="symbol required"></span>
</label>
<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="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
@ -366,7 +381,7 @@
<div class="pull-right">
<button type="submit" ng-disabled="disableAddButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in">
<i class='fa fa-spinner fa-spin' ng-if="disableAddButton"> </i> Submit
<i class='fa fa-spinner fa-spin' ng-if="disableAddButton"> </i> Submit
</button>
<button type="cancel" ng-click="daybookAdd.reset(Form)" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Reset

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

@ -119,10 +119,16 @@
</th>
<th>Paid To / Received From
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Sem/Course/University
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Mode of Payment
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -144,9 +150,11 @@
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td>
<td> {{p.FeePaymentDetails}}<br>{{p.CourseName}} <br> {{p.UniversityName}}</td>
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>

108
Apollo/assets/views/daybook/daybooksuperAdminApproval.html
View File

@ -42,7 +42,7 @@
<div class="col-md-12">
<div class="row">
<div class="col-md-4">
<div class="col-md-3">
<div data-ng-controller="DatepickerDemoCtrl">
<label>
From Date
@ -54,7 +54,7 @@
</div>
</div>
<div class="col-md-4">
<div class="col-md-3">
<div data-ng-controller="DatepickerDemoCtrl">
<label>
To Date
@ -66,7 +66,14 @@
</div>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<div class="col-md-3">
<label for="form-field-select-2">
Search
</label>
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>
<div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<label for="form-field-select-2">
Income/Expense
</label>
@ -194,9 +201,9 @@
<table style="width: 100%;" class="table table-hover">
<thead>
<tr>
<th>
</th>
<!--<th ng-if="dayBookApprovalAccess == '1'">
</th>-->
<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>-->
</th>
@ -218,21 +225,21 @@
<th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<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>
</th>
<th></th>
</tr>
</thead>
<tbody dir-paginate="p in searchResultDetails|itemsPerPage:10">
<tbody dir-paginate="p in searchResultDetails| filter:search:strict |itemsPerPage:10">
<tr>
<td>
<label ng-if="p.Status == 'Pending'">
<!--<td>
<label ng-if="dayBookApprovalAccess == '1'">
<input type="checkbox" ng-model="p.Selected" ng-change="setOneSelect(p)" />
</label>
</td>
</label>
</td>-->
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
@ -257,6 +264,81 @@
<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>
</td>
<td ng-if="p.ListName == 'Expense'">
<i class="ti-write" tooltip="Update Status" ng-click="updateStatus(p);"></i>
</td>
</tr>
<tr ng-show="p.ORDER_ID == editId">
<td colspan="8">
<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="updateStatusClose()" 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>
</td>
</tr>
</tbody>
</table>

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

@ -35,7 +35,7 @@
</div>
</div>
<div ng-if="viewStudentDetailsPage">
<tabset class="tabbable">
<tabset class="tabbable" ng-init="init()">
<tab heading="View" id="viewDayBook">
<div class="container-fluid container-fullw">
<div class="row">
@ -91,6 +91,13 @@
</div>
</div>
<div class="col-md-4">
<label for="form-field-select-2">
Search
</label>
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>
</div>
<!--<div class="col-md-12" ng-if="noRecordFound == true" style="min-height: 281px;">
<p style="color: red;" align="center"><strong><h3 class="text-center">No
@ -136,10 +143,16 @@
</th>
<th>Paid To / Received From
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Sem/Course/University
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Mode of Payment
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -155,15 +168,17 @@
</tr>
</thead>
<tbody dir-paginate="p in data|itemsPerPage:10">
<tbody dir-paginate="p in data | filter:search:strict | itemsPerPage:10">
<tr>
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td>
<td> {{p.FeePaymentDetails}}<br>{{p.CourseName}} <br> {{p.UniversityName}}</td>
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>
@ -172,15 +187,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>
<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 == '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 class="center" ng-if="p.Status != 'Pending' && p.ListName != 'Income' ">-</td>
<td class="center" ng-if="p.ListName == 'Income' ">
<td class="center" ng-if="p.Status != 'Pending' && p.ListName != 'Income' && p.Status == 'Cancel' ">-</td>
<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 == 0 ">
<i tooltip="DELETE" class="glyphicon glyphicon-remove" ng-click="deleteFeePayableEntry(p.ID)"></i>
</span>
</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> <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>
@ -265,7 +281,7 @@
<div class="center">
<button type="submit" ng-disabled="disableEditButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in">
<i class='fa fa-spinner fa-spin' ng-if="disableEditButton"> </i> Submit
<i class='fa fa-spinner fa-spin' ng-if="disableEditButton"> </i> Submit
</button>
<button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Cancel
@ -302,14 +318,14 @@
<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"
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.$error.maxlength">Enter a Valid Date </span>
</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">
Income/Expense <span class="symbol required"></span>
</label>
@ -323,29 +339,29 @@
</div>
</div>
<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>
Voucher Number
Voucher Number <span class="symbol required"></span>
</label>
<input type="text" name="voucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModelAdd.voucherNumber"
/>
<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>
required/>
<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 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>
Paid To / Received From
Paid To / Received From <span class="symbol required"></span>
</label>
<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>
</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>
Description
Description <span class="symbol required"></span>
</label>
<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="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
@ -391,7 +407,7 @@
<div class="pull-right">
<button type="submit" ng-disabled="disableAddButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
data-style="zoom-in">
<i class='fa fa-spinner fa-spin' ng-if="disableAddButton"> </i> Submit
<i class='fa fa-spinner fa-spin' ng-if="disableAddButton"> </i> Submit
</button>
<button type="cancel" ng-click="daybookAdd.reset(Form)" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
Reset