Pārlūkot izejas kodu

Updated notes styles

Samson Mutunga 3 gadi atpakaļ
vecāks
revīzija
25d4bda9e2

+ 2 - 2
resources/views/app/patient/canvas-sections/pmhx/summary.php

@@ -117,8 +117,8 @@ else {
     endif;
 
     if(isset($contentData['comments'])) { ?>
-        <div class="mt-2 mb-1">
-            <div class="font-weight-bold">Comments:</div>
+        <div class="d-flex align-items-start mt-2 mb-1">
+            <div class="font-weight-bold mr-2">Comments:</div>
             <div class="click-to-copy"><?= $contentData['comments'] ?></div>
         </div>
     <?php }

+ 2 - 2
resources/views/app/patient/canvas-sections/pshx/summary.php

@@ -91,8 +91,8 @@ else {
     endif;
 
     if(isset($contentData['comments'])) { ?>
-        <div class="mt-2 mb-1">
-            <div class="font-weight-bold">Comments:</div>
+        <div class="d-flex align-items-start mt-2 mb-1">
+            <div class="font-weight-bold mr-2">Comments:</div>
             <div class="click-to-copy"><?= $contentData['comments'] ?></div>
         </div>
     <?php }

+ 2 - 2
resources/views/app/patient/canvas-sections/sochx/summary.php

@@ -91,8 +91,8 @@ else {
     endif;
 
     if(isset($contentData['comments'])) { ?>
-        <div class="mt-2 mb-1">
-            <div class="font-weight-bold">Comments:</div>
+        <div class="d-flex align-items-start mt-2 mb-1">
+            <div class="font-weight-bold mr-2">Comments:</div>
             <div class="click-to-copy"><?= $contentData['comments'] ?></div>
         </div>
     <?php }

+ 13 - 7
resources/views/app/patient/segment-templates/history_screenings/summary.blade.php

@@ -16,18 +16,24 @@ $point = Point::getGlobalSingletonOfCategory($patient, 'SCREENINGS_HISTORY', tru
 
 if ($point && @$point->data) {
     $contentData = $point->data;
+    ?>
+    <table class="table table-bordered table-sm mb-0">
+    <?php
     for ($i = 0; $i < $contentData['count']; $i++) {
     ?>
-    <div class="<?= $i > 0 ? 'mt-2' : '' ?>">
-        <div class="pb-1">
-            <b><?= isset($contentData['items'][$i]['screening']) ? $contentData['items'][$i]['screening'] : '--' ?></b>
-            <?php if(isset($contentData['items'][$i]['comments']) && !empty($contentData['items'][$i]['comments'])): ?>
+    <tr>
+    <td><b><?= isset($contentData['items'][$i]['screening']) ? $contentData['items'][$i]['screening'] : '--' ?></b></td>
+    <td>
+        <?php if(isset($contentData['items'][$i]['comments']) && !empty($contentData['items'][$i]['comments'])): ?>
             <span class="ml-1 text-secondary">(<?= $contentData['items'][$i]['comments'] ?>)</span>
-            <?php endif; ?>
-        </div>
-    </div>
+        <?php endif; ?>
+    </td>
+    </tr>
     <?php
     }
+    ?>
+    </table>
+    <?php
 }
 else {
 ?>

+ 2 - 2
resources/views/app/patient/segment-templates/history_surgical/summary.blade.php

@@ -75,8 +75,8 @@ if ($point && @$point->data) {
     endif;
 
     if(isset($contentData['comments']) && !empty(trim($contentData['comments']))) { ?>
-        <div class="mt-2 mb-1">
-            <div class="font-weight-bold">Comments:</div>
+        <div class="d-flex aslign-items-start mt-2 mb-1">
+            <div class="font-weight-bold mr-2">Comments:</div>
             <div><?= $contentData['comments'] ?></div>
         </div>
     <?php }

+ 17 - 15
resources/views/app/patient/segment-templates/intake_exercise/summary.blade.php

@@ -15,28 +15,30 @@ $points = [
 ];
 ?>
 
-<?php if(count($points)): ?>
+<?php if(!count($points)): ?>
     <span>-</span>
 <?php endif ?>
-
+<table class="table table-bordered table-sm mb-0">
 <?php foreach ($points as $p): ?>
 <?php $point = $p['point']; ?>
 <?php if(!!$point): ?>
 <?php $review = $point->lastChildReview; ?>
 <?php if ($review && @($review->data)) $review->data = json_decode($review->data); ?>
-<div class="mb-2">
-    <div class="d-flex align-items-baseline">
-        <b><?= $p['name'] ?></b>
-    </div>
-    <?php if(!!$review): ?>
-    <div class="pl-3 mt-1 d-flex align-items-baseline">
-        <span class="text-secondary font-weight-bold mr-2">Subjective:</span>
-        <div class="inline-html-container">
-            <?php $review = $review->data; ?>
-            <?php include(resource_path('views/app/patient/segment-templates/_child_review/exercise/' . $p['category'] . '/view-review.php')); ?>
+<tr>
+    <td  style="max-width: 300px;"><b><?= $p['name'] ?></b></td>
+    <td>
+        <?php if(!!$review): ?>
+        <div class="pl-3 mt-1 d-flex align-items-baseline">
+            <span class="text-secondary font-weight-bold mr-2">Subjective:</span>
+            <div class="inline-html-container">
+                <?php $review = $review->data; ?>
+                <?php include(resource_path('views/app/patient/segment-templates/_child_review/exercise/' . $p['category'] . '/view-review.php')); ?>
+            </div>
         </div>
-    </div>
-    <?php endif; ?>
-</div>
+        <?php endif; ?>
+    </td>
+    
+</tr>
 <?php endif; ?>
 <?php endforeach; ?>
+</table>

+ 1 - 1
resources/views/app/patient/segment-templates/intake_nutrition/summary.blade.php

@@ -25,7 +25,7 @@ $points = [
 ];
 ?>
 
-<?php if(count($points)): ?>
+<?php if(!count($points)): ?>
     <span>-</span>
 <?php endif ?>
 

+ 17 - 15
resources/views/app/patient/segment-templates/plan_exercise/summary.blade.php

@@ -15,28 +15,30 @@ $points = [
 ];
 ?>
 
-<?php if(count($points)): ?>
+<?php if(!count($points)): ?>
     <span>-</span>
 <?php endif ?>
-
+<table class="table table-bordered table-sm mb-0">
 <?php foreach ($points as $p): ?>
 <?php $point = $p['point']; ?>
 <?php if(!!$point): ?>
 <?php $plan = $point->lastChildPlan; ?>
 <?php if ($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
-<div class="mb-2">
-    <div class="d-flex align-items-baseline">
-        <b><?= $p['name'] ?></b>
-    </div>
-    <?php if(!!$plan): ?>
-    <div class="pl-3 mt-1 d-flex align-items-baseline">
-        <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-        <div class="inline-html-container">
-            <?php $plan = $plan->data; ?>
-            <?php include(resource_path('views/app/patient/segment-templates/_child_plan/exercise/' . $p['category'] . '/view-plan.php')); ?>
+<tr>
+    <td style="width: 300px;"><b><?= $p['name'] ?></b></td>
+    <td>
+        <?php if(!!$plan): ?>
+        <div class="pl-3 mt-1 d-flex align-items-baseline">
+            <span class="text-secondary font-weight-bold mr-2">Plan:</span>
+            <div class="inline-html-container">
+                <?php $plan = $plan->data; ?>
+                <?php include(resource_path('views/app/patient/segment-templates/_child_plan/exercise/' . $p['category'] . '/view-plan.php')); ?>
+            </div>
         </div>
-    </div>
-    <?php endif; ?>
-</div>
+        <?php endif; ?>
+    </td>
+    
+</tr>
 <?php endif; ?>
 <?php endforeach; ?>
+</table>

+ 1 - 1
resources/views/app/patient/segment-templates/plan_nutrition/summary.blade.php

@@ -25,7 +25,7 @@ $points = [
 ];
 ?>
 
-<?php if(count($points)): ?>
+<?php if(!count($points)): ?>
     <span>-</span>
 <?php endif ?>
 

+ 2 - 2
storage/sections/pmhx_deleted_canvas/summary.php

@@ -119,8 +119,8 @@ for ($i = 0; $i < count($customFields); $i++) {
 }
 
 if(isset($newContentData['comments'])) { ?>
-    <div class="mt-2 mb-1">
-        <div class="font-weight-bold">Comments:</div>
+    <div class="d-flex align-items-start mt-2 mb-1">
+        <div class="font-weight-bold mr-2">Comments:</div>
         <div><?= $newContentData['comments'] ?></div>
     </div>
 <?php }

+ 2 - 2
storage/sections/pshx_deleted_canvas/summary.php

@@ -68,8 +68,8 @@ for ($i = 0; $i < count($customFields); $i++) {
 }
 
 if(isset($newContentData['comments'])) { ?>
-    <div class="mt-2 mb-1">
-        <div class="font-weight-bold">Comments:</div>
+    <div class="d-flex align-items-start mt-2 mb-1">
+        <div class="font-weight-bold mr-2">Comments:</div>
         <div><?= $newContentData['comments'] ?></div>
     </div>
 <?php }