updates on server

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) {

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/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_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>