From b141de2d79dfe05f3010b8e6865cacd6e71063a6 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 23 Dec 2017 18:43:39 +0530
Subject: [PATCH] course details changes done

---
 .../views/status-update/updateFeesStatus.html | 193 ++++++++++++++----
 1 file changed, 151 insertions(+), 42 deletions(-)

diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html
index 3273c6c1..9271d03e 100644
--- a/Apollo/assets/views/status-update/updateFeesStatus.html
+++ b/Apollo/assets/views/status-update/updateFeesStatus.html
@@ -38,12 +38,13 @@
                    <!-- <legend>
                         Update Fees Status
                     </legend>-->
-                    <div class="col-md-6">
+
+                    <div class="col-md-12">
                         <fieldset>
                             <legend>Fees Details</legend>
                             <div class="row">
 
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.feesType.$dirty && Form.feesType.$invalid, 'has-success':Form.feesType.$valid}">
                                     <label>
                                         Fees Type <span class="symbol required"></span>
@@ -51,13 +52,13 @@
                                     <select class="form-control" name="feesType" tabindex="7" id="feesType"
                                             ng-model="updateModel.feesType"
                                             ng-options="fees.Sem_Year for fees in studentFeesInfo"
-                                            required ng-change="changeTotalFees(updateModel,'0');">
+                                            required ng-change="changeTotalFees(updateModel.feesType);">
                                         <option value=""> Select Fees Type</option>
                                     </select>
                                     <span class="error text-small block"
                                           ng-if="Form.feesType.$dirty && Form.feesType.$invalid">Fees type is required</span>
                                 </div>
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.sessionname.$dirty && Form.sessionname.$invalid, 'has-success':Form.sessionname.$valid}">
                                     <label>
                                         Session Name <span class="symbol required"></span>
@@ -65,7 +66,7 @@
 
                                     <input type="text"  placeholder="Enter Session Name"
                                            tabindex="8" class="form-control" name="sessionname"
-                                           ng-model="updateModel.sessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required />
+                                           ng-model="updateModel.feesType.SessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/>
                                     <span class="error text-small block"
                                           ng-if="Form.sessionname.$dirty && Form.sessionname.$error.required">Session name is required</span>
                                     <span class="error text-small block"
@@ -73,8 +74,25 @@
                                     <!--<span class="success text-small"-->
                                     <!--ng-if="Form.stopname.$valid">Thank You!</span>-->
                                 </div>
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.rollNo.$dirty && Form.rollNo.$invalid, 'has-success':Form.rollNo.$valid}">
+                                    <label>
+                                        Roll Number <span class="symbol required"></span>
+                                    </label>
 
-                                <div class="col-md-6 form-group"
+                                    <input type="text"  placeholder="Enter Roll No"
+                                           tabindex="8" class="form-control" name="rollNo"
+                                           ng-model="updateModel.feesType.RollNo" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/>
+                                    <span class="error text-small block"
+                                          ng-if="Form.rollNo.$dirty && Form.rollNo.$error.required">Roll No is required</span>
+                                    <span class="error text-small block"
+                                          ng-if="Form.rollNo.$dirty && Form.rollNo.$error.pattern">Invalid roll no </span>
+                                    <!--<span class="success text-small"-->
+                                    <!--ng-if="Form.stopname.$valid">Thank You!</span>-->
+                                </div>
+
+
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid,'has-success':Form.feesAmount.$valid}">
                                     <label>
                                         Course Fees <span class="symbol required"></span>
@@ -82,7 +100,7 @@
 
                                     <input type="text"  placeholder="Enter Fees Amount"
                                            autofocus tabindex="9" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
-                                           ng-model="updateModel.feesType.PendingFees" ng-pattern="/^[0-9]*$/" required ng-change="changeTotalFees(updateModel,'1');"/>
+                                           ng-model="updateModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" required readonly/>
                                     <span class="error text-small block"
                                           ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
                                           ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>
