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

daybook pdf sno

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-09-19 16:34:40 +05:30
parent 7f6e3460bc
commit 9f96539089
7 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ class DayBook_model extends CI_Model
// $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 ,
t7.UniversityName as UniversityName, t6.CourseName as CourseName
t7.UniversityName as UniversityName, t6.CourseName as CourseName,t7.UniversityID,t8.Lastname,t8.MobileNumber
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 AND t3.BranchCode = t1.BranchCode
@ -102,6 +102,7 @@ class DayBook_model extends CI_Model
LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
left join ".STUDENTS." as t8 on t8.StudentID = t1.StudentID
WHERE t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC";
}

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

@ -204,7 +204,7 @@ $scope.dayBookApprovalAccess = '';
for(var i = datas.length ; i > 0; --i){
var element = datas[i-1];
var value = {};
value['SNo'] = intDataSNo;
value['SNo'] = element.ORDER_ID;
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
var ListName = element.ListName;
value['PaidReceivedToFrom'] = element.PaidTo || '-';

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

@ -206,7 +206,7 @@ $scope.dayBookApprovalAccess = '';
for(var i = datas.length ; i > 0; --i){
var element = datas[i-1];
var value = {};
value['SNo'] = intDataSNo;
value['SNo'] = element.ORDER_ID;
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
var ListName = element.ListName;
value['PaidReceivedToFrom'] = element.PaidTo || '-';

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

@ -299,7 +299,7 @@ $scope.loadStaring = true;
for(var i = datas.length ; i > 0; --i){
var element = datas[i-1];
var value = {};
value['SNo'] = intDataSNo;
value['SNo'] = element.ORDER_ID;
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
var ListName = element.ListName;
value['PaidReceivedToFrom'] = element.PaidTo || '-';

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

@ -138,6 +138,8 @@
<table class="table table-bordered" export-table>
<thead>
<tr>
<th>S.No</th>
<th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
</th>
@ -189,6 +191,7 @@
</thead>
<tbody dir-paginate="p in data | filter:search:strict |itemsPerPage:10">
<tr>
<td>{{p.ORDER_ID}}</td>
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>

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

@ -136,6 +136,7 @@
<table class="table table-bordered export-table">
<thead>
<tr>
<th>S.No</th>
<th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -188,6 +189,7 @@
<tbody dir-paginate="p in data | filter:search:strict | itemsPerPage:10">
<tr>
<td>{{p.ORDER_ID}}</td>
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>

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

@ -123,6 +123,8 @@
<table class="table table-bordered export-table">
<thead>
<tr>
<th>S.No</th>
<th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -177,6 +179,7 @@
<tbody dir-paginate="p in data | filter:search:strict | itemsPerPage:10">
<tr>
<td>{{p.ORDER_ID}}</td>
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>