diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php
index e637863a..49119bd8 100644
--- a/Apollo/api/application/models/DayBook_model.php
+++ b/Apollo/api/application/models/DayBook_model.php
@@ -38,16 +38,18 @@ class DayBook_model extends CI_Model
 
     public function get_Daybook_Details_List($reqData, $reqDataBy) {
 
-        if($reqData['date'] != '') {
+        if($reqData['date'] != '' && $reqData['dateTo'] != '') {
         $this->db->select('t1.*, t2.ListName, t3.TypeName');
         $this->db->from(''.DAYBOOKMASTER. ' as t1');
         $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT');
         $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
-        $this->db->where('t1.Date', $reqData['date']);
+        $this->db->where('t1.Date >=', $reqData['date']);
+        $this->db->where('t1.Date <=', $reqData['dateTo']);
+        // $this->db->where('t1.Date', $reqData['date']);
         $this->db->order_by('CreatedOn', 'DESC');
         $this->db->where('t1.BranchCode', $reqDataBy['localBranchID']);
         } else {
-             $this->db->select('t1.*, t2.ListName, t3.TypeName');
+        $this->db->select('t1.*, t2.ListName, t3.TypeName');
         $this->db->from(''.DAYBOOKMASTER. ' as t1');
         $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT');
         $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
@@ -139,16 +141,31 @@ class DayBook_model extends CI_Model
     }
 
     public function get_Daybook_Details_List_superAdmin($reqData, $reqDataBy){
-        $this->db->select('t1.*, t2.ListName, t3.TypeName, t4.BranchName');
-        $this->db->from(''.DAYBOOKMASTER. ' as t1');
-        $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT');
-        $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
-        $this->db->join('' . BRANCH . ' as t4', 't4.BranchCode = t1.BranchCode', 'LEFT');
-        $this->db->where('t1.Date', $reqData['date']);
-        $this->db->order_by('CreatedOn', 'DESC');
-        // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT');
-        $dayBookDetails = $this->db->get();
-        $dayBookDetailsList = $dayBookDetails->result();
+
+         if($reqData['date'] != '' && $reqData['dateTo'] != '') {
+            $this->db->select('t1.*, t2.ListName, t3.TypeName, t4.BranchName');
+            $this->db->from(''.DAYBOOKMASTER. ' as t1');
+            $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT');
+            $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
+            $this->db->join('' . BRANCH . ' as t4', 't4.BranchCode = t1.BranchCode', 'LEFT');
+            $this->db->where('t1.Date >=', $reqData['date']);
+            $this->db->where('t1.Date <=', $reqData['dateTo']);
+            $this->db->order_by('CreatedOn', 'DESC');
+            // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT');
+            $dayBookDetails = $this->db->get();
+            $dayBookDetailsList = $dayBookDetails->result();
+         }  else {
+            $this->db->select('t1.*, t2.ListName, t3.TypeName, t4.BranchName');
+            $this->db->from(''.DAYBOOKMASTER. ' as t1');
+            $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT');
+            $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
+            $this->db->join('' . BRANCH . ' as t4', 't4.BranchCode = t1.BranchCode', 'LEFT');
+            // $this->db->where('t1.Date', $reqData['date']);
+            $this->db->order_by('CreatedOn', 'DESC');
+            // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT');
+            $dayBookDetails = $this->db->get();
+            $dayBookDetailsList = $dayBookDetails->result();
+         }
 
         $results['dayBookListStatus']      = true;
         $results['dayBookListDetails'] = $dayBookDetailsList;
diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js
index 66353cc1..9efc45e9 100644
--- a/Apollo/assets/js/controllers/daybookCtrl.js
+++ b/Apollo/assets/js/controllers/daybookCtrl.js
@@ -10,13 +10,15 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
     var localDetails = ipCookie('cookiechk');
 
     $scope.searchData = {
-        "date": ""
+        "date": "",
+        "dateTo": ""
     }
 
     $scope.init = function () {
         $scope.currentDate = new Date();
         var formate = "dd-MM-yyyy";
         $scope.searchData.date = $filter('date')(new Date($scope.currentDate), formate);
+        $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
         $scope.getDayBookList();
         $scope.getIncomeExpenseType_Status();
     }
@@ -33,6 +35,25 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
         }
     }
 
+    $scope.changeToDate = function () {
+        
+        if($scope.searchData.dateTo !== undefined) {
+            var formate = "dd-MM-yyyy";
+            $scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
+            $scope.getDayBookList();
+        } else {
+            $scope.searchData.dateTo = '';
+            $scope.getDayBookList();
+        }
+    }
+
+      // sorting function for table params
+    $scope.sort = function (keyname) {
+        // alert();
+        $scope.sortKey = keyname;   //set the sortKey to the param passed
+        $scope.reverse = !$scope.reverse; //if true make it false and vice versa
+    }
+
     $scope.noRecordFound = true;
 
     $scope.getDayBookList = function () {
@@ -204,7 +225,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
             } else {
                 var formate = "dd-MM-yyyy";
                 $scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
-                $scope.myModelAdd.status = 'Pending';
+                $scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved';
                 // $scope.data.push(myModelAdd);
 
                 var addDayBookDetails = {
diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js
index abfce0e8..4a1f1512 100644
--- a/Apollo/assets/js/controllers/daybookadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybookadminCtrl.js
@@ -21,8 +21,9 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
     //     }
     // }
 
-    $scope.searchData = {
-        "date": ""
+     $scope.searchData = {
+        "date": "",
+        "dateTo": ""
     }
 
     $scope.init = function () {
@@ -34,6 +35,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
             $scope.currentDate = new Date();
             var formate = "dd-MM-yyyy";
             $scope.searchData.date = $filter('date')(new Date($scope.currentDate), formate);
+             $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
             $scope.getIncomeExpenseType_Status();
             $scope.getDayBookList();
         } else if(LOCALTYPE === 'R004') {
@@ -43,13 +45,16 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
             $scope.currentDate = new Date();
             var formate = "dd-MM-yyyy";
             $scope.searchData.date = $filter('date')(new Date($scope.currentDate), formate);
+             $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
             $scope.getIncomeExpenseType_Status();
             $scope.getDayBookList();    
         }
     }
 
+    
     $scope.changeDate = function () {
-         if($scope.searchData.date !== undefined) {
+        
+        if($scope.searchData.date !== undefined) {
             var formate = "dd-MM-yyyy";
             $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
             $scope.getDayBookList();
@@ -59,6 +64,24 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
         }
     }
 
+    $scope.changeToDate = function () {
+        
+        if($scope.searchData.dateTo !== undefined) {
+            var formate = "dd-MM-yyyy";
+            $scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
+            $scope.getDayBookList();
+        } else {
+            $scope.searchData.dateTo = '';
+            $scope.getDayBookList();
+        }
+    }
+
+      // sorting function for table params
+    $scope.sort = function (keyname) {
+        // alert();
+        $scope.sortKey = keyname;   //set the sortKey to the param passed
+        $scope.reverse = !$scope.reverse; //if true make it false and vice versa
+    }
 
     $scope.getIncomeExpenseType_Status = function () {
         var getIncomeExpenseType = {
diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
index 092678cc..d2f77e3c 100644
--- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
@@ -21,8 +21,9 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
     //     }
     // }
 
-    $scope.searchData = {
-        "date": ""
+      $scope.searchData = {
+        "date": "",
+        "dateTo": ""
     }
 
     $scope.init = function () {
@@ -35,6 +36,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
             $scope.currentDate = new Date();
             var formate = "dd-MM-yyyy";
             $scope.searchData.date = $filter('date')(new Date($scope.currentDate), formate);
+            $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
             $scope.getIncomeExpenseType_Status();
             $scope.getDayBookList();    
         } else {
@@ -42,8 +44,9 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
         }
     }
 
-    $scope.changeDate = function () {
-         if($scope.searchData.date !== undefined) {
+     $scope.changeDate = function () {
+        
+        if($scope.searchData.date !== undefined) {
             var formate = "dd-MM-yyyy";
             $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
             $scope.getDayBookList();
@@ -53,6 +56,25 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
         }
     }
 
+    $scope.changeToDate = function () {
+        
+        if($scope.searchData.dateTo !== undefined) {
+            var formate = "dd-MM-yyyy";
+            $scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
+            $scope.getDayBookList();
+        } else {
+            $scope.searchData.dateTo = '';
+            $scope.getDayBookList();
+        }
+    }
+
+      // sorting function for table params
+    $scope.sort = function (keyname) {
+        // alert();
+        $scope.sortKey = keyname;   //set the sortKey to the param passed
+        $scope.reverse = !$scope.reverse; //if true make it false and vice versa
+    }
+
 
     $scope.getIncomeExpenseType_Status = function () {
         var getIncomeExpenseType = {
diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index e978a056..a7982a29 100644
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -45,8 +45,7 @@
                                     <!--<pre>{{searchData.date}}</pre>-->
                                     <div data-ng-controller="DatepickerDemoCtrl">
                                         <label>
-                                                Date <span
-                                                    class="symbol required"></span>
+                                               From Date 
                                             </label>
                                         <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
                                             is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
@@ -55,6 +54,19 @@
 
                                     </div>
                                 </div>
+                                <div class="col-md-4">
+                                    <!--<pre>{{searchData.date}}</pre>-->
+                                    <div data-ng-controller="DatepickerDemoCtrl">
+                                        <label>
+                                                To Date 
+                                            </label>
+                                        <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
+                                            is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                            placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
+                                            show-button-bar="true" />
+
+                                    </div>
+                                </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
@@ -64,23 +76,23 @@
                                 <table class="table table-hover">
                                     <thead>
                                         <tr>
-                                            <th ng-click="sort('date')">Date
-                                                <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            <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>
-                                            <th ng-click="sort('incomeExpense')">Income/Expense
-                                                <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            <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>
-                                            <th ng-click="sort('type')">Type
-                                                <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            <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 ng-click="sort('amount')">Amount
-                                                <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            <th >Amount
+                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
-                                            <th ng-click="sort('amount')">Description
-                                                <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            <th>Description
+                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
-                                            <th class="center" 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 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>
                                             <th class="center">Activity
                                             </th>
@@ -93,18 +105,20 @@
                                             <td>{{p.TypeName}}</td>
                                             <td>{{p.Amount}}</td>
                                             <td style="width: 275px;">{{p.Description}}</td>
-                                            <td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Income'">
-                                             - </td>
-                                            <td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Expense'"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
+                                            <!--<td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Income'">
+                                                - </td>-->
+                                            <td class="center" 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>
                                             </td>
-                                            <td class="center" ng-if="p.Status != 'Pending'">-</td>
+                                            <td class="center" ng-if="p.Status != 'Pending' && p.ListName != 'Income' ">-</td>
+                                            <td class="center" ng-if="p.ListName == 'Income' ">
+                                                <span> <i  tooltip="EDIT" class="glyphicon glyphicon-pencil"  ng-click="setEditId(p.ID)"></i> </span>
+                                            </td>
                                             <td class="center" ng-if="p.Status == 'Pending'">
                                                 <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>
                                             </td>
-
                                         </tr>
                                         <tr ng-show="editId === p.ID" ng-if="editId === p.ID">
                                             <!--<pre>{{ p }}</pre>-->
@@ -230,10 +244,10 @@
                                                Amount <span class="symbol required"></span>
                                                     
                                             </label>
-                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control" ng-model="myModelAdd.amount"
-                                        required/>
+                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
+                                        ng-model="myModelAdd.amount" required/>
                                     <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
-                          
+
                                 </div>
                                 <div class="col-md-4">
                                     <label>
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index 8915a2bf..265e1988 100644
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -29,22 +29,33 @@
                                             <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
                                         </div>-->
 
-                                        <div class="col-md-4">
-                                            <!--<pre>{{searchData.date}}</pre>-->
-                                            <div data-ng-controller="DatepickerDemoCtrl">
-                                                <label>
-                                                Date 
+                                           <div class="col-md-4">
+                                    <!--<pre>{{searchData.date}}</pre>-->
+                                    <div data-ng-controller="DatepickerDemoCtrl">
+                                        <label>
+                                               From Date
                                             </label>
-                                                <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
-                                                    is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
-                                                    placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
-                                                    show-button-bar="true" />
+                                        <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
+                                            is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                            placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
+                                            show-button-bar="true" />
 
-                                            </div>
-                                        </div>
                                     </div>
-                                    <div class="row">
-                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+                                </div>
+                                <div class="col-md-4">
+                                    <!--<pre>{{searchData.date}}</pre>-->
+                                    <div data-ng-controller="DatepickerDemoCtrl">
+                                        <label>
+                                                To Date 
+                                            </label>
+                                        <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
+                                            is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                            placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
+                                            show-button-bar="true" />
+
+                                    </div>
+                                </div>
+                                 <div class="col-md-4 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>
@@ -58,22 +69,36 @@
 
                                         </div>
                                     </div>
+                                    <!--<div class="row">
+                                        <div class="col-md-4 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>
+                                            <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(myModelAdd.name)"
+                                                required>
+                                                <option value="" disabled selected>Select</option>
+                                                <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
+                                                </select>
+                                            <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
+
+                                        </div>
+                                    </div>-->
                                      <div class="table-responsive" ng-if="showTheRefValue == 'I002'">
                                         <table class="table table-hover" ng-if="searchResultLength > 0">
                                             <thead>
                                                 <tr>
                                                    
-                                                    <th ng-click="sort('date')">Date
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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>
-                                                    <th ng-click="sort('incomeExpense')">Income/Expense
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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>
-                                                    <th ng-click="sort('type')">Type
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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 ng-click="sort('amount')">Amount
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th>Amount
+                                                        <!--<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')">Description
                                                         <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
@@ -109,23 +134,23 @@
                                                         <input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
                                                         />
                                                     </th>
-                                                    <th ng-click="sort('date')">Date
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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>
-                                                    <th ng-click="sort('incomeExpense')">Income/Expense
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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>
-                                                    <th ng-click="sort('type')">Type
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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 ng-click="sort('amount')">Amount
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th>Amount
+                                                        <!--<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')">Description
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th>Description
+                                                        <!--<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 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>
                                                 </tr>
                                             </thead>
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index eeb693d6..d2361c21 100644
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -29,22 +29,33 @@
                                             <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
                                         </div>-->
 
-                                        <div class="col-md-4">
-                                            <!--<pre>{{searchData.date}}</pre>-->
-                                            <div data-ng-controller="DatepickerDemoCtrl">
-                                                <label>
-                                                Date 
+                                           <div class="col-md-4">
+                                    <!--<pre>{{searchData.date}}</pre>-->
+                                    <div data-ng-controller="DatepickerDemoCtrl">
+                                        <label>
+                                               From Date 
                                             </label>
-                                                <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
-                                                    is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
-                                                    placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
-                                                    show-button-bar="true" />
+                                        <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
+                                            is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                            placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
+                                            show-button-bar="true" />
 
-                                            </div>
-                                        </div>
                                     </div>
-                                    <div class="row">
-                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+                                </div>
+                                <div class="col-md-4">
+                                    <!--<pre>{{searchData.date}}</pre>-->
+                                    <div data-ng-controller="DatepickerDemoCtrl">
+                                        <label>
+                                                To Date 
+                                            </label>
+                                        <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
+                                            is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                            placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
+                                            show-button-bar="true" />
+
+                                    </div>
+                                </div>
+                                                       <div class="col-md-4 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>
@@ -58,28 +69,42 @@
 
                                         </div>
                                     </div>
+                                    <!--<div class="row">
+                                        <div class="col-md-4 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>
+                                            <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(myModelAdd.name)"
+                                                required>
+                                                <option value="" disabled selected>Select</option>
+                                                <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
+                                                </select>
+                                            <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
+
+                                        </div>
+                                    </div>-->
                                      <div class="table-responsive" ng-if="showTheRefValue == 'I002'">
                                         <table class="table table-hover" ng-if="searchResultLength > 0">
                                             <thead>
                                                 <tr>
-                                                    <th ng-click="sort('date')">Branch
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th ng-click="sort('BranchName')">Branch
+                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                     </th>
                                                    
-                                                    <th ng-click="sort('date')">Date
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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>
-                                                    <th ng-click="sort('incomeExpense')">Income/Expense
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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>
-                                                    <th ng-click="sort('type')">Type
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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 ng-click="sort('amount')">Amount
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th >Amount
+                                                        <!--<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')">Description
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th >Description
+                                                        <!--<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>
@@ -108,26 +133,26 @@
                                         <table class="table table-hover" ng-if="searchResultLength > 0">
                                             <thead>
                                                 <tr> 
-                                                    <th ng-click="sort('date')">Branch
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th ng-click="sort('BranchName')">Branch
+                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                                     </th>
-                                                    <th ng-click="sort('date')">Date
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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>
-                                                    <th ng-click="sort('incomeExpense')">Income/Expense
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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>
-                                                    <th ng-click="sort('type')">Type
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <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 ng-click="sort('amount')">Amount
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th>Amount
+                                                        <!--<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')">Description
-                                                        <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                                    <th>Description
+                                                        <!--<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 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>
                                                 </tr>
                                             </thead>