fixed issues

PSMRI · Apr 12, 2024 · 28e8dec · 28e8dec
1 parent fd2ca2a
commit 28e8dec
Show file tree

Hide file tree

Showing 53 changed files with 1,346 additions and 1,265 deletions.
diff --git a/src/app/app-modules/core/components/app-header/app-header.component.html b/src/app/app-modules/core/components/app-header/app-header.component.html
@@ -152,7 +152,7 @@
           </button>
         </li>
         <li class="nav-item" *ngIf="item.role === 'TC Specialist'">
-          <button mat-button [matMenuTriggerFor]="TCitems">
+          <button class="nav-btn" mat-button [matMenuTriggerFor]="TCitems">
             {{ item.label }}
             <span class="caret"></span>
           </button>

diff --git a/src/app/app-modules/core/components/common-dialog/common-dialog.component.css b/src/app/app-modules/core/components/common-dialog/common-dialog.component.css
@@ -7,6 +7,14 @@
     font-weight: 400;
 }
 
+.action .button-confirm {
+    border: 1px solid lightgray;
+    margin-left: 5px;
+    width: 70px;
+    background-color: #0277bd !important;
+    color: white !important;
+}
+
 .message {
     font-size: 16px;
     /* color: rgba(0, 0, 0, 0.6); */

diff --git a/src/app/app-modules/core/components/common-dialog/common-dialog.component.html b/src/app/app-modules/core/components/common-dialog/common-dialog.component.html
@@ -212,7 +212,7 @@ <h4>{{ message | titlecase }}</h4>
       {{ btnCancelText }}
     </button>
     <button
-      class="full-width-login button-ok"
+      class="full-width-login button-confirm"
       (click)="dialogRef.close(selectedValue)"
       cdkFocusInitial
     >

diff --git a/...es/core/components/open-previous-visit-details/open-previous-visit-details.component.html b/...es/core/components/open-previous-visit-details/open-previous-visit-details.component.html
@@ -179,18 +179,15 @@ <h4 class="norecord" style="text-align: center">
                               >
                                 <ng-container
                                   *ngFor="
-                                    let viewProvisionalDiagnosisProvided of visit
+                                    let provisionalDiagnosis of visit
                                       .benPreviousData?.doctorData?.diagnosis
                                       ?.provisionalDiagnosisList
                                   "
                                 >
                                   <ng-container
-                                    *ngIf="
-                                      viewProvisionalDiagnosisProvided.term !==
-                                      ''
-                                    "
+                                    *ngIf="provisionalDiagnosis.term !== ''"
                                   >
-                                    {{ viewProvisionalDiagnosisProvided.term }},
+                                    {{ provisionalDiagnosis.term }},
                                   </ng-container>
                                 </ng-container>
                                 <ng-container

diff --git a/...ules/core/components/open-previous-visit-details/open-previous-visit-details.component.ts b/...ules/core/components/open-previous-visit-details/open-previous-visit-details.component.ts
@@ -55,7 +55,7 @@ export class OpenPreviousVisitDetailsComponent implements OnInit {
   }
 
   loadPreviousVisitDetails() {
-    this.doctorService.getMMUHistory().subscribe(
+    this.doctorService.getTMHistory().subscribe(
       (data: any) => {
         console.log('data', data);
         if (data.statusCode === 200) {
@@ -86,7 +86,7 @@ export class OpenPreviousVisitDetailsComponent implements OnInit {
           beneficiaryRegID: item.beneficiaryRegID,
           visitCode: item.visitCode,
         };
-        this.doctorService.getMMUCasesheetData(reqObj).subscribe((res: any) => {
+        this.doctorService.getTMCasesheetData(reqObj).subscribe((res: any) => {
           if (res.statusCode === 200 && res.data !== null) {
             this.previousVisitData[i]['benPreviousData'] = res.data;
             this.filteredHistory = res.data;

diff --git a/src/app/app-modules/core/core.module.ts b/src/app/app-modules/core/core.module.ts
@@ -54,7 +54,6 @@ import { CalibrationComponent } from './components/calibration/calibration.compo
 import { ConfirmatoryDiagnosisDirective } from './directives/confirmatory-diagnosis.directive';
 import { DisableFormControlDirective } from './directives/disableFormControl.directive';
 import { NullDefaultValueDirective } from './directives/null-default-value.directive';
-import { OpenModalDirective } from './directives/open-modal.directive';
 import { AllergenSearchComponent } from './components/allergen-search/allergen-search.component';
 import { SpinnerComponent } from './components/spinner/spinner.component';
 import { StringValidatorDirective } from './directives/stringValidator.directive';
@@ -104,7 +103,6 @@ import { RegistrarService } from '../registrar/shared/services/registrar.service
     SpecialistLoginComponent,
     MyEmailDirective,
     MyMobileNumberDirective,
-    OpenModalDirective,
     ConfirmatoryDiagnosisDirective,
     MyNameDirective,
     MyPasswordDirective,
@@ -137,7 +135,6 @@ import { RegistrarService } from '../registrar/shared/services/registrar.service
     PreviousDetailsComponent,
     MyEmailDirective,
     MyMobileNumberDirective,
-    OpenModalDirective,
     ConfirmatoryDiagnosisDirective,
     MyNameDirective,
     MyPasswordDirective,

diff --git a/src/app/app-modules/core/directives/open-modal.directive.ts b/src/app/app-modules/core/directives/open-modal.directive.ts
diff --git a/src/app/app-modules/nurse-doctor/anc/anc-immunization/anc-immunization.component.html b/src/app/app-modules/nurse-doctor/anc/anc-immunization/anc-immunization.component.html
@@ -4,22 +4,24 @@
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
       *ngIf="enableTTStatus_1_2 || enableTTStatus_1_2_b"
     >
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ancData?.ancImmune?.tt1Status
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="tT_1Status"
-        formControlName="tT_1Status"
-        (change)="checkTT_1Status(tT_1Status)"
-      >
-        <mat-option
-          *ngFor="let immunizationStatus_1 of selectImmunizationStatus"
-          [value]="immunizationStatus_1"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ancData?.ancImmune?.tt1Status
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="tT_1Status"
+          formControlName="tT_1Status"
+          (change)="checkTT_1Status(tT_1Status)"
         >
-          {{ immunizationStatus_1 }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let immunizationStatus_1 of selectImmunizationStatus"
+            [value]="immunizationStatus_1"
+          >
+            {{ immunizationStatus_1 }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4"
@@ -88,22 +90,24 @@
         (enableTTStatus_1_2_b && tT_1Status !== null)
       "
     >
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ancData?.ancImmune?.tt2Status
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="tT_2Status"
-        formControlName="tT_2Status"
-        (change)="checkTT_2Status(tT_2Status)"
-      >
-        <mat-option
-          *ngFor="let immunizationStatus_2 of selectImmunizationStatus"
-          [value]="immunizationStatus_2"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ancData?.ancImmune?.tt2Status
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="tT_2Status"
+          formControlName="tT_2Status"
+          (change)="checkTT_2Status(tT_2Status)"
         >
-          {{ immunizationStatus_2 }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let immunizationStatus_2 of selectImmunizationStatus"
+            [value]="immunizationStatus_2"
+          >
+            {{ immunizationStatus_2 }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4"
@@ -178,22 +182,24 @@
         (enableTTStatus_1_2 && tT_1Status === 'NA' && tT_2Status !== null)
       "
     >
-      <mat-label class="mat-label-text">{{
-        current_language_set?.ancData?.ancImmune?.ttBoosterStatus
-      }}</mat-label>
-      <mat-select
-        class="input-full-width"
-        name="tT_3Status"
-        formControlName="tT_3Status"
-        (change)="checkTT_3Status(tT_3Status)"
-      >
-        <mat-option
-          *ngFor="let immunizationStatus_3 of selectImmunizationStatus"
-          [value]="immunizationStatus_3"
+      <mat-form-field [style.width]="'100%'">
+        <mat-label class="mat-label-text">{{
+          current_language_set?.ancData?.ancImmune?.ttBoosterStatus
+        }}</mat-label>
+        <mat-select
+          class="input-full-width"
+          name="tT_3Status"
+          formControlName="tT_3Status"
+          (change)="checkTT_3Status(tT_3Status)"
         >
-          {{ immunizationStatus_3 }}
-        </mat-option>
-      </mat-select>
+          <mat-option
+            *ngFor="let immunizationStatus_3 of selectImmunizationStatus"
+            [value]="immunizationStatus_3"
+          >
+            {{ immunizationStatus_3 }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4"