From 0e01bc657a6349d2bba1b34e6ff7a0c76e431fb5 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 11 Dec 2018 14:56:01 +0530 Subject: [PATCH] UI changes --- ng6-seed/src/app/dashboard/dashboard.component.html | 8 ++++---- ng6-seed/src/app/dashboard/dashboard.component.scss | 7 +++++-- ng6-seed/src/app/dashboard/dashboard.component.ts | 1 + .../edit-pd-applicant.component.html | 2 +- .../edit-pd-applicant.component.scss | 4 +++- .../edit-pd-master/edit-pd-master.component.html | 2 +- .../edit-pd-master/edit-pd-master.component.scss | 12 ++++++++++-- .../list-pd/map-pd-view/map-pd-view.component.html | 2 +- .../list-pd/map-pd-view/map-pd-view.component.scss | 3 +++ .../pd-allocation/pd-allocation.component.scss | 4 ++++ .../list-pd/pd-allocation/pd-allocation.component.ts | 8 +++++--- .../model-edit-pd-report.component.html | 0 .../model-edit-pd-report.component.scss | 0 .../model-edit-pd-report.component.spec.ts | 0 .../model-edit-pd-report.component.ts | 0 .../pd-requirement/pd-requirement.component.html | 0 .../pd-requirement/pd-requirement.component.scss | 0 .../pd-requirement/pd-requirement.component.spec.ts | 0 .../pd-requirement/pd-requirement.component.ts | 0 .../forms/general-info/general-info.component.html | 0 .../forms/general-info/general-info.component.scss | 0 .../general-info/general-info.component.spec.ts | 0 .../forms/general-info/general-info.component.ts | 0 .../other-applicant-details.component.html | 0 .../other-applicant-details.component.scss | 0 .../other-applicant-details.component.spec.ts | 0 .../other-applicant-details.component.ts | 0 .../report-template/report-template.component.html | 0 .../report-template/report-template.component.scss | 0 .../report-template.component.spec.ts | 0 .../report-template/report-template.component.ts | 0 31 files changed, 38 insertions(+), 15 deletions(-) mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.ts mode change 100644 => 100755 ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.html mode change 100644 => 100755 ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.scss mode change 100644 => 100755 ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.ts diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index 4ea5cdf2d..c77268923 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,6 +1,6 @@
- +
{{dashboardTitle}} @@ -45,7 +45,7 @@
-
+
Full - {{total1}}
-
+
Smart - {{total2}}
-
+

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss index 4fe099dd8..3bd6bebcf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss @@ -2,5 +2,7 @@ mat-form-field { margin: 0 2%; } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; + // padding: 10px !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 0fe16aa64..af3fa43c1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss index 4fe099dd8..d03494e25 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss @@ -2,5 +2,13 @@ mat-form-field { margin: 0 2%; } .paragraph_change { - color: #e00201 !important; -} \ No newline at end of file + color: #fff !important; + background-color: #e00201 !important; + // padding: 10px !important; +} + .cdk-global-overlay-wrapper{ + justify-content: center !important; +} + mat-dialog-actions{ + border-top: 2px solid #e00201; + } \ 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 8411c320e..8a6caf518 100755 --- 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 @@ -81,7 +81,7 @@
-
+
II Full   II Smart
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss index f4a19b950..80a496fbf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss @@ -39,4 +39,7 @@ $mat-toolbar-height-mobile-landscape: 48px !default; /* optional: show position indicator in red */ ::-webkit-scrollbar-thumb { background: #FF0000; +} +::ng-deep .body-container{ + padding:0px !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss index 460dfa640..4a8d6adb2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss @@ -12,3 +12,7 @@ .text_change { color: #e00201 !important; } + .cdk-global-overlay-wrapper{ + justify-content: center !important; +} + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts index 5717e4de8..6cfc777fa 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, OnInit, Inject, ViewEncapsulation } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material'; import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; import { NotifierService } from 'angular-notifier'; @@ -8,7 +8,9 @@ import { AllocationViewMoreComponent } from './../allocation-view-more/allocatio @Component({ selector: 'app-pd-allocation', templateUrl: './pd-allocation.component.html', - styleUrls: ['./pd-allocation.component.scss'] + styleUrls: ['./pd-allocation.component.scss'], + encapsulation: ViewEncapsulation.None + }) export class PdAllocationComponent implements OnInit { public pageTitle: string = "Allocation To PD Officer"; @@ -89,7 +91,7 @@ export class PdAllocationComponent implements OnInit { data: details, disableClose: true, position: { right: '0'}, - width:'80%', + width:'100%', // hasBackdrop:false }); // dialogSchedule.afterClosed() diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.scss b/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.spec.ts b/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.ts b/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.ts old mode 100644 new mode 100755