= 3 лет назад
Родитель
Сommit
858b283805
25 измененных файлов с 33 добавлено и 30 удалено
  1. 5 1
      public/css/style.css
  2. 1 1
      resources/views/app/patient/segment-templates/_child_plan/edit-plan-in-place.php
  3. 1 1
      resources/views/app/patient/segment-templates/_child_plan/edit-plan.php
  4. 1 1
      resources/views/app/patient/segment-templates/_child_plan/nutrition/DAILY_INTAKE_CALORIES/edit-plan.php
  5. 1 1
      resources/views/app/patient/segment-templates/_child_plan/nutrition/DAILY_INTAKE_CARBOHYDRATES/edit-plan.php
  6. 1 1
      resources/views/app/patient/segment-templates/_child_plan/nutrition/FAST_FOOD/edit-plan.php
  7. 1 1
      resources/views/app/patient/segment-templates/_child_plan/nutrition/HIGH_SUGAR_BEVERAGES/edit-plan.php
  8. 1 1
      resources/views/app/patient/segment-templates/_child_plan/nutrition/PORTION_SIZES/edit-plan.php
  9. 1 1
      resources/views/app/patient/segment-templates/_child_plan/nutrition/SNACKS/edit-plan.php
  10. 1 1
      resources/views/app/patient/segment-templates/_child_plan/nutrition/VEGETABLES/edit-plan.php
  11. 1 1
      resources/views/app/patient/segment-templates/_child_plan/nutrition/WATER_INTAKE/edit-plan.php
  12. 1 1
      resources/views/app/patient/segment-templates/_child_review/edit-review-in-place.php
  13. 1 1
      resources/views/app/patient/segment-templates/_child_review/edit-review.php
  14. 1 1
      resources/views/app/patient/segment-templates/_child_review/nutrition/DAILY_INTAKE_CALORIES/edit-review.php
  15. 1 1
      resources/views/app/patient/segment-templates/_child_review/nutrition/DAILY_INTAKE_CARBOHYDRATES/edit-review.php
  16. 1 1
      resources/views/app/patient/segment-templates/_child_review/nutrition/FAST_FOOD/edit-review.php
  17. 1 1
      resources/views/app/patient/segment-templates/_child_review/nutrition/HIGH_SUGAR_BEVERAGES/edit-review.php
  18. 1 1
      resources/views/app/patient/segment-templates/_child_review/nutrition/PORTION_SIZES/edit-review.php
  19. 1 1
      resources/views/app/patient/segment-templates/_child_review/nutrition/SNACKS/edit-review.php
  20. 1 1
      resources/views/app/patient/segment-templates/_child_review/nutrition/VEGETABLES/edit-review.php
  21. 1 1
      resources/views/app/patient/segment-templates/_child_review/nutrition/WATER_INTAKE/edit-review.php
  22. 2 3
      resources/views/app/patient/segment-templates/chief_complaint/summary.blade.php
  23. 2 2
      resources/views/app/patient/segment-templates/omega_cc/summary.blade.php
  24. 2 2
      resources/views/app/patient/wizard-partials/common-fields-add.blade.php
  25. 2 2
      resources/views/app/patient/wizard-partials/common-fields-edit.blade.php

+ 5 - 1
public/css/style.css

