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

daybook changes (nidhila)

Browse Source
This commit is contained in:
gayathri1990 2018-08-23 15:32:28 +05:30
parent 7e2385eb97
commit 93157ccc25
3 changed files with 87 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,52 +123,52 @@
<table class="table table-bordered" export-table> <table class="table table-bordered" export-table>
<thead> <thead>
<tr> <tr>
<th ng-click="sort('Date')">Date <th ng-click="sort('Date')" style="width: 20%">Date
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th ng-click="sort('ListName')">Income/Expense <th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Voucher Number / Bill Number <th style="width: 5%">Voucher No / Bill No
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Paid To / Received From <th style="width: 7.5%">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>
<th>Sem <!-- <th>Sem
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Course <th>Course
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> -->
<th style="width: 7.5%"> University,</br>Course,</br>Sem
</th> </th>
<th>University <th ng-click="sort('TypeName')" style="width: 7.5%">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th ng-click="sort('TypeName')">Type <th style="width: 7%">
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>
Receipt No Receipt No
</th> </th>
<th> <th style="width: 7%">
Comments Comments
</th> </th>
<th>Mode of Payment <th style="width: 7%">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>
<th>Amount <th style="width: 5%">Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Balance <th style="width: 7%">Balance
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Reason <th style="width: 7%">Reason
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th class="center" ng-click="sort('Status')">Status <th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th class="center">Activity <th class="center" style="width: 7.5%">Activity
</th> </th>
</tr> </tr>
</thead> </thead>
@ -178,9 +178,7 @@
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td> <td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td> <td>{{p.PaidTo}}</td>
<td> {{p.FeePaymentDetails}}</td> <td> {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}}</td>
<td> {{p.UniversityName}}</td>
<td> <td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span> <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> <span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>

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

@ -123,52 +123,52 @@
<table class="table table-bordered export-table"> <table class="table table-bordered export-table">
<thead> <thead>
<tr> <tr>
<th ng-click="sort('Date')">Date <th ng-click="sort('Date')" style="width: 20%">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>
<th ng-click="sort('ListName')">Income/Expense <th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Voucher Number / Bill Number <th style="width: 5%">Voucher No / Bill No
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Paid To / Received From <th style="width: 7.5%">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>
<th>Sem <!-- <th>Sem
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Course <th>Course
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> -->
<th style="width: 7.5%">University,</br>Course,</br>Sem
</th> </th>
<th>University <th ng-click="sort('TypeName')" style="width: 7.5%">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th ng-click="sort('TypeName')">Type <th style="width: 7%">
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>
Receipt No Receipt No
</th> </th>
<th> <th style="width: 7%">
Comments Comments
</th> </th>
<th>Mode of Payment <th style="width: 7%">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>
<th>Amount <th style="width: 5%">Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Balance <th style="width: 7%">Balance
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Reason <th style="width: 7%">Reason
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th class="center" ng-click="sort('Status')">Status <th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th class="center">Activity <th class="center" style="width: 7.5%">Activity
</th> </th>
</tr> </tr>
</thead> </thead>
@ -179,9 +179,9 @@
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td> <td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td> <td>{{p.PaidTo}}</td>
<td> {{p.FeePaymentDetails}}</td> <!-- <td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td> -->
<td>{{p.UniversityName}}</td> <td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
<td> <td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span> <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> <span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>

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

@ -15,6 +15,7 @@
<div> <div>
<tabset class="tabbable"> <tabset class="tabbable">
<tab heading="View" id="viewDayBook"> <tab heading="View" id="viewDayBook">
<!--<button ng-click="generatePFD()">generatePFD</button>-->
<div class="container-fluid container-fullw"> <div class="container-fluid container-fullw">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -108,50 +109,50 @@
<table class="table table-bordered export-table"> <table class="table table-bordered export-table">
<thead> <thead>
<tr> <tr>
<th ng-click="sort('Date')">Date <th ng-click="sort('Date')" style="width: 20%">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>
<th class="th" ng-click="sort('ListName')">Income/Expense <th class="th" ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>--> <!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Voucher Number / Bill Number <th style="width: 5%">Voucher No / Bill No
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>--> <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Paid To / Received From <th style="width: 7.5%">Paid To / Received From
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>--> <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Sem <!-- <th>Sem
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th> <th>
Course Course
</th> -->
<th style="width: 7.5%">
University,</br>Course,</br>Sem
</th> </th>
<th> <th ng-click="sort('TypeName')" style="width: 7.5%">Type
University
</th> </th>
<th ng-click="sort('TypeName')">Type <th style="width: 7.5%">
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>
Receipt No Receipt No
</th> </th>
<th> <th style="width: 7.5%">
Comments Comments
</th> </th>
<th>Mode of Payment <th style="width: 7.5%">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>
<th>Amount <th style="width: 5%">Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Balance <th style="width: 7%">Balance
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Reason</th> <th style="width: 7%">Reason</th>
<th class="center" ng-click="sort('Status')">Status <th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th class="center">Action <th class="center" style="width: 7.5%">Action
</th> </th>
</tr> </tr>
</thead> </thead>
@ -162,9 +163,8 @@
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td> <td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td> <td>{{p.PaidTo}}</td>
<td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}} </td> <td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
<td>{{p.UniversityName}}</td>
<td> <td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span> <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> <span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>