Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

app/Models/Point.php

@@ -230,7 +230,8 @@ class Point extends Model
     }
 
     public static function getPlanPoints(Client $_patient, Note $_note, $_assoc = false) {
-        $points = Point
+        
+	$points = Point
             ::where('client_id', $_patient->id)
             ->where('is_removed_due_to_entry_error', false)
             ->where(function ($query1) use ($_note) {

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 {
@@ -3329,11 +3329,17 @@ body.forced-masking #mask {
     margin-top: 0 !important;
     margin-bottom: 0 !important;
 }
+
+.ql-editor {
+    padding: 6px 6px; 
+}
+
 .pdf-form-preloader {
     display: flex;
     align-items: center;
     justify-content: center;
 }
+
 .pdf-form-preloader i {
     font-size: 35px;
     color: #9e9e9e;

resources/views/app/patient/module-specific-summary-renderers/medication/plan.blade.php

@@ -40,9 +40,9 @@
                                 @endif
                                 <?php elseif ($point->added_in_note_id === $note->id): ?>
                                 <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                                <span class="text-sm text-success">* Prescribed during visit</span>
+                                <span class="text-sm text-success">* Added during visit</span>
                                 <?php else: ?>
-                                <span class="text-sm text-info">* Prescribed on intake</span>
+                                <span class="text-sm text-info">* Added on intake</span>
                                 <?php endif;?>
                                 <?php endif; ?>
                             </span>
@@ -55,4 +55,4 @@
 
         </div>
     </div>
-@endif
+@endif

resources/views/app/patient/module-specific-summary-renderers/problem/plan.blade.php

@@ -12,6 +12,7 @@
             <table class="table table-bordered table-xs table-cage mb-0">
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
+		
                 <tr>
                     <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
@@ -55,4 +56,4 @@
 
         </div>
     </div>
-@endif
+@endif

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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; ?>
 

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>

resources/views/app/patient/segment-templates/informed_consent/edit.blade.php

@@ -19,7 +19,7 @@ if (!!@$point->data) {
         <input type="hidden" name="category" value="<?= $category ?>">
         <input type="hidden" name="data" value="{{json_encode($contentData)}}">
 
-        <label class="d-flex align-items-baseline mb-2">
+        <label class="d-flex align-items-baseline">
             <div class="mr-2 align-self-stretch" style="padding-top: 2px;">
                 <input type="checkbox" data-name="informed_consent" {{@($contentData["informed_consent"] ? 'checked' : '')}}>
             </div>

resources/views/app/patient/segment-templates/informed_consent/summary.blade.php

@@ -14,7 +14,7 @@ if (!!@$point->data) {
 }
 ?>
 
-<div class="d-flex align-items-baseline mb-2">
+<div class="d-flex align-items-baseline">
     <div class="align-self-stretch min-width-30px text-left">
         @if(@($contentData["informed_consent"]))
             <i class="fa fa-check"></i>

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>

resources/views/app/patient/segment-templates/omega_informed_consent/edit.blade.php

@@ -19,7 +19,7 @@ if (!!@$point->data) {
         <input type="hidden" name="category" value="<?= $category ?>">
         <input type="hidden" name="data" value="{{json_encode($contentData)}}">
 
-        <label class="d-flex align-items-baseline mb-2">
+        <label class="d-flex align-items-baseline">
             <div class="mr-2 align-self-stretch" style="padding-top: 2px;">
                 <input type="checkbox" data-name="informed_consent" {{@($contentData["informed_consent"] ? 'checked' : '')}}>
             </div>

resources/views/app/patient/segment-templates/omega_informed_consent/summary.blade.php

@@ -14,7 +14,7 @@ if (!!@$point->data) {
 }
 ?>
 
-<div class="d-flex align-items-baseline mb-2">
+<div class="d-flex align-items-baseline">
     @if(!@($contentData["informed_consent"]))
         <div class="align-self-stretch min-width-30px text-left">
             <i class="fa fa-exclamation-triangle"></i>

resources/views/app/patient/segment-templates/omega_medications/summary.blade.php

@@ -49,9 +49,9 @@ $plural = 'Medications';
 				@endif
 				<?php elseif ($point->added_in_note_id === $note->id): ?>
 				<?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-					<span class="text-sm text-success">* Prescribed during visit</span>
+					<span class="text-sm text-success">* Addeded during visit</span>
 				<?php else: ?>
-					<span class="text-sm text-info">* Prescribed on intake</span>
+					<span class="text-sm text-info">* Added on intake</span>
 				<?php endif;?>
 				<?php endif; ?>
 				</span>

resources/views/app/patient/segment-templates/omega_plan_problems/summary.blade.php

@@ -9,7 +9,6 @@ $numRelevant = 0;
 $numVisible = 0;
 $plural = 'Problems';
 ?>
-
 <?php if (!count($points)): ?>
     <div class="text-secondary">-</div>
 <?php else: ?>
@@ -19,7 +18,8 @@ $plural = 'Problems';
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
-        <?php $numVisible++; ?>
+        <?php if(!$rel && $point->addition_reason_category != 'DURING_VISIT' /* && @VJ PLAN_NOT_UPDATED_ON_THIS_NOTE */ ) continue; ?>
+	<?php $numVisible++; ?>
         <tr>
             <td class="width-40px pl-0 pr-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
@@ -53,7 +53,7 @@ $plural = 'Problems';
                         <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
                             <span class="ml-2 text-sm text-success">* Added during visit</span>
                         <?php else: ?>
-                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                            <span class="ml-2 text-sm text-info">* Added on intakee</span>
                         <?php endif;?>
                     <?php endif; ?>
                 </div>

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; ?>

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; ?>