fixed segment suggestions

app/Models/Segment.php

@@ -26,14 +26,23 @@ class Segment extends Model
 
     public function summarySuggestions()
     {
-        return $this->hasMany(SegmentSummarySuggestion::class, 'segment_id', 'id');
+        return $this->hasMany(SegmentSummarySuggestion::class, 'segment_id', 'id')->orderBy('created_at', 'DESC');
     }
 
     public function summaryUpdates()
     {
-        return $this->hasMany(SegmentSummaryUpdate::class, 'segment_id', 'id');
+        return $this->hasMany(SegmentSummaryUpdate::class, 'segment_id', 'id')->orderBy('created_at', 'DESC');;
     }
 
+    public function currentSegmentSummarySuggestion() {
+        return $this->hasOne(SegmentSummarySuggestion::class, 'id', 'current_segment_summary_suggestion_id');
+    }
+
+    public function currentSegmentSummaryChange() {
+        return $this->hasOne(SegmentSummaryChange::class, 'id', 'current_segment_summary_change_id');
+    }
+    
+
     public function getRecalculatedHtml($performer){
         $pro = $performer->pro;
         $segment = $this; 

app/Models/SegmentSummaryUpdate.php → app/Models/SegmentSummaryChange.php

@@ -4,7 +4,7 @@ namespace App\Models;
 
 # use Illuminate\Database\Eloquent\Model;
 
-class SegmentSummaryUpdate extends Model
+class SegmentSummaryChange extends Model
 {
     protected $table = 'segment_summary_change';
 

resources/views/app/patient/note/dashboard.blade.php

@@ -355,6 +355,26 @@
             </div>
             @endif
 
+
+            @if($note->is_signed_by_hcp)
+                @php 
+                    $suggestionMode = request()->get('suggestion_mode');
+                @endphp 
+                @if($suggestionMode == 'on')
+                    <a class="ml-3 native font-weight-normal refresh-segment c-pointer screen-only"
+                        href="/patients/view/{{$note->client->uid}}/notes/view/{{$note->uid}}?suggestion_mode=off"
+                        title="Update with latest patient data">
+                        Toggle Suggestion Mode Off
+                    </a>
+                @else 
+                    <a class="ml-3 native font-weight-normal refresh-segment c-pointer screen-only"
+                        href="/patients/view/{{$note->client->uid}}/notes/view/{{$note->uid}}?suggestion_mode=on"
+                        title="Update with latest patient data">
+                        Turn Suggestion Mode On
+                    </a>
+                @endif
+            @endif
+
             <div class="ml-auto d-flex align-items-start">
                 <div class="">
                     <div>

resources/views/app/patient/note/note-segment-list.blade.php

@@ -1,3 +1,6 @@
+<?php  
+    $suggestionModeOn = request()->get('suggestion_mode') == 'on' && $note->is_signed_by_hcp 
+?> 
 <div class="segments-list" id="note-segments-list">
     <?php
     $previousHeading = null;
@@ -30,83 +33,11 @@
 		@else
 			@if(in_array($segment->segmentTemplate->internal_name, config('app.note_lhs_segments')))
 				<div>
-					@include('app.patient.note.segment')
-
-                    <div class="row ml-2 border m-2 p-2">
-                        <div class="col-md-6">
-                            <h2>Suggestions</h2>
-                                <div class="d-block mt-1" moe>
-                                    <a class="text-nowrap" href="" show start>Create Suggestion</a>
-                                    <form url="/api/segment/putSegmentSummarySuggestion">
-                                        <input type="hidden" name="uid" value="{{$segment->uid}}">
-                                        <textarea name="suggestedSummaryHtml" rte>
-                                            @if(request()->get('suggestion_mode') == 'on')
-                                             {!! $segment->getRecalculatedHtml($performer)['summaryHtml'] !!}
-                                            @else
-                                             {!! $segment->summary_html !!}
-                                            @endif
-                                        </textarea>
-                                        <div class="mb-0">
-                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                        </div>
-                                    </form>
-                                </div>
-                                <div>
-                                    @foreach($segment->summarySuggestions as $suggestion)
-                                    <div class="shadow mb-1 p-1 bg-white rounded">
-                                        {!! $suggestion->summary_html !!}
-                                        <div class="">
-                                            status: {{$suggestion->status}} - {{$suggestion->status_memo}}
-                                        </div>
-                                        <div>
-                                            <div class="d-block mt-1" moe>
-                                                <a class="text-nowrap" href="" show start>Accept</a>
-                                                <form url="/api/segment/putSegmentSummaryChange">
-                                                    <input type="hidden" name="uid" value="{{$segment->uid}}">
-                                                    <textarea name="newSummaryHtml" rte>{!! $suggestion->summary_html !!}</textarea>
-                                                    <div class="mb-0">
-                                                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </div>
-                                        <div>
-                                            <div class="d-block mt-1" moe>
-                                                <a class="text-nowrap" href="" show start>Update Status</a>
-                                                <form url="/api/segmentSummarySuggestion/update-status">
-                                                    <input type="hidden" name="uid" value="{{$suggestion->uid}}">
-                                                    <div class="form-group">
-                                                        <label for="" class="control-label">Status</label>
-                                                        <input type="text" name="status" class="form-control input-sm">
-                                                    </div>
-                                                    <div class="form-group">
-                                                        <label for="" class="control-label">Memo</label>
-                                                        <textarea name="memo" class="form-control input-sm"></textarea>
-                                                    </div>
-                                                    <div class="mb-0">
-                                                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    @endforeach 
-                                </div>
-                        </div>
-                        <div class="col-md-6">
-                            <h2>Updates</h2>
-                            <div>
-                                @foreach($segment->summaryUpdates as $summaryUpdate)
-                                <div class="shadow mb-1 p-1 bg-white rounded">
-                                    {!! $summaryUpdate->summary_html !!}
-                                </div>
-                                @endforeach 
-                            </div>
-                        </div>
-                    </div>
+                    @if($suggestionModeOn)
+                        @include('app.patient.note.segment.suggestions_and_updates')
+                    @else 
+                        @include('app.patient.note.segment')
+                    @endif
 				</div>
 			@endif
 		@endif

resources/views/app/patient/note/segment.blade.php

@@ -62,6 +62,7 @@
                 <i class="fa fa-sync"></i>
             </a>
 
+           
             <!-- if intake - link to plan segment-->
             <?php
             $isIntake = strpos($iName, 'intake_') === 0;
@@ -101,7 +102,11 @@
     <?php if(!$isLSSegment): ?>
 
     <div class="d-none if-not-edit inset-comment summary-container {{$iName === 'medrisk_vigilence' ? 'px-0' : 'p-2 pl-4'}}">
-        {!! $segment->summary_html !!}
+        @if($note->is_signed_by_hcp && $segment->change_summary_html)
+            {!! $segment->change_summary_html !!}
+        @else 
+            {!! $segment->summary_html !!}
+        @endif 
     </div>
 
 

resources/views/app/patient/note/segment/suggestions_and_updates.blade.php

@@ -0,0 +1,100 @@
+
+<?php $iName = $segment->segmentTemplate->internal_name; ?>
+<?php $isLSSegment = strpos($iName, 'lifestyle_') === 0; ?>
+<div class="ml-2">
+    @if($iName === 'medrisk_vigilence')
+        <div class="font-weight-bold text-center flex-grow-1">
+            <div class="on-hover-hide font-weight-normal text-info font-weight-bold text-center pt-2 font-size-11">MRV</div>
+            <span class="on-hover-only text-left">MedRisk Vigilence</span>
+        </div>
+    @else
+        <span class="font-weight-bold d-flex align-items-center {{$isLSSegment || $iName === 'medrisk_vigilence' ? '' : 'xxxmb-2'}}" style="">
+            <span style="color: black; text-decoration: underline; font-size: 13px;">
+    @if($isLSSegment && $iName === 'lifestyle_general')
+                Lifestyle
+            @else
+                {{$segment->display_title}}
+            @endif
+    </span>
+            @if($segment->heading && $iName !== 'medrisk_vigilence')
+                <span class="text-secondary ml-2 text-sm font-weight-normal">({{$segment->heading}})</span>
+            @endif
+        </span>
+    @endif
+
+    @if($isLSSegment)
+        @if($iName === 'lifestyle_general')
+            <a href="#" class="ls-segment-trigger ml-2" data-target="lifestyle_general">General</a>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <a href="#" class="ls-segment-trigger" data-target="lifestyle_nutrition">Nutrition</a>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <a href="#" class="ls-segment-trigger" data-target="lifestyle_physical_activity">Physical Act.</a>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <a href="#" class="ls-segment-trigger" data-target="lifestyle_sleep">Sleep</a>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <a href="#" class="ls-segment-trigger" data-target="lifestyle_social">Social Relns.</a>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <a href="#" class="ls-segment-trigger" data-target="lifestyle_substances">Subst. Use</a>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <a href="#" class="ls-segment-trigger" data-target="lifestyle_stress">Stress</a>
+        @else
+            <span class="text-info ml-auto font-weight-normal">(click to view)</span>
+        @endif
+    @endif
+</div>
+@if($segment->currentSegmentSummarySuggestion)
+<div class="shadow m-2 p-2">
+    Current Suggestion: {!! $segment->currentSegmentSummarySuggestion->summary_html !!}
+
+    <div class="d-block mt-1" moe>
+        <a  start >Accept</a>
+        <form url="/api/segment/putSegmentSummaryChange" >
+            <input type="hidden" name="uid" value="{{$segment->uid}}">
+            <textarea rte name="newSummaryHtml">{!! $segment->currentSegmentSummarySuggestion->summary_html !!}</textarea>
+            <div class="mb-0">
+                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+            </div>
+        </form>
+    </div>
+
+    <div class="">
+        status: {{$segment->currentSegmentSummarySuggestion->status}} - {{$segment->currentSegmentSummarySuggestion->status_memo}}
+    </div>
+    <div>
+        <div class="d-block mt-1" moe>
+            <a class="text-nowrap" href="" show start>Update Status</a>
+            <form url="/api/segmentSummarySuggestion/update-status">
+                <input type="hidden" name="uid" value="{{$segment->currentSegmentSummarySuggestion->uid}}">
+                <div class="form-group">
+                    <label for="" class="control-label">Status</label>
+                    <input type="text" name="status" class="form-control input-sm">
+                </div>
+                <div class="form-group">
+                    <label for="" class="control-label">Memo</label>
+                    <textarea name="memo" class="form-control input-sm"></textarea>
+                </div>
+                <div class="mb-0">
+                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+@endif
+
+<div class="row ml-2 border m-2 p-2">
+    <div class="d-block mt-1" moe>
+        <form url="/api/segment/putSegmentSummarySuggestion" show>
+            <input type="hidden" name="uid" value="{{$segment->uid}}">
+            <textarea name="suggestedSummaryHtml" rte>
+                {!! $segment->getRecalculatedHtml($performer)['summaryHtml'] !!}
+            </textarea>
+            <div class="mb-0 mt-2">
+                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+            </div>
+        </form>
+    </div>
+</div>