From ee9bc1eb843aa578602f1ae5958ca79f47d96055 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 8 Oct 2018 14:16:06 +0530
Subject: [PATCH] daybook changes

---
 Apollo/assets/js/controllers/daybookCtrl.js   | 21 +++-
 .../assets/js/controllers/daybookadminCtrl.js | 20 +++-
 .../js/controllers/daybooksuperadminCtrl.js   | 38 +++++++-
 Apollo/assets/views/daybook/daybook.html      | 63 ++++++++----
 Apollo/assets/views/daybook/daybookadmin.html | 64 +++++++++----
 .../views/daybook/daybooksuperadmin.html      | 96 ++++++++++++-------
 6 files changed, 220 insertions(+), 82 deletions(-)

diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js
index 95d6a7e9..6f8559cf 100644
--- a/Apollo/assets/js/controllers/daybookCtrl.js
+++ b/Apollo/assets/js/controllers/daybookCtrl.js
@@ -458,6 +458,19 @@ $scope.dayBookApprovalAccess = '';
         $scope.getTypes = type === 'I002' ? $scope.getIncomeTypes : $scope.getExpenseTypes;
     };
 
+
+ $scope.SelectType='';
+$scope.selecttype = function(type)
+{
+    //alert(type)
+    $scope.SelectType= type;
+
+    console.log($scope.SelectType);
+
+}
+
+
+
     $scope.editId = -1;
     $scope.setEditId = function (P) {
         // alert(id);
@@ -514,7 +527,8 @@ $scope.dayBookApprovalAccess = '';
             "description_paid": p.PaidDescription,
             "voucherNumber": p.VoucherNumber,
             "branch":p.BranchCode,
-            "name": p.Name
+            "name": p.Name,
+            "TypeID":$scope.incexp.TypeID
         }
         // alert(JSON.stringify($scope.myModel));
     }
@@ -705,8 +719,9 @@ else
                $scope.disableAddButton = true;
                 var sdate= $('#date').val();
                 var formate = "dd-MM-yyyy";
-                $scope.myModelAdd.date= sdate;
-                //$scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
+               // $scope.myModelAdd.date= sdate;
+               $scope.myModelAdd.date = new Date();
+              $scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
                 $scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved';
                 // $scope.data.push(myModelAdd);
 
diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js
index d378dd1c..9a866796 100644
--- a/Apollo/assets/js/controllers/daybookadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybookadminCtrl.js
@@ -450,6 +450,18 @@ $scope.dayBookApprovalAccess = '';
         $scope.getTypes = type === 'I002' ? $scope.getIncomeTypes : $scope.getExpenseTypes;
     };
 
+
+
+    $scope.SelectType='';
+$scope.selecttype = function(type)
+{
+    //alert(type)
+    $scope.SelectType= type;
+
+    console.log($scope.SelectType);
+
+}
+
     $scope.editId = -1;
     $scope.setEditId = function (P) {
         // alert(id);
@@ -505,7 +517,8 @@ $scope.dayBookApprovalAccess = '';
             "description_paid": p.PaidDescription,
             "voucherNumber": p.VoucherNumber,
             "branch":p.BranchCode,
-            "name": p.Name
+            "name": p.Name,
+            "TypeID":$scope.incexp.TypeID
         }
         // alert(JSON.stringify($scope.myModel));
     }
@@ -694,8 +707,9 @@ else
                 var sdate= $('#date').val();
                $scope.disableAddButton = true;
                 var formate = "dd-MM-yyyy";
-                $scope.myModelAdd.date= sdate;
-                //$scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
+               // $scope.myModelAdd.date= sdate;
+               $scope.myModelAdd.date = new Date();
+                $scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
                 $scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved';
                 // $scope.data.push(myModelAdd);
 
diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
index c7069a05..24538eeb 100644
--- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
@@ -535,15 +535,24 @@ $scope.loadStaring = true;
         };
         $http(getIncomeExpenseType).then(function (response) {
             if (response.data.typeNameStatus) {
+
+                // console.log(response.data)
                 $scope.incomeExpenseName = response.data.typeList;
                 $scope.incomeExpenseType = response.data.typeNameList;
+                console.log($scope.incomeExpenseName)
+                console.log($scope.incomeExpenseType)
 
             }
         });
+
+
+        //console.log( $scope.incomeExpenseName)
     }
 
     // parse the income and expense type from the list
     $scope.getType = function (type) {
+
+        alert(type)
         $scope.getIncomeTypes = $scope.incomeExpenseName.filter(function (val) {
             return val.TypeID === 'I002' ? 1 : 0;
         });
@@ -555,10 +564,23 @@ $scope.loadStaring = true;
         $scope.myModelAdd.type = '';
         $scope.getTypes = type === 'I002' ? $scope.getIncomeTypes : $scope.getExpenseTypes;
 
-       // console.log($scope.getTypes)
+       console.log($scope.getIncomeTypes)
 
     };
 
+$scope.SelectType='';
+$scope.selecttype = function(type)
+{
+    //alert(type)
+    $scope.SelectType= type;
+
+    console.log($scope.SelectType);
+
+}
+
+
+
+
     $scope.editId = -1;
     $scope.setEditId = function (P) {
         //alert(id);
@@ -598,8 +620,12 @@ $scope.loadStaring = true;
         "name": ""
     }
 