@@ -90,7 +108,9 @@
                                           ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
 
                                 </div>
-                                <div class="col-md-6 form-group"
+                            </div>
+                            <div class="row">
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.STF.$dirty && Form.STF.$invalid}">
                                     <label>
                                         STF/WR
@@ -98,7 +118,7 @@
 
                                     <input type="text"  placeholder="Enter STF/WR Amount"
                                            autofocus tabindex="10" class="form-control" name="STF" id="STF" ng-maxlength="9"
-                                           ng-model="updateModel.STF_WR" ng-pattern="/^[0-9]*$/" ng-change="changeTotalFees(updateModel,'1');" />
+                                           ng-model="updateModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" readonly/>
                                     <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>
@@ -106,7 +126,7 @@
                                           ng-if="Form.STF.$error.maxlength || Form.STF.$error.pattern">Enter a valid amount</span>
 
                                 </div>
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.others.$dirty && Form.others.$invalid}">
                                     <label>
                                         Others</span>
@@ -114,7 +134,7 @@
 
                                     <input type="text"  placeholder="Enter Other Amount"
                                            autofocus tabindex="11" class="form-control" name="others" id="others" ng-maxlength="9"
-                                           ng-model="updateModel.others" ng-pattern="/^[0-9]*$/" ng-change="changeTotalFees(updateModel,'1');"/>
+                                           ng-model="updateModel.feesType.Others" ng-pattern="/^[0-9]*$/" readonly/>
                                     <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>
@@ -122,7 +142,7 @@
                                           ng-if="Form.others.$error.maxlength || Form.others.$error.pattern">Enter a valid amount</span>
 
                                 </div>
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
                                     <label>
                                         Waiver</span>
@@ -130,7 +150,7 @@
 
                                     <input type="text"  placeholder="Enter Waiver Amount"
                                            autofocus tabindex="12" class="form-control" name="waiver" id="waiver" ng-maxlength="9"
-                                           ng-model="updateModel.waiver" ng-pattern="/^[0-9]*$/" ng-change="changeTotalFees(updateModel,'1');"/>
+                                           ng-model="updateModel.feesType.Waiver" ng-pattern="/^[0-9]*$/" readonly/>
                                     <span class="error text-small block"
                                           ng-if="Form.waiver.$dirty && Form.waiver.$invalid"
                                           ng-hide="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Waiver amount is required</span>
@@ -138,15 +158,15 @@
                                           ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
 
                                 </div>
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
                                     <label>
-                                        Total Fees</span>
+                                        Total Payable Fees</span>
                                     </label>
 
                                     <input type="text"  placeholder="Enter Total Amount"
                                            autofocus tabindex="13" class="form-control" name="total" id="total" ng-maxlength="9"
-                                           ng-model="updateModel.total" ng-pattern="/^[0-9]*$/"/>
+                                           ng-model="updateModel.feesType.BalanceAmount" ng-pattern="/^[0-9]*$/" readonly/>
                                     <span class="error text-small block"
                                           ng-if="Form.total.$dirty && Form.total.$invalid"
                                           ng-hide="Form.total.$error.maxlength || Form.total.$error.pattern">Total amount is required</span>
@@ -154,20 +174,7 @@
                                           ng-if="Form.total.$error.maxlength || Form.total.$error.pattern">Enter a valid amount</span>
 
                                 </div>
-                                <div class="col-md-6 form-group"
-                                     ng-class="{'has-error':Form.trackStatus.$dirty && Form.trackStatus.$invalid, 'has-success':Form.trackStatus.$valid}">
-                                    <label>
-                                        Status For Track <span class="symbol required"></span>
-                                    </label>
-                                    <select class="form-control" name="trackStatus" tabindex="14" id="trackStatus"
-                                            ng-model="updateModel.statusCode"
-                                            ng-options="trackS.ListCode as trackS.ListName for trackS in getFeesUpdateStatus"
-                                            required>
-                                        <option value=""> Select Status</option>
-                                    </select>
-                                    <span class="error text-small block"
-                                          ng-if="Form.trackStatus.$dirty && Form.trackStatus.$invalid">Status is required</span>
-                                </div>
+
 
 
 
