From 93157ccc257abfb841ac939a54e91e76a98d4b40 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Thu, 23 Aug 2018 15:32:28 +0530
Subject: [PATCH] daybook changes (nidhila)

---
 Apollo/assets/views/daybook/daybook.html      | 62 +++++++++----------
 Apollo/assets/views/daybook/daybookadmin.html | 62 +++++++++----------
 .../views/daybook/daybooksuperadmin.html      | 52 ++++++++--------
 3 files changed, 87 insertions(+), 89 deletions(-)

diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index c82497f6..4d8a0385 100755
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -123,52 +123,52 @@
                                 <table class="table table-bordered" export-table>
                                     <thead>
                                         <tr>
-                                            <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 ng-click="sort('Date')" style="width: 20%">Date
+                                               
                                             </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 ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
+                                                
                                             </th>
-                                            <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 style="width: 5%">Voucher No / Bill No
+                                             
                                             </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 style="width: 7.5%">Paid To / Received From
+                                               
                                             </th>
-                                            <th>Sem
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <!-- <th>Sem
+                                              
                                             </th>
                                             <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>University
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th ng-click="sort('TypeName')" style="width: 7.5%">Type
+                                                
                                             </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> 
+                                            <th style="width: 7%"> 
                                                 Receipt No
                                             </th>
-                                            <th> 
+                                            <th style="width: 7%"> 
                                                 Comments
                                             </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 style="width: 7%">Mode of Payment
+                                              
                                             </th>
-                                            <th>Amount
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th style="width: 5%">Amount
+                                               
                                             </th>
-                                            <th>Balance
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th style="width: 7%">Balance
+                                                
                                             </th>
-<th>Reason
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th style="width: 7%">Reason
+                                               
                                             </th>
-                                            <th class="center" 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 class="center" ng-click="sort('Status')" style="width: 7.5%">Status
+                                               
                                             </th>
-                                            <th class="center">Activity
+                                            <th class="center" style="width: 7.5%">Activity
                                             </th>
                                         </tr>
                                     </thead>
@@ -178,9 +178,7 @@
                                             <td>{{p.ListName}}</td>
                                             <td>{{p.VoucherNumber}}</td>
                                             <td>{{p.PaidTo}}</td>
-                                            <td> {{p.FeePaymentDetails}}</td>
-                                            <td>{{p.CourseName}}</td>
-                                            <td> {{p.UniversityName}}</td>
+                                            <td> {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</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>
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index 46e73219..84d364c5 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -123,52 +123,52 @@
                                 <table class="table table-bordered export-table">
                                     <thead>
                                         <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 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 ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
+                                               
                                             </th>
-                                            <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 style="width: 5%">Voucher No / Bill No
+                                               
                                             </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 style="width: 7.5%">Paid To / Received From
+                                               
                                             </th>
-                                             <th>Sem
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <!--  <th>Sem
+                                               
                                             </th>
                                             <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>University
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th ng-click="sort('TypeName')" style="width: 7.5%">Type
+                                               
                                             </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> 
+                                             <th style="width: 7%"> 
                                                 Receipt No
                                             </th>
-                                            <th> 
+                                            <th style="width: 7%"> 
                                                 Comments
                                             </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 style="width: 7%">Mode of Payment
+                                                
                                             </th>
-                                            <th>Amount
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th style="width: 5%">Amount
+                                               
                                             </th>
-                                            <th>Balance
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th style="width: 7%">Balance
+                                                
                                             </th>
-<th>Reason
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th style="width: 7%">Reason
+                                               
                                             </th>
-                                            <th class="center" 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 class="center" ng-click="sort('Status')" style="width: 7.5%">Status
+                                               
                                             </th>
-                                            <th class="center">Activity
+                                            <th class="center" style="width: 7.5%">Activity
                                             </th>
                                         </tr>
                                     </thead>
@@ -179,9 +179,9 @@
                                             <td>{{p.ListName}}</td>
                                             <td>{{p.VoucherNumber}}</td>
                                             <td>{{p.PaidTo}}</td>
-                                            <td> {{p.FeePaymentDetails}}</td>
-                                            <td>{{p.CourseName}}</td>
-                                            <td>{{p.UniversityName}}</td>
+                                           <!--  <td> {{p.FeePaymentDetails}}</td>
+                                            <td>{{p.CourseName}}</td> -->
+                                            <td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</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>
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index 2fef15b7..3609c614 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -15,6 +15,7 @@
         <div>
       <tabset class="tabbable">
             <tab heading="View" id="viewDayBook">
+                <!--<button ng-click="generatePFD()">generatePFD</button>-->
                 <div class="container-fluid container-fullw">
                     <div class="row">
                         <div class="col-md-12">
@@ -108,50 +109,50 @@
                                 <table class="table table-bordered export-table">
                                     <thead>
                                         <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 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>-->
                                             </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>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>Sem
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                              <!-- <th>Sem
+                                            
                                             </th>
                                             <th>
                                                 Course
+                                            </th> -->
+                                            <th style="width: 7.5%">
+                                               University,</br>Course,</br>Sem
                                             </th>
-                                            <th>
-                                                University
+                                            <th ng-click="sort('TypeName')" style="width: 7.5%">Type
+                                                
                                             </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> 
+                                             <th style="width: 7.5%"> 
                                                 Receipt No
                                             </th>
-                                            <th> 
+                                            <th style="width: 7.5%"> 
                                                 Comments
                                             </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 style="width: 7.5%">Mode of Payment
+                                               
                                             </th>
-                                            <th>Amount
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th style="width: 5%">Amount
+                                                
                                             </th>
-                                            <th>Balance
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            <th style="width: 7%">Balance
+                                              
                                             </th>
-                                            <th>Reason</th>
-                                            <th class="center" 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 style="width: 7%">Reason</th>
+                                            <th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
+                                               
                                             </th>
-                                            <th class="center">Action
+                                            <th class="center" style="width: 7.5%">Action
                                             </th>
                                         </tr>
                                     </thead>
@@ -162,9 +163,8 @@
                                             <td>{{p.ListName}}</td>
                                             <td>{{p.VoucherNumber}}</td>
                                             <td>{{p.PaidTo}}</td>
-                                            <td> {{p.FeePaymentDetails}}</td>
-                                            <td>{{p.CourseName}} </td> 
-                                            <td>{{p.UniversityName}}</td>
+                                           
+                                            <td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</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>