course details changes done
This commit is contained in:
parent
2a21e4b2de
commit
93e191b336
@ -30,6 +30,36 @@
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.setfeesType.$dirty && Form.setfeesType.$invalid">Fees type is required</span>
|
||||
</div>
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.batchCode.$dirty && Form.batchCode.$invalid, 'has-success':Form.batchCode.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">
|
||||
<label>
|
||||
Batch <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" name="batchCode" tabindex="8" id="batchCode"
|
||||
ng-model="setModel.feesType.BatchCode"
|
||||
ng-options="batch.BatchCode as batch.BatchName for batch in BatchDetails" ng-click="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
|
||||
required>
|
||||
<option value=""> Select Batch</option>
|
||||
</select>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span>
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'">
|
||||
<label>
|
||||
Batch
|
||||
</label>
|
||||
<!--<select class="form-control" name="batchCode" tabindex="8" id="batchCode"
|
||||
ng-model="setModel.feesType.BatchCode"
|
||||
ng-options="batch.BatchCode as batch.BatchName for batch in BatchDetails" ng-click="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
|
||||
required>
|
||||
<option value=""> Select Batch</option>
|
||||
</select>-->
|
||||
<input type="text" placeholder="Enter Batch Name"
|
||||
tabindex="8" class="form-control" name="batchCode"
|
||||
ng-model="setModel.feesType.BatchCode" ng-readonly="true" />
|
||||
<!--<span class="error text-small block"
|
||||
ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span>-->
|
||||
</div>
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.setsessionname.$dirty && Form.setsessionname.$invalid, 'has-success':Form.setsessionname.$valid}">
|
||||
<label>
|
||||
@ -37,7 +67,7 @@
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Session Name"
|
||||
tabindex="8" class="form-control" name="setsessionname"
|
||||
tabindex="9" class="form-control" name="setsessionname"
|
||||
ng-model="setModel.feesType.SessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.setsessionname.$dirty && Form.setsessionname.$error.required">Session name is required</span>
|
||||
@ -53,13 +83,17 @@
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Roll No"
|
||||
tabindex="9" class="form-control" name="setrollNo"
|
||||
tabindex="10" class="form-control" name="setrollNo"
|
||||
ng-model="setModel.feesType.RollNo" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.setrollNo.$dirty && Form.setrollNo.$error.required">Roll no is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.setrollNo.$dirty && Form.setrollNo.$error.pattern">Invalid roll no </span>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid,'has-success':Form.feesAmount.$valid}">
|
||||
<label>
|
||||
@ -67,7 +101,7 @@
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Fees Amount"
|
||||
autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
|
||||
autofocus tabindex="11" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
|
||||
ng-model="setModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" readonly required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
|
||||
@ -77,10 +111,6 @@
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.STF.$dirty && Form.STF.$invalid}">
|
||||
<label>
|
||||
@ -88,8 +118,8 @@
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter STF/WR Amount"
|
||||
autofocus tabindex="11" class="form-control" name="STF" id="STF" ng-maxlength="9"
|
||||
ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
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');" 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>
|
||||
@ -104,8 +134,8 @@
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Other Amount"
|
||||
autofocus tabindex="12" class="form-control" name="others" id="others" ng-maxlength="9"
|
||||
ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
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');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" 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>
|
||||
@ -136,8 +166,8 @@
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Waiver Amount"
|
||||
autofocus tabindex="13" class="form-control" name="waiver" id="waiver" ng-maxlength="9"
|
||||
ng-model="setModel.feesType.Waiver" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
autofocus tabindex="14" class="form-control" name="waiver" id="waiver" ng-maxlength="9"
|
||||
ng-model="setModel.feesType.Waiver" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
<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>
|
||||
@ -145,6 +175,9 @@
|
||||
ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
|
||||
<label>
|
||||
@ -152,7 +185,7 @@
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Total Amount"
|
||||
autofocus tabindex="14" class="form-control" name="total" id="total" ng-maxlength="9"
|
||||
autofocus tabindex="15" class="form-control" name="total" id="total" ng-maxlength="9"
|
||||
ng-model="setTotalAmount" ng-pattern="/^[0-9]*$/" readonly/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.total.$dirty && Form.total.$invalid"
|
||||
@ -163,7 +196,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="row" ng-if="updateMoreItems.length>=1">
|
||||
<div class="col-md-12">
|
||||
<div class="panel panel-white" id="panel2">
|
||||
<div class="panel-heading bg-light-blue">
|
||||
@ -176,9 +209,87 @@
|
||||
|
||||
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
|
||||
<div class="panel-body">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group"
|
||||
<div class="col-md-3">
|
||||
<input type="button" class="btn btn-sm btn-info" title="Click to add one more items" value="Add More" ng-click="clickMoreItems(Form,setModel.feesType);" style="margin-top:0%;" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
</div>
|
||||
</div>
|
||||
</br>
|
||||
|
||||
<div class="row" ng-repeat="n in updateMoreItems">
|
||||
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.Name==undefined, 'has-success':n.Name!=undefined}">
|
||||
<label> Installment
|
||||
<span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Installment"
|
||||
class="form-control" name="instllment{{$index}}"
|
||||
ng-model="n.Name" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required/>
|
||||
<span class="error text-small block" ng-if="n.Name==undefined">Enter a valid installment</span>
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.Amount==undefined, 'has-success':n.Amount!=undefined}">
|
||||
<label>
|
||||
Amount
|
||||
<span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<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'" required/>
|
||||
<span class="error text-small block" ng-if="n.Amount==undefined">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<!-- <div class="col-md-3 form-group" ng-class="{'has-error':n.DueDate==undefined, 'has-success':n.DueDate!=undefined}">
|
||||
<label>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Date"
|
||||
autofocus class="form-control" name="date{{$index}}" id="date{{$index}}"
|
||||
ng-model="n.DueDate" required/>
|
||||
<span class="error text-small block" ng-if="n.DueDate==undefined">Enter a valid date</span>
|
||||
|
||||
</div>-->
|
||||
|
||||
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':n.DueDate==undefined, 'has-success':n.DueDate!=undefined}">
|
||||
<label> Due Date
|
||||
<span class="symbol required"></span>
|
||||
</label>
|
||||
<input type="text"
|
||||
class="form-control " tabindex="16"
|
||||
ng-click="startOpen = !startOpen"
|
||||
datepicker-popup="dd-MM-yyyy"
|
||||
ng-model="n.DueDate"
|
||||
is-open="startOpen"
|
||||
ng-init="startOpen = false"
|
||||
name="date{{$index}}"
|
||||
datepicker-options="dateOptions"
|
||||
placeholder="Select Date"
|
||||
min-date="getDateArray[$index].Date"
|
||||
max-date="getDateArray[$index+2].Date"
|
||||
close-text="Close" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required="required"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="n.DueDate==undefined">Date is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.date.$valid ">Thank You</span>-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<!--<div class="row">
|
||||
<!–<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.insName.$dirty && Form.insName.$invalid,'has-success':Form.insName.$valid}">
|
||||
<label>
|
||||
Installment <span
|
||||
@ -232,83 +343,15 @@
|
||||
close-text="Close" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required="required"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.date.$dirty && Form.date.$error.required">Date is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.date.$valid ">Thank You</span>-->
|
||||
<!–<span class="success text-small block"–>
|
||||
<!–ng-if="Form.date.$valid ">Thank You</span>–>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>–>
|
||||
<div class="col-md-3">
|
||||
<input type="button" class="btn btn-sm btn-info" title="Click to add one more items" value="Add More" ng-click="clickMoreItems(myModelInstallemt,Form,setModel.feesType);" style="margin-top:16%;" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
<input type="button" class="btn btn-sm btn-info" title="Click to add one more items" value="Add More" ng-click="clickMoreItems(Form,setModel.feesType);" style="margin-top:16%;" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" ng-repeat="n in updateMoreItems">
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.Name==undefined, 'has-success':n.Name!=undefined}">
|
||||
<label>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Installment"
|
||||
class="form-control" name="instllment{{$index}}"
|
||||
ng-model="n.Name" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required/>
|
||||
<span class="error text-small block" ng-if="n.Name==undefined">Enter a valid installment</span>
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.Amount==undefined, 'has-success':n.Amount!=undefined}">
|
||||
<label>
|
||||
</label>
|
||||
|
||||
<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'" required/>
|
||||
<span class="error text-small block" ng-if="n.Amount==undefined">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<!-- <div class="col-md-3 form-group" ng-class="{'has-error':n.DueDate==undefined, 'has-success':n.DueDate!=undefined}">
|
||||
<label>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Date"
|
||||
autofocus class="form-control" name="date{{$index}}" id="date{{$index}}"
|
||||
ng-model="n.DueDate" required/>
|
||||
<span class="error text-small block" ng-if="n.DueDate==undefined">Enter a valid date</span>
|
||||
|
||||
</div>-->
|
||||
|
||||
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':n.DueDate==undefined, 'has-success':n.DueDate!=undefined}">
|
||||
<label>
|
||||
|
||||
</label>
|
||||
<input type="text"
|
||||
class="form-control " tabindex="16"
|
||||
ng-click="startOpen = !startOpen"
|
||||
datepicker-popup="dd-MM-yyyy"
|
||||
ng-model="n.DueDate"
|
||||
is-open="startOpen"
|
||||
ng-init="startOpen = false"
|
||||
name="date{{$index}}"
|
||||
datepicker-options="dateOptions"
|
||||
placeholder="Select Date"
|
||||
max-date="futureDate"
|
||||
close-text="Close" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required="required"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="n.DueDate==undefined">Date is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.date.$valid ">Thank You</span>-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
|
||||
</div>
|
||||
@ -321,11 +364,11 @@
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ladda="ldloading5.zoom_in" tabindex="17" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="submitFeesForStudent(user,Form,setModel.feesType,'zoom-in',myModelInstallemt)" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"> <!--ng-disabled="setModel.feesType.ExistValue=='1'"-->
|
||||
<button type="submit" ladda="ldloading5.zoom_in" tabindex="16" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="submitFeesForStudent(user,Form,setModel.feesType,'zoom-in')" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"> <!--ng-disabled="setModel.feesType.ExistValue=='1'"-->
|
||||
Save
|
||||
</button>
|
||||
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="18" value="Cancel"
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="17" value="Cancel"
|
||||
ng-click="cancel();">
|
||||
|
||||
</input>
|
||||
@ -357,7 +400,7 @@
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in feesStructureInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
||||
<tbody ng-repeat="p in feesStructureInfo|orderBy:sortKey:reverse|filter:search:strict">
|
||||
<tr ng-if="p.ExistValue=='1'">
|
||||
<td>{{p.Sem_Year}}</td>
|
||||
<td>{{p.SessionName}}</td>
|
||||
@ -374,8 +417,8 @@
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
<!--<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>-->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user