From 435a6ad6f010d7906fa4cb894e1b8094e99519fc Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Thu, 31 May 2018 09:32:46 +0530
Subject: [PATCH] daybook changes : kdk (31-5-2018 )

---
 Apollo/assets/views/daybook/daybook.html      | 35 +++++++++++--------
 Apollo/assets/views/daybook/daybookadmin.html | 32 ++++++++++-------
 .../views/daybook/daybooksuperadmin.html      | 29 ++++++++-------
 3 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index bfcdd969..5bb6c227 100755
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -205,17 +205,19 @@
                                         </tr>
                                         <tr ng-show="editId === p.ID" ng-if="editId === p.ID">
                                             <!--<pre>{{ p }}</pre>-->
-                                            <td colspan="9">
+                                             <td colspan="15">
                                                 <form name="Form" id="form" novalidate ng-submit="daybookeditUpdate.submit(Form, myModel)" method="post">
                                                     <div ng-init="copyModel(p)" class="container" style="background-color: rgb(248, 248, 248);
                                         border-radius: 6px;padding: 22px;">
                                                         <div class="row">
-                                                            <div class="col-md-4 form-group">
+                                                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid, 'has-success':Form.editvoucherNumber.$valid}">
                                                                 <label>
                                                 Voucher Number 
                                             </label>
                                                                 <input type="text" name="editvoucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModel.voucherNumber"
-                                                                />
+                                                              required    ng-pattern="/^[a-zA-Z0-9-]*$/"  />
+                                                              
+                                                                <span class="error text-small block" ng-if="Form.editvoucherNumber.$error.pattern">Enter a Valid Voucher Number.</span>
                                                                 <span class="error text-small block" ng-if="Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid" ng-hide="Form.editvoucherNumber.$error.maxlength || Form.editvoucherNumber.$error.minlength || Form.editvoucherNumber.$error.pattern">Voucher Number is required.</span>
                                                             </div>
                                                             <div class="col-md-4 form-group" ng-class="{'has-error':Form.editpaidTo.$dirty && Form.editpaidTo.$invalid, 'has-success':Form.editpaidTo.$valid}">
@@ -223,18 +225,19 @@
                                                 Paid To / Received From
                                             </label>
                                                                 <input type="text" name="editpaidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModel.paidTo"
-                                                                />
+                                                                required/>
                                                                 <span class="error text-small block" ng-if="Form.editpaidTo.$dirty && Form.editpaidTo.$invalid" ng-hide="Form.editpaidTo.$error.maxlength || Form.editpaidTo.$error.minlength || Form.editpaidTo.$error.pattern">Paid To / Received From is required.</span>
                                                             </div>
-                                                            <div class="col-md-4">
+                                                            <div class="col-md-4" ng-class="{'has-error':Form.editdescription_paid.$dirty && Form.editdescription_paid.$invalid, 'has-success':Form.editdescription_paid.$valid}">
                                                                 <label>
                                                Description
                                             </label>
 
                                                                 <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="editdescription_paid" ng-model="myModel.description_paid"
-                                                                    maxlength="100" />
+                                                                   required maxlength="100" />
                                                                 <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.editdescription_paid.$dirty && Form.editdescription_paid.$error.pattern">Invalid Description</span>
+                                                                    <span class="error text-small block" ng-if="Form.editdescription_paid.$dirty && Form.editdescription_paid.$invalid" ng-hide="Form.editdescription_paid.$error.maxlength || Form.editdescription_paid.$error.minlength || Form.editdescription_paid.$error.pattern">Description required.</span>
+                                                           
 
                                                             </div>
 
@@ -263,16 +266,16 @@
                                                                 <span class="error text-small block" ng-if="Form.editAmount.$dirty && Form.editAmount.$error.required">Amount is Required </span>
 
                                                             </div>
-                                                            <div class="col-md-4">
+                                                            <div class="col-md-4"  ng-class="{'has-error':Form.editComments.$dirty && Form.editComments.$invalid, 'has-success':Form.editComments.$valid}">
                                                                 <label>
                                                Comments
                                             </label>
 
                                                                 <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description"
-                                                                    maxlength="100" />
+                                                                 required   maxlength="100" />
                                                                 <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Charactes.</span>
-                                                                <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
-
+                                                                <span class="error text-small block" ng-if="Form.editComments.$dirty && Form.editComments.$invalid" ng-hide="Form.editComments.$error.maxlength || Form.editComments.$error.minlength || Form.editComments.$error.pattern">Comments required.</span>
+                                                           
                                                             </div>
                                                         </div>
                                                         <div class="row">
@@ -281,7 +284,7 @@
                                                             <div class="center">
                                                                 <button type="submit" ng-disabled="disableEditButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
                                                                     data-style="zoom-in">
-                                                  <i class='fa fa-spinner fa-spin' ng-if="disableEditButton"> </i>    Submit
+                                              <i class='fa fa-spinner fa-spin' ng-if="disableEditButton"> </i>    Submit
                                             </button>
                                                                 <button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
                                                 Cancel