@@ -176,16 +183,100 @@
                             </div>
 
 
-                </fieldset>
+                        </fieldset>
 
 
                     </div>
-                    <div class="col-md-6">
+                    <div class="col-md-12">
+                        <fieldset>
+                            <legend>Course End Fees</legend>
+                            <div class="row">
+
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.provFess.$dirty && Form.provFess.$invalid}">
+                                    <label>
+                                        Prov Cert Fees
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter Prov Cert Fees"
+                                           autofocus tabindex="8" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
+                                           ng-model="updateModel.feesType.PC" ng-pattern="/^[0-9]*$/" readonly>
+                                    <span class="error text-small block"
+                                          ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
+
+                                </div>
+
+
+
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.transferAmount.$dirty && Form.transferAmount.$invalid}">
+                                    <label>
+                                        Transfer Cert Fees
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter transfer Cert Fees"
+                                           autofocus tabindex="9" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
+                                           ng-model="updateModel.feesType.TC" ng-pattern="/^[0-9]*$/" readonly>
+                                    <span class="error text-small block"
+                                          ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
+
+                                </div>
+
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.degreeAmount.$dirty && Form.degreeAmount.$invalid}">
+                                    <label>
+                                        Degree Cert Fees
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter Degree Cert Fees"
+                                           autofocus tabindex="10" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
+                                           ng-model="updateModel.feesType.DC" ng-pattern="/^[0-9]*$/" readonly>
+                                    <span class="error text-small block"
+                                          ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
+
+                                </div>
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.migrationAmount.$dirty && Form.migrationAmount.$invalid}">
+                                    <label>
+                                        Migration Cert Fees
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter Migration Cert Fees"
+                                           autofocus tabindex="11" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
+                                           ng-model="updateModel.feesType.MC" ng-pattern="/^[0-9]*$/" readonly>
+                                    <span class="error text-small block"
+                                          ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
+
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.otherAmount.$dirty && Form.otherAmount.$invalid}">
+                                    <label>
+                                        Other Fees
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter Other Fees"
+                                           autofocus tabindex="12" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
+                                           ng-model="updateModel.feesType.OtherFees" ng-pattern="/^[0-9]*$/" readonly>
+                                    <span class="error text-small block"
+                                          ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
+
+                                </div>
+                            </div>
+
+
+
+                        </fieldset>
+
+
+                    </div>
+                    <div class="col-md-12">
                         <fieldset>
                             <legend>Bill Details</legend>
                             <div class="row">
                                 <div data-ng-controller="DatepickerDemoCtrl">
-                                    <div class="col-md-6 form-group"
+                                    <div class="col-md-3 form-group"
                                          ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
                                         <label>
                                            Bill Date <span
@@ -212,7 +303,7 @@
 
                                 </div>
 
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.billno.$dirty && Form.billno.$invalid, 'has-success':Form.billno.$valid}">
                                     <label>
                                         Bill No <span class="symbol required"></span>
@@ -226,7 +317,7 @@
                                     <span class="error text-small block"
                                           ng-if="Form.billno.$dirty && Form.billno.$error.pattern">Invalid bill no </span>
                                 </div>
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.billAmount.$dirty && Form.billAmount.$invalid,'has-success':Form.billAmount.$valid}">
                                     <label>
                                         Bill Amount <span class="symbol required"></span>
@@ -243,7 +334,7 @@
 
                                 </div>
 
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.paymentOn.$dirty && Form.paymentOn.$invalid, 'has-success':Form.paymentOn.$valid}">
                                     <label>
                                         Mode Of Payment <span class="symbol required"></span>
