From c5d8698bebd8ac37e3c79cd6e6199997736ddb82 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Wed, 18 Apr 2018 11:01:07 +0530
Subject: [PATCH] daybook staff disable the cancelling the entry : kdk

---
 .../views/daybook/dayBookadminApproval.html       | 15 +++++++++++----
 Apollo/assets/views/daybook/daybook.html          |  2 +-
 Apollo/assets/views/daybook/daybookadmin.html     |  9 ++++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Apollo/assets/views/daybook/dayBookadminApproval.html b/Apollo/assets/views/daybook/dayBookadminApproval.html
index 26e7b6c8..c2179024 100755
--- a/Apollo/assets/views/daybook/dayBookadminApproval.html
+++ b/Apollo/assets/views/daybook/dayBookadminApproval.html
@@ -45,7 +45,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
@@ -57,7 +57,7 @@
 
                                             </div>
                                         </div>
-                                        <div class="col-md-4">
+                                        <div class="col-md-3">
                                             <div data-ng-controller="DatepickerDemoCtrl">
                                                 <label>
                                                 To Date 
@@ -69,7 +69,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>
@@ -225,7 +232,7 @@
                                                         <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>
diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index be7b351a..9f5ffdb2 100755
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -158,7 +158,7 @@
                                             <td class="center" ng-if="p.Status == 'Pending'">
                                                   <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>
+                                                <!--<span> <i tooltip="DELETE" class="glyphicon glyphicon-remove" ng-click="deleEditEntry(p.ID)"></i> </span>-->
                                                   </span>
                                             </td>
                                         </tr>
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index 41bbb1e7..f1e015e8 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -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
@@ -131,7 +138,7 @@
                                         </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>