fixed segment suggestions

app/Models/Segment.php

@@ -29,19 +29,13 @@ class Segment extends Model
         return $this->hasMany(SegmentSummarySuggestion::class, 'segment_id', 'id')->orderBy('created_at', 'DESC');
     }
 
-    public function summaryUpdates()
-    {
-        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 proposedSegmentSummarySuggestion() {
+        return $this->hasOne(SegmentSummarySuggestion::class, 'id', 'proposed_segment_summary_suggestion_id');
     }
 
-    public function currentSegmentSummaryChange() {
-        return $this->hasOne(SegmentSummaryChange::class, 'id', 'current_segment_summary_change_id');
+    public function acceptedSegmentSummarySuggestion() {
+        return $this->hasOne(SegmentSummarySuggestion::class, 'id', 'accepted_segment_summary_suggestion_id');
     }
-    
 
     public function getRecalculatedHtml($performer){
         $pro = $performer->pro;

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

@@ -102,8 +102,8 @@
     <?php if(!$isLSSegment): ?>
 
     <div class="d-none if-not-edit inset-comment summary-container {{$iName === 'medrisk_vigilence' ? 'px-0' : 'p-2 pl-4'}}">
-        @if($note->is_signed_by_hcp && $segment->change_summary_html)
-            {!! $segment->change_summary_html !!}
+        @if($note->is_signed_by_hcp && $segment->accepted_suggestion_summary_html)
+            {!! $segment->accepted_suggestion_summary_html !!}
         @else 
             {!! $segment->summary_html !!}
         @endif 

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

@@ -42,59 +42,64 @@
         @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>
+@if($segment->proposedSegmentSummarySuggestion)
+    <div class=" m-2 p-2">
+        {!! $segment->proposedSegmentSummarySuggestion->summary_html !!}
+        <div class="d-flex">
+            <div class="d-block mt-1 mr-2" moe>
+                <form url="/api/segment/acceptProposedSegmentSummarySuggestion" show>
+                    <input type="hidden" name="uid" value="{{$segment->uid}}">
+                    <div class="mb-0">
+                        <button class="btn btn-primary btn-sm" submit>Accept</button>
+                    </div>
+                </form>
+            </div>
+            <div class="d-block mt-1  mr-2" moe>
+                <form url="/api/segment/rejectProposedSegmentSummarySuggestion" show>
+                    <input type="hidden" name="uid" value="{{$segment->uid}}">
+                    <div class="mb-0">
+                        <button class="btn btn-primary btn-sm" submit>Reject</button>
+                    </div>
+                </form>
             </div>
-        </form>
-    </div>
 
-    <div class="">
-        status: {{$segment->currentSegmentSummarySuggestion->status}} - {{$segment->currentSegmentSummarySuggestion->status_memo}}
+            <div class="d-block mt-1" moe>
+                <a class="btn btn-outline-primary btn-sm " start>Override proposed suggestion</a>
+                <form url="/api/segment/overrideProposedSegmentSummarySuggestion">
+                    <input type="hidden" name="uid" value="{{$segment->uid}}">
+                    <textarea name="proposedSuggestedSummaryHtml" class="form-control" rte>{!! $segment->proposedSegmentSummarySuggestion->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>
+@else
+    <div class=" ml-2 border m-2 p-2">
+        @if($segment->accepted_suggestion_summary_html)
+            {!! $segment->accepted_suggestion_summary_html !!}
+        @else 
+            {!! $segment->summary_html !!}
+        @endif 
+        <hr>
         <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">
+            <a href="" start>Propose suggestion</a>
+            <form url="/api/segment/proposeSegmentSummarySuggestion">
+                <input type="hidden" name="uid" value="{{$segment->uid}}">
+                <textarea name="proposedSuggestedSummaryHtml" rte>
+                    @if($segment->accepted_suggestion_summary_html)
+                        {!! $segment->accepted_suggestion_summary_html !!}
+                    @else 
+                        {!! $segment->getRecalculatedHtml($performer)['summaryHtml'] !!}
+                    @endif 
+                </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>
-</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>
+@endif