diff --git a/src/app/views/courier/courier/courier.component.html b/src/app/views/courier/courier/courier.component.html index 4a460ac..4aa3730 100644 --- a/src/app/views/courier/courier/courier.component.html +++ b/src/app/views/courier/courier/courier.component.html @@ -27,8 +27,10 @@ Courier Name Docket No. + Date Type Comments + Send To / Received From Received By/ Dispatched By Status Action @@ -38,8 +40,10 @@ {{cour.courierName}} {{cour.docketNo}} + {{cour.date}} {{cour.type}} {{cour.comments}} + {{cour.sendTo}} {{cour.receiveBy}} {{cour.status}} @@ -83,34 +87,57 @@ +
+ + +
- +
- - + +
+    + +
-
- - +
+ + +
+ +
-
+
+
+ + +
- +
-
- - -
diff --git a/src/app/views/courier/courier/courier.component.ts b/src/app/views/courier/courier/courier.component.ts index 50c19bd..d27058b 100644 --- a/src/app/views/courier/courier/courier.component.ts +++ b/src/app/views/courier/courier/courier.component.ts @@ -20,6 +20,7 @@ export class CourierComponent implements OnInit { type: 'Received', comments: 'Documents Details', receiveBy: 'sss', + sendTo: 'KR Univ', status: 'sent', date: '20/07/2018', qt: 120, @@ -32,6 +33,7 @@ export class CourierComponent implements OnInit { type: 'Dispatched', comments: 'answer booklets details', receiveBy: 'asd', + sendTo: 'SC 2', status: 'received by SC', date: '28/06/2018', qt: 120, @@ -44,6 +46,7 @@ export class CourierComponent implements OnInit { type: 'Dispatched', comments: 'details', receiveBy: 'abc', + sendTo: 'SC 1', status: 'Sent by SC', date: '12/06/2018', qt: 120, diff --git a/src/app/views/enrolment/student/student.component.html b/src/app/views/enrolment/student/student.component.html index c954de0..ea47bb9 100644 --- a/src/app/views/enrolment/student/student.component.html +++ b/src/app/views/enrolment/student/student.component.html @@ -93,7 +93,7 @@ Student Name Father Name Mobile - Course + Course/University Sem/Year Batch Status @@ -106,13 +106,13 @@ {{app.studentName}} {{app.fatherName}} {{app.mobile}} - {{app.course}} + {{app.course}} / {{app.univ}} {{app.sem}} {{app.batch}} Active In-Active - + @@ -136,14 +136,14 @@ Add Student
- - +

- Add Student Personal Details + Personal Details
@@ -156,6 +156,18 @@
+
+ + +
+ + +
+
@@ -186,16 +198,7 @@
-
- - - - -
+
@@ -208,12 +211,13 @@
- +
- + + Same as Permanent Address
@@ -223,7 +227,7 @@
- Add Course Details + Course Details
@@ -287,7 +291,11 @@
-
+ + + + Re-registertion +
Re-registration diff --git a/src/app/views/enrolment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts index 0958466..4885938 100644 --- a/src/app/views/enrolment/student/student.component.ts +++ b/src/app/views/enrolment/student/student.component.ts @@ -21,6 +21,7 @@ export class StudentComponent implements OnInit { fatherName: 'mmm mmm', mobile: '+919876543210', course: 'B.Sc', + univ: 'KR university', sem: 2, batch: 'Jan 2018', status: '1' @@ -31,6 +32,7 @@ export class StudentComponent implements OnInit { fatherName: 'sss sss', mobile: '+919876511111', course: 'B.Sc', + univ: 'KR university', sem: 4, batch: 'Jan 2018', status: '1' @@ -41,6 +43,7 @@ export class StudentComponent implements OnInit { fatherName: 'nnn nnn', mobile: '+919876500000', course: 'B.Sc', + univ: 'KR university', sem: 8, batch: 'Jan 2018', status: '0' diff --git a/src/app/views/masters/form-list/form-list.component.html b/src/app/views/masters/form-list/form-list.component.html index d61f9e6..fed3447 100644 --- a/src/app/views/masters/form-list/form-list.component.html +++ b/src/app/views/masters/form-list/form-list.component.html @@ -23,6 +23,7 @@ From Name From Type + Course / University Description Status Action @@ -32,6 +33,7 @@ {{form.formName}} {{form.formType}} + {{form.course}} / {{form.univ}} {{form.description}} Active @@ -78,17 +80,39 @@
+
+ + + +
+
+
+
+ + + +
-
-
Upload Form :
-
+
+
+
Active/De-Active :