@@ -257,8 +348,22 @@
                                     <span class="error text-small block"
                                           ng-if="Form.paymentOn.$dirty && Form.paymentOn.$invalid">Payment type is required</span>
                                 </div>
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.trackStatus.$dirty && Form.trackStatus.$invalid, 'has-success':Form.trackStatus.$valid}">
+                                    <label>
+                                        Status For Track <span class="symbol required"></span>
+                                    </label>
+                                    <select class="form-control" name="trackStatus" tabindex="14" id="trackStatus"
+                                            ng-model="updateModel.statusCode"
+                                            ng-options="trackS.ListCode as trackS.ListName for trackS in getFeesUpdateStatus"
+                                            required>
+                                        <option value=""> Select Status</option>
+                                    </select>
+                                    <span class="error text-small block"
+                                          ng-if="Form.trackStatus.$dirty && Form.trackStatus.$invalid">Status is required</span>
+                                </div>
 
-                                <div class="col-md-12 form-group"
+                                <div class="col-md-4 form-group"
                                      ng-class="{'has-error':Form.studcomments.$dirty && Form.studcomments.$invalid,'has-success':Form.studcomments.$valid}">
                                     <label>
                                         Comments For Student <span class="symbol required"></span>
@@ -271,7 +376,7 @@
                                     <!--<span class="success text-small"-->
                                     <!--ng-if="Form.address.$valid">Thank You!</span>-->
                                 </div>
-                                <div class="col-md-12 form-group"
+                                <div class="col-md-4 form-group"
                                      ng-class="{'has-error':Form.internalcomments.$dirty && Form.internalcomments.$invalid,'has-success':Form.internalcomments.$valid}">
                                     <label>
                                         Comments For Internal <span class="symbol required"></span>
@@ -300,10 +405,13 @@
                                     <tr>
                                         <th>Fees Name</th>
                                         <th>Course Name</th>
-                                        <th>Total Payable</th>
+                                        <th>Session Name</th>
+                                        <th>Roll Number</th>
+                                        <th>Course Fees</th>
                                         <th>STF/WR</th>
                                         <th>Others</th>
                                         <th>Waiver</th>
+                                        <th>Payable Fees</th>
                                         <th>Paid</th>
                                         <th>Balance</th>
                                         <th></th>
@@ -314,10 +422,13 @@
                                     <tr>
                                         <td>{{p.FeesName}}</td>
                                         <td>{{p.CourseName}}</td>
-                                        <td>{{p.PayableAmount}}</td>
+                                        <td>{{p.SessionName}}</td>
+                                        <td>{{p.RollNo}}</td>
+                                        <td>{{p.CourseFees}}</td>
                                         <td>{{p.STFOrWR}}</td>
                                         <td>{{p.Others}}</td>
                                         <td>{{p.Waiver}}</td>
+                                        <td>{{p.PayableAmount}}</td>
                                         <td>{{p.PaidBillAmount}}</td>
                                         <td>{{p.BalanceAmount}}</td>
 
@@ -341,7 +452,6 @@
                                                     <th>Bill NO</th>
                                                     <th>Bill Date</th>
                                                     <th>Bill Amount</th>
-                                                    <th>Session Name</th>
                                                     <th>Print</th>
                                                 </tr>
                                                 </thead>
@@ -350,7 +460,6 @@
                                                     <td>{{v.BillNO}}</td>
                                                     <td>{{v.BillDate}}</td>
                                                     <td>{{v.BillAmount}}</td>
-                                                    <td>{{v.SessionID}}</td>
                                                     <td>
                                                         <a tooltip="Click to print" ng-mouseleave="mouseLeave()" pdf-save-button="{{v.BillNO}}" pdf-name="Billno-{{v.BillNO}}.pdf" class="btn"><i class="fa fa-print" ng-click="ShowHide(v)"></i></a>