Merge branch 'develop' of https://github.com/PSMRI/TM-UI into develop

PSMRI · Jul 12, 2024 · 4a6f584 · 4a6f584
2 parents 790f2b7 + cf57f43
commit 4a6f584
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 42 deletions.
diff --git a/...-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.css b/...-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.css
@@ -1,8 +1,8 @@
-.select-full-width {
+/* .select-full-width {
     width: 100%;
     white-space: nowrap;
     overflow: hidden;
-}
+} */
 
 .input-full-width {
     width: 100%;

diff --git a/...modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html b/...modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html
@@ -39,7 +39,7 @@ <h4 style="font-size: 18px">
       >
         <ng-container [formGroupName]="i">
           <div class="col-md-3 box">
-            <mat-form-field>
+            <mat-form-field [style.width]="'100%'">
               <mat-label class="mat-label-text">{{
                 currentLanguageSet?.historyData?.ancHistory
                   ?.pastIllnessDataANC_OPD_NCD_PNC?.illness
@@ -66,7 +66,7 @@ <h4 style="font-size: 18px">
             class="col-2 box"
             *ngIf="pastIllness.value.illnessType?.illnessType === 'Other'"
           >
-            <mat-form-field class="input-full-width">
+            <mat-form-field [style.width]="'100%'" class="input-full-width">
               <mat-label class="mat-label-text">{{
                 currentLanguageSet?.historyData?.opd_NCD_PNCHistory?.obstetric
                   ?.others
@@ -84,7 +84,7 @@ <h4 style="font-size: 18px">
           </div>
 
           <div class="col-2 box">
-            <mat-form-field class="input-full-width">
+            <mat-form-field [style.width]="'100%'" class="input-full-width">
               <mat-label class="mat-label-text">{{
                 currentLanguageSet?.nurseData?.chiefComplaintsDetails?.duration
               }}</mat-label>
@@ -102,7 +102,7 @@ <h4 style="font-size: 18px">
           </div>
 
           <div class="col-3 box">
-            <mat-form-field>
+            <mat-form-field [style.width]="'100%'">
               <mat-label class="mat-label-text">{{
                 currentLanguageSet?.DurationData?.timeperiodAgo
               }}</mat-label>
@@ -120,7 +120,7 @@ <h4 style="font-size: 18px">
             </mat-form-field>
           </div>
 
-          <div class="col-2 box">
+          <div class="col-2 box" style="margin-top: 15px">
             <button
               style="margin-right: 5px"
               mat-mini-fab
@@ -172,7 +172,7 @@ <h4 style="font-size: 18px">
     >
       <ng-container [formGroupName]="i">
         <div class="col-3 box">
-          <mat-form-field>
+          <mat-form-field [style.width]="'100%'">
             <mat-label class="mat-label-text">{{
               currentLanguageSet?.historyData?.ancHistory
                 ?.pastHOSurgeryANC_OPD_NCD_PNC?.hoSurgery
@@ -198,7 +198,7 @@ <h4 style="font-size: 18px">
           class="col-2 box"
           *ngIf="pastSurgery.value.surgeryType?.surgeryType === 'Other'"
         >
-          <mat-form-field class="input-full-width">
+          <mat-form-field [style.width]="'100%'" class="input-full-width">
             <mat-label class="mat-label-text">{{
               currentLanguageSet?.historyData?.opd_NCD_PNCHistory?.obstetric
                 ?.others
@@ -216,7 +216,7 @@ <h4 style="font-size: 18px">
         </div>
 
         <div class="col-2 box">
-          <mat-form-field class="input-full-width">
+          <mat-form-field [style.width]="'100%'" class="input-full-width">
             <mat-label class="mat-label-text">{{
               currentLanguageSet?.nurseData?.chiefComplaintsDetails?.duration
             }}</mat-label>
@@ -234,7 +234,7 @@ <h4 style="font-size: 18px">
         </div>
 
         <div class="col-3 box">
-          <mat-form-field>
+          <mat-form-field [style.width]="'100%'">
             <mat-label class="mat-label-text">{{
               currentLanguageSet?.DurationData?.timeperiodAgo
             }}</mat-label>
@@ -252,7 +252,7 @@ <h4 style="font-size: 18px">
           </mat-form-field>
         </div>
 
-        <div class="col-2 box">
+        <div class="col-2 box" style="margin-top: 15px">
           <button
             mat-mini-fab
             color="warn"

diff --git a/...nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html b/...nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html
@@ -65,16 +65,13 @@
     </div>
   </div>
   <div class="row m-t-10">
-    <div
-      class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
-      style="padding-left: 27px"
-    >
+    <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
       <label class="control-label" for="dietaryType">{{
         currentLanguageSet?.historyData?.ancHistory
           ?.personalHistoryANC_OPD_NCD_PNC?.dietaryType
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group formControlName="dietaryType">
+      <mat-radio-group formControlName="dietaryType" style="margin-left: -6px">
         <mat-radio-button color="primary" value="Vegetarian">{{
           currentLanguageSet?.historyData?.ancHistory
             ?.personalHistoryANC_OPD_NCD_PNC?.vegetarian
@@ -93,14 +90,17 @@
 
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
-      style="padding-left: 27px"
+      style="margin-left: -8px"
     >
       <label class="control-label" for="physicalActivityType">{{
         currentLanguageSet?.historyData?.ancHistory
           ?.personalHistoryANC_OPD_NCD_PNC?.physicalActivityType
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group formControlName="physicalActivityType">
+      <mat-radio-group
+        formControlName="physicalActivityType"
+        style="margin-left: -6px"
+      >
         <mat-radio-button color="primary" value="Sedentary">{{
           currentLanguageSet?.historyData?.ancHistory
             ?.personalHistoryANC_OPD_NCD_PNC?.sedentary
@@ -114,15 +114,18 @@
 
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
-      style="padding-left: 27px"
+      style="margin-left: -8px"
       *ngIf="beneficiary?.ageVal >= 18"
     >
       <label class="control-label" for="riskySexualPracticesStatus">{{
         currentLanguageSet?.historyData?.ancHistory
           ?.personalHistoryANC_OPD_NCD_PNC?.riskySexualPracticesStatus
       }}</label>
       <div class="clearfix"></div>
-      <mat-radio-group formControlName="riskySexualPracticesStatus">
+      <mat-radio-group
+        formControlName="riskySexualPracticesStatus"
+        style="margin-left: -6px"
+      >
         <mat-radio-button color="primary" [value]="true">
           {{ currentLanguageSet?.common?.yes }}
         </mat-radio-button>
@@ -136,7 +139,7 @@
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
       *ngIf="beneficiary?.ageVal >= 13"
     >
-      <mat-form-field>
+      <mat-form-field [style.width]="'85%'">
         <mat-label class="mat-label-text">{{
           currentLanguageSet?.historyData?.ancHistory
             ?.personalHistoryANC_OPD_NCD_PNC?.tobaccoData?.tobaccoUseStatus
@@ -155,9 +158,10 @@
 
     <div
       class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
+      style="margin-left: -8px"
       *ngIf="beneficiary?.ageVal >= 13"
     >
-      <mat-form-field>
+      <mat-form-field [style.width]="'85%'">
         <mat-label class="mat-label-text">{{
           currentLanguageSet?.historyData?.ancHistory
             ?.personalHistoryANC_OPD_NCD_PNC?.alcoholData?.alcoholUseStatus
@@ -174,8 +178,11 @@
       </mat-form-field>
     </div>
 
-    <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box">
-      <mat-form-field>
+    <div
+      class="col-xs-12 col-sm-6 col-md-4 col-lg-4 box"
+      style="margin-left: -8px"
+    >
+      <mat-form-field [style.width]="'85%'">
         <mat-label class="mat-label-text">{{
           currentLanguageSet?.historyData?.ancHistory
             ?.personalHistoryANC_OPD_NCD_PNC?.allergicStatus?.allergicStatus

diff --git a/...list-wrapper/nurse-mmu-tm-referred-worklist/nurse-mmu-tm-referred-worklist.component.html b/...list-wrapper/nurse-mmu-tm-referred-worklist/nurse-mmu-tm-referred-worklist.component.html
@@ -40,12 +40,13 @@
   <div class="row m-t-10 m-b-40">
     <div class="col-sm-12">
       <mat-card>
-        <section class="table-responsive">
-          <div class="mat-elevation-z8 responsiveTable">
+        <section class="">
+          <div class="">
             <table
               mat-table
               [dataSource]="dataSource"
               aria-describedby="nurseWorklist"
+              class="table table-striped"
             >
               <ng-container matColumnDef="sno">
                 <th

diff --git a/...r/nurse-worklist-wrapper/nurse-tm-future-worklist/nurse-tm-future-worklist.component.html b/...r/nurse-worklist-wrapper/nurse-tm-future-worklist/nurse-tm-future-worklist.component.html
@@ -40,12 +40,13 @@
   <div class="row m-t-10 m-b-40">
     <div class="col-sm-12">
       <mat-card>
-        <section class="table-responsive">
-          <div class="mat-elevation-z8 responsiveTable">
+        <section class="">
+          <div class="  ">
             <table
               mat-table
               [dataSource]="dataSource"
               aria-describedby="nurseWorklist"
+              class="table table-striped"
             >
               <ng-container matColumnDef="sno">
                 <th

diff --git a/...es/nurse-doctor/nurse-worklist-wrapper/nurse-tm-worklist/nurse-tm-worklist.component.html b/...es/nurse-doctor/nurse-worklist-wrapper/nurse-tm-worklist/nurse-tm-worklist.component.html
@@ -40,12 +40,13 @@
   <div class="row m-t-10 m-b-40">
     <div class="col-sm-12">
       <mat-card>
-        <section class="table-responsive">
-          <div class="mat-elevation-z8 responsiveTable">
+        <section class="">
+          <div class="">
             <table
               mat-table
               [dataSource]="dataSource"
               aria-describedby="nurseWorklist"
+              class="table table-striped"
             >
               <ng-container matColumnDef="sno">
                 <th

diff --git a/...-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html b/...-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html
@@ -51,7 +51,7 @@
               <ng-container matColumnDef="sno">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -72,7 +72,7 @@
               <ng-container matColumnDef="beneficiaryID">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -89,7 +89,7 @@
               <ng-container matColumnDef="beneficiaryName">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -106,7 +106,7 @@
               <ng-container matColumnDef="gender">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -123,7 +123,7 @@
               <ng-container matColumnDef="age">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -140,7 +140,7 @@
               <ng-container matColumnDef="status">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -157,7 +157,7 @@
               <ng-container matColumnDef="fatherName">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -174,7 +174,7 @@
               <ng-container matColumnDef="district">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -192,7 +192,7 @@
               <ng-container matColumnDef="phoneNo">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >
@@ -209,7 +209,7 @@
               <ng-container matColumnDef="image">
                 <th
                   mat-header-cell
-                  style="border-bottom: none; text-align: center"
+                  style="border-bottom: none"
                   *matHeaderCellDef
                   mat-sort-header
                 >

diff --git a/src/styles.css b/src/styles.css
@@ -464,7 +464,7 @@ mat-mdc-form-field-label-always-float {
   color: block !important;
   font-family: unset !important;
   line-height: var(--mat-table-header-headline-line-height);
-  font-size: unset !important;
+  font-size: 14px !important;
   font-weight: var(--mat-table-header-headline-weight, 500);
 }
 
@@ -750,3 +750,6 @@ control.mat-mdc-form-field-input-control {
   background: #0277bd !important;
 
 }
+.mdc-text-field--outlined .mdc-notched-outline {
+  height: 40px !important;
+}