@@ -503,7 +503,7 @@ body [note-rte][data-field-name="planValue"] {
 body [note-rte][slim-rte] .ql-editor[contenteditable],
 body [note-rte][data-field-name="reviewValue"] .ql-editor[contenteditable],
 body [note-rte][data-field-name="planValue"] .ql-editor[contenteditable] {
-    min-height: 56px !important;
+    min-height: 30px !important;
     padding: .25rem .5rem !important;
 }
 .ql-container p {
@@ -3328,4 +3328,8 @@ body.forced-masking #mask {
 .note-container .summary-container p {
     margin-top: 0 !important;
     margin-bottom: 0 !important;
+}
+
+.ql-editor {
+    padding: 6px 6px; 
 }

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/edit-plan-in-place.php

@@ -38,7 +38,7 @@ else {
                 <div class="d-flex align-items-baseline mb-1">
                     <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                 </div>
-                <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
             </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/edit-plan.php

@@ -42,7 +42,7 @@ else {
             <div class="d-flex align-items-baseline mb-1">
                 <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
             </div>
-            <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+            <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
         </div>
         <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/nutrition/DAILY_INTAKE_CALORIES/edit-plan.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/nutrition/DAILY_INTAKE_CARBOHYDRATES/edit-plan.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/nutrition/FAST_FOOD/edit-plan.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/nutrition/HIGH_SUGAR_BEVERAGES/edit-plan.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/nutrition/PORTION_SIZES/edit-plan.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/nutrition/SNACKS/edit-plan.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/nutrition/VEGETABLES/edit-plan.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_plan/nutrition/WATER_INTAKE/edit-plan.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/edit-review-in-place.php

@@ -42,7 +42,7 @@ else {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/edit-review.php

@@ -46,7 +46,7 @@ else {
                 <div class="d-flex align-items-baseline mb-1">
                     <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                 </div>
-                <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
             </div>
         <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/nutrition/DAILY_INTAKE_CALORIES/edit-review.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/nutrition/DAILY_INTAKE_CARBOHYDRATES/edit-review.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/nutrition/FAST_FOOD/edit-review.php

@@ -56,7 +56,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/nutrition/HIGH_SUGAR_BEVERAGES/edit-review.php

@@ -44,7 +44,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/nutrition/PORTION_SIZES/edit-review.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/nutrition/SNACKS/edit-review.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/nutrition/VEGETABLES/edit-review.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

+ 1 - 1
resources/views/app/patient/segment-templates/_child_review/nutrition/WATER_INTAKE/edit-review.php

@@ -46,7 +46,7 @@ if (@$point) {
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
             <?php endif; ?>
 

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

@@ -1,5 +1,6 @@
 <?php
 $category = 'CHIEF_COMPLAINT';
+$endPoint = 'upsertNoteSingleton';
 
 use App\Models\Point;
 
@@ -10,8 +11,7 @@ if ($point && !!@$point->data) {
 }
 
 if(!$parsed || !@$parsed->free_text) {
-    /*
-    list($problemPoints, $counts) = Point::getPointsOfCategoryExtended($patient, 'PROBLEM', $note);
+    $problemPoints = Point::getPointsOfCategory($patient, 'PROBLEM');
     $problemNames = [];
     foreach ($problemPoints as $problemPoint) {
         if($problemPoint->relevanceToNote($note)) {
@@ -39,7 +39,6 @@ if(!$parsed || !@$parsed->free_text) {
     $parsed = json_decode(json_encode([
         "free_text" => $defaultCC
     ]));
-    */
 }
 ?>
 <div>

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

@@ -10,7 +10,7 @@ if ($point && !!@$point->data) {
 }
 
 if(!$parsed || !@$parsed->free_text) {
-    /*
+    
     list($problemPoints, $counts) = Point::getPointsOfCategoryExtended($patient, 'PROBLEM', $note);
     $problemNames = [];
     foreach ($problemPoints as $problemPoint) {
@@ -39,7 +39,7 @@ if(!$parsed || !@$parsed->free_text) {
     $parsed = json_decode(json_encode([
         "free_text" => $defaultCC
     ]));
-    */
+    
 }
 ?>
 <div>

+ 2 - 2
resources/views/app/patient/wizard-partials/common-fields-add.blade.php

@@ -215,7 +215,7 @@
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous {{@$reviewLabel ? $reviewLabel : 'Subjective'}} / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
                 <div class="d-none disallow-if-review-same-as" compare-width="reviewValue"><?= str_compact($previousValue) ?></div>
                 <?php endif; ?>
@@ -262,7 +262,7 @@
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous {{@$planLabel ? $planLabel : 'Plan'}} / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
                 <div class="d-none disallow-if-plan-same-as" compare-width="planValue"><?= str_compact($previousValue) ?></div>
                 <?php endif; ?>

+ 2 - 2
resources/views/app/patient/wizard-partials/common-fields-edit.blade.php

@@ -193,7 +193,7 @@
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous {{@$reviewLabel ? $reviewLabel : 'Subjective'}} / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
                 <div class="d-none disallow-if-review-same-as" compare-width="reviewValue"><?= str_compact($previousValue) ?></div>
                 <?php endif; ?>
@@ -240,7 +240,7 @@
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="text-sm text-secondary">Previous {{@$planLabel ? $planLabel : 'Plan'}} / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                    <div class="p-1 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
                 <div class="d-none disallow-if-plan-same-as" compare-width="planValue"><?= str_compact($previousValue) ?></div>
                 <?php endif; ?>