Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollosc
This commit is contained in:
gayathri1990
commit
b37e9acd0a
@ -116,7 +116,9 @@
|
||||
</td>
|
||||
<td>{{app.comments}}</td>
|
||||
<td>
|
||||
<i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i>
|
||||
<i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> |
|
||||
<i class="fa fa-money line-height-table" tooltip="Fees" (click)="feesModal.show();getFeesModelWindowDetails(app)"></i>
|
||||
|
||||
<!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
|
||||
</td>
|
||||
</tr>
|
||||
@ -321,7 +323,7 @@
|
||||
|
||||
</tab>
|
||||
<tab>
|
||||
<ng-template tabHeading>Re-registertion</ng-template>
|
||||
<ng-template tabHeading>Re-registration</ng-template>
|
||||
<div>
|
||||
<div class="card line-height">
|
||||
<div class="card-header">
|
||||
@ -400,6 +402,86 @@
|
||||
</div>
|
||||
</div>
|
||||
</tab>
|
||||
<tab>
|
||||
<ng-template tabHeading>Other Registration</ng-template>
|
||||
<div>
|
||||
<div class="card line-height">
|
||||
<div class="card-header">
|
||||
Other Registration
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class=" form-group col-md-3">
|
||||
<label>Form ID</label>
|
||||
<div class="input-prepend input-group">
|
||||
<input id="otherSearch" class="form-control" type="text" placeholder="Form ID">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Enrolment Number</label>
|
||||
<div class="input-prepend input-group">
|
||||
<input id="otherEnrolment" class="form-control" type="text" placeholder="Enrolment Number">
|
||||
</div>
|
||||
</div>
|
||||
<div class=" form-group col-md-3">
|
||||
<label>Student Name</label>
|
||||
<div class="input-prepend input-group">
|
||||
<input id="otherStudent" class="form-control" type="text" placeholder="Student Name">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label></label>
|
||||
<div class="input-prepend input-group">
|
||||
<button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Search</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div align="right">
|
||||
<button type="submit" class="btn btn-sm btn-success" (click)="otherRegModal.show(); getOtherRegModelWindowDetails(app)"> Add Other Registration</button>
|
||||
<!--<button type="reset" class="btn btn-sm btn-danger"> Reset</button>-->
|
||||
</div>
|
||||
<table class="table table-bordered table-responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Batch</th>
|
||||
<th>Form Id</th>
|
||||
<th>Course</th>
|
||||
<th>University</th>
|
||||
<th>Sem/Year</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Jan 2018</td>
|
||||
<td>KES08432</td>
|
||||
<td>B.Com</td>
|
||||
<td>KR Univ</td>
|
||||
<td>3</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Jul 2017</td>
|
||||
<td>KES04321</td>
|
||||
<td>B.Com</td>
|
||||
<td>KR Univ</td>
|
||||
<td>2</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Jan 2017</td>
|
||||
<td>KES00921</td>
|
||||
<td>B.Com</td>
|
||||
<td>KR Univ</td>
|
||||
<td>1</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</tab>
|
||||
</tabset>
|
||||
</tab>
|
||||
</tabset>
|
||||
@ -469,3 +551,124 @@
|
||||
<!-- /.modal-dialog -->
|
||||
</div>
|
||||
<!-- /.modal -->
|
||||
|
||||
<!-- start student fees modal-->
|
||||
|
||||
<div bsModal #feesModal="bs-modal" class="modal fade" tabindex="-2" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-lg" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Fees Details</h4>
|
||||
<button type="button" class="close" (click)="feesModal.hide()" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="feesName">Fees Name <span class="danger">*</span></label>
|
||||
<select class="form-control" id="semyear">
|
||||
<option>Late Fees</option>
|
||||
<option>Other Fees</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="feesAmount">Fees Amount <span class="danger">*</span></label>
|
||||
<input type="text" class="form-control" value="15000" id="feesAmount" placeholder="Enter fees amount">
|
||||
</div>
|
||||
|
||||
<div class="form-group col-sm-4" style="margin-top: 28px;">
|
||||
<button type="button" class="btn btn-sm btn-primary"><i class="fa fa-plus-circle "></i> Add</button>
|
||||
</div>
|
||||
</div><!--/.row-->
|
||||
<div class="row">
|
||||
<div class="col-md-10">
|
||||
<table class="table table-bordered table-responive table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Fees Name</th>
|
||||
<th>Fees Amount</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let list of feesModalData">
|
||||
<td><span>{{list.feesName}}</span></td>
|
||||
<td>
|
||||
<span>{{list.feesAmount}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!--/.col-->
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" (click)="feesModal.hide()">Close</button>
|
||||
<button type="button" class="btn btn-primary">Save</button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.fees modal-content -->
|
||||
</div>
|
||||
<!-- /. fees modal-dialog -->
|
||||
</div>
|
||||
<!-- /.fees modal -->
|
||||
|
||||
<!-- start other registration modal -->
|
||||
<div bsModal #otherRegModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-lg" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Other Registration</h4>
|
||||
<button type="button" class="close" (click)="otherRegModal.hide()" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<label><b> Student Name</b> </label>
|
||||
<p>XYZ</p>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><b> Enrolment Number</b> </label>
|
||||
<p>UNIV120876</p>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><b> Course</b> </label>
|
||||
<p>B.Com</p>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><b> University</b> </label>
|
||||
<p>KR Univ</p>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="name"><b> Registration Type <span class="danger">*</span></b> </label>
|
||||
<select id="disabledSelect" class="form-control">
|
||||
<option value="0">Select</option>
|
||||
<option value="1">PC</option>
|
||||
<option value="2">TC</option>
|
||||
<option value="3">DC</option>
|
||||
<option value="3">Other</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" (click)="otherRegModal.hide()">Close</button>
|
||||
<button type="button" class="btn btn-primary">Save</button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.modal-content -->
|
||||
</div>
|
||||
<!-- /.modal-dialog -->
|
||||
</div>
|
||||
<!-- /.modal -->
|
||||
@ -12,6 +12,8 @@ export class StudentComponent implements OnInit {
|
||||
public myModalData;
|
||||
students: any;
|
||||
oldReg: boolean = false;
|
||||
public feesModal;
|
||||
public feesModalData;
|
||||
constructor() { }
|
||||
ngOnInit(){
|
||||
this.students = [
|
||||
@ -25,7 +27,20 @@ export class StudentComponent implements OnInit {
|
||||
sem: 2,
|
||||
batch: 'Jan 2018',
|
||||
status: '1',
|
||||
comments: 'approved by Univ'
|
||||
comments: 'approved by Univ',
|
||||
feesDetails:[
|
||||
{
|
||||
feesName:"Tution Fees",
|
||||
feesAmount:25000,
|
||||
feesType:"Per Sem",
|
||||
status:"Pending"
|
||||
},
|
||||
{
|
||||
feesName:"Exam Fees",
|
||||
feesAmount:800,
|
||||
feesType:"Per Sem",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
formId: 'KAN00107',
|
||||
@ -37,7 +52,20 @@ export class StudentComponent implements OnInit {
|
||||
sem: 4,
|
||||
batch: 'Jan 2018',
|
||||
status: '1',
|
||||
comments: 'approved by Univ'
|
||||
comments: 'approved by Univ',
|
||||
feesDetails:[
|
||||
{
|
||||
feesName:"Tution Fees",
|
||||
feesAmount:25000,
|
||||
feesType:"Per Sem",
|
||||
status:"Pending"
|
||||
},
|
||||
{
|
||||
feesName:"Exam Fees",
|
||||
feesAmount:800,
|
||||
feesType:"Per Sem",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
formId: 'KAN00086',
|
||||
@ -49,7 +77,19 @@ export class StudentComponent implements OnInit {
|
||||
sem: 8,
|
||||
batch: 'Jan 2018',
|
||||
status: '0',
|
||||
comments: 'rejected by Univ'
|
||||
comments: 'rejected by Univ',
|
||||
feesDetails:[
|
||||
{
|
||||
feesName:"Tution Fees",
|
||||
feesAmount:25000,
|
||||
feesType:"Per Sem",
|
||||
},
|
||||
{
|
||||
feesName:"Exam Fees",
|
||||
feesAmount:800,
|
||||
feesType:"Per Sem",
|
||||
},
|
||||
],
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -60,4 +100,9 @@ export class StudentComponent implements OnInit {
|
||||
editEmployee(){
|
||||
this.show = !this.show;
|
||||
}
|
||||
// open student fees modal
|
||||
getFeesModelWindowDetails(details) {
|
||||
console.log(details)
|
||||
this.feesModalData = details.feesDetails||null;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user