student view changes : kdk

This commit is contained in:
dineshkumarkannan 2018-08-10 18:53:49 +05:30
parent e94fe51bf1
commit 8cbdee81b0
2 changed files with 127 additions and 13 deletions

View File

@ -15,7 +15,7 @@
<div class="col-md-2">
<div class="input-prepend input-group">
<select id="disabledSelect" class="form-control">
<option value="0">Batch</option>
<option value="0">Session</option>
<option value="1">Jan 2017</option>
<option value="2">Jul 2017</option>
<option value="3">Jan 2018</option>
@ -74,7 +74,7 @@
<table class="table table-bordered table-responsive line-height-table">
<thead>
<tr>
<th>Batch</th>
<th>Session</th>
<th>Form Id</th>
<th>Student Name</th>
<th>Father Name</th>
@ -94,8 +94,9 @@
<td>{{app.course}} / {{app.univ}}</td>
<td>{{app.sem}}</td>
<td>
<span *ngIf="app.status == 1" style="line-height: 0.1;">Active</span>
<span *ngIf="app.status == 0" style="line-height: 0.1;">In-Active</span>
{{app.status}}
<!--<span *ngIf="app.status == 1" style="line-height: 0.1;">Active</span>
<span *ngIf="app.status == 0" style="line-height: 0.1;">In-Active</span>-->
</td>
<td>{{app.comments}}</td>
<td>
@ -107,7 +108,7 @@
</div>
<ng-template #pending_content>
<i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> |
<i class="fa fa-edit fa-file-code-o text-danger" tooltip="Answer Booklet" data-toggle="modal" (click)="myModal2.show(); getModelWindowDetails(app, 'answerBooklet')"></i> |
<i class="fa fa-edit fa-file-code-o text-success" tooltip="Answer Booklet" data-toggle="modal" (click)="myModal2.show(); getModelWindowDetails(app, 'answerBooklet')"></i> |
<i class="fa fa-edit fa-id-card-o text-danger" tooltip="Mark Card" data-toggle="modal" (click)="myModal2.show(); getModelWindowDetails(app, 'markCard')"></i> |
<i class="fa fa-money line-height-table text-danger" tooltip="Fees" (click)="feesModal.show();getFeesModelWindowDetails(app)"></i>
</ng-template>
@ -356,11 +357,12 @@
<table class="table table-bordered table-responsive">
<thead>
<tr>
<th>Batch</th>
<th>Session</th>
<th>Form Id</th>
<th>Course</th>
<th>University</th>
<th>Sem/Year</th>
<th>Action</th>
</tr>
</thead>
<tbody>
@ -370,6 +372,10 @@
<td>B.Com</td>
<td>KR Univ</td>
<td>3</td>
<td>
<i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>
</td>
</tr>
<tr>
<td>Jul 2017</td>
@ -377,6 +383,10 @@
<td>B.Com</td>
<td>KR Univ</td>
<td>2</td>
<td>
<i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>
</td>
</tr>
<tr>
<td>Jan 2017</td>
@ -384,6 +394,10 @@
<td>B.Com</td>
<td>KR Univ</td>
<td>1</td>
<td>
<i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>
</td>
</tr>
</tbody>
</table>
@ -436,7 +450,7 @@
<table class="table table-bordered table-responsive">
<thead>
<tr>
<th>Batch</th>
<th>Session</th>
<th>Form Id</th>
<th>Course</th>
<th>University</th>
@ -540,6 +554,105 @@
</div>
<!-- /.modal -->
<div bsModal #myModelReReg="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">Re-registration Form</h4>
<button type="button" class="close" (click)="myModelReReg.hide()" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="container">
<div class="row">
<div class="col-md-6">
<label><b> Form ID : </b> </label> KES08432
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b> Student Name : </b> </label> XYZ
</div>
<div class="col-md-6">
<label><b>Enrolment Number : </b> </label> UNIV120876
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b> Course : </b> </label> B.Com
</div>
<div class="col-md-6">
<label><b> University : </b> </label> KR Univ
</div>
</div>
<div class="row">
<div class="col-md-6">
<label for="name"> <b>Sem/Year :</b> </label> 3
</div>
<div class="col-md-6">
<label for="name"><b>Session :</b></label> Jan 2018
</div>
</div>
<div class="container">
<div class="row">
<table class="table table-bordered table-responsive">
<thead>
<th>Subject Code</th>
<th>Subject Name</th>
</thead>
<tbody>
<tr>
<td>SFJK000021</td>
<td>Subject 1</td>
</tr>
<tr>
<td>SFJK000021</td>
<td>Subject 2</td>
</tr>
<tr>
<td>SFJK000021</td>
<td>Subject 3</td>
</tr>
<tr>
<td>SFJK000021</td>
<td>Subject 4</td>
</tr>
<tr>
<td>SFJK000021</td>
<td>Subject 5</td>
</tr>
<tr>
<td>SFJK000021</td>
<td>Subject 6</td>
</tr>
<tr>
<td></td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" (click)="myModelReReg.hide()">Close</button>
<!--<button type="button" class="btn btn-primary">Save</button>-->
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.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">

View File

@ -10,6 +10,7 @@ export class StudentComponent implements OnInit {
closed = false;
public myModal;
public myModalData;
public myModelReReg;
public modelType: string;
students: any;
oldReg: boolean = false;
@ -23,10 +24,10 @@ export class StudentComponent implements OnInit {
studentName: 'xyz',
fatherName: 'mmm mmm',
course: 'B.Sc',
univ: 'KR university',
univ: 'KR univ',
sem: 2,
batch: 'Jan 2018',
status: '1',
status: 'Send To Univ',
comments: 'approved by Univ',
feesDetails:[
{
@ -47,10 +48,10 @@ export class StudentComponent implements OnInit {
studentName: 'abc',
fatherName: 'sss sss',
course: 'B.Sc',
univ: 'KR university',
univ: 'KR univ',
sem: 4,
batch: 'Jan 2018',
status: '1',
status: 'Send To Univ',
comments: 'approved by Univ',
feesDetails:[
{
@ -71,10 +72,10 @@ export class StudentComponent implements OnInit {
studentName: 'uvw',
fatherName: 'nnn nnn',
course: 'B.Sc',
univ: 'KR university',
univ: 'KR univ',
sem: 8,
batch: 'Jan 2018',
status: '0',
status: 'rejected by Univ',
comments: 'rejected by Univ',
feesDetails:[
{