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

…velop
PSMRI · Mar 25, 2024 · 576158b · 576158b
2 parents cd32a5a + 752a152
commit 576158b
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 15 deletions.
diff --git a/src/app/app-modules/lab/worklist/worklist.component.css b/src/app/app-modules/lab/worklist/worklist.component.css
@@ -20,7 +20,7 @@ mat-input-container {
 
 mat-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
 @media (max-width: 481px) {

diff --git a/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.css b/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.css
@@ -12,7 +12,7 @@ mat-input-container {
 
 mat-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
 :host /deep/ .pagination {

diff --git a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css
@@ -12,7 +12,7 @@ mat-input-container {
 
 mat-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
 :host /deep/ .pagination {
@@ -187,4 +187,4 @@ ul li div {
 .totalCount,
 .description {
   padding-top: 15px;
-}
+}
diff --git a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html
@@ -192,7 +192,6 @@
                 </th>
                 <td class="centered" mat-cell *matCellDef="let element">
                   <mat-checkbox
-                    class="control-label"
                     [disabled]="
                       element.statusCode === 1 ||
                       element.statusCode === 2 ||
@@ -234,30 +233,37 @@
               <ng-container matColumnDef="action">
                 <th
                   mat-header-cell
-                  style="border-bottom: none"
+                  style="border-bottom: unset !important; text-align: center"
                   *matHeaderCellDef
                   mat-sort-header
                   colspan="3"
-                  style="text-align: center"
                   id="action"
                 >
                   {{ currentLanguageSet?.bendetails?.action }}
                 </th>
-                <td mat-cell *matCellDef="let element">
+                <td
+                  mat-cell
+                  *matCellDef="let element"
+                  class="col-12"
+                  style="text-align: center; width: 26%"
+                >
                   <button
                     mat-raised-button
                     (click)="cancelTCRequest(element)"
                     matTooltip="{{ currentLanguageSet?.tc?.cancelTc }}"
                     color="warn"
+                    class="mat_blue_table col-4"
                     [disabled]="element.specialist_flag !== 1"
                   >
                     {{ currentLanguageSet?.common?.cancel }}
                   </button>
                   <button
+                    style="margin: 0px 10px 0px 10px !important"
                     mat-raised-button
                     (click)="openScheduler(element)"
                     matTooltip="{{ currentLanguageSet?.tc?.reschedule }}"
                     color="primary"
+                    class="mat_blue_table col-4"
                     [disabled]="element.specialist_flag !== 4"
                   >
                     {{ currentLanguageSet?.tc?.schedule }}
@@ -267,6 +273,7 @@
                     (click)="initiateTC(element)"
                     matTooltip="{{ currentLanguageSet?.tc?.startTc }}"
                     color="accent"
+                    class="mat_blue_table col-4"
                     [disabled]="
                       element.specialist_flag !== 1 && !element.benArrivedFlag
                     "

diff --git a/...klist-wrapper/nurse-mmu-tm-referred-worklist/nurse-mmu-tm-referred-worklist.component.css b/...klist-wrapper/nurse-mmu-tm-referred-worklist/nurse-mmu-tm-referred-worklist.component.css
@@ -4,7 +4,7 @@ md2-pagination {
 
   md-card {
     min-height: 400px;
-    padding: 15px;
+    /* padding: 15px; */
   }
 
   .norecord {

diff --git a/...or/nurse-worklist-wrapper/nurse-tm-future-worklist/nurse-tm-future-worklist.component.css b/...or/nurse-worklist-wrapper/nurse-tm-future-worklist/nurse-tm-future-worklist.component.css
@@ -12,7 +12,7 @@ md-input-container {
 
 md-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
 :host /deep/ .pagination {

diff --git a/...les/nurse-doctor/nurse-worklist-wrapper/nurse-tm-worklist/nurse-tm-worklist.component.css b/...les/nurse-doctor/nurse-worklist-wrapper/nurse-tm-worklist/nurse-tm-worklist.component.css
@@ -12,7 +12,7 @@ md-input-container {
 
 md-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
 :host /deep/ .pagination {

diff --git a/...p-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css b/...p-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css
@@ -4,7 +4,7 @@ mat-pagination {
 
 mat-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
 .norecord {

diff --git a/...es/nurse-doctor/tc-specialist-future-worklist/tc-specialist-future-worklist.component.css b/...es/nurse-doctor/tc-specialist-future-worklist/tc-specialist-future-worklist.component.css
@@ -15,7 +15,7 @@ mat-input-container {
 
 mat-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
  :host /deep/ .pagination {

diff --git a/src/app/app-modules/nurse-doctor/tc-specialist-worklist/tc-specialist-worklist.component.css b/src/app/app-modules/nurse-doctor/tc-specialist-worklist/tc-specialist-worklist.component.css
@@ -15,7 +15,7 @@ mat-input-container {
 
 mat-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
 #refresh,

diff --git a/src/app/app-modules/pharmacist/worklist/worklist.component.css b/src/app/app-modules/pharmacist/worklist/worklist.component.css
@@ -16,7 +16,7 @@ md-input-container {
 
 md-card {
   min-height: 400px;
-  padding: 15px;
+  /* padding: 15px; */
 }
 
 .norecord {

diff --git a/src/styles.css b/src/styles.css
@@ -88,6 +88,24 @@
   line-height: 36px;
   min-width: 88px;
 }
+.mat_blue_table {
+  background-color: #0277bd !important;
+  border-color: unset !important;
+  color: white;
+  border: unset;
+  border-radius: 3px;
+  line-height: 36px;
+  width: 90px;
+}
+.mat_blue_table:disabled {
+  background-color: #e0e0e0 !important;
+  border-color: unset !important;
+  color: rgba(0, 0, 0, 0.38);
+  border: unset;
+  border-radius: 3px;
+  line-height: 36px;
+  width: 90px;
+}
 .mat_green {
   background-color: #43a047 !important;
   border-color: unset !important;