+
+
     $scope.copyModel = function (p) {
         var inc = $scope.incomeExpenseType.filter((inc) => inc.ID == p.Type);
+
+        console.log(inc)
         $scope.incexp = inc[0];
         $scope.myModel = {
             "id": p.ID,
@@ -613,7 +639,8 @@ $scope.loadStaring = true;
             "description_paid": p.PaidDescription,
             "voucherNumber": p.VoucherNumber,
             "branch": p.BranchCode,
-            "name": p.Name
+            "name": p.Name,
+            "TypeID":$scope.incexp.TypeID
 
         }
         // alert(JSON.stringify($scope.myModel));
@@ -822,8 +849,11 @@ else
                 var sdate = $('#date').val();
                 $scope.disableAddButton = true;
                 var formate = "dd-MM-yyyy";
-                $scope.myModelAdd.date = sdate;
-                //$scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
+                // $scope.myModelAdd.date = sdate;
+                 $scope.myModelAdd.date = new Date();
+                 
+                $scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
+                //console.log($scope.myModelAdd.date);return false;
                 $scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved';
                 // $scope.data.push(myModelAdd);
 
diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index 06c0efff..2f9d2e62 100755
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -281,7 +281,7 @@
                                 </label>
 
                                 <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"  ng-if="(typeName.ListCode == 'I001' ||  typeName.ListCode == 'I002')" label="{{typeName.ListName}}">
+                                <optgroup ng-repeat="typeName in incomeExpenseName"  ng-if="(typeName.ListCode == myModel.TypeID)" 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> 
@@ -345,7 +345,7 @@
                      <form name="Form" id="form" novalidate ng-submit="daybookAdd.submit(Form, myModelAdd)" method="post">
                         <div>
                             <div class="row">
-                                <div data-ng-controller="DatepickerDemoCtrl">
+                               <!--  <div data-ng-controller="DatepickerDemoCtrl">
                                     <div class="col-md-4 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
                                         <label>
                                                 Date <span
@@ -360,13 +360,13 @@
                                         <span class="error text-small block" ng-if="Form.addDate.$dirty && Form.addDate.$invalid" ng-hide="Form.addDate.$error.maxlength">Date is required.</span>
                                         <span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
                                     </div>
-                                </div>
+                                </div> -->
                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                     <label for="form-field-select-2">
                                                Income/Expense <span class="symbol required"></span>
                                                 </label>
                                     <!--<pre>{{incomeExpenseName }}</pre>-->
-                                    <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
+                                    <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="selecttype(myModelAdd.name)"
                                         required>
                                                 <option value="" disabled selected>Select</option>
                                                 
@@ -387,11 +387,9 @@
                                            
                                                 <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
                                      <option value="" disabled selected>Select Type</option>
-
-                                     <optgroup ng-repeat="typeName in incomeExpenseName"  ng-if="(typeName.ListCode == 'I001' ||  typeName.ListCode == 'I002')" label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
-
-                                    </optgroup> 
+                                      <option ng-repeat="incexpType in incomeExpenseType" ng-if="incexpType.TypeID==SelectType" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
+                                   
+                                                
                                                 </select>
 
 
@@ -400,13 +398,7 @@
                                 </div>
 
 
-
-
-
-
-                            </div>
-                            <div class="row">
-                                <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
+                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
                                     <label>
                                                 Voucher Number <span class="symbol required"></span>
                                             </label>
@@ -416,6 +408,24 @@
                                
                                     <span class="error text-small block" ng-if="Form.voucherNumber.$dirty && Form.voucherNumber.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span>
                                 </div>
+
+
+
+
+
+
+                            </div>
+                            <div class="row">
+                               <!--  <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
+                                    <label>
+                                                Voucher Number <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" name="voucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModelAdd.voucherNumber"
+                                  ng-pattern="/^[a-zA-Z0-9-]*$/"   required/>
+                                       <span class="error text-small block" ng-if="Form.voucherNumber.$error.pattern">Enter a Valid Voucher Number</span>
+                               
+                                    <span class="error text-small block" ng-if="Form.voucherNumber.$dirty && Form.voucherNumber.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span>
+                                </div> -->
                                 <div class="col-md-4 form-group"  ng-class="{'has-error':Form.paidTo.$dirty && Form.paidTo.$invalid , 'has-success':Form.paidTo.$valid}">
                                     <label>
                                                 Paid To / Received From <span class="symbol required"></span>
@@ -438,6 +448,23 @@
                                     <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"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
+                                    <label>
+                                               Description  <span class="symbol required"></span>
+                                            </label>
+
+                                    <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid"
+                                        maxlength="100" required/>
+                                    <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
+                                    <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
+
+                                </div>
+
+
+
                             </div>
                             <div class="row">
                                 
@@ -451,7 +478,7 @@
                                 </div> -->
 
 
-                                <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
+                             <!--    <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
                                     <label>
                                                Description  <span class="symbol required"></span>
                                             </label>
@@ -461,7 +488,7 @@
                                     <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
                                     <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
 
-                                </div>
+                                </div> -->
                                 <div class="col-md-4">
                                     <label>
                                                Comments
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index 67d08f57..fdd4bfcc 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -288,7 +288,7 @@
                                                   <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"   ng-if="(typeName.ListCode == 'I001' ||  typeName.ListCode == 'I002')" label="{{typeName.ListName}}">
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"   ng-if="(typeName.ListCode == myModel.TypeID)" 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> 
@@ -355,7 +355,7 @@
                      <form name="Form" id="form" novalidate ng-submit="daybookAdd.submit(Form, myModelAdd)" method="post">
                         <div>
                             <div class="row">
-                                <div data-ng-controller="DatepickerDemoCtrl">
+                                <!-- <div data-ng-controller="DatepickerDemoCtrl">
                                     <div class="col-md-4 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
                                         <label>
                                                 Date <span
@@ -370,14 +370,14 @@
                                         <span class="error text-small block" ng-if="Form.addDate.$dirty && Form.addDate.$invalid" ng-hide="Form.addDate.$error.maxlength">Date is required.</span>
                                         <span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
                                     </div>
-                                </div>
+                                </div> -->
 
                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                     <label for="form-field-select-2">
                                                Income/Expense <span class="symbol required"></span>
                                                 </label>
                                     <!--<pre>{{incomeExpenseName }}</pre>-->
-                                    <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
+                                    <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="selecttype(myModelAdd.name)"
                                         required>
                                                 <option value="" disabled selected>Select</option>
                                                
@@ -392,14 +392,12 @@
                                     <label for="form-field-select-2">
                                               Type  <span class="symbol required"></span>
                                                 </label>
-                                                <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
-                                     <option value="" disabled selected>Select Type</option>
+                                    <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                        <option value="" disabled selected>Select Type</option>
+                                        <option ng-repeat="incexpType in incomeExpenseType" ng-if="incexpType.TypeID==SelectType" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
 
-                                     <optgroup ng-repeat="typeName in incomeExpenseName"  ng-if="(typeName.ListCode == 'I001' ||  typeName.ListCode == 'I002')" label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
-
-                                    </optgroup> 
-                                                </select>
+                                    
+                                    </select>
                                                 
                                     <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
 
@@ -407,12 +405,7 @@
 
 
 
-
-
-
-                            </div>
-                            <div class="row">
-                                <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
+                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
                                     <label>
                                                 Voucher Number <span class="symbol required"></span>
                                             </label>
@@ -422,6 +415,24 @@
                                
                                     <span class="error text-small block" ng-if="Form.voucherNumber.$dirty && Form.voucherNumber.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span>
                                 </div>
+
+
+
+
+
+
+                            </div>
+                            <div class="row">
+                               <!--  <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
+                                    <label>
+                                                Voucher Number <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" name="voucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModelAdd.voucherNumber"
+                                  ng-pattern="/^[a-zA-Z0-9-]*$/"   required/>
+                                       <span class="error text-small block" ng-if="Form.voucherNumber.$error.pattern">Enter a Valid Voucher Number</span>
+                               
+                                    <span class="error text-small block" ng-if="Form.voucherNumber.$dirty && Form.voucherNumber.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span>
+                                </div> -->
                                 <div class="col-md-4 form-group"  ng-class="{'has-error':Form.paidTo.$dirty && Form.paidTo.$invalid , 'has-success':Form.paidTo.$valid}">
                                     <label>
                                                 Paid To / Received From <span class="symbol required"></span>
@@ -454,6 +465,21 @@
 
 
 
+                                  <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
+                                    <label>
+                                               Description  <span class="symbol required"></span>
+                                            </label>
+
+                                    <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid"
+                                        maxlength="100" required/>
+                                    <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
+                                    <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
+
+                                </div>
+
+
+
+
                             </div>
                             <div class="row">
                              
@@ -466,7 +492,7 @@
                                     <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"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
+                               <!--   <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
                                     <label>
                                                Description  <span class="symbol required"></span>
                                             </label>
@@ -476,7 +502,7 @@
                                     <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
                                     <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
 
-                                </div>
+                                </div> -->
                                 <div class="col-md-4">
                                     <label>
                                                Comments
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index e3b48753..1d8a4479 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -265,25 +265,16 @@
                                                                 <label for="form-field-select-2">
                                                Type <span class="symbol required"></span>
                                                 </label>
-    {{typeItem}}
-                                                <!-- <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> -->
-
-
 
+                                           <!--  {{myModel.TypeID}} -->
                                                  <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"  ng-if="(typeName.ListCode == 'I001' ||  typeName.ListCode == 'I002')"  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 ng-repeat="typeName in incomeExpenseName"  ng-if="(typeName.ListCode == myModel.TypeID)"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="incexpType.TypeID==myModel.TypeID" value="{{incexpType.ID}}" ng-selected="incexp.ID == incexpType.ID">{{incexpType.TypeName}}</option>
 
                                     </optgroup> 
-                                                <!-- <option value="" disabled selected>Select Type</option>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
+                                                
                                                 </select>
                                                 
                                                 <span class="error text-small block" ng-if="Form.editType.$dirty && Form.editType.$error.required">Type is Required</span>
@@ -345,7 +336,7 @@
                     <form name="Form" id="form" novalidate ng-submit="daybookAdd.submit(Form, myModelAdd)" method="post">
                         <div>
                             <div class="row">
-                                <div data-ng-controller="DatepickerDemoCtrl">
+                               <!--  <div data-ng-controller="DatepickerDemoCtrl">
                                     <div class="col-md-4 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
                                         <label>
                                                 Date <span
@@ -360,46 +351,51 @@
                                         <span class="error text-small block" ng-if="Form.addDate.$dirty && Form.addDate.$invalid" ng-hide="Form.addDate.$error.maxlength">Date is required.</span>
                                         <span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
                                     </div>
-                                </div>
+                                </div> -->
 
                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                     <label for="form-field-select-2">
                                                Income/Expense <span class="symbol required"></span>
                                                 </label>
                                     <!--<pre>{{incomeExpenseName }}</pre>-->
-                                    <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
+                                    <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="selecttype(myModelAdd.name)"
                                         required>
-                                                <option value="" disabled selected>Select</option>
+                                                <option value="" selected>Select</option>
                                                 <!-- <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
 
                                                 <option value="I001">EXPENSE</option>
                                                 <option value="I002">INCOME</option>
-                                                </select>
+                                    </select>
+                                    
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
 
 
-
+<!-- {{SelectType}} -->
                                   <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
                                     <label for="form-field-select-2">
                                               Type  <span class="symbol required"></span>
                                                 </label>
-                                    <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
-                                 <option value="" disabled selected>Select Type</option>
+                             
+
+                            <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                
+                                <option value="" selected>Select Type</option>
+                                <option ng-repeat="incexpType in incomeExpenseType" ng-if="incexpType.TypeID==SelectType" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
+                            
+                            </select>
+
+
+
 
-                                     <optgroup ng-repeat="typeName in incomeExpenseName" ng-if="(typeName.ListCode == 'I001' ||  typeName.ListCode == 'I002')"  label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
 
-                                    </optgroup> 
-                                              
-                                                </select>
                                     <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
 
                                 </div>
 
-                            </div>
-                            <div class="row">
-                                <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
+
+
+                               <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
                                     <label>
                                                 Voucher Number <span class="symbol required"></span>
                                             </label>
@@ -409,6 +405,21 @@
                                
                                     <span class="error text-small block" ng-if="Form.voucherNumber.$dirty && Form.voucherNumber.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span>
                                 </div>
+
+
+
+                            </div>
+                            <div class="row">
+                               <!--  <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
+                                    <label>
+                                                Voucher Number <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" name="voucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModelAdd.voucherNumber"
+                                  ng-pattern="/^[a-zA-Z0-9-]*$/"   required/>
+                                       <span class="error text-small block" ng-if="Form.voucherNumber.$error.pattern">Enter a Valid Voucher Number</span>
+                               
+                                    <span class="error text-small block" ng-if="Form.voucherNumber.$dirty && Form.voucherNumber.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span>
+                                </div> -->
                                 <div class="col-md-4 form-group"  ng-class="{'has-error':Form.paidTo.$dirty && Form.paidTo.$invalid , 'has-success':Form.paidTo.$valid}">
                                     <label>
                                                 Paid To / Received From <span class="symbol required"></span>
@@ -431,13 +442,8 @@
 
 
 
-                             
 
-                            </div>
-                            <div class="row">
-
-                         
-                            <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
+                                  <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
                                     <label>
                                                Description  <span class="symbol required"></span>
                                             </label>
@@ -449,6 +455,26 @@
 
                                 </div>
 
+
+
+                             
+
+                            </div>
+                            <div class="row">
+
+                         
+                          <!--   <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
+                                    <label>
+                                               Description  <span class="symbol required"></span>
+                                            </label>
+
+                                    <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid"
+                                        maxlength="100" required/>
+                                    <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
+                                    <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
+
+                                </div> -->
+
                                <!--  <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
                                     <label>
                                                Amount <span class="symbol required"></span>