From 4bf1313c20456f64030307471ee86a730fe5ad2c Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 10 May 2018 10:54:25 +0530
Subject: [PATCH] fine amount calculation removed from fees status

---
 .../views/status-update/setFeesForStudent.html       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html
index 6b5304ec..2f810876 100755
--- a/Apollo/assets/views/status-update/setFeesForStudent.html
+++ b/Apollo/assets/views/status-update/setFeesForStudent.html
@@ -167,10 +167,8 @@
 
                                     <input type="text"  placeholder="Enter STF/WR Amount"
                                            autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9"
-                                           ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','2','2',{{setModel.feesType.STFOrWR}});" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-if="setModel.feesType.STFOrWR!=''"/>
-                                    <input type="text"  placeholder="Enter STF/WR Amount"
-                                           autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9"
-                                           ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','2','2',0);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-if="setModel.feesType.STFOrWR==''"/>
+                                           ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}});" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
+
                                     <span class="error text-small block"
                                           ng-if="Form.STF.$dirty && Form.STF.$invalid"
                                           ng-hide="Form.STF.$error.maxlength || Form.STF.$error.pattern">STF/WR amount is required</span>
@@ -186,7 +184,7 @@
 
                                     <input type="text"  placeholder="Enter Other Amount"
                                            autofocus tabindex="13" class="form-control" name="others" id="others" ng-maxlength="9"
-                                           ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','1','2',{{setModel.feesType.STFOrWR}});" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" readonly/>
+                                           ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}});" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
                                     <span class="error text-small block"
                                           ng-if="Form.others.$dirty && Form.others.$invalid"
                                           ng-hide="Form.others.$error.maxlength || Form.others.$error.pattern">Others amount is required</span>
@@ -284,7 +282,7 @@
 
                                                         <input type="text"  placeholder="Enter Fees Amount"
                                                                autofocus class="form-control" name="amount{{$index}}" id="amount{{$index}}" ng-maxlength="8"
-                                                               ng-model="n.Amount" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"  ng-change="changeInstallemtAmt('{{n.Amount}}',n.Amount,$index,setModel.feesType,setTotalAmount,setModel.feesType.Others);" required/>
+                                                               ng-model="n.Amount" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"  ng-change="changeInstallemtAmt('{{n.Amount}}',n.Amount,$index,setModel.feesType);" required/>
                                                         <!--ng-readonly="updateMoreItems.length==$index+1"-->
                                                         <span class="error text-small block"  ng-if="n.Amount==undefined">Enter a valid amount</span>
 
@@ -320,7 +318,7 @@
                                                                    min-date="getDateArray[$index].Date"
                                                                    max-date="getDateArray[$index+2].Date"
                                                                     show-button-bar="false"
-                                                                   close-text="Close" ng-change="calculateDueAmount(setModel.feesType,setTotalAmount,setModel.feesType.Others,setModel.feesType.STFOrWR,'1',setModel.feesType.STFOrWR);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true"  required="required"/>
+                                                                   close-text="Close" ng-change="calculateDueAmount(setModel.feesType,setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true"  required="required"/>
                                                             <span class="error text-small block"
                                                                   ng-if="n.DueDate==undefined">Date is required.</span>
                                                             <!--<span class="success text-small block"-->