@@ -306,7 +309,7 @@
             <tab heading="Add" id="addDayBook">
                 <!--<pre>{{myModelAdd}}</pre>-->
                   <div>
-                    <form name="Form" id="form" novalidate ng-submit="daybookAdd.submit(Form, myModelAdd)" method="post">
+                     <form name="Form" id="form" novalidate ng-submit="daybookAdd.submit(Form, myModelAdd)" method="post">
                         <div>
                             <div class="row">
                                 <div data-ng-controller="DatepickerDemoCtrl">
@@ -315,7 +318,7 @@
                                                 Date <span
                                                     class="symbol required"></span>
                                             </label>
-                                        <input type="text" id="datere" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAdd.date"
+                                        <input type="text" id="date" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAdd.date"
                                             is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
                                             placeholder="Select Date" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
                                             show-button-bar="true"  max-date="todayDate" />
@@ -344,7 +347,9 @@
                                                 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"
-                                    required/>
+                                  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}">
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index 831c3dbd..0729f9f4 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -206,17 +206,19 @@
                                         </tr>
                                         <tr ng-show="editId === p.ID" ng-if="editId === p.ID">
                                             <!--<pre>{{ p }}</pre>-->
-                                            <td colspan="9">
+                                            <td colspan="15">
                                                 <form name="Form" id="form" novalidate ng-submit="daybookeditUpdate.submit(Form, myModel)" method="post">
                                                     <div ng-init="copyModel(p)" class="container" style="background-color: rgb(248, 248, 248);
                                         border-radius: 6px;padding: 22px;">
                                                         <div class="row">
-                                                            <div class="col-md-4 form-group">
+                                                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid, 'has-success':Form.editvoucherNumber.$valid}">
                                                                 <label>
                                                 Voucher Number 
                                             </label>
                                                                 <input type="text" name="editvoucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModel.voucherNumber"
-                                                                />
+                                                              required    ng-pattern="/^[a-zA-Z0-9-]*$/"  />
+                                                              
+                                                                <span class="error text-small block" ng-if="Form.editvoucherNumber.$error.pattern">Enter a Valid Voucher Number.</span>
                                                                 <span class="error text-small block" ng-if="Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid" ng-hide="Form.editvoucherNumber.$error.maxlength || Form.editvoucherNumber.$error.minlength || Form.editvoucherNumber.$error.pattern">Voucher Number is required.</span>
                                                             </div>
                                                             <div class="col-md-4 form-group" ng-class="{'has-error':Form.editpaidTo.$dirty && Form.editpaidTo.$invalid, 'has-success':Form.editpaidTo.$valid}">
@@ -224,18 +226,19 @@
                                                 Paid To / Received From
                                             </label>
                                                                 <input type="text" name="editpaidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModel.paidTo"
-                                                                />
+                                                                required/>
                                                                 <span class="error text-small block" ng-if="Form.editpaidTo.$dirty && Form.editpaidTo.$invalid" ng-hide="Form.editpaidTo.$error.maxlength || Form.editpaidTo.$error.minlength || Form.editpaidTo.$error.pattern">Paid To / Received From is required.</span>
                                                             </div>
-                                                            <div class="col-md-4">
+                                                            <div class="col-md-4" ng-class="{'has-error':Form.editdescription_paid.$dirty && Form.editdescription_paid.$invalid, 'has-success':Form.editdescription_paid.$valid}">
                                                                 <label>
                                                Description
                                             </label>
 
                                                                 <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="editdescription_paid" ng-model="myModel.description_paid"
-                                                                    maxlength="100" />
+                                                                   required maxlength="100" />
                                                                 <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.editdescription_paid.$dirty && Form.editdescription_paid.$error.pattern">Invalid Description</span>
+                                                                    <span class="error text-small block" ng-if="Form.editdescription_paid.$dirty && Form.editdescription_paid.$invalid" ng-hide="Form.editdescription_paid.$error.maxlength || Form.editdescription_paid.$error.minlength || Form.editdescription_paid.$error.pattern">Description required.</span>
+                                                           
 
                                                             </div>
 
@@ -264,16 +267,16 @@
                                                                 <span class="error text-small block" ng-if="Form.editAmount.$dirty && Form.editAmount.$error.required">Amount is Required </span>
 
                                                             </div>
-                                                            <div class="col-md-4">
+                                                            <div class="col-md-4"  ng-class="{'has-error':Form.editComments.$dirty && Form.editComments.$invalid, 'has-success':Form.editComments.$valid}">
                                                                 <label>
                                                Comments
                                             </label>
 
                                                                 <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description"
-                                                                    maxlength="100" />
+                                                                 required   maxlength="100" />
                                                                 <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Charactes.</span>
-                                                                <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
-
+                                                                <span class="error text-small block" ng-if="Form.editComments.$dirty && Form.editComments.$invalid" ng-hide="Form.editComments.$error.maxlength || Form.editComments.$error.minlength || Form.editComments.$error.pattern">Comments required.</span>
+                                                           
                                                             </div>
                                                         </div>
                                                         <div class="row">
