diff --git a/src/app/views/masters/fees-master/fees-master.component.html b/src/app/views/masters/fees-master/fees-master.component.html index 970d8db..1106445 100644 --- a/src/app/views/masters/fees-master/fees-master.component.html +++ b/src/app/views/masters/fees-master/fees-master.component.html @@ -43,49 +43,45 @@ - TF + Tution Fees Tution Fees Active - | - + - SF + Semester Fees Semester Fees Active - | - + - EF + Exam Fees Exam Fees Inactive - | - + - MF + Mark Sheet Fees Mark Sheet Fees Inactive - | - + diff --git a/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.html b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.html index c84e13a..33b1704 100644 --- a/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.html +++ b/src/app/views/masters/fees-share-allotment-master/fees-share-allotment-master.component.html @@ -6,13 +6,13 @@ - View Share + View Fees Share
- View Share Allocate Details + View Fees Share Details
@@ -143,14 +143,14 @@
- Add Share + Add Fees Share
- Add Study Center Share Details + Add Study Center Fees Share Details
diff --git a/src/app/views/masters/status-master/status-master.component.html b/src/app/views/masters/status-master/status-master.component.html index fb6997b..d59f635 100644 --- a/src/app/views/masters/status-master/status-master.component.html +++ b/src/app/views/masters/status-master/status-master.component.html @@ -1,110 +1,475 @@
- -
-
- -
-
-
+ +
+ +
+ + + + Answer BookLet +
-
+
+ + +
+
+   + +
+ +
+
+ +
+
+
+ View Answer Booklet Status +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
Status NameTypeStatusAction
{{book.statusName}}{{book.type}} + {{book.status}} + + +
+ +
+ +
+ +
+
+
+
+ + + Courier +
+ +
+ + +
+
+   + +
+ +
+
+ +
+
+
+ View Courier Status +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
Status NameTypeStatusAction
{{courier.statusName}}{{courier.type}} + {{courier.status}} + + +
+ +
+ +
+ +
+
+
+
+ + + Fees +
+ +
+ + +
+
+   + +
+ +
+
+ +
+
+
+ View Fees Status +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
Status NameTypeStatusAction
{{fees.statusName}}{{fees.type}} + {{fees.status}} + + +
+ +
+ +
+ +
+
+
+
+ + + Form +
+ +
-
+
 
+
- - - -
-
- -
-
-
- -
-
-
- View Status Details -
-
-
-
-
- - -
-
-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Status NameStatusAction
Open - Active - - -
Close - Active - - -
Pending - Active - - -
- -
- + +
+
+
+ View Form Status +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
Status NameTypeStatusAction
{{form.statusName}}{{form.type}} + {{form.status}} + + +
+ +
+ +
+ +
+
+
+
+ + + Mark Card +
+ +
+ + +
+
+   + +
+
- -
-
-
-
- - - +
+ +
+
+
+ View Mark Card Status +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
Status NameTypeStatusAction
{{mark.statusName}}{{mark.type}} + {{mark.status}} + + +
+ +
+ +
+ +
+
+
+
+ + + Study Material +
+ +
+ + +
+
+   + +
+ +
+
+ +
+
+
+ View Study Material Status +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + +
Status NameTypeStatusAction
{{material.statusName}}{{material.type}} + {{material.status}} + + +
+ +
+ +
+ +
+
+
+
+ + +
+
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 a2c8c52..cc75a4b 100644 --- a/src/app/views/masters/status-master/status-master.component.scss +++ b/src/app/views/masters/status-master/status-master.component.scss @@ -7,7 +7,6 @@ a:hover { cursor:pointer; } - .endBtn { - padding-right: 100px; - margin-top: -50px; + .saveBtn { + padding-top: 28px; } \ 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 e7ced8d..3092756 100644 --- a/src/app/views/masters/status-master/status-master.component.ts +++ b/src/app/views/masters/status-master/status-master.component.ts @@ -6,10 +6,82 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./status-master.component.scss'] }) export class StatusMasterComponent implements OnInit { - + bookStatus: any; + courierStatus: any; + feesStatus: any; + formStatus: any; + markCardStatus: any; + studyMaterialStatus: any; constructor() { } ngOnInit() { + this.bookStatus = [ + { + statusName: 'Sent to SC ', + type: 'Answer Booklet', + status: 'Active' + }, + { + statusName: 'Received by SC ', + type: 'Answer Booklet', + status: 'Active' + }, + ] + this.courierStatus = [ + { + statusName: 'Sent by SC', + type: 'Courier', + status: 'Active' + }, + { + statusName: 'Received by Apollo', + type: 'Courier', + status: 'Active' + }, + ] + this.feesStatus = [ + { + statusName: 'Paid', + type: 'Fees', + status: 'Active' + }, + { + statusName: 'Refund', + type: 'Fees', + status: 'Active' + }, + ] + this.formStatus = [ + { + statusName: 'Sent to Apollo ', + type: 'Form', + status: 'Active' + }, + ] + this.markCardStatus = [ + { + statusName: 'Sent to SC ', + type: 'Mark Card', + status: 'Active' + }, + { + statusName: 'Received by SC ', + type: 'Mark Card', + status: 'Active' + }, + ] + this.studyMaterialStatus = [ + { + statusName: 'Received', + type: 'Study Material', + status: 'Active' + }, + { + statusName: 'Pending', + type: 'Study Material', + status: 'Active' + }, + ] } } diff --git a/src/app/views/masters/university-master/university-master.component.html b/src/app/views/masters/university-master/university-master.component.html index 917c9e5..96dee07 100644 --- a/src/app/views/masters/university-master/university-master.component.html +++ b/src/app/views/masters/university-master/university-master.component.html @@ -6,7 +6,7 @@ - View University  29 + View University  
@@ -45,7 +45,7 @@ Active - | + | @@ -57,7 +57,7 @@ Active - | + | @@ -69,7 +69,7 @@ Inactive - | + | @@ -81,7 +81,7 @@ Inactive - | + | @@ -93,7 +93,7 @@ Active - | + | @@ -125,10 +125,11 @@
+
- +
@@ -168,13 +169,14 @@
+
- +  
diff --git a/src/app/views/masters/university-master/university-master.component.ts b/src/app/views/masters/university-master/university-master.component.ts index 1700a37..c8a54b1 100644 --- a/src/app/views/masters/university-master/university-master.component.ts +++ b/src/app/views/masters/university-master/university-master.component.ts @@ -14,5 +14,6 @@ export class UniversityMasterComponent implements OnInit { ngOnInit() { } - + + } diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html index 7a25f67..c19a71c 100644 --- a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html +++ b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html @@ -221,7 +221,7 @@   Center A - Batch A + 1st Sem / 2018 MCA 10 @@ -232,7 +232,7 @@   Center B - Batch B + 2nd Sem / 2018 MBA 15 15 @@ -242,7 +242,7 @@   Center C - Batch C + 3rd Sem / 2019 BE 20 18 @@ -252,7 +252,7 @@   Center D - Batch D + 4th Sem / 2019 DE 34