From 2bdad14b181139f837dfb9a2c61f9254909470ab Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 23 Aug 2018 14:13:46 +0530
Subject: [PATCH 1/2] daybook fiels

---
 Apollo/assets/views/daybook/daybook.html      | 129 ++++++++++--------
 Apollo/assets/views/daybook/daybookadmin.html |  88 +++++++-----
 .../views/daybook/daybooksuperadmin.html      |  14 +-
 3 files changed, 138 insertions(+), 93 deletions(-)

diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index fb7d062c..c82497f6 100755
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -252,29 +252,20 @@
 
                                                         </div>
                                                         <div class="row">
-                                                            <div class="col-md-4" ng-class="{'has-error':Form.editType.$dirty && Form.editType.$invalid, 'has-success':Form.editType.$valid}">
-                                                                <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> -->
+                                <div class="col-md-4" ng-class="{'has-error':Form.editType.$dirty && Form.editType.$invalid, 'has-success':Form.editType.$valid}">
+                                 <label for="form-field-select-2">
+                                Type <span class="symbol required"></span>
+                                </label>
 
-<!-- {{myModel.type}} {{incomeExpenseType}} -->
-                                                  <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModel.type" required>
+                                <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>
 
-                                     <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>
+                                </div>
                                                             <div class="col-md-4" ng-class="{'has-error':Form.editAmount.$dirty && Form.editAmount.$invalid, 'has-success':Form.editAmount.$valid}">
                                                                 <label>
                                                Amount <span class="symbol required"></span>
@@ -332,7 +323,7 @@
                         <div>
                             <div class="row">
                                 <div data-ng-controller="DatepickerDemoCtrl">
-                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
+                                    <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
                                                     class="symbol required"></span>
@@ -347,7 +338,7 @@
                                         <span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
                                     </div>
                                 </div>
-                                <div class="col-md-6 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+                                <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>
@@ -355,12 +346,41 @@
                                     <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
                                         required>
                                                 <option value="" disabled 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>
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
+
+
+
+
+
+                                <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>
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  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}">
@@ -381,6 +401,33 @@
                                     required/>
                                     <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</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>
+                                            </label>
+                                    <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>
+                            <div class="row">
+                                
+                              <!--   <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>
+                                            </label>
+                                    <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"  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>
@@ -392,42 +439,6 @@
                                     <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">
-                                <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>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
-                                                </select> -->
-                                           
-                                                <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"  label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{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.addType.$dirty && Form.addType.$error.required">Type is Required</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>
-                                            </label>
-                                    <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>
-                                    <!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
-                                </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 29321ca0..46e73219 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -336,7 +336,7 @@
                         <div>
                             <div class="row">
                                 <div data-ng-controller="DatepickerDemoCtrl">
-                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
+                                    <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
                                                     class="symbol required"></span>
@@ -351,7 +351,8 @@
                                         <span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
                                     </div>
                                 </div>
-                                <div class="col-md-6 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+
+                                <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>
@@ -359,12 +360,36 @@
                                     <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
                                         required>
                                                 <option value="" disabled 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>
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
+
+                              
+                               <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>
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  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}">
@@ -385,7 +410,7 @@
                                     required/>
                                     <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From 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>
@@ -395,33 +420,8 @@
                                     <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>
-                            <div class="row">
-                                <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>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
-                                                </select> -->
-
-                                                <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"  label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{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.addType.$dirty && Form.addType.$error.required">Type is Required</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>
@@ -429,7 +429,33 @@
                                     <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>
-                                    <!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
+                                </div>
+
+
+
+
+                            </div>
+                            <div class="row">
+                             
+                              <!--   <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>
+                                            </label>
+                                    <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"  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">
                                     <label>
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index 8207f617..2fef15b7 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -77,6 +77,10 @@
                                                 background: #ddd;
                                                 white-space: pre;
                                             }
+
+                        
+
+                        
                             </style>
 
                             <div class="row">
@@ -95,6 +99,10 @@
                                 background: lightgray;
                                 /*font-size: 16px;*/
                              }
+
+                            
+
+
                              </style>
 <button ng-click="exportData()">export</button>
                                 <table class="table table-bordered export-table">
@@ -103,7 +111,7 @@
                                             <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('ListName')">Income/Expense
+                                            <th class="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>Voucher Number / Bill Number
@@ -143,7 +151,7 @@
                                             <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 class="center">Action
                                             </th>
                                         </tr>
                                     </thead>
@@ -352,7 +360,7 @@
                                               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>
+                                 <option value="" disabled selected>Select Type</option>
 
                                      <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
                                                  <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>

From 2f3a078a29f974c498d35a691f8a4a426e764254 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 23 Aug 2018 14:37:11 +0530
Subject: [PATCH 2/2] call tracking re changes

---
 Apollo/api/application/controllers/Call_Tracking_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php
index a0cdfd9c..412ed4d0 100755
--- a/Apollo/api/application/controllers/Call_Tracking_Controller.php
+++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php
@@ -445,7 +445,7 @@ class Call_Tracking_Controller extends REST_Controller {
     $tracking_details['CreatedBranch'] = $this->post('branchId');
     //store tracking followup details
     $tracking_followup_details['FollowupOn'] = $this->post('date');
-    $tracking_followup_details['FollowupComments'] = $comments;
+    $tracking_followup_details['FollowupComments'] = $comments[$index];
     
     $tracking_followup_details['StatusName'] = $this->post('status');
     $tracking_followup_details['AssignedStaff'] = $this->post('assignedTo');