From 24de3f58ec8b9183285d8e4f86321705a3829d4a Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 1 Aug 2018 17:24:30 +0530 Subject: [PATCH] fees share and status master changes --- ...fees-share-allotment-master.component.html | 8 +- .../status-master.component.html | 557 +++++++++++++++--- .../status-master.component.scss | 5 +- .../status-master/status-master.component.ts | 74 ++- 4 files changed, 540 insertions(+), 104 deletions(-) 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' + }, + ] } }