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

merge changes

Browse Source
This commit is contained in:
gandhimathi 2018-08-02 10:20:13 +05:30
parent 8d3657dbfd
commit 7408df1242
2 changed files with 313 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/app/views/enrolment/student/student.component.html
View File

@ -100,8 +100,8 @@
</td>
<td>
<i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> |
<i class="fa fa-edit fa-file-code-o" tooltip="Answer Booklet"></i> |
<i class="fa fa-edit fa-id-card-o" tooltip="Mark Card"></i>
<i class="fa fa-edit fa-file-code-o" tooltip="Answer Booklet" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app, 'answerBooklet')"></i> |
<i class="fa fa-edit fa-id-card-o" tooltip="Mark Card" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app, 'markCard')"></i>
<!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
</td>
</tr>
@ -203,8 +203,7 @@
</div>
<div class="form-group col-md-4">
<label for="currentAddress">Current Address<span class="danger">*</span> </label>
<textarea class="form-control" id="currentAddress" placeholder="Enter Current Address"></textarea>
Same as Permanent Address <span><input type="checkbox"></span>
<textarea class="form-control" id="currentAddress" placeholder="Enter Current Address"></textarea> Same as Permanent Address <span><input type="checkbox"></span>
</div>
</div>
</div>
@ -367,47 +366,35 @@
<div class="modal-dialog modal-lg" role="document" *ngIf="myModalData">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">{{ myModalData.applicationId }}</h4>
<h4 class="modal-title" *ngIf="modelType == 'markCard'"> Mark Card Status</h4>
<h4 class="modal-title" *ngIf="modelType == 'answerBooklet'"> Answer Booklet Status</h4>
<button type="button" class="close" (click)="myModal.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> Student Name : </b> </label> {{myModalData.studentName}}
</div>
<div class="col-md-6">
<label><b>Course Name : </b> </label> {{myModalData.courseName}}
</div>
</div>
<div class="row">
<div class="col-md-6">
<label><b> Sem/Year : </b> </label> {{myModalData.sem}}
</div>
</div>
<div class="row">
<div class="col-md-4">
<label for="name"> Status</label>
<select id="disabledSelect" class="form-control">
<option value="0">Select Status</option>
<option value="1">Approved</option>
<option value="2">Rejected</option>
<option value="3">Canceled</option>
</select>
</div>
<div class="col-md-4">
<label for="comment">Comments <span class="danger">*</span></label>
<textarea class="form-control" id="comments" placeholder="Enter Comments"></textarea>
</div>
</div>
<table class="table table-bordered table-responsive">
<thead>
<tr>
<th>Status</th>
<th>Comments</th>
<th>Date</th>
</tr>
</thead>
<tbody>
<tr>
<td>Send to SC</td>
<td><b>{{ modelType | uppercase }} </b>- Send to Studet Center</td>
<td>4/05/2018</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" (click)="myModal.hide()">Close</button>
<button type="button" class="btn btn-primary">Save</button>
<!--<button type="button" class="btn btn-primary">Save</button>-->
</div>
</div>
<!-- /.modal-content -->

4
src/app/views/enrolment/student/student.component.ts
View File

@ -10,6 +10,7 @@ export class StudentComponent implements OnInit {
closed = false;
public myModal;
public myModalData;
public modelType: string;
students: any;
oldReg: boolean = false;
constructor() { }
@ -50,8 +51,9 @@ export class StudentComponent implements OnInit {
}
]
}
getModelWindowDetails(emp) {
getModelWindowDetails(emp, type) {
this.myModalData = emp||null;
this.modelType = type;
}
editEmployee(){