Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batch options in fees screen changes done

Browse Source
This commit is contained in:
gandhimathi 2018-04-17 13:19:13 +05:30
parent 6f88cabcb7
commit 0e238c7a36
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -58,6 +58,25 @@
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.feesType.$dirty && Form.feesType.$invalid">Sem/Year is required</span> ng-if="Form.feesType.$dirty && Form.feesType.$invalid">Sem/Year is required</span>
</div> </div>
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.batchname.$dirty && Form.batchname.$invalid, 'has-success':Form.batchname.$valid}">
<label ng-if="updateModel.feesType.ProgramType=='Y001' || updateModel.feesType.ProgramType=='P001' || updateModel.feesType.ProgramType=='P002'">
Batch <span class="symbol required"></span>
</label>
<label ng-if="updateModel.feesType.ProgramType!='Y001' && updateModel.feesType.ProgramType!='P001' && updateModel.feesType.ProgramType!='P002'">
Batch <!--<span class="symbol required"></span>-->
</label>
<input type="text" placeholder="Enter Batch Name"
tabindex="8" class="form-control" name="batchname"
ng-model="updateModel.feesType.BatchName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/>
<span class="error text-small block"
ng-if="Form.batchname.$dirty && Form.batchname.$error.required">Batch name is required</span>
<span class="error text-small block"
ng-if="Form.batchname.$dirty && Form.batchname.$error.pattern">Invalid batch name </span>
<!--<span class="success text-small"-->
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
</div>
<div class="col-md-3 form-group" <div class="col-md-3 form-group"
ng-class="{'has-error':Form.sessionname.$dirty && Form.sessionname.$invalid, 'has-success':Form.sessionname.$valid}"> ng-class="{'has-error':Form.sessionname.$dirty && Form.sessionname.$invalid, 'has-success':Form.sessionname.$valid}">
<label ng-if="updateModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"> <label ng-if="updateModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'">
@ -71,7 +90,7 @@
</label> </label>
<input type="text" placeholder="Enter Session Name" <input type="text" placeholder="Enter Session Name"
tabindex="8" class="form-control" name="sessionname" tabindex="9" class="form-control" name="sessionname"
ng-model="updateModel.feesType.SessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/> ng-model="updateModel.feesType.SessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.sessionname.$dirty && Form.sessionname.$error.required">Session name is required</span> ng-if="Form.sessionname.$dirty && Form.sessionname.$error.required">Session name is required</span>
@ -87,7 +106,7 @@
</label> </label>
<input type="text" placeholder="Enter Session Name" <input type="text" placeholder="Enter Session Name"
tabindex="9" class="form-control" name="sessionname" tabindex="10" class="form-control" name="sessionname"
ng-model="updateModel.feesType.ToSessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/> ng-model="updateModel.feesType.ToSessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.sessionname.$dirty && Form.sessionname.$error.required">Session name is required</span> ng-if="Form.sessionname.$dirty && Form.sessionname.$error.required">Session name is required</span>
@ -103,7 +122,7 @@
</label> </label>
<input type="text" placeholder="Enter Roll No" <input type="text" placeholder="Enter Roll No"
tabindex="10" class="form-control" name="rollNo" tabindex="11" class="form-control" name="rollNo"
ng-model="updateModel.feesType.RollNo" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" readonly/> ng-model="updateModel.feesType.RollNo" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" readonly/>
<!--<span class="error text-small block" <!--<span class="error text-small block"
ng-if="Form.rollNo.$dirty && Form.rollNo.$error.required">Roll No is required</span>--> ng-if="Form.rollNo.$dirty && Form.rollNo.$error.required">Roll No is required</span>-->
@ -120,7 +139,7 @@
</label> </label>
<input type="text" placeholder="Enter Fees Amount" <input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="11" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9" autofocus tabindex="12" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
ng-model="updateModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" required readonly/> ng-model="updateModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" required readonly/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid" ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
@ -136,7 +155,7 @@
</label> </label>
<input type="text" placeholder="Enter STF/WR Amount" <input type="text" placeholder="Enter STF/WR Amount"
autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9" autofocus tabindex="13" class="form-control" name="STF" id="STF" ng-maxlength="9"
ng-model="updateModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" readonly/> ng-model="updateModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" readonly/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.STF.$dirty && Form.STF.$invalid" ng-if="Form.STF.$dirty && Form.STF.$invalid"
@ -152,7 +171,7 @@
</label> </label>
<input type="text" placeholder="Enter Other Amount" <input type="text" placeholder="Enter Other Amount"
autofocus tabindex="13" class="form-control" name="others" id="others" ng-maxlength="9" autofocus tabindex="14" class="form-control" name="others" id="others" ng-maxlength="9"
ng-model="updateModel.feesType.Others" ng-pattern="/^[0-9]*$/" readonly/> ng-model="updateModel.feesType.Others" ng-pattern="/^[0-9]*$/" readonly/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.others.$dirty && Form.others.$invalid" ng-if="Form.others.$dirty && Form.others.$invalid"
@ -421,7 +440,8 @@
<thead> <thead>
<tr> <tr>
<th>Sem/Year</th> <th>Sem/Year</th>
<th>Course Name</th> <th>Course</th>
<th>Batch</th>
<th ng-if="existStudentFeesDetails[0].ProgramType=='P001' || existStudentFeesDetails[0].ProgramType=='P002'">Session From/Session To</th> <th ng-if="existStudentFeesDetails[0].ProgramType=='P001' || existStudentFeesDetails[0].ProgramType=='P002'">Session From/Session To</th>
<th ng-if="existStudentFeesDetails[0].ProgramType=='Y001'">Session</th> <th ng-if="existStudentFeesDetails[0].ProgramType=='Y001'">Session</th>
<th>Roll Number</th> <th>Roll Number</th>
@ -441,6 +461,7 @@
<tr> <tr>
<td>{{p.FeesName}}</td> <td>{{p.FeesName}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>
<td>{{p.BatchName}}</td>
<!--<td>{{p.SessionName}}</td> <!--<td>{{p.SessionName}}</td>
<td>{{p.ToSessionName}}</td>--> <td>{{p.ToSessionName}}</td>-->
<td ng-if="existStudentFeesDetails[0].ProgramType=='P001' || existStudentFeesDetails[0].ProgramType=='P002'">{{p.SessionName}}/{{p.ToSessionName}}</td> <td ng-if="existStudentFeesDetails[0].ProgramType=='P001' || existStudentFeesDetails[0].ProgramType=='P002'">{{p.SessionName}}/{{p.ToSessionName}}</td>
@ -544,8 +565,9 @@
<tr style="height: 24px;"> <tr style="height: 24px;">
<td style="width: 136px; height: 24px;"><strong>Course:</strong>&nbsp;{{items.CourseName}}</td> <td style="width: 136px; height: 24px;"><strong>Course:</strong>&nbsp;{{items.CourseName}}</td>
<td style="width: 136px; height: 24px;"><strong>Sem/Year:</strong>&nbsp;{{items.FeesName}}</td> <td style="width: 136px; height: 24px;"><strong>Sem/Year:</strong>&nbsp;{{items.FeesName}}</td>
<td ng-if="items.ToSessionName=='Not Applicale'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;{{items.SessionName}}</td> <td ng-if="items.SessionName!='Not Applicable' && items.ToSessionName=='Not Applicable'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;{{items.SessionName}}</td>
<td ng-if="items.ToSessionName!='Not Applicale'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;{{items.SessionName}}/{{items.ToSessionName}}</td> <td ng-if="items.SessionName!='Not Applicable' && items.ToSessionName!='Not Applicable'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;{{items.SessionName}}/{{items.ToSessionName}}</td>
<td ng-if="items.SessionName=='Not Applicable' && items.ToSessionName=='Not Applicable'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;</td>
<td style="width: 137px; height: 24px;"><strong>Univ:</strong>&nbsp;{{items.UniveShortName}}</td> <td style="width: 137px; height: 24px;"><strong>Univ:</strong>&nbsp;{{items.UniveShortName}}</td>
</tr> </tr>
<tr style="height: 24px;"> <tr style="height: 24px;">