diff --git a/src/app/views/enrolment/student/student.component.html b/src/app/views/enrolment/student/student.component.html index f9a0241..c160a22 100644 --- a/src/app/views/enrolment/student/student.component.html +++ b/src/app/views/enrolment/student/student.component.html @@ -116,7 +116,9 @@ {{app.comments}} - + | + + @@ -321,7 +323,7 @@ - Re-registertion + Re-registration
@@ -400,6 +402,86 @@
+ + Other Registration +
+
+
+ Other Registration +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
BatchForm IdCourseUniversitySem/Year
Jan 2018KES08432B.ComKR Univ3
Jul 2017KES04321B.ComKR Univ2
Jan 2017KES00921B.ComKR Univ1
+
+
+
+
+
@@ -468,4 +550,125 @@
- \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/src/app/views/enrolment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts index 9a241ad..d870705 100644 --- a/src/app/views/enrolment/student/student.component.ts +++ b/src/app/views/enrolment/student/student.component.ts @@ -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; + } }