From 3ddf79de2385fe0ec646de5f5e5b71222ab825bd Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 9 Aug 2018 11:57:23 +0530
Subject: [PATCH] bug fixes-Re-alignment

---
 .../views/hallticket/generatehallticket.html  | 25 ++++++++++---------
 .../reregistration/reregistrationform.html    | 25 ++++++++++---------
 .../status-update/answer_booklet_status.html  | 21 ++++++++--------
 .../status-update/application_status.html     | 21 ++++++++--------
 .../status-update/certification_status.html   | 21 ++++++++--------
 .../status-update/study_material_status.html  | 21 ++++++++--------
 .../views/status-update/updateFeesStatus.html |  1 +
 7 files changed, 71 insertions(+), 64 deletions(-)

diff --git a/Apollo/assets/views/hallticket/generatehallticket.html b/Apollo/assets/views/hallticket/generatehallticket.html
index fd87aad5..8832f41f 100755
--- a/Apollo/assets/views/hallticket/generatehallticket.html
+++ b/Apollo/assets/views/hallticket/generatehallticket.html
@@ -57,6 +57,19 @@
 						 <!-- <pre>{{myModel.universityName | json}}</pre>-->
 
                     </div>
+					<div class="col-md-2 form-group">
+							
+							 <label>
+                           Batch Name
+								</label>
+								<select ui-select2 class="form-control" name="batch" tabindex="4" id="batch"
+										ng-model="myModel.batchName" ng-change="captureBatchName()"
+										>
+									<option value=""> Select Batch</option>
+									<option ng-repeat="batchDetails in myModel.universityName.batchDetails"  value="{{batchDetails.BatchCode}}"><span ng-show="batchDetails.BatchCode != ''"><strong>{{batchDetails.BatchName}}</strong></span></option>
+								</select>
+						<!-- <pre>{{myModel.batchName | json}}</pre> -->
+							</div>
                     <div class="col-md-3 form-group">
                         <label>
                             Course
@@ -70,19 +83,7 @@
 						<!-- <pre>{{myModel.courseName|json}}</pre> -->
                     </div>
 					
-							<div class="col-md-2 form-group">
 							
-							 <label>
-                           Batch Name
-								</label>
-								<select ui-select2 class="form-control" name="batch" tabindex="4" id="batch"
-										ng-model="myModel.batchName" ng-change="captureBatchName()"
-										>
-									<option value=""> Select Batch</option>
-									<option ng-repeat="batchDetails in myModel.universityName.batchDetails"  value="{{batchDetails.BatchCode}}"><span ng-show="batchDetails.BatchCode != ''"><strong>{{batchDetails.BatchName}}</strong></span></option>
-								</select>
-						<!-- <pre>{{myModel.batchName | json}}</pre> -->
-							</div>
 							
 							<div class="col-md-2 form-group">
 						
diff --git a/Apollo/assets/views/reregistration/reregistrationform.html b/Apollo/assets/views/reregistration/reregistrationform.html
index 7ae06b95..034d24ab 100644
--- a/Apollo/assets/views/reregistration/reregistrationform.html
+++ b/Apollo/assets/views/reregistration/reregistrationform.html
@@ -55,6 +55,19 @@
                      <!-- <pre>{{myModel.universityName | json}}</pre>-->
 
                 </div>
+				<div class="col-md-2 form-group">
+                        
+                         <label>
+                       Batch Name
+                            </label>
+                            <select ui-select2 class="form-control" name="batch" tabindex="4" id="batch"
+                                    ng-model="myModel.batchName"
+                                    >
+                                <option value=""> Select Batch</option>
+                                <option ng-repeat="batchDetails in myModel.universityName.batchDetails"  value="{{batchDetails.BatchCode}}"><span ng-show="batchDetails.BatchCode != ''"><strong>{{batchDetails.BatchName}}</strong></span></option>
+                            </select>
+                    <!-- <pre>{{myModel.batchName | json}}</pre> -->
+                        </div>
                 <div class="col-md-3 form-group">
                     <label>
                         Course
@@ -68,19 +81,7 @@
                     <!-- <pre>{{myModel.courseName|json}}</pre> -->
                 </div>
                 
-                        <div class="col-md-2 form-group">
                         
-                         <label>
-                       Batch Name
-                            </label>
-                            <select ui-select2 class="form-control" name="batch" tabindex="4" id="batch"
-                                    ng-model="myModel.batchName"
-                                    >
-                                <option value=""> Select Batch</option>
-                                <option ng-repeat="batchDetails in myModel.universityName.batchDetails"  value="{{batchDetails.BatchCode}}"><span ng-show="batchDetails.BatchCode != ''"><strong>{{batchDetails.BatchName}}</strong></span></option>
-                            </select>
-                    <!-- <pre>{{myModel.batchName | json}}</pre> -->
-                        </div>
                         
                         <div class="col-md-2 form-group">
                     
diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html
index 1c321d17..55c3bc4d 100755
--- a/Apollo/assets/views/status-update/answer_booklet_status.html
+++ b/Apollo/assets/views/status-update/answer_booklet_status.html
@@ -31,6 +31,16 @@
                             </select>
                         </div>
 
+						 <div class="col-md-4">
+                            <label for="form-field-select-2">
+                                               Batch 
+                        </label>
+
+                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
+                        <option value=""  selected>Select Batch</option>
+                        <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
+                        </select>
+                        </div>
 
                         <div class="col-md-4">
                         <div class="col-md-12">
@@ -50,16 +60,7 @@
                         </div>
                         
 
-                        <div class="col-md-4">
-                            <label for="form-field-select-2">
-                                               Batch 
-                        </label>
-
-                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
-                        <option value=""  selected>Select Batch</option>
-                        <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
-                        </select>
-                        </div>
+                       
 
 
                     </div>
diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html
index a8db0608..d8b395dd 100755
--- a/Apollo/assets/views/status-update/application_status.html
+++ b/Apollo/assets/views/status-update/application_status.html
@@ -31,7 +31,17 @@
                             </select>
                         </div>
 
+                         <div class="col-md-4">
+                            <label for="form-field-select-2">
+                                               Batch 
+                        </label>
 
+                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
+                        <option value=""  selected>Select Batch</option>
+                         <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
+                        </select>
+                        </div>
+						
                         <div class="col-md-4">
                          <div class="col-md-12">
                             <div class="col-md-12">
@@ -49,16 +59,7 @@
                         </div>
                         </div>
 
-                        <div class="col-md-4">
-                            <label for="form-field-select-2">
-                                               Batch 
-                        </label>
-
-                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
-                        <option value=""  selected>Select Batch</option>
-                         <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
-                        </select>
-                        </div>
+                       
 
 
                     </div>
diff --git a/Apollo/assets/views/status-update/certification_status.html b/Apollo/assets/views/status-update/certification_status.html
index afd3ae1f..ae8fef58 100755
--- a/Apollo/assets/views/status-update/certification_status.html
+++ b/Apollo/assets/views/status-update/certification_status.html
@@ -31,7 +31,17 @@
                             </select>
                         </div>
 
+                         <div class="col-md-4">
+                            <label for="form-field-select-2">
+                                               Batch 
+                        </label>
 
+                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
+                        <option value=""  selected>Select Batch</option>
+                          <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
+                        </select>
+                        </div>
+						
                         <div class="col-md-4">
                         <div class="col-md-12">
                             <div class="col-md-12">
@@ -48,16 +58,7 @@
                         </div>
                         </div>
 
-                        <div class="col-md-4">
-                            <label for="form-field-select-2">
-                                               Batch 
-                        </label>
-
-                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
-                        <option value=""  selected>Select Batch</option>
-                          <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
-                        </select>
-                        </div>
+                       
 
 
                     </div>
diff --git a/Apollo/assets/views/status-update/study_material_status.html b/Apollo/assets/views/status-update/study_material_status.html
index 73458840..2d6b5ea5 100755
--- a/Apollo/assets/views/status-update/study_material_status.html
+++ b/Apollo/assets/views/status-update/study_material_status.html
@@ -31,7 +31,17 @@
                             </select>
                         </div>
 
+                         <div class="col-md-4">
+                            <label for="form-field-select-2">
+                                               Batch
+                        </label>
 
+                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
+                        <option value="" selected>Select Batch</option>
+                        <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
+                        </select>
+                        </div>
+						
                         <div class="col-md-4">
                         <div class="col-md-12">
                             <div class="col-md-12">
@@ -50,16 +60,7 @@
                         </div>
                         </div>
 
-                        <div class="col-md-4">
-                            <label for="form-field-select-2">
-                                               Batch
-                        </label>
-
-                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
-                        <option value="" selected>Select Batch</option>
-                        <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
-                        </select>
-                        </div>
+                       
 
 
                     </div>
diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html
index eb7c3a9e..42c0ba7d 100755
--- a/Apollo/assets/views/status-update/updateFeesStatus.html
+++ b/Apollo/assets/views/status-update/updateFeesStatus.html
@@ -283,6 +283,7 @@
                                     <input type="text"  placeholder="Enter Fees Amount"
                                            autofocus tabindex="19" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
                                            ng-model="updateModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
+										   <span style="font-size: 11px;color:red;">Total Payable:</span><span style="font-size: 11px;">Rs.{{updateModel.feesType.BalanceAmount}}</span>
                                     <span class="error text-small block"
                                           ng-if="Form.billAmount.$dirty && Form.billAmount.$invalid"
                                           ng-hide="Form.billAmount.$error.maxlength || Form.billAmount.$error.pattern">Bill amount is required</span>