From a9367a8e02b34fada03eb9437b2e676c750456a5 Mon Sep 17 00:00:00 2001 From: Parth Kothari Date: Wed, 21 Aug 2024 17:30:17 +0530 Subject: [PATCH 01/21] Resolved eqeqeq warnings from es lint --- .../cancer-patient-vitals/cancer-patient-vitals.component.ts | 2 +- .../general-patient-vitals/general-patient-vitals.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.ts b/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.ts index a368837..b4f3040 100644 --- a/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.ts +++ b/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.ts @@ -116,7 +116,7 @@ export class CancerPatientVitalsComponent } this.attendant = this.route.snapshot.params['attendant']; - if (this.attendant == 'nurse') { + if (this.attendant === 'nurse') { this.getPreviousVisitAnthropometry(); } } diff --git a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts index 4143476..ffda5e5 100644 --- a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts +++ b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts @@ -234,7 +234,7 @@ export class GeneralPatientVitalsComponent console.log('doctorScreen', this.doctorScreen); this.attendant = this.route.snapshot.params['attendant']; - if (this.attendant == 'nurse') { + if (this.attendant === 'nurse') { this.getPreviousVisitAnthropometry(); } } From 781b0fb72519b2846f88cd46af7cd4895a02e3e4 Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Mon, 26 Aug 2024 19:10:05 +0530 Subject: [PATCH 02/21] upload file cancel button fix --- Common-UI | 2 +- .../upload-files/upload-files.component.html | 15 ++++++--------- .../cancer-patient-vitals.component.ts | 2 +- .../general-patient-vitals.component.ts | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Common-UI b/Common-UI index 044502b..f051391 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 044502ba0557b1cfa3516b484ac1411fa987476d +Subproject commit f051391f6c56024c4bee4fab5d25fe4239026896 diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html index d9fb357..7fc0e3e 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html +++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html @@ -37,20 +37,17 @@
- {{ file.fileName }} - - + (click)="remove(file)" + >cancel +
diff --git a/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.ts b/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.ts index a368837..b4f3040 100644 --- a/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.ts +++ b/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.ts @@ -116,7 +116,7 @@ export class CancerPatientVitalsComponent } this.attendant = this.route.snapshot.params['attendant']; - if (this.attendant == 'nurse') { + if (this.attendant === 'nurse') { this.getPreviousVisitAnthropometry(); } } diff --git a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts index 4143476..ffda5e5 100644 --- a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts +++ b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts @@ -234,7 +234,7 @@ export class GeneralPatientVitalsComponent console.log('doctorScreen', this.doctorScreen); this.attendant = this.route.snapshot.params['attendant']; - if (this.attendant == 'nurse') { + if (this.attendant === 'nurse') { this.getPreviousVisitAnthropometry(); } } From 3106ae03267074b879eb1e30aa7c94a4b55cea5c Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Mon, 26 Aug 2024 19:53:31 +0530 Subject: [PATCH 03/21] ng build CSS files syntex errors fix --- .../data-sync/workarea/workarea.component.css | 8 ++++---- .../lab/workarea/workarea.component.css | 10 +++++----- src/app/app-modules/login/login.component.css | 2 +- .../anc/anc-details/anc-details.component.css | 2 +- .../beneficiary-platform-history.component.css | 6 +++--- .../findings/findings.component.css | 4 ++-- .../prescription/prescription.component.css | 6 +++--- .../family-disease-history.component.css | 4 ++-- .../obstetric-history.component.css | 4 ++-- .../personal-history.component.css | 8 ++++---- ...comorbidity-concurrent-conditions.component.css | 4 ++-- .../family-history-ncdscreening.component.css | 6 +++--- .../family-history/family-history.component.css | 4 ++-- .../medication-history.component.css | 4 ++-- .../menstrual-history.component.css | 2 +- .../other-vaccines/other-vaccines.component.css | 4 ++-- .../past-history/past-history.component.css | 6 +++--- .../personal-history.component.css | 12 ++++++------ .../nurse-worklist-tabs.component.css | 8 ++++---- .../nurse-doctor/reports/reports.component.css | 2 +- .../chief-complaints.component.css | 14 +++++++------- .../covid-vaccination-status.component.css | 2 +- .../travel-history/travel-history.component.css | 2 +- .../visit-details/visit-details.component.css | 2 +- .../register-demographic-details.component.css | 2 +- .../register-other-details.component.css | 2 +- .../register-personal-details.component.css | 4 ++-- .../service-point/service-point.component.css | 2 +- .../set-password/set-password.component.css | 2 +- 29 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/app/app-modules/data-sync/workarea/workarea.component.css b/src/app/app-modules/data-sync/workarea/workarea.component.css index 5e4e4cd..4c506a4 100644 --- a/src/app/app-modules/data-sync/workarea/workarea.component.css +++ b/src/app/app-modules/data-sync/workarea/workarea.component.css @@ -141,20 +141,20 @@ margin-top: 30px; --mat-tab-header-with-background-foreground-color: black !important; } -.tabs_css >>>.mat-mdc-tab.mdc-tab--active .mdc-tab__text-label { +.tabs_css ::ng-deep .mat-mdc-tab.mdc-tab--active .mdc-tab__text-label { color: black !important; } -.tabs_css >>> .mat-mdc-tab-header{ +.tabs_css ::ng-deep .mat-mdc-tab-header{ font-weight: bold !important; background-color: rgba(37, 55, 70, 0.2) !important; box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, 0.1) !important; } -.tabs_css >>> .mat-mdc-tab .mdc-tab-indicator__content--underline { +.tabs_css ::ng-deep .mat-mdc-tab .mdc-tab-indicator__content--underline { border-color: unset !important; } -.mat_form_field_width >>> .mat-mdc-text-field-wrapper { +.mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 130% !important; } h4{ diff --git a/src/app/app-modules/lab/workarea/workarea.component.css b/src/app/app-modules/lab/workarea/workarea.component.css index 7ab2eba..57d6c6b 100644 --- a/src/app/app-modules/lab/workarea/workarea.component.css +++ b/src/app/app-modules/lab/workarea/workarea.component.css @@ -231,14 +231,14 @@ md-expansion-panel { color: whitesmoke; border-radius: 10%; } -.tabs_css >>> .mat-mdc-tab.mdc-tab--active .mdc-tab__text-label { +.tabs_css ::ng-deep .mat-mdc-tab.mdc-tab--active .mdc-tab__text-label { color:unset !important; } -.tabs_css >>> .mat-mdc-tab-labels { +.tabs_css ::ng-deep .mat-mdc-tab-labels { width: 25rem !important; } -.tabs_css >>> .mat-mdc-tab { +.tabs_css ::ng-deep .mat-mdc-tab { -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -251,7 +251,7 @@ md-expansion-panel { font-weight: var(--mat-tab-header-label-text-weight); } -.tabs_css >>> .mat-tab-group.mat-primary .mat-tab-label:focus, .mat-tab-group.mat-primary .mat-tab-link:focus, .mat-tab-nav-bar.mat-primary .mat-tab-label:focus, .mat-tab-nav-bar.mat-primary .mat-tab-link:focus { +.tabs_css ::ng-deep .mat-tab-group.mat-primary .mat-tab-label:focus, .mat-tab-group.mat-primary .mat-tab-link:focus, .mat-tab-nav-bar.mat-primary .mat-tab-label:focus, .mat-tab-nav-bar.mat-primary .mat-tab-link:focus { background-color: rgba(179, 229, 252, 0.3); } @@ -262,6 +262,6 @@ md-expansion-panel { } -.mat_form_field_width >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 163% !important; } \ No newline at end of file diff --git a/src/app/app-modules/login/login.component.css b/src/app/app-modules/login/login.component.css index 9f269dd..4408cf5 100644 --- a/src/app/app-modules/login/login.component.css +++ b/src/app/app-modules/login/login.component.css @@ -132,6 +132,6 @@ input::-ms-reveal, input::-ms-clear { display: none; } -.mat_form_field_width >>> .mat-mdc-text-field-wrapper { +.mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 138% !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/anc/anc-details/anc-details.component.css b/src/app/app-modules/nurse-doctor/anc/anc-details/anc-details.component.css index a065411..19e4f3c 100644 --- a/src/app/app-modules/nurse-doctor/anc/anc-details/anc-details.component.css +++ b/src/app/app-modules/nurse-doctor/anc/anc-details/anc-details.component.css @@ -17,6 +17,6 @@ .mat-form-field { line-height: unset; } -mat-datepicker-toggle >>>.mat-mdc-form-field-icon-suffix, [dir=rtl] .mat-mdc-form-field-icon-prefix { +mat-datepicker-toggle ::ng-deep .mat-mdc-form-field-icon-suffix, [dir=rtl] .mat-mdc-form-field-icon-prefix { padding: 0px 0 0 34px; } diff --git a/src/app/app-modules/nurse-doctor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.css b/src/app/app-modules/nurse-doctor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.css index e82fa98..92316d8 100644 --- a/src/app/app-modules/nurse-doctor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.css +++ b/src/app/app-modules/nurse-doctor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.css @@ -67,17 +67,17 @@ img { padding: 20px; } -mat-form-field >>>.mat-mdc-text-field-wrapper { +mat-form-field ::ng-deep .mat-mdc-text-field-wrapper { width: 30% !important; } table, th, td { border: 1px solid; } - tr >>>.mat-mdc-row:hover { + tr ::ng-deep .mat-mdc-row:hover { color:unset !important; } - table >>>.mdc-data-table__table { + table ::ng-deep .mdc-data-table__table { min-width: 98% !important; margin-left: 13px !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.css b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.css index 8419fa6..1448bfd 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.css +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.css @@ -14,10 +14,10 @@ .multi_row_select{ padding: 10px 0px; } -/* .mat_label_fix >>> +/* .mat_label_fix ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -.mat_label_fix >>> .mat-mdc-text-field-wrapper { +.mat_label_fix ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.css b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.css index 3d578dd..a2ecc9d 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.css +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.css @@ -16,11 +16,11 @@ .input-full-width { width: 100%; } -.input-full-width-one >>> +.input-full-width-one ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: rgba(240, 245, 245, 0.5) !important; } -.input-full-width-one >>> .mat-mdc-text-field-wrapper { +.input-full-width-one ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } @@ -57,7 +57,7 @@ legend { } } -mat-form-field >>>.mat-label-text { +mat-form-field ::ng-deep .mat-label-text { color: #999 !important; font-weight: 600 !important; letter-spacing: initial !important; diff --git a/src/app/app-modules/nurse-doctor/history/cancer-history/family-disease-history/family-disease-history.component.css b/src/app/app-modules/nurse-doctor/history/cancer-history/family-disease-history/family-disease-history.component.css index 679753b..19fa019 100644 --- a/src/app/app-modules/nurse-doctor/history/cancer-history/family-disease-history/family-disease-history.component.css +++ b/src/app/app-modules/nurse-doctor/history/cancer-history/family-disease-history/family-disease-history.component.css @@ -28,10 +28,10 @@ h5{ .multi_row_select{ padding: 10px 0px; } -mat-form-field >>> +mat-form-field ::ng-deep /* .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -mat-form-field >>> .mat-mdc-text-field-wrapper { +mat-form-field ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/history/cancer-history/obstetric-history/obstetric-history.component.css b/src/app/app-modules/nurse-doctor/history/cancer-history/obstetric-history/obstetric-history.component.css index a442a97..5067a41 100644 --- a/src/app/app-modules/nurse-doctor/history/cancer-history/obstetric-history/obstetric-history.component.css +++ b/src/app/app-modules/nurse-doctor/history/cancer-history/obstetric-history/obstetric-history.component.css @@ -21,10 +21,10 @@ h5{ .mat-form-field { line-height: unset; } -.mat_form_field_width >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 80% !important; } -.mat_form_field_width_one >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width_one ::ng-deep .mat-mdc-text-field-wrapper { width: 148%; } diff --git a/src/app/app-modules/nurse-doctor/history/cancer-history/personal-history/personal-history.component.css b/src/app/app-modules/nurse-doctor/history/cancer-history/personal-history/personal-history.component.css index ad5de42..535bd31 100644 --- a/src/app/app-modules/nurse-doctor/history/cancer-history/personal-history/personal-history.component.css +++ b/src/app/app-modules/nurse-doctor/history/cancer-history/personal-history/personal-history.component.css @@ -31,15 +31,15 @@ input[type=number]::-webkit-outer-spin-button { } -.mat_form_field_width_thee >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width_thee ::ng-deep .mat-mdc-text-field-wrapper { width: 83% !important; } -.mat_form_field_width >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 83% !important; } -.mat_form_field_width_one >>> .mat-mdc-text-field-wrapper { +.mat_form_field_width_one ::ng-deep .mat-mdc-text-field-wrapper { width: 28% !important; } -.mat_form_field_width_two >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width_two ::ng-deep .mat-mdc-text-field-wrapper { width: 159% !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.css b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.css index 3cb3e0b..e4a3e62 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.css +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.css @@ -24,10 +24,10 @@ .multi_row_select{ padding: 10px 0px; } -/* mat-form-field >>> +/* mat-form-field ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -mat-form-field >>> .mat-mdc-text-field-wrapper { +mat-form-field ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.css b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.css index 84519e9..75449d8 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.css +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.css @@ -13,16 +13,16 @@ .box { height: 60px; } -/* mat-form-field >>> +/* mat-form-field ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -mat-form-field >>> .mat-mdc-text-field-wrapper { +mat-form-field ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } .multi_row_select{ padding: 10px 0px; } -.mat_border_style >>> .mat-mdc-form-field:not(.mat-form-field-no-animations) .mdc-text-field__input :disabled { +.mat_border_style ::ng-deep .mat-mdc-form-field:not(.mat-form-field-no-animations) .mdc-text-field__input :disabled { border-bottom-style: dotted !important; } diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.css b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.css index d7cfa27..18fd291 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.css +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.css @@ -16,10 +16,10 @@ .multi_row_select{ padding: 10px 0px; } -/* .input-full-width >>> +/* .input-full-width ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -.input-full-width >>> .mat-mdc-text-field-wrapper { +.input-full-width ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.css b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.css index 9f50f4c..451d8c6 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.css +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.css @@ -12,10 +12,10 @@ .multi_row_select{ padding: 10px 0px; } -/* mat-form-field >>> +/* mat-form-field ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -mat-form-field >>> .mat-mdc-text-field-wrapper { +mat-form-field ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.css b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.css index a6b10e3..c621305 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.css +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.css @@ -13,6 +13,6 @@ .box { height: 60px; } -.mat_form_field_width >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 125% !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/other-vaccines/other-vaccines.component.css b/src/app/app-modules/nurse-doctor/history/general-opd-history/other-vaccines/other-vaccines.component.css index 228e3f5..47e7e0f 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/other-vaccines/other-vaccines.component.css +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/other-vaccines/other-vaccines.component.css @@ -16,10 +16,10 @@ .multi_row_select{ padding: 10px 0px; } -/* mat-form-field >>> +/* mat-form-field ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -mat-form-field >>> .mat-mdc-text-field-wrapper { +mat-form-field ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.css b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.css index d6a6832..52f1ba9 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.css +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.css @@ -6,17 +6,17 @@ .box { height: 60px; } -/* mat-form-field >>> +/* mat-form-field ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -mat-form-field >>> .mat-mdc-text-field-wrapper { +mat-form-field ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } .multi_row_select{ padding: 10px 0px; } -/* .mat_border_style >>> .mat-mdc-form-field:not(.mat-form-field-no-animations) .mdc-text-field__input :disabled { +/* .mat_border_style ::ng-deep .mat-mdc-form-field:not(.mat-form-field-no-animations) .mdc-text-field__input :disabled { border-bottom-style: dotted !important; } */ diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.css b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.css index c267367..82202ed 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.css +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.css @@ -17,7 +17,7 @@ .box { height: 60px; } -/* .mat_form_field >>> +/* .mat_form_field ::ng-deep .mat-mdc-text-field-wrapper:not(.mdc-text-field--outlined) .mat-mdc-form-field-infix { background-color: #f5f5f5 !important; @@ -41,19 +41,19 @@ margin-bottom: 10px; } - /* .mat_form_field >>> + /* .mat_form_field ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f0f5f5 !important; } */ -/* .mat_form_field >>> .mat-mdc-text-field-wrapper { +/* .mat_form_field ::ng-deep .mat-mdc-text-field-wrapper { height:unset !important; } -.mat_form_field_length >>> .input-full-width[_ngcontent-ng-c1820935159] { +.mat_form_field_length ::ng-deep .input-full-width[_ngcontent-ng-c1820935159] { width: 75% !important; } -.mat_form_field_length >>> .mdc-text-field__input { +.mat_form_field_length ::ng-deep .mdc-text-field__input { width: 51% !important; */ @@ -62,6 +62,6 @@ padding: 0px; box-sizing: unset; } -/* .mat_form_field_width >>> .mat-mdc-text-field-wrapper { +/* .mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 55% !important; } */ \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-tabs/nurse-worklist-tabs.component.css b/src/app/app-modules/nurse-doctor/nurse-worklist-tabs/nurse-worklist-tabs.component.css index 332b1a9..e52eefe 100644 --- a/src/app/app-modules/nurse-doctor/nurse-worklist-tabs/nurse-worklist-tabs.component.css +++ b/src/app/app-modules/nurse-doctor/nurse-worklist-tabs/nurse-worklist-tabs.component.css @@ -1,11 +1,11 @@ -.tabs_css >>> .mat-mdc-tab.mdc-tab--active .mdc-tab__text-label { +.tabs_css ::ng-deep .mat-mdc-tab.mdc-tab--active .mdc-tab__text-label { color:unset !important; } -.tabs_css >>> .mat-mdc-tab-labels { +.tabs_css ::ng-deep .mat-mdc-tab-labels { width: 25rem !important; } -.tabs_css >>> .mat-mdc-tab { +.tabs_css ::ng-deep .mat-mdc-tab { -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -18,6 +18,6 @@ font-weight: var(--mat-tab-header-label-text-weight); } -.tabs_css >>> .mat-tab-group.mat-primary .mat-tab-label:focus, .mat-tab-group.mat-primary .mat-tab-link:focus, .mat-tab-nav-bar.mat-primary .mat-tab-label:focus, .mat-tab-nav-bar.mat-primary .mat-tab-link:focus { +.tabs_css ::ng-deep .mat-tab-group.mat-primary .mat-tab-label:focus, .mat-tab-group.mat-primary .mat-tab-link:focus, .mat-tab-nav-bar.mat-primary .mat-tab-label:focus, .mat-tab-nav-bar.mat-primary .mat-tab-link:focus { background-color: rgba(179, 229, 252, 0.3); } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/reports/reports.component.css b/src/app/app-modules/nurse-doctor/reports/reports.component.css index f7ec069..7bf3852 100644 --- a/src/app/app-modules/nurse-doctor/reports/reports.component.css +++ b/src/app/app-modules/nurse-doctor/reports/reports.component.css @@ -30,6 +30,6 @@ background-color: rgba(0, 0, 0, 0.12); color: rgba(0, 0, 0, 0.38); } -/* .mat_form_field_color >>>.mdc-text-field--filled, .mdc-text-field--focused { +/* .mat_form_field_color ::ng-deep .mdc-text-field--filled, .mdc-text-field--focused { background-color: #f2f2f0 !important; } */ \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.css b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.css index 254a945..256caa1 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.css +++ b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.css @@ -28,29 +28,29 @@ h5 { border-bottom: 1px solid lightgray; } -.input-full-width>>>.mdc-text-field--no-label:not(.mdc-text-field--outlined):not(.mdc-text-field--textarea) .mat-mdc-form-field-infix { +.input-full-width::ng-deep .mdc-text-field--no-label:not(.mdc-text-field--outlined):not(.mdc-text-field--textarea) .mat-mdc-form-field-infix { padding-top: 16px; padding-bottom: 16px; /* background-color: #f0f5f5 !important; */ margin-left: unset; } -.input_style>>>.mdc-text-field--no-label:not(.mdc-text-field--outlined):not(.mdc-text-field--textarea) .mat-mdc-form-field-infix { +.input_style::ng-deep .mdc-text-field--no-label:not(.mdc-text-field--outlined):not(.mdc-text-field--textarea) .mat-mdc-form-field-infix { padding-top: 16px; padding-bottom: 16px; /* background-color: #f0f5f5 !important; */ margin-left: unset; } -.input_style>>>.mdc-text-field { +.input_style::ng-deep .mdc-text-field { padding: unset !important; } -.input-full-width>>>.mdc-text-field { +.input-full-width::ng-deep .mdc-text-field { padding: unset !important; } -/* .input-full-width>>>.mdc-text-field--filled:not(.mdc-text-field--disabled) .mdc-line-ripple::before { +/* .input-full-width::ng-deep .mdc-text-field--filled:not(.mdc-text-field--disabled) .mdc-line-ripple::before { border-bottom-style: dotted !important; } */ @@ -72,11 +72,11 @@ h5 { width: 40px; height: 40px; } -/* .input-full-width >>> .mat-mdc-form-field:not(.mat-form-field-no-animations) .mdc-text-field__input { +/* .input-full-width ::ng-deep .mat-mdc-form-field:not(.mat-form-field-no-animations) .mdc-text-field__input { border-bottom-style: unset !important; } */ -/* .input-full-width>>>.mat-mdc-text-field-wrapper:not(.mdc-text-field--outlined) .mat-mdc-form-field-infix { +/* .input-full-width::ng-deep .mat-mdc-text-field-wrapper:not(.mdc-text-field--outlined) .mat-mdc-form-field-infix { background-color: #f0f5f5 !important; } */ diff --git a/src/app/app-modules/nurse-doctor/visit-details/covid-vaccination-status/covid-vaccination-status.component.css b/src/app/app-modules/nurse-doctor/visit-details/covid-vaccination-status/covid-vaccination-status.component.css index 8346108..0d3fcdc 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/covid-vaccination-status/covid-vaccination-status.component.css +++ b/src/app/app-modules/nurse-doctor/visit-details/covid-vaccination-status/covid-vaccination-status.component.css @@ -14,6 +14,6 @@ border-radius: 3px; margin-bottom: 10px; } -.mat_form_field_width >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 185% !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.css b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.css index 2286fcf..4c462c2 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.css +++ b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.css @@ -8,6 +8,6 @@ padding-top: 8px; } -mat-form-field >>>.mat-mdc-select-trigger { +mat-form-field ::ng-deep .mat-mdc-select-trigger { width: 154% !important; } \ No newline at end of file diff --git a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.css b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.css index b466a69..a2e2c08 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.css +++ b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.css @@ -22,6 +22,6 @@ h5{ height: 60px; } -/* .mat_form_field_width >>>.mat-mdc-text-field-wrapper { +/* .mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 95%; } */ \ No newline at end of file diff --git a/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.css b/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.css index 959cd45..be1cf19 100644 --- a/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.css +++ b/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.css @@ -12,6 +12,6 @@ margin-top:1px ; } - .mat_form_field_width >>> .mat-mdc-text-field-wrapper { + .mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 100% !important; } \ No newline at end of file diff --git a/src/app/app-modules/registrar/registration/register-other-details/register-other-details.component.css b/src/app/app-modules/registrar/registration/register-other-details/register-other-details.component.css index 82a99af..7815a62 100644 --- a/src/app/app-modules/registrar/registration/register-other-details/register-other-details.component.css +++ b/src/app/app-modules/registrar/registration/register-other-details/register-other-details.component.css @@ -12,6 +12,6 @@ float: left; font-size: 12px; } -/* .mat_form_field_width >>> .mat-mdc-text-field-wrapper { +/* .mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 90% !important; } */ \ No newline at end of file diff --git a/src/app/app-modules/registrar/registration/register-personal-details/register-personal-details.component.css b/src/app/app-modules/registrar/registration/register-personal-details/register-personal-details.component.css index 49a3799..39b7724 100644 --- a/src/app/app-modules/registrar/registration/register-personal-details/register-personal-details.component.css +++ b/src/app/app-modules/registrar/registration/register-personal-details/register-personal-details.component.css @@ -66,9 +66,9 @@ ::ng-deep.bs-datepicker.bs-datepicker-container { padding: 0 !important; } - .mat_form_field_width >>> .mat-mdc-text-field-wrapper { + .mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { width: 100% !important; } -.mat_form_field_width_one >>> .mat-mdc-text-field-wrapper { +.mat_form_field_width_one ::ng-deep .mat-mdc-text-field-wrapper { width: 107% !important; } \ No newline at end of file diff --git a/src/app/app-modules/service-point/service-point.component.css b/src/app/app-modules/service-point/service-point.component.css index e7d1be9..616c49e 100644 --- a/src/app/app-modules/service-point/service-point.component.css +++ b/src/app/app-modules/service-point/service-point.component.css @@ -40,7 +40,7 @@ mat-card-actions { display: block; float: right; } -.mat_form_field_width >>>.mat-mdc-text-field-wrapper { +.mat_form_field_width ::ng-deep .mat-mdc-text-field-wrapper { padding-right: unset !important; } .mat-form-field-width{ diff --git a/src/app/app-modules/set-password/set-password.component.css b/src/app/app-modules/set-password/set-password.component.css index cacbf70..a834bc7 100644 --- a/src/app/app-modules/set-password/set-password.component.css +++ b/src/app/app-modules/set-password/set-password.component.css @@ -4,7 +4,7 @@ md-grid-list { justify-content: center; height: 550px; } -.mat_field >>>.mat-mdc-form-field { +.mat_field ::ng-deep .mat-mdc-form-field { display:initial !important; } md-card { From 3cbb956b28edeb41ba32359f9261a5b88f9056d5 Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Mon, 26 Aug 2024 19:58:57 +0530 Subject: [PATCH 04/21] common_UI deployement --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index f051391..5ec42df 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit f051391f6c56024c4bee4fab5d25fe4239026896 +Subproject commit 5ec42df9f6d40647283e9c484c4bfeea3d8b27b8 From e1666f59cfbe8048e2d5564ee980ba22c5e1d61f Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Thu, 29 Aug 2024 14:58:59 +0530 Subject: [PATCH 05/21] readme file changes and add nvmrc file --- .nvmrc | 1 + Common-UI | 2 +- README.md | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..3f430af --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v18 diff --git a/Common-UI b/Common-UI index 5ec42df..c6acea4 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 5ec42df9f6d40647283e9c484c4bfeea3d8b27b8 +Subproject commit c6acea4978ff89439714dd8f4e715b11bef7b5b5 diff --git a/README.md b/README.md index f00d672..0877089 100644 --- a/README.md +++ b/README.md @@ -31,9 +31,8 @@ This microservice is developed using Java and the Spring Boot framework, with My Ensure that the following prerequisites are met before building the MMU service: * JDK 17 -* Maven -* NPM/YARN -* Spring Boot v2 +* Maven +* Nodejs v18.10.0 * MySQL ### Installation From e8daac76e82ab3eefdd2095f8bf394c6c9432e56 Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Mon, 2 Sep 2024 16:58:02 +0530 Subject: [PATCH 06/21] comman UI wardeployement --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index c6acea4..c03dec3 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit c6acea4978ff89439714dd8f4e715b11bef7b5b5 +Subproject commit c03dec35c0824bc049a4c76a797f151abcab1e71 From ac15fd0347e764f268875c7359723b65fdc3fa28 Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Mon, 2 Sep 2024 19:02:50 +0530 Subject: [PATCH 07/21] Change in interceptor service for Swasaa --- .../core/services/http-interceptor.service.ts | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/app/app-modules/core/services/http-interceptor.service.ts b/src/app/app-modules/core/services/http-interceptor.service.ts index e1aa39e..f1eb2a1 100644 --- a/src/app/app-modules/core/services/http-interceptor.service.ts +++ b/src/app/app-modules/core/services/http-interceptor.service.ts @@ -7,6 +7,7 @@ import { HttpResponse, HttpClient, HttpErrorResponse, + HttpHeaders, } from '@angular/common/http'; import { catchError, tap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; @@ -22,6 +23,10 @@ import { environment } from 'src/environments/environment'; export class HttpInterceptorService implements HttpInterceptor { timerRef: any; currentLanguageSet: any; + donotShowSpinnerUrl = [ + environment.syncDownloadProgressUrl, + environment.ioturl, + ]; constructor( private spinnerService: SpinnerService, private router: Router, @@ -34,18 +39,30 @@ export class HttpInterceptorService implements HttpInterceptor { next: HttpHandler ): Observable> { const key: any = sessionStorage.getItem('key'); - let modifiedReq = null; - if (key !== undefined && key !== null) { + let modifiedReq = req; + if (req.body instanceof FormData) { modifiedReq = req.clone({ - headers: req.headers - .set('Authorization', key) - .set('ServerAuthorization', key) - .set('Content-Type', 'application/json'), + // headers: req.headers + // .set('Authorization', key || '') + // .set('ServerAuthorization', key) + // .set('Content-Type', 'application/json'), + headers: req.headers.set('Authorization', key || ''), }); } else { - modifiedReq = req.clone({ - headers: req.headers.set('Authorization', ''), - }); + // modifiedReq = req.clone({ + // headers: req.headers.set('Authorization', ''), + // }); + if (key !== undefined && key !== null) { + modifiedReq = req.clone({ + headers: req.headers + .set('Authorization', key) + .set('Content-Type', 'application/json'), + }); + } else { + modifiedReq = req.clone({ + headers: req.headers.set('Authorization', ''), + }); + } } return next.handle(modifiedReq).pipe( tap((event: HttpEvent) => { From c849e779323d33753c5c184bcb96feff634dd4dc Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Thu, 5 Sep 2024 09:56:45 +0530 Subject: [PATCH 08/21] comman UI wardeployement --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index c03dec3..a4fd683 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit c03dec35c0824bc049a4c76a797f151abcab1e71 +Subproject commit a4fd6833b0847a8ad9d25d2fb10fdf9ee08309c8 From f10543386cb34691ef5119ce10d0c36231f0ac9d Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Fri, 6 Sep 2024 11:02:56 +0530 Subject: [PATCH 09/21] comman UI wardeployement --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index a4fd683..cbb93d0 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit a4fd6833b0847a8ad9d25d2fb10fdf9ee08309c8 +Subproject commit cbb93d04faf5975271b969d580e5cfb85a424782 From 2e6726d8e76380193cc33fde7f03742b35f2a7f4 Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Mon, 9 Sep 2024 11:56:44 +0530 Subject: [PATCH 10/21] comman UI wardeployement --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index cbb93d0..5bed5b1 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit cbb93d04faf5975271b969d580e5cfb85a424782 +Subproject commit 5bed5b1e8b1acafa94d5a7c5d1542366646d75c3 From bdb02d98a46e635c0a18d1728d8c65305cc00fd2 Mon Sep 17 00:00:00 2001 From: nkokkiligadda87 Date: Mon, 9 Sep 2024 15:25:34 +0530 Subject: [PATCH 11/21] comman UI wardeployement --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 5bed5b1..113f377 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 5bed5b1e8b1acafa94d5a7c5d1542366646d75c3 +Subproject commit 113f37713b5272008b4de17f74a279035fb8baeb From 9a1fbe99893c4e1611f6a82cd3267e0bd3dac193 Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Wed, 11 Sep 2024 16:17:14 +0530 Subject: [PATCH 12/21] MMU Service Point related Changes --- .../register-demographic-details.component.ts | 10 +- .../service-point/service-point.component.ts | 121 +++++++++--------- .../service-point/service-point.service.ts | 2 + src/assets/Assamese.json | 2 +- src/assets/English.json | 2 +- src/assets/Hindi.json | 6 +- 6 files changed, 75 insertions(+), 68 deletions(-) diff --git a/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.ts b/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.ts index 95123fc..81198ec 100644 --- a/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.ts +++ b/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.ts @@ -857,7 +857,7 @@ export class RegisterDemographicDetailsComponent this.onDistrictChangeOnLoad(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } @@ -879,7 +879,7 @@ export class RegisterDemographicDetailsComponent this.onSubDistrictOnLoad(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } @@ -905,7 +905,7 @@ export class RegisterDemographicDetailsComponent }); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingLocationDetails, + this.currentLanguageSet.alerts.info.issuesinfetchingLocation, 'error' ); } @@ -924,7 +924,7 @@ export class RegisterDemographicDetailsComponent this.emptyVillage(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.issuesInFetchingLocationDetails, + this.currentLanguageSet.alerts.info.issuesinfetchingLocation, 'error' ); } @@ -1063,7 +1063,7 @@ export class RegisterDemographicDetailsComponent this.emptyVillage(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } diff --git a/src/app/app-modules/service-point/service-point.component.ts b/src/app/app-modules/service-point/service-point.component.ts index d105aa7..6a139de 100644 --- a/src/app/app-modules/service-point/service-point.component.ts +++ b/src/app/app-modules/service-point/service-point.component.ts @@ -244,7 +244,7 @@ export class ServicePointComponent implements OnInit, DoCheck { (servicePoint: any) => { return servicePoint.servicePointName .toLowerCase() - .startsWith(searchTerm.toLowerCase()); + .startsWith(searchTerm?.toLowerCase()); } ); } else { @@ -320,47 +320,26 @@ export class ServicePointComponent implements OnInit, DoCheck { saveDemographicsToStorage(data: any) { if (data) { - if (data.stateMaster && data.stateMaster.length >= 1) { + if (data?.userDetails) { localStorage.setItem('location', JSON.stringify(data)); this.statesList = data.stateMaster; this.servicePointForm.controls.stateID.patchValue( - data.otherLoc.stateID + data?.userDetails?.stateID ); this.servicePointForm.controls.stateName.patchValue( - data.otherLoc.stateName + data?.userDetails?.stateName ); - this.fetchDistricts(this.servicePointForm.controls.stateID.value); - if (data.otherLoc.districtList) { - this.servicePointForm.patchValue({ - districtID: data.otherLoc.districtList[0].districtID, - districtName: data.otherLoc.districtList[0].districtName, - }); - this.fetchSubDistrictsOnDistrictSelection( - data.otherLoc.districtList[0].districtID - ); - console.log('subDistrictList', this.subDistrictList); - console.log('data before patch', this.servicePointForm); - if (data.otherLoc.districtList[0].blockID) { - this.servicePointForm.patchValue({ - blockID: data.otherLoc.districtList[0].blockID, - blockName: data.otherLoc.districtList[0].blockName, - }); - console.log('data after patch', this.servicePointForm); - this.onSubDistrictChange(data.otherLoc.districtList[0].blockID); - } else { - this.confirmationService.alert( - 'Please add block in worklocation mapping to proceed further', - 'info' - ); - } - } + this.servicePointForm.patchValue({ + districtID: data?.userDetails?.districtID, + districtName: data?.userDetails?.districtName, + }); - // } - // this.servicePointForm.controls.districtID.reset(); - // this.servicePointForm.controls.blockID.reset(); - // this.servicePointForm.controls.districtBranchID.reset(); + this.fetchSubDistrictsOnDistrictSelection(data); } else { - this.locationGathetingIssues(); + this.confirmationService.alert( + 'Please add block in worklocation mapping to proceed further', + 'info' + ); } } else { this.locationGathetingIssues(); @@ -372,7 +351,7 @@ export class ServicePointComponent implements OnInit, DoCheck { this.districtList = res.data; } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } @@ -396,35 +375,61 @@ export class ServicePointComponent implements OnInit, DoCheck { this.servicePointForm.controls.districtBranchID.reset(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } }); } - fetchSubDistrictsOnDistrictSelection(districtID: any) { - if (districtID) { - this.districtList.forEach((item: any) => { - if (item.districtID === districtID) - return this.servicePointForm.controls.districtName.setValue( - item.districtName - ); - }); + fetchSubDistrictsOnDistrictSelection(locDetails: any) { + const blockList = locDetails?.userDetails?.blockList; + if (blockList && blockList.length > 0 && blockList[0]?.blockId) { + const districtID = locDetails?.userDetails?.districtID; + this.registrarService + .getSubDistrictList(districtID) + .subscribe((res: any) => { + if (res && res.statusCode === 200) { + this.subDistrictList = res.data; + this.servicePointForm.controls.districtBranchID.reset(); + + const blockList = locDetails?.userDetails?.blockList; + if (blockList && blockList.length > 0 && blockList[0]?.blockId) { + this.subDistrictList.forEach((blockDetails: any) => { + if (blockDetails.blockID === parseInt(blockList[0]?.blockId)) { + this.servicePointForm.controls['blockID'].setValue( + blockDetails.blockID + ); + this.servicePointForm.controls['blockName'].setValue( + blockDetails.blockName + ); + } + }); + this.getVillageMaster(locDetails); + } + } + }); + } else { + this.confirmationService.alert( + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, + 'error' + ); } - this.registrarService - .getSubDistrictList(districtID) - .subscribe((res: any) => { - if (res && res.statusCode === 200) { - this.subDistrictList = res.data; - this.servicePointForm.controls.districtBranchID.reset(); - } else { - this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, - 'error' - ); - } - }); + } + + getVillageMaster(locDetails: any) { + const blockID = locDetails?.userDetails?.blockList[0]?.blockId; + this.registrarService.getVillageList(blockID).subscribe((res: any) => { + if (res && res.statusCode === 200) { + this.villageList = res.data; + this.servicePointForm.controls.districtBranchID.reset(); + } else { + this.confirmationService.alert( + this.currentLanguageSet.alerts.info.issuesinfetchingLocation, + 'error' + ); + } + }); } onSubDistrictChange(blockID: any) { @@ -442,7 +447,7 @@ export class ServicePointComponent implements OnInit, DoCheck { this.servicePointForm.controls.districtBranchID.reset(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingLocationDetails, + this.currentLanguageSet.alerts.info.issuesinfetchingLocation, 'error' ); } diff --git a/src/app/app-modules/service-point/service-point.service.ts b/src/app/app-modules/service-point/service-point.service.ts index e5b495f..5f5665a 100644 --- a/src/app/app-modules/service-point/service-point.service.ts +++ b/src/app/app-modules/service-point/service-point.service.ts @@ -42,10 +42,12 @@ export class ServicePointService { getMMUDemographics() { const spID = localStorage.getItem('servicePointID'); const spPSMID = localStorage.getItem('providerServiceID'); + const userId = localStorage.getItem('userID'); return this.http.post(environment.demographicsCurrentMasterUrl, { spID: spID, spPSMID: spPSMID, + userId: userId, }); } } diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json index 231346b..5bea294 100644 --- a/src/assets/Assamese.json +++ b/src/assets/Assamese.json @@ -1249,7 +1249,7 @@ "issuesinfetchingLocation": "আপোনাৰ অৱস্থান প্ৰাপ্ত কৰাত সমস্যা। পুনৰ লগইন কৰক আৰু পুনৰ চেষ্টা কৰক।", "RemoveTheChanges": "আপুনি পৰিবর্তনখিনি আতৰাবলৈ নিশ্চিত নে?", "issuesInFetchingLocationDetails": "অৱস্থানৰ বিৱৰণ প্ৰাপ্ত কৰাৰ সমস্যা, অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।", - "issuesInFetchingDemographics,": "জনগাঁথনি প্ৰাপ্ত কৰাৰ সমস্যা, অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।", + "issuesInFetchingDemographics": "জনগাঁথনি প্ৰাপ্ত কৰাৰ সমস্যা, অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।", "pleaseInputFieldFirst": "প্ৰথমে নিৰ্বাচিত ক্ষেত্ৰৰ বাবে অনুগ্ৰহ কৰি ইনপুট কৰক", "continueSession": "কনটিনি‍উ চেচনঃ আপোনাৰ চেচনটি কনটিনিউ কৰিব বিচাৰে নেকি?", "sessionGoingToExpire": "আপোনাৰ চেচনটৰি সময়ত অতিবাহিত (এক্সপাইৰি) হ'বলৈ ওলাইছে", diff --git a/src/assets/English.json b/src/assets/English.json index 2412deb..a21521a 100644 --- a/src/assets/English.json +++ b/src/assets/English.json @@ -1258,7 +1258,7 @@ "issuesinfetchingLocation": "Issues in fetching your location. Relogin & Try again", "RemoveTheChanges": "Are you sure to remove the changes", "issuesInFetchingLocationDetails": "Issues in Fetching Location Details, please try again", - "issuesInFetchingDemographics,": "Issues in Fetching Demographics, Please try again", + "issuesInFetchingDemographics": "Issues in Fetching Demographics, Please try again", "pleaseInputFieldFirst": "Please input for selected field first", "continueSession": "continueSession: Want to continue your session", "sessionGoingToExpire": "Your Session is Going To Expire", diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json index 8f341e5..fc32d21 100644 --- a/src/assets/Hindi.json +++ b/src/assets/Hindi.json @@ -1244,10 +1244,10 @@ "notAuthorized": "आप इस पेज को देखने के लिए अधिकृत नहीं हैं", "usernamenPass": "उपयोगकर्ता के नाम और पासवर्ड दोनों आवश्यक हैं", "IssuesinConnectingtoInventory": "सूची से कनेक्ट करने में रुकावट, पुनः प्रयास करे", - "IssuesinfetchingLocation": "Issues in fetching your location. Relogin & Try again", + "issuesinfetchingLocation": "Issues in fetching your location. Relogin & Try again", "RemoveTheChanges": "क्या आप परिवर्तनों को दूर करने के लिए सहमत हैं?", - "IssuesInFetchingLocationDetails": "स्थान के विवरण को पुनर्प्राप्त में समस्या आ रही है , कृपया पुनः प्रयास करें", - "IssuesInFetchingDemographics,": "जनसांख्यिकी विवरण निकालने  मे त्रुटि , कृपया पुन: प्रयास करें", + "issuesInFetchingLocationDetails": "स्थान के विवरण को पुनर्प्राप्त में समस्या आ रही है , कृपया पुनः प्रयास करें", + "issuesInFetchingDemographics": "जनसांख्यिकी विवरण निकालने  मे त्रुटि , कृपया पुन: प्रयास करें", "PleaseInputFieldFirst": "पहले चयनित क्षेत्र में निविष्टियो को डालें", "continueSession": "सत्र जारी है: क्या आप सत्र जारी रखना चाहते हैं", "sessionGoingToExpire": "आपकी सत्र समाप्त हो रही है", From 270b301c816e79700780ce3ef44338ae07c7df0c Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Wed, 11 Sep 2024 16:55:50 +0530 Subject: [PATCH 13/21] Added minor change in service point screen --- .../service-point/service-point.component.ts | 54 ++++++++----------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/src/app/app-modules/service-point/service-point.component.ts b/src/app/app-modules/service-point/service-point.component.ts index 6a139de..4b917da 100644 --- a/src/app/app-modules/service-point/service-point.component.ts +++ b/src/app/app-modules/service-point/service-point.component.ts @@ -383,38 +383,30 @@ export class ServicePointComponent implements OnInit, DoCheck { } fetchSubDistrictsOnDistrictSelection(locDetails: any) { - const blockList = locDetails?.userDetails?.blockList; - if (blockList && blockList.length > 0 && blockList[0]?.blockId) { - const districtID = locDetails?.userDetails?.districtID; - this.registrarService - .getSubDistrictList(districtID) - .subscribe((res: any) => { - if (res && res.statusCode === 200) { - this.subDistrictList = res.data; - this.servicePointForm.controls.districtBranchID.reset(); - - const blockList = locDetails?.userDetails?.blockList; - if (blockList && blockList.length > 0 && blockList[0]?.blockId) { - this.subDistrictList.forEach((blockDetails: any) => { - if (blockDetails.blockID === parseInt(blockList[0]?.blockId)) { - this.servicePointForm.controls['blockID'].setValue( - blockDetails.blockID - ); - this.servicePointForm.controls['blockName'].setValue( - blockDetails.blockName - ); - } - }); - this.getVillageMaster(locDetails); - } + const districtID = locDetails?.userDetails?.districtID; + this.registrarService + .getSubDistrictList(districtID) + .subscribe((res: any) => { + if (res && res.statusCode === 200) { + this.subDistrictList = res.data; + this.servicePointForm.controls.districtBranchID.reset(); + + const blockList = locDetails?.userDetails?.blockList; + if (blockList && blockList.length > 0 && blockList[0]?.blockId) { + this.subDistrictList.forEach((blockDetails: any) => { + if (blockDetails.blockID === parseInt(blockList[0]?.blockId)) { + this.servicePointForm.controls['blockID'].setValue( + blockDetails.blockID + ); + this.servicePointForm.controls['blockName'].setValue( + blockDetails.blockName + ); + } + }); + this.getVillageMaster(locDetails); } - }); - } else { - this.confirmationService.alert( - this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, - 'error' - ); - } + } + }); } getVillageMaster(locDetails: any) { From e37a660f8cd37135dcda05b38ecd6af76ba049fc Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Wed, 11 Sep 2024 17:00:36 +0530 Subject: [PATCH 14/21] Added minor change in service point screen --- src/app/app-modules/service-point/service-point.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app-modules/service-point/service-point.component.ts b/src/app/app-modules/service-point/service-point.component.ts index 4b917da..e86011f 100644 --- a/src/app/app-modules/service-point/service-point.component.ts +++ b/src/app/app-modules/service-point/service-point.component.ts @@ -337,8 +337,8 @@ export class ServicePointComponent implements OnInit, DoCheck { this.fetchSubDistrictsOnDistrictSelection(data); } else { this.confirmationService.alert( - 'Please add block in worklocation mapping to proceed further', - 'info' + this.currentLanguageSet.alerts.info.issuesInFetchingLocationDetails, + 'error' ); } } else { From 7ffb1fc5384eceec8dde7fc0358cc2a1a42ccb2b Mon Sep 17 00:00:00 2001 From: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:58:17 +0530 Subject: [PATCH 15/21] AMM-943 MMU Service Point Related Changes - addition of Taluk and Village (#105) * MMU Service Point related Changes * Added minor change in service point screen * Added minor change in service point screen --- .../register-demographic-details.component.ts | 10 +- .../service-point/service-point.component.ts | 99 +++++++++---------- .../service-point/service-point.service.ts | 2 + src/assets/Assamese.json | 2 +- src/assets/English.json | 2 +- src/assets/Hindi.json | 6 +- 6 files changed, 60 insertions(+), 61 deletions(-) diff --git a/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.ts b/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.ts index 95123fc..81198ec 100644 --- a/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.ts +++ b/src/app/app-modules/registrar/registration/register-demographic-details/register-demographic-details.component.ts @@ -857,7 +857,7 @@ export class RegisterDemographicDetailsComponent this.onDistrictChangeOnLoad(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } @@ -879,7 +879,7 @@ export class RegisterDemographicDetailsComponent this.onSubDistrictOnLoad(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } @@ -905,7 +905,7 @@ export class RegisterDemographicDetailsComponent }); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingLocationDetails, + this.currentLanguageSet.alerts.info.issuesinfetchingLocation, 'error' ); } @@ -924,7 +924,7 @@ export class RegisterDemographicDetailsComponent this.emptyVillage(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.issuesInFetchingLocationDetails, + this.currentLanguageSet.alerts.info.issuesinfetchingLocation, 'error' ); } @@ -1063,7 +1063,7 @@ export class RegisterDemographicDetailsComponent this.emptyVillage(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } diff --git a/src/app/app-modules/service-point/service-point.component.ts b/src/app/app-modules/service-point/service-point.component.ts index d105aa7..e86011f 100644 --- a/src/app/app-modules/service-point/service-point.component.ts +++ b/src/app/app-modules/service-point/service-point.component.ts @@ -244,7 +244,7 @@ export class ServicePointComponent implements OnInit, DoCheck { (servicePoint: any) => { return servicePoint.servicePointName .toLowerCase() - .startsWith(searchTerm.toLowerCase()); + .startsWith(searchTerm?.toLowerCase()); } ); } else { @@ -320,47 +320,26 @@ export class ServicePointComponent implements OnInit, DoCheck { saveDemographicsToStorage(data: any) { if (data) { - if (data.stateMaster && data.stateMaster.length >= 1) { + if (data?.userDetails) { localStorage.setItem('location', JSON.stringify(data)); this.statesList = data.stateMaster; this.servicePointForm.controls.stateID.patchValue( - data.otherLoc.stateID + data?.userDetails?.stateID ); this.servicePointForm.controls.stateName.patchValue( - data.otherLoc.stateName + data?.userDetails?.stateName ); - this.fetchDistricts(this.servicePointForm.controls.stateID.value); - if (data.otherLoc.districtList) { - this.servicePointForm.patchValue({ - districtID: data.otherLoc.districtList[0].districtID, - districtName: data.otherLoc.districtList[0].districtName, - }); - this.fetchSubDistrictsOnDistrictSelection( - data.otherLoc.districtList[0].districtID - ); - console.log('subDistrictList', this.subDistrictList); - console.log('data before patch', this.servicePointForm); - if (data.otherLoc.districtList[0].blockID) { - this.servicePointForm.patchValue({ - blockID: data.otherLoc.districtList[0].blockID, - blockName: data.otherLoc.districtList[0].blockName, - }); - console.log('data after patch', this.servicePointForm); - this.onSubDistrictChange(data.otherLoc.districtList[0].blockID); - } else { - this.confirmationService.alert( - 'Please add block in worklocation mapping to proceed further', - 'info' - ); - } - } + this.servicePointForm.patchValue({ + districtID: data?.userDetails?.districtID, + districtName: data?.userDetails?.districtName, + }); - // } - // this.servicePointForm.controls.districtID.reset(); - // this.servicePointForm.controls.blockID.reset(); - // this.servicePointForm.controls.districtBranchID.reset(); + this.fetchSubDistrictsOnDistrictSelection(data); } else { - this.locationGathetingIssues(); + this.confirmationService.alert( + this.currentLanguageSet.alerts.info.issuesInFetchingLocationDetails, + 'error' + ); } } else { this.locationGathetingIssues(); @@ -372,7 +351,7 @@ export class ServicePointComponent implements OnInit, DoCheck { this.districtList = res.data; } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } @@ -396,37 +375,55 @@ export class ServicePointComponent implements OnInit, DoCheck { this.servicePointForm.controls.districtBranchID.reset(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, + this.currentLanguageSet.alerts.info.issuesInFetchingDemographics, 'error' ); } }); } - fetchSubDistrictsOnDistrictSelection(districtID: any) { - if (districtID) { - this.districtList.forEach((item: any) => { - if (item.districtID === districtID) - return this.servicePointForm.controls.districtName.setValue( - item.districtName - ); - }); - } + fetchSubDistrictsOnDistrictSelection(locDetails: any) { + const districtID = locDetails?.userDetails?.districtID; this.registrarService .getSubDistrictList(districtID) .subscribe((res: any) => { if (res && res.statusCode === 200) { this.subDistrictList = res.data; this.servicePointForm.controls.districtBranchID.reset(); - } else { - this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingDemographics, - 'error' - ); + + const blockList = locDetails?.userDetails?.blockList; + if (blockList && blockList.length > 0 && blockList[0]?.blockId) { + this.subDistrictList.forEach((blockDetails: any) => { + if (blockDetails.blockID === parseInt(blockList[0]?.blockId)) { + this.servicePointForm.controls['blockID'].setValue( + blockDetails.blockID + ); + this.servicePointForm.controls['blockName'].setValue( + blockDetails.blockName + ); + } + }); + this.getVillageMaster(locDetails); + } } }); } + getVillageMaster(locDetails: any) { + const blockID = locDetails?.userDetails?.blockList[0]?.blockId; + this.registrarService.getVillageList(blockID).subscribe((res: any) => { + if (res && res.statusCode === 200) { + this.villageList = res.data; + this.servicePointForm.controls.districtBranchID.reset(); + } else { + this.confirmationService.alert( + this.currentLanguageSet.alerts.info.issuesinfetchingLocation, + 'error' + ); + } + }); + } + onSubDistrictChange(blockID: any) { if (blockID) { this.subDistrictList.forEach((item: any) => { @@ -442,7 +439,7 @@ export class ServicePointComponent implements OnInit, DoCheck { this.servicePointForm.controls.districtBranchID.reset(); } else { this.confirmationService.alert( - this.currentLanguageSet.alerts.info.IssuesInFetchingLocationDetails, + this.currentLanguageSet.alerts.info.issuesinfetchingLocation, 'error' ); } diff --git a/src/app/app-modules/service-point/service-point.service.ts b/src/app/app-modules/service-point/service-point.service.ts index e5b495f..5f5665a 100644 --- a/src/app/app-modules/service-point/service-point.service.ts +++ b/src/app/app-modules/service-point/service-point.service.ts @@ -42,10 +42,12 @@ export class ServicePointService { getMMUDemographics() { const spID = localStorage.getItem('servicePointID'); const spPSMID = localStorage.getItem('providerServiceID'); + const userId = localStorage.getItem('userID'); return this.http.post(environment.demographicsCurrentMasterUrl, { spID: spID, spPSMID: spPSMID, + userId: userId, }); } } diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json index 231346b..5bea294 100644 --- a/src/assets/Assamese.json +++ b/src/assets/Assamese.json @@ -1249,7 +1249,7 @@ "issuesinfetchingLocation": "আপোনাৰ অৱস্থান প্ৰাপ্ত কৰাত সমস্যা। পুনৰ লগইন কৰক আৰু পুনৰ চেষ্টা কৰক।", "RemoveTheChanges": "আপুনি পৰিবর্তনখিনি আতৰাবলৈ নিশ্চিত নে?", "issuesInFetchingLocationDetails": "অৱস্থানৰ বিৱৰণ প্ৰাপ্ত কৰাৰ সমস্যা, অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।", - "issuesInFetchingDemographics,": "জনগাঁথনি প্ৰাপ্ত কৰাৰ সমস্যা, অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।", + "issuesInFetchingDemographics": "জনগাঁথনি প্ৰাপ্ত কৰাৰ সমস্যা, অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।", "pleaseInputFieldFirst": "প্ৰথমে নিৰ্বাচিত ক্ষেত্ৰৰ বাবে অনুগ্ৰহ কৰি ইনপুট কৰক", "continueSession": "কনটিনি‍উ চেচনঃ আপোনাৰ চেচনটি কনটিনিউ কৰিব বিচাৰে নেকি?", "sessionGoingToExpire": "আপোনাৰ চেচনটৰি সময়ত অতিবাহিত (এক্সপাইৰি) হ'বলৈ ওলাইছে", diff --git a/src/assets/English.json b/src/assets/English.json index 2412deb..a21521a 100644 --- a/src/assets/English.json +++ b/src/assets/English.json @@ -1258,7 +1258,7 @@ "issuesinfetchingLocation": "Issues in fetching your location. Relogin & Try again", "RemoveTheChanges": "Are you sure to remove the changes", "issuesInFetchingLocationDetails": "Issues in Fetching Location Details, please try again", - "issuesInFetchingDemographics,": "Issues in Fetching Demographics, Please try again", + "issuesInFetchingDemographics": "Issues in Fetching Demographics, Please try again", "pleaseInputFieldFirst": "Please input for selected field first", "continueSession": "continueSession: Want to continue your session", "sessionGoingToExpire": "Your Session is Going To Expire", diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json index 8f341e5..fc32d21 100644 --- a/src/assets/Hindi.json +++ b/src/assets/Hindi.json @@ -1244,10 +1244,10 @@ "notAuthorized": "आप इस पेज को देखने के लिए अधिकृत नहीं हैं", "usernamenPass": "उपयोगकर्ता के नाम और पासवर्ड दोनों आवश्यक हैं", "IssuesinConnectingtoInventory": "सूची से कनेक्ट करने में रुकावट, पुनः प्रयास करे", - "IssuesinfetchingLocation": "Issues in fetching your location. Relogin & Try again", + "issuesinfetchingLocation": "Issues in fetching your location. Relogin & Try again", "RemoveTheChanges": "क्या आप परिवर्तनों को दूर करने के लिए सहमत हैं?", - "IssuesInFetchingLocationDetails": "स्थान के विवरण को पुनर्प्राप्त में समस्या आ रही है , कृपया पुनः प्रयास करें", - "IssuesInFetchingDemographics,": "जनसांख्यिकी विवरण निकालने  मे त्रुटि , कृपया पुन: प्रयास करें", + "issuesInFetchingLocationDetails": "स्थान के विवरण को पुनर्प्राप्त में समस्या आ रही है , कृपया पुनः प्रयास करें", + "issuesInFetchingDemographics": "जनसांख्यिकी विवरण निकालने  मे त्रुटि , कृपया पुन: प्रयास करें", "PleaseInputFieldFirst": "पहले चयनित क्षेत्र में निविष्टियो को डालें", "continueSession": "सत्र जारी है: क्या आप सत्र जारी रखना चाहते हैं", "sessionGoingToExpire": "आपकी सत्र समाप्त हो रही है", From 9a93ef697d3044014672506c7dc0d186aa2fb7c5 Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Mon, 16 Sep 2024 18:08:13 +0530 Subject: [PATCH 16/21] Added mandatory condition for Travel History section --- .../visit-details/travel-history/travel-history.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html index a6fd032..8943d7e 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html +++ b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html @@ -4,7 +4,7 @@
- {{ currentLanguageSet?.travel?.haveyouTravelledlast14days }} + {{ currentLanguageSet?.travel?.haveyouTravelledlast14days }} *
From 0df6d469f2f439c9045af2241b80e311514879ae Mon Sep 17 00:00:00 2001 From: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Date: Wed, 18 Sep 2024 11:20:41 +0530 Subject: [PATCH 17/21] AMM-928 Travel History mandatory changes (#109) * MMU Service Point related Changes * Added minor change in service point screen * Added minor change in service point screen * Added mandatory condition for Travel History section --- .../visit-details/travel-history/travel-history.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html index a6fd032..8943d7e 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html +++ b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html @@ -4,7 +4,7 @@
- {{ currentLanguageSet?.travel?.haveyouTravelledlast14days }} + {{ currentLanguageSet?.travel?.haveyouTravelledlast14days }} *
From c74c2764bfc87ae50367c00c7daeb30f1491bd9c Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Wed, 18 Sep 2024 16:39:01 +0530 Subject: [PATCH 18/21] URL changes using jboss context-root --- .github/workflows/package-prod.yml | 2 +- .github/workflows/package.yml | 4 ++-- WEB-INF/jboss-web.xml | 3 +++ angular.json | 15 ++++++++++----- package-lock.json | 4 ++-- package.json | 2 +- src/app/app.component.spec.ts | 6 +++--- src/environments/environment.ci.ts | 2 +- src/environments/environment.dev.ts | 2 +- src/environments/environment.prod.ts | 2 +- src/environments/environment.test.ts | 2 +- src/environments/environment.ts | 3 +-- 12 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 WEB-INF/jboss-web.xml diff --git a/.github/workflows/package-prod.yml b/.github/workflows/package-prod.yml index 1c4d998..89ff210 100644 --- a/.github/workflows/package-prod.yml +++ b/.github/workflows/package-prod.yml @@ -48,4 +48,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: MMU-UI - path: dist/mmu-ui-next/mmu-ui-next.war + path: dist/mmu-ui/mmu-ui.war diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6e2df65..1bd33cc 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -47,10 +47,10 @@ jobs: npm run build - name: Create WAR file - run: jar -cvf mmu-ui-next.war -C dist . + run: jar -cvf mmu-ui.war -C dist . - name: Upload WAR file as artifact uses: actions/upload-artifact@v2 with: name: MMU-UI - path: mmu-ui-next.war + path: mmu-ui.war diff --git a/WEB-INF/jboss-web.xml b/WEB-INF/jboss-web.xml new file mode 100644 index 0000000..3680287 --- /dev/null +++ b/WEB-INF/jboss-web.xml @@ -0,0 +1,3 @@ + +/mmu + \ No newline at end of file diff --git a/angular.json b/angular.json index 204435f..88b7c01 100644 --- a/angular.json +++ b/angular.json @@ -3,7 +3,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "MMU-UI-NEXT": { + "MMU-UI": { "projectType": "application", "schematics": {}, "root": "", @@ -22,7 +22,12 @@ "tsConfig": "tsconfig.app.json", "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + { + "glob": "**/*", + "input": "WEB-INF", + "output": "/WEB-INF" + } ], "styles": [ "@angular/material/prebuilt-themes/indigo-pink.css", @@ -92,10 +97,10 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "browserTarget": "MMU-UI-NEXT:build:production" + "browserTarget": "MMU-UI:build:production" }, "development": { - "browserTarget": "MMU-UI-NEXT:build:development" + "browserTarget": "MMU-UI:build:development" } }, "defaultConfiguration": "development" @@ -103,7 +108,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "MMU-UI-NEXT:build" + "browserTarget": "MMU-UI:build" } }, "test": { diff --git a/package-lock.json b/package-lock.json index a044b78..a10c59c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "mmu-ui-next", + "name": "mmu-ui", "version": "0.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "mmu-ui-next", + "name": "mmu-ui", "version": "0.0.0", "dependencies": { "@angular/animations": "^16.2.0", diff --git a/package.json b/package.json index 2c7a706..fd5afc0 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "mmu-ui-next", + "name": "mmu-ui", "version": "0.0.0", "scripts": { "ng": "ng", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 967db66..149e74f 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -16,10 +16,10 @@ describe('AppComponent', () => { expect(app).toBeTruthy(); }); - it(`should have as title 'MMU-UI-NEXT'`, () => { + it(`should have as title 'MMU-UI'`, () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.componentInstance; - expect(app.title).toEqual('MMU-UI-NEXT'); + expect(app.title).toEqual('MMU-UI'); }); it('should render title', () => { @@ -27,7 +27,7 @@ describe('AppComponent', () => { fixture.detectChanges(); const compiled = fixture.nativeElement as HTMLElement; expect(compiled.querySelector('.content span')?.textContent).toContain( - 'MMU-UI-NEXT app is running!' + 'MMU-UI app is running!' ); }); }); diff --git a/src/environments/environment.ci.ts b/src/environments/environment.ci.ts index 9acdcd4..9c80737 100644 --- a/src/environments/environment.ci.ts +++ b/src/environments/environment.ci.ts @@ -51,7 +51,7 @@ export const environment = { haemoglobinTest: `Haemoglobin Test`, parentAPI: `${MMU_API}`, - INVENTORY_URL: `${INVENTORY_UI}inventory-ui-next/#/redirin?`, + INVENTORY_URL: `${INVENTORY_UI}inventory/#/redirin?`, fallbackUrl: `/pharmacist/redirfallback`, redirInUrl: `/pharmacist/redirin`, diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 3958b92..e2d0459 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -68,7 +68,7 @@ export const environment = { haemoglobinTest: `Haemoglobin Test`, parentAPI: `${MMU_API}`, - INVENTORY_URL: `${inventoryUI_IP}/inventory-ui-v1.0/#/redirin?`, + INVENTORY_URL: `${inventoryUI_IP}/inventory/#/redirin?`, fallbackUrl: `/pharmacist/redirfallback`, redirInUrl: `/pharmacist/redirin`, diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 04e5c29..83d923d 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -67,7 +67,7 @@ export const environment = { haemoglobinTest: `Haemoglobin Test`, parentAPI: `${MMU_API}`, - INVENTORY_URL: `${inventoryUI_IP}inventory-ui-v1.0/#/redirin?`, + INVENTORY_URL: `${inventoryUI_IP}inventory/#/redirin?`, fallbackUrl: `/pharmacist/redirfallback`, redirInUrl: `/pharmacist/redirin`, diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 70ca703..398eeb9 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -68,7 +68,7 @@ export const environment = { haemoglobinTest: `Haemoglobin Test`, parentAPI: `${MMU_API}`, - INVENTORY_URL: `${inventoryUI_IP}/inventory-ui-v1.0/#/redirin?`, + INVENTORY_URL: `${inventoryUI_IP}/inventory/#/redirin?`, fallbackUrl: `/pharmacist/redirfallback`, redirInUrl: `/pharmacist/redirin`, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 88fc11d..0bb4fd8 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -78,8 +78,7 @@ export const environment = { parentAPI: `${MMU_API}`, abhaExtension: `@abdm`, - INVENTORY_URL: - 'https://amritwprdev.piramalswasthya.org/inventory-ui-next/#/redirin?', + INVENTORY_URL: 'https://amritwprdev.piramalswasthya.org/inventory/#/redirin?', fallbackUrl: `/pharmacist/redirfallback`, redirInUrl: `/pharmacist/redirin`, From 82ae2b31694b7c826803ab15143fda3455d3290a Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Thu, 19 Sep 2024 09:41:13 +0530 Subject: [PATCH 19/21] Minor change in angular.json --- angular.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular.json b/angular.json index 88b7c01..ef16e05 100644 --- a/angular.json +++ b/angular.json @@ -26,7 +26,7 @@ { "glob": "**/*", "input": "WEB-INF", - "output": "/WEB-INF" + "output": "WEB-INF" } ], "styles": [ From 0d61889909be1bef6fd565ccc6b30db4af21be63 Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Thu, 19 Sep 2024 10:49:46 +0530 Subject: [PATCH 20/21] Minor changes --- WEB-INF/jboss-web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WEB-INF/jboss-web.xml b/WEB-INF/jboss-web.xml index 3680287..a278979 100644 --- a/WEB-INF/jboss-web.xml +++ b/WEB-INF/jboss-web.xml @@ -1,3 +1,3 @@ -/mmu + /mmu \ No newline at end of file From e855ad80b506e7ee58d7cbffd0f46ca2f088d084 Mon Sep 17 00:00:00 2001 From: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:59:04 +0530 Subject: [PATCH 21/21] Download master and interceptor related changes (#118) --- .../core/services/http-interceptor.service.ts | 21 +++++++------------ .../master-download.component.ts | 1 + 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/app/app-modules/core/services/http-interceptor.service.ts b/src/app/app-modules/core/services/http-interceptor.service.ts index f1eb2a1..f792493 100644 --- a/src/app/app-modules/core/services/http-interceptor.service.ts +++ b/src/app/app-modules/core/services/http-interceptor.service.ts @@ -39,6 +39,7 @@ export class HttpInterceptorService implements HttpInterceptor { next: HttpHandler ): Observable> { const key: any = sessionStorage.getItem('key'); + const serverKey = localStorage.getItem('serverKey'); let modifiedReq = req; if (req.body instanceof FormData) { modifiedReq = req.clone({ @@ -49,20 +50,12 @@ export class HttpInterceptorService implements HttpInterceptor { headers: req.headers.set('Authorization', key || ''), }); } else { - // modifiedReq = req.clone({ - // headers: req.headers.set('Authorization', ''), - // }); - if (key !== undefined && key !== null) { - modifiedReq = req.clone({ - headers: req.headers - .set('Authorization', key) - .set('Content-Type', 'application/json'), - }); - } else { - modifiedReq = req.clone({ - headers: req.headers.set('Authorization', ''), - }); - } + modifiedReq = req.clone({ + headers: req.headers + .set('Authorization', key || '') + .set('Content-Type', 'application/json') + .set('ServerAuthorization', serverKey || ''), + }); } return next.handle(modifiedReq).pipe( tap((event: HttpEvent) => { diff --git a/src/app/app-modules/data-sync/master-download/master-download.component.ts b/src/app/app-modules/data-sync/master-download/master-download.component.ts index 1459288..6e0a398 100644 --- a/src/app/app-modules/data-sync/master-download/master-download.component.ts +++ b/src/app/app-modules/data-sync/master-download/master-download.component.ts @@ -30,6 +30,7 @@ import { MatDialogRef } from '@angular/material/dialog'; selector: 'app-master-download', templateUrl: './master-download.component.html', styleUrls: ['./master-download.component.css'], + providers: [DataSyncService], }) export class MasterDownloadComponent implements OnInit { constructor(