@@ -293,6 +296,7 @@
                                                 </form>
                                             </td>
 
+
                                         </tr>
                                     </tbody>
                                 </table>
@@ -307,7 +311,7 @@
             <tab heading="Add" id="addDayBook">
                 <!--<pre>{{myModelAdd}}</pre>-->
                 <div>
-                    <form name="Form" id="form" novalidate ng-submit="daybookAdd.submit(Form, myModelAdd)" method="post">
+                     <form name="Form" id="form" novalidate ng-submit="daybookAdd.submit(Form, myModelAdd)" method="post">
                         <div>
                             <div class="row">
                                 <div data-ng-controller="DatepickerDemoCtrl">
@@ -345,7 +349,9 @@
                                                 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"
-                                    required/>
+                                  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}">
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index f83041ad..e0884976 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -182,17 +182,19 @@
                                         </tr>
                                         <tr ng-show="editId === p.ID" ng-if="editId === p.ID">
                                             <!--<pre>{{ p }}</pre>-->
-                                            <td colspan="9">
+                                            <td colspan="15">
                                                 <form name="Form" id="form" novalidate ng-submit="daybookeditUpdate.submit(Form, myModel)" method="post">
                                                     <div ng-init="copyModel(p)" class="container" style="background-color: rgb(248, 248, 248);
                                         border-radius: 6px;padding: 22px;">
                                                         <div class="row">
-                                                            <div class="col-md-4 form-group">
+                                                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid, 'has-success':Form.editvoucherNumber.$valid}">
                                                                 <label>
                                                 Voucher Number 
                                             </label>
                                                                 <input type="text" name="editvoucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModel.voucherNumber"
-                                                                />
+                                                              required    ng-pattern="/^[a-zA-Z0-9-]*$/"  />
+                                                              
+                                                                <span class="error text-small block" ng-if="Form.editvoucherNumber.$error.pattern">Enter a Valid Voucher Number.</span>
                                                                 <span class="error text-small block" ng-if="Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid" ng-hide="Form.editvoucherNumber.$error.maxlength || Form.editvoucherNumber.$error.minlength || Form.editvoucherNumber.$error.pattern">Voucher Number is required.</span>
                                                             </div>
                                                             <div class="col-md-4 form-group" ng-class="{'has-error':Form.editpaidTo.$dirty && Form.editpaidTo.$invalid, 'has-success':Form.editpaidTo.$valid}">
@@ -200,18 +202,19 @@
                                                 Paid To / Received From
                                             </label>
                                                                 <input type="text" name="editpaidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModel.paidTo"
-                                                                />
+                                                                required/>
                                                                 <span class="error text-small block" ng-if="Form.editpaidTo.$dirty && Form.editpaidTo.$invalid" ng-hide="Form.editpaidTo.$error.maxlength || Form.editpaidTo.$error.minlength || Form.editpaidTo.$error.pattern">Paid To / Received From is required.</span>
                                                             </div>
-                                                            <div class="col-md-4">
+                                                            <div class="col-md-4" ng-class="{'has-error':Form.editdescription_paid.$dirty && Form.editdescription_paid.$invalid, 'has-success':Form.editdescription_paid.$valid}">
                                                                 <label>
                                                Description
                                             </label>
 
                                                                 <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="editdescription_paid" ng-model="myModel.description_paid"
-                                                                    maxlength="100" />
+                                                                   required maxlength="100" />
                                                                 <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.editdescription_paid.$dirty && Form.editdescription_paid.$error.pattern">Invalid Description</span>
+                                                                    <span class="error text-small block" ng-if="Form.editdescription_paid.$dirty && Form.editdescription_paid.$invalid" ng-hide="Form.editdescription_paid.$error.maxlength || Form.editdescription_paid.$error.minlength || Form.editdescription_paid.$error.pattern">Description required.</span>
+                                                           
 
                                                             </div>
 
@@ -240,16 +243,16 @@
                                                                 <span class="error text-small block" ng-if="Form.editAmount.$dirty && Form.editAmount.$error.required">Amount is Required </span>
 
                                                             </div>
-                                                            <div class="col-md-4">
+                                                            <div class="col-md-4"  ng-class="{'has-error':Form.editComments.$dirty && Form.editComments.$invalid, 'has-success':Form.editComments.$valid}">
                                                                 <label>
                                                Comments
                                             </label>
 
                                                                 <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description"
-                                                                    maxlength="100" />
+                                                                 required   maxlength="100" />
                                                                 <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Charactes.</span>
-                                                                <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
-
+                                                                <span class="error text-small block" ng-if="Form.editComments.$dirty && Form.editComments.$invalid" ng-hide="Form.editComments.$error.maxlength || Form.editComments.$error.minlength || Form.editComments.$error.pattern">Comments required.</span>
+                                                           
                                                             </div>
                                                         </div>
                                                         <div class="row">
@@ -321,7 +324,9 @@
                                                 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"
-                                    required/>
+                                  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}">