diff --git a/src/app/views/courier/courier/courier.component.html b/src/app/views/courier/courier/courier.component.html index c89c234..1210bd4 100644 --- a/src/app/views/courier/courier/courier.component.html +++ b/src/app/views/courier/courier/courier.component.html @@ -11,7 +11,7 @@ Courier Details List
-
+
@@ -73,13 +73,21 @@
- Add Courier Details + Add Courier Details
+
+ + +
@@ -88,19 +96,12 @@
-
- - -
+
- - + +
@@ -115,7 +116,7 @@
- +
-
+
@@ -139,13 +136,18 @@
-
-
+
+ +
+ + +
+
@@ -195,7 +197,7 @@ {{myModalData.weight}}
-
+
{{myModalData.amt}}
@@ -203,7 +205,7 @@ {{myModalData.date}}
-
+
- + @@ -86,10 +86,10 @@

- +
- + @@ -111,13 +111,22 @@ @@ -366,11 +375,12 @@
BatchSession Form Id Student Name Father Name{{app.course}} / {{app.univ}} {{app.sem}} - Active - In-Active + {{app.status}} + {{app.comments}} - | - +
+ | + +
+ + | + + + +
- + + @@ -380,6 +390,8 @@ + @@ -387,6 +399,10 @@ + @@ -394,6 +410,10 @@ +
BatchSession Form Id Course University Sem/YearAction
B.Com KR Univ 3 +
Jul 2017B.Com KR Univ 2 + + +
Jan 2017B.Com KR Univ 1 + + +
@@ -446,7 +466,7 @@ - + @@ -491,13 +511,14 @@
-

Re-registertion

+

Re-registration

+
XYZ @@ -552,6 +573,105 @@
+
BatchSession Form Id Course University
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Subject CodeSubject Name
SFJK000021Subject 1
SFJK000021Subject 2
SFJK000021Subject 3
SFJK000021Subject 4
SFJK000021Subject 5
SFJK000021Subject 6
+
+
+
+ +
+
+ + +
+
+ +
+ + + +
+
@@ -605,6 +726,17 @@
+
+
+ 25800 +
+
+ 25000 +
+
+ 800 +
+
diff --git a/src/app/views/enrolment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts index 842ff4b..a83909e 100644 --- a/src/app/views/enrolment/student/student.component.ts +++ b/src/app/views/enrolment/student/student.component.ts @@ -10,6 +10,7 @@ export class StudentComponent implements OnInit { closed = false; public myModal; public myModalData; + public myModelReReg; students: any; oldReg: boolean = false; public feesModal; @@ -23,11 +24,12 @@ export class StudentComponent implements OnInit { fatherName: 'mmm mmm', mobile: '+919876543210', course: 'B.Sc', - univ: 'KR university', + univ: 'KR univ', sem: 2, batch: 'Jan 2018', - status: '1', + status: 'Send To Univ', comments: 'approved by Univ', + feesStatus: 0, feesDetails:[ { feesName:"Tution Fees", @@ -48,11 +50,12 @@ export class StudentComponent implements OnInit { fatherName: 'sss sss', mobile: '+919876511111', course: 'B.Sc', - univ: 'KR university', + univ: 'KR univ', sem: 4, batch: 'Jan 2018', - status: '1', + status: 'Approved by Univ', comments: 'approved by Univ', + feesStatus: 1, feesDetails:[ { feesName:"Tution Fees", @@ -73,11 +76,12 @@ export class StudentComponent implements OnInit { fatherName: 'nnn nnn', mobile: '+919876500000', course: 'B.Sc', - univ: 'KR university', + univ: 'KR univ', sem: 8, batch: 'Jan 2018', - status: '0', + status: 'rejected by Univ', comments: 'rejected by Univ', + feesStatus: 1, feesDetails:[ { feesName:"Tution Fees", 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 b25c4c4..f44d63a 100644 --- a/src/app/views/masters/form-list/form-list.component.html +++ b/src/app/views/masters/form-list/form-list.component.html @@ -94,7 +94,7 @@
- + +
+
+   + +
+ +
+
+ +
+
+
+ View Document Status +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
Status NameTypeStatusAction
{{document.statusName}}{{document.type}} + {{document.status}} + + +
+ +
+ +
+ +
+
+
+
+ Fees
diff --git a/src/app/views/masters/status-master/status-master.component.scss b/src/app/views/masters/status-master/status-master.component.scss index cc75a4b..87c5967 100644 --- a/src/app/views/masters/status-master/status-master.component.scss +++ b/src/app/views/masters/status-master/status-master.component.scss @@ -8,5 +8,5 @@ cursor:pointer; } .saveBtn { - padding-top: 28px; + padding-top: 29px; } \ No newline at end of file diff --git a/src/app/views/masters/status-master/status-master.component.ts b/src/app/views/masters/status-master/status-master.component.ts index 3092756..50c0cf5 100644 --- a/src/app/views/masters/status-master/status-master.component.ts +++ b/src/app/views/masters/status-master/status-master.component.ts @@ -12,6 +12,7 @@ export class StatusMasterComponent implements OnInit { formStatus: any; markCardStatus: any; studyMaterialStatus: any; + documentStatus: any; constructor() { } ngOnInit() { @@ -39,6 +40,18 @@ export class StatusMasterComponent implements OnInit { status: 'Active' }, ] + this.documentStatus = [ + { + statusName: 'Sent to SC ', + type: 'Document', + status: 'Active' + }, + { + statusName: 'Received by SC', + type: 'Document', + status: 'Active' + }, + ] this.feesStatus = [ { statusName: 'Paid',