From e5b52e1c592905133dcc58a3ef67005de5d73ef3 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 11 Aug 2018 17:04:39 +0530
Subject: [PATCH] cashbook

---
 Apollo/assets/js/controllers/daybookadminCtrl.js |  8 ++++++--
 Apollo/assets/views/daybook/daybookadmin.html    | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js
index c4459d42..7d71392a 100755
--- a/Apollo/assets/js/controllers/daybookadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybookadminCtrl.js
@@ -208,12 +208,16 @@ $scope.dayBookApprovalAccess = '';
     }
 
     $scope.copyModel = function (p) {
-        console.log(p);
+        //console.log(p);
+        var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type);
+        console.log(inc);
+        $scope.incexp = inc[0];
+
         $scope.myModel = {
             "id": p.ID,
             "date": p.Date,
             "incomeExpense": p.Name,
-            "type": p.Type,
+            "type":$scope.incexp.ID,
             "amount": p.Amount,
             "status": p.Status,
             "description": p.Description,
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index 91dd6175..40330bb2 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -254,12 +254,24 @@
                                                                 <label for="form-field-select-2">
                                                Type <span class="symbol required"></span>
                                                 </label>
-
+<!-- 
                                                                 <select class="form-control" ng-init="getType(p.Name)" tabindex="1" class="cs-select cs-skin-elastic" name="editType" ng-model="myModel.type"
                                                                     required>
                                                 <option value="" disabled selected>Select Type</option>
                                                 <option ng-repeat="typeItem in getTypes" ng-selected="typeItem.ID == p.Type"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
-                                                </select>
+                                                </select> -->
+
+
+                                                  <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModel.type" required>
+
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}" ng-selected="incexp.ID == incexpType.ID">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                    </select>
+
+
                                                                 <span class="error text-small block" ng-if="Form.editType.$dirty && Form.editType.$error.required">Type is Required</span>
 
                                                             </div>