From 012f01649d0938e1f32ad4bd371d31eb00ae0368 Mon Sep 17 00:00:00 2001
From: saravanakumar_kandasami
 <https://saravanakumar_kandasami@bitbucket.org/venbainformationtechnology/unave-marundhu.git>
Date: Fri, 2 Feb 2018 12:34:06 +0530
Subject: [PATCH] day book

---
 .../assets/views/daybook/dayBookApproval.html |  4 +--
 Apollo/assets/views/daybook/daybookadmin.html | 35 +++++++++----------
 .../views/daybook/daybooksuperadmin.html      |  4 +--
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html
index 3c2b125a..cebc9993 100644
--- a/Apollo/assets/views/daybook/dayBookApproval.html
+++ b/Apollo/assets/views/daybook/dayBookApproval.html
@@ -160,7 +160,7 @@
                                                         <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
-                                                        <th>Description
+                                                        <th>Description/Comments
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
                                                         <th ng-click="sort('TypeName')">Type
@@ -256,7 +256,7 @@
                                                         <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
-                                                        <th>Description
+                                                        <th>Description/Comments
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
                                                         <th ng-click="sort('TypeName')">Type
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index 99e816c9..9ed19424 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -144,7 +144,7 @@
                                             </div>
                                         </div>
                                         <div class="table-responsive">
-                                            <table style="width: 1200px;" class="table table-hover" ng-if="dataLengthIncome > 0">
+                                            <table style="width: 100%;" class="table table-hover" ng-if="dataLengthIncome > 0">
                                                 <thead>
                                                     <tr>
 
@@ -160,7 +160,7 @@
                                                         <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
-                                                        <th>Description
+                                                        <th>Description/Comments
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
                                                         <th ng-click="sort('TypeName')">Type
@@ -169,9 +169,7 @@
                                                         <th>Amount
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
-                                                        <th>Comments
-                                                            <!--<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('amount')">Status
                                                         <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                     </th>-->
@@ -188,19 +186,19 @@
                                                         <td>
                                                             <div id="containersPara">
                                                                 <div id="wrapper">
-                                                                    {{p.PaidDescription}}
+                                                                    {{p.PaidDescription}} /  {{p.Description}}
                                                                 </div>
                                                             </div>
                                                         </td>
                                                         <td>{{p.TypeName}}</td>
                                                         <td>{{p.Amount}}</td>
-                                                        <td>
+                                                        <!-- <td>
                                                             <div id="containersPara">
                                                                 <div id="wrapper">
                                                                     {{p.Description}}
                                                                 </div>
                                                             </div>
-                                                        </td>
+                                                        </td> -->
                                                         <!--<td 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>
@@ -239,9 +237,10 @@
                                             </div>
                                         </div>
                                         <div class="table-responsive">
-                                            <table style="width: 1200px;" class="table table-hover" ng-if="dataLengthExpense > 0">
+                                            <table style="width: 100%;" class="table table-hover" ng-if="dataLengthExpense > 0">
                                                 <thead>
                                                     <tr>
+                                                         <th></th>
                                                         <th ng-if="dayBookApprovalAccess == '1'">
                                                           
                                                             <input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
@@ -259,7 +258,7 @@
                                                         <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
-                                                        <th>Description
+                                                        <th>Description/Comments
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
                                                         <th ng-click="sort('TypeName')">Type
@@ -268,9 +267,7 @@
                                                         <th>Amount
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
-                                                        <th>Comments
-                                                            <!--<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>
@@ -281,9 +278,9 @@
                                                     <tr>
                                                         <td>
                                                             <label ng-if="dayBookApprovalAccess == '1' && p.Status == 'Pending'">
-                                                    <input  type="checkbox" ng-model="p.Selected" ng-change="openUpdateWind()" />
-                                                    <!--{{p.StudentID}}-->
-                                                </label>
+                                                             <input  type="checkbox" ng-model="p.Selected" ng-change="openUpdateWind()" />
+                                                            <!--{{p.StudentID}}-->
+                                                             </label>
                                                         </td>
                                                         <td>{{p.Date}}</td>
                                                         <td>{{p.ListName}}</td>
@@ -292,19 +289,19 @@
                                                         <td>
                                                             <div id="containersPara">
                                                                 <div id="wrapper">
-                                                                    {{p.PaidDescription}}
+                                                                    {{p.PaidDescription}} / {{p.Description}}
                                                                 </div>
                                                             </div>
                                                         </td>
                                                         <td>{{p.TypeName}}</td>
                                                         <td>{{p.Amount}}</td>
-                                                        <td>
+                                                        <!-- <td>
                                                             <div id="containersPara">
                                                                 <div id="wrapper">
                                                                     {{p.Description}}
                                                                 </div>
                                                             </div>
-                                                        </td>
+                                                        </td> -->
                                                         <td tooltip="{{p.Approval_Comments}} BY {{p.Approved_by_name}}"><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>
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index f9105d06..7068f695 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -173,7 +173,7 @@
                                                         <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
-                                                        <th>Description
+                                                        <th>Description/Comments
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
                                                         <th ng-click="sort('TypeName')">Type
@@ -274,7 +274,7 @@
                                                         <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                         </th>
-                                                        <th>Description
+                                                        <th>Description/Comments
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
                                                         <th ng-click="sort('TypeName')">Type