From 92ed2a45357f1ac8444d0f2c0168b3289f00bfe1 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 25 Apr 2018 16:32:26 +0530
Subject: [PATCH] branch master changes

---
 Apollo/assets/views/branchDetails.html | 90 +++++++++++++++-----------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/Apollo/assets/views/branchDetails.html b/Apollo/assets/views/branchDetails.html
index 7ce3e45c..ec0fa475 100755
--- a/Apollo/assets/views/branchDetails.html
+++ b/Apollo/assets/views/branchDetails.html
@@ -5,6 +5,16 @@
         box-shadow: 0px 0px 2px #007AFF;
         padding: 0.5em 0.6em;
     }
+    .thumb {
+        width: 130px;
+        height: 140px;
+        margin: 2px;
+        float: left;
+    }
+
+    .uploader {
+        clear: both;
+    }
 </style>
 <!-- start: PAGE TITLE -->
 <section id="page-title">
@@ -156,7 +166,7 @@
                                                 Branch Code <span class="symbol required"></span>
                                             </label>
 
-                                            <input type="text" placeholder="Enter Branch Code" tabindex="1" class="form-control" name="branchcode" ng-model="myModel.branchCode"
+                                            <input disallow-spaces type="text" placeholder="Enter Branch Code" tabindex="1" class="form-control" id="branchcode" name="branchcode" ng-model="myModel.branchCode"
                                                 ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
                                             <span class="error text-small block" ng-if="Form.branchcode.$dirty && Form.branchcode.$error.required">Branch code is required</span>
                                             <span class="error text-small block" ng-if="Form.branchcode.$dirty && Form.branchcode.$error.pattern">Invalid branch code </span>
@@ -234,6 +244,22 @@
                                             <!--<span class="success text-small"-->
                                             <!--ng-if="Form.address.$valid">Thank You!</span>-->
                                         </div>
+                                        <div class="col-md-4 form-group"
+                                             ng-class="{'has-error':Form.feesTitle.$dirty && Form.feesTitle.$invalid, 'has-success':Form.feesTitle.$valid}">
+                                            <label>
+                                                Fees Receipt Title <span class="symbol required"></span>
+                                            </label>
+
+                                            <input type="text" capitalize  placeholder="Enter Fees Receipt Title"
+                                                   tabindex="8" class="form-control" name="feesTitle"
+                                                   ng-model="myModel.feesTitle" ng-pattern="/^[a-zA-Z0-9-._()/\s]*$/" required/>
+                                            <span class="error text-small block"
+                                                  ng-if="Form.feesTitle.$dirty && Form.feesTitle.$error.required">Fees receipt title is required</span>
+                                            <span class="error text-small block"
+                                                  ng-if="Form.feesTitle.$dirty && Form.feesTitle.$error.pattern">Invalid Fees receipt title </span>
+                                            <!--<span class="success text-small"-->
+                                            <!--ng-if="Form.feesTitle.$valid">Thank You!</span>-->
+                                        </div>
                                         <div class="col-md-4">
                                             <label>
                                                 Active/De-Active
@@ -257,52 +283,42 @@
 
                                         </div>
 
-                                        <div class="col-md-3">
-                                            <form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
-                                                <div class="file-upload">
-                                                    <div class="row">
-                                                        <div class="col-md-6">
+                                    </div>
+                                    <div class="row">
+                                    <div class="col-md-6">
+                                        <form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
+                                            <div class="file-upload">
+                                                <div class="row">
+                                                    <div class="col-md-6">
 
-                                                            <div class="form-group">
-                                                                <div class="user-image">
-                                                                    <h5>Branch Logo</h5>
-                                                                    <div class=" margin-bottom-5">
+                                                        <div class="form-group">
+                                                            <div class="user-image">
+                                                                <h5>Branch Logo</h5>
+                                                                <div class=" margin-bottom-5">
 
-                                                                    </div>
                                                                 </div>
-                                                                <!--<input type="file" file-model="idProof"
-                                                                       accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
-                                                                <div>
-                                                                    <div ng-repeat="step in stepsModel">
-                                                                        <!--<a class="close-thin"></a>-->
-                                                                        <img class="thumb" ng-src="{{step}}" />
-                                                                        <div class="col-md-12">
-                                                                            <div class="pull-right">
-                                                                                <button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImage()">Reset
-                                                                    </button>
-                                                                            </div>
+                                                            </div>
+                                                            <!--<input type="file" file-model="idProof"
+                                                                   accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
+                                                            <div>
+                                                                <div ng-repeat="step in stepsModel">
+                                                                    <!--<a class="close-thin"></a>-->
+                                                                    <img class="thumb" ng-src="{{step}}" />
+                                                                    <div class="col-md-12">
+                                                                        <div class="pull-right">
+                                                                            <button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImage()">Reset
+                                                                            </button>
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <input type="file" accept="image/*" file-upload onchange="angular.element(this).scope().imageUpload(event)" />
-                                                                <style>
-                                                                    .thumb {
-                                                                        width: 130px;
-                                                                        height: 140px;
-                                                                        margin: 18px;
-                                                                        float: left;
-                                                                    }
-
-                                                                    .uploader {
-                                                                        clear: both;
-                                                                    }
-                                                                </style>
                                                             </div>
+                                                            <input type="file" accept="image/*" file-upload onchange="angular.element(this).scope().imageUpload(event)" />
                                                         </div>
                                                     </div>
                                                 </div>
-                                            </form>
-                                        </div>
+                                            </div>
+                                        </form>
+                                    </div>
                                     </div>
                                     <div class="col-md-12">
                                         <div class="pull-right">