Merge branch 'PSMRI:develop' into develop

PSMRI · Sep 21, 2024 · f08a157 · f08a157
2 parents dc01bab + e855ad8
commit f08a157
Show file tree

Hide file tree

Showing 56 changed files with 187 additions and 173 deletions.
diff --git 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
@@ -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/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v18
diff --git a/Common-UI b/Common-UI
diff --git 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

diff --git a/WEB-INF/jboss-web.xml b/WEB-INF/jboss-web.xml
@@ -0,0 +1,3 @@
+<jboss-web>
+  <context-root>/mmu</context-root>
+</jboss-web>
diff --git 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,18 +97,18 @@
           "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"
         },
         "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
diff --git 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-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,17 +39,22 @@ export class HttpInterceptorService implements HttpInterceptor {
     next: HttpHandler
   ): Observable<HttpEvent<any>> {
     const key: any = sessionStorage.getItem('key');
-    let modifiedReq = null;
-    if (key !== undefined && key !== null) {
+    const serverKey = localStorage.getItem('serverKey');
+    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', ''),
+        headers: req.headers
+          .set('Authorization', key || '')
+          .set('Content-Type', 'application/json')
+          .set('ServerAuthorization', serverKey || ''),
       });
     }
     return next.handle(modifiedReq).pipe(

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
@@ -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(

diff --git 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
@@ -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;
 }
diff --git 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;
 }
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
@@ -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/...octor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.css b/...octor/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;
 }
diff --git a/.../app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.css b/.../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;
 }
diff --git a/...ules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.css b/...ules/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/...doctor/history/cancer-history/family-disease-history/family-disease-history.component.css b/...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;
 }
diff --git a/...les/nurse-doctor/history/cancer-history/obstetric-history/obstetric-history.component.css b/...les/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/...dules/nurse-doctor/history/cancer-history/personal-history/personal-history.component.css b/...dules/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;
 }
diff --git a/...history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.css b/...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;
 }
diff --git a/...general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.css b/...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/...ules/nurse-doctor/history/general-opd-history/family-history/family-history.component.css b/...ules/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;
 }
+2 −61		README.md
+2 −2		src/registrar/family-tagging/edit-family-tagging/edit-family-tagging.component.css
+3 −1		src/registrar/registration/consent-form/consent-form.component.css
+3 −3		src/registrar/registration/location-information/location-information.component.css
+3 −3		src/registrar/registration/other-information/other-information.component.css
+5 −0		src/registrar/registration/personal-information/personal-information.component.css
+9 −1		src/registrar/registration/registration.component.html