diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 26a1a14eb..c90384612 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -31,7 +31,7 @@ - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 4fe4b3d2f..6b1dabefe 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -30,7 +30,7 @@ + matTooltipPosition="above" color="primary">visibility diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index 2d8717a78..4487795cc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -29,7 +29,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index 5b846cb0d..405e0fb14 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -15,26 +15,26 @@ - All + select_all All - Scheduled + schedule Scheduled - In Progress + hdr_strong  In Progress - Completed + done  Completed - QC Completed + done_all QC_Completed diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss index 9e293a473..123db6e6c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss @@ -13,4 +13,11 @@ } .fontsize{ font-size:14px; -} \ No newline at end of file +} + +.mat-ink-bar{ + background-color:red; +} +.mat-tab-label-active{ + color: red !important; + } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html index d6feedecd..30d6932eb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html @@ -39,11 +39,11 @@ -  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
- {{details.customer_segment_abbr}} {{details.loan_amount}}
- {{details.pd_date_of_initiation}}
- {{details.pd_status}} - {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} +  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.customer_segment_abbr}} {{details.loan_amount}}
+ {{details.pd_date_of_initiation}}
+ {{details.pd_status}} - {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 8b1d38166..785c6309b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -29,7 +29,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index 7c7ba2623..f8177653a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -32,7 +32,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index 18e6a2295..17ac0ee26 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -1,14 +1,14 @@ - + - + -
{{category.category_name}}
+ {{category.category_name}}
@@ -25,7 +25,7 @@
Category @@ -62,7 +62,8 @@
-
{{optionsForm.controls.pd_question.value}}
+ + {{optionsForm.controls.pd_question.value}}
@@ -125,10 +126,10 @@
- arrow_backward - skip_previous - skip_next - arrow_forward + skip_previous + chevron_left + chevron_right + skip_next
@@ -140,7 +141,7 @@ -
{{selectedCategory.question}}
+ {{selectedCategory.question}}
@@ -148,8 +149,8 @@
- skip_previous - skip_next + chevron_left + chevron_right
@@ -166,11 +167,11 @@ -
{{textBoxForm.controls.pd_question.value}}
+ {{textBoxForm.controls.pd_question.value}}
- + @@ -228,10 +229,10 @@
- arrow_backward - skip_previous - skip_next - arrow_forward + skip_previous + chevron_left + chevron_right + skip_next
@@ -242,7 +243,7 @@ -
{{selectedCategory.question}}
+ {{selectedCategory.question}}
@@ -250,8 +251,8 @@
- skip_previous - skip_next + chevron_left + chevron_right
@@ -266,7 +267,7 @@
-
{{checkBoxForm.controls.pd_question.value}}
+ {{checkBoxForm.controls.pd_question.value}}
@@ -324,10 +325,10 @@
- arrow_backward - skip_previous - skip_next - arrow_forward + skip_previous + chevron_left + chevron_right + skip_next
@@ -337,8 +338,8 @@ - -
{{selectedCategory.question}}
+ + {{selectedCategory.question}} @@ -346,8 +347,8 @@
- skip_previous - skip_next + chevron_left + chevron_right
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss index 3c41b47e0..e71caa4d2 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss @@ -113,7 +113,9 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7); } } - +mat-icon{ + color: #ff3636; +} .start_close_btn { position: fixed; right: 69px; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index 2118ecebe..6dcd7b8fe 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -122,7 +122,7 @@ loadTemplates(startID:string){ // load question based answer list getAnswers(serachList:any){ - + this.answerList=[]; this._pd.getAnswersForPD(serachList).subscribe( data => { if (data.status == 200) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 6b9143ef8..4f0dd61f1 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -15,7 +15,7 @@
{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}}  On  {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }} + {{master.pd_status | titlecase}}
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-list.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-list.component.html index 5dd4f9d75..bbe37f0d7 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-list.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-list.component.html @@ -11,11 +11,11 @@ - Completed + done Completed - QC Completed + done_all QC Completed diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-list.component.scss b/ng6-seed/src/app/quality-check/qc-list/qc-list.component.scss index 9e293a473..123db6e6c 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-list.component.scss +++ b/ng6-seed/src/app/quality-check/qc-list/qc-list.component.scss @@ -13,4 +13,11 @@ } .fontsize{ font-size:14px; -} \ No newline at end of file +} + +.mat-ink-bar{ + background-color:red; +} +.mat-tab-label-active{ + color: red !important; + } \ No newline at end of file diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html index b3c34a3a0..b9e6c908d 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html @@ -1,13 +1,13 @@ - + - + -
{{category.category_name}}
+ {{category.category_name}}
@@ -24,7 +24,7 @@
Category @@ -61,7 +61,7 @@
-
{{optionsForm.controls.pd_question.value}}
+ {{optionsForm.controls.pd_question.value}}
@@ -124,10 +124,10 @@
- arrow_backward - skip_previous - skip_next - arrow_forward + skip_previous + chevron_left + chevron_right + skip_next
@@ -139,7 +139,7 @@ -
{{selectedCategory.question}}
+ {{selectedCategory.question}}
@@ -147,8 +147,8 @@
- skip_previous - skip_next + chevron_left + chevron_right
@@ -165,11 +165,11 @@ -
{{textBoxForm.controls.pd_question.value}}
-
+ {{textBoxForm.controls.pd_question.value}} +
- + @@ -227,10 +227,10 @@
- arrow_backward - skip_previous - skip_next - arrow_forward + skip_previous + chevron_left + chevron_right + skip_next
@@ -241,7 +241,7 @@ -
{{selectedCategory.question}}
+ {{selectedCategory.question}}
@@ -249,8 +249,8 @@
- skip_previous - skip_next + chevron_left + chevron_right
@@ -262,10 +262,10 @@ - +
-
{{checkBoxForm.controls.pd_question.value}}
+ {{checkBoxForm.controls.pd_question.value}}
@@ -323,10 +323,10 @@
- arrow_backward - skip_previous - skip_next - arrow_forward + skip_previous + chevron_left + chevron_right + skip_next
@@ -337,7 +337,7 @@ -
{{selectedCategory.question}}
+ {{selectedCategory.question}}
@@ -345,8 +345,8 @@
- skip_previous - skip_next + chevron_left + chevron_right
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss index 3723ab575..0e5aa8a36 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss @@ -113,7 +113,9 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7); } } - +mat-icon{ + color: #ff3636; +} .start_close_btn { position: fixed; right: 69px; diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts index c0617707e..576298f02 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts @@ -8,7 +8,8 @@ import { QcService } from './../../qc-service/qc.service'; @Component({ selector: 'app-qc-start', templateUrl: './qc-start.component.html', - styleUrls: ['./qc-start.component.scss'] + styleUrls: ['./qc-start.component.scss'], + }) export class QcStartComponent implements OnInit, OnDestroy { private notifier: NotifierService; @@ -121,6 +122,7 @@ loadTemplates(startID:string){ // load question based answer list getAnswers(serachList:any){ + this.answerList=[]; this._qc.getAnswersForPD(serachList).subscribe( data => { diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index 744a6c4cc..14f062c2e 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -14,7 +14,7 @@
{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}}  On  {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }} + {{master.pd_status | titlecase}}
@@ -24,7 +24,7 @@
-
+
@@ -42,8 +42,7 @@

{{master.product_name}} / {{master.subproduct_name}}

{{master.pd_type_name}} /  {{master.loan_amount}}

{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}

-

{{master.pd_status}} - {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }}

- +