Преглед на файлове

Admin ability to de/reactivate segments - and show/hide them in print/display

Vijayakrishnan преди 3 години
родител
ревизия
cb61680c77

+ 3 - 3
app/Models/Note.php

@@ -84,7 +84,7 @@ class Note extends Model
     {
         return $this->hasMany(Segment::class, 'note_id', 'id')
             ->where('id', '!=', $this->core_segment_id) // dont include core-segment
-            ->where('is_active', true)
+            //->where('is_active', true)
             ->orderBy('position_index', 'asc');
     }
 
@@ -93,7 +93,7 @@ class Note extends Model
         return $this->hasMany(Segment::class, 'note_id', 'id')
             ->whereRaw("(left_or_right IS NULL OR left_or_right = 'LEFT')")
             ->where('id', '!=', $this->core_segment_id) // dont include core-segment
-            ->where('is_active', true)
+            //->where('is_active', true)
             ->orderBy('position_index', 'asc');
     }
 
@@ -102,7 +102,7 @@ class Note extends Model
         return $this->hasMany(Segment::class, 'note_id', 'id')
             ->where('left_or_right', 'RIGHT')
             ->where('id', '!=', $this->core_segment_id) // dont include core-segment
-            ->where('is_active', true)
+            //->where('is_active', true)
             ->orderBy('position_index', 'asc');
     }
 

+ 4 - 1
resources/views/app/patient/note/note-segment-list-print.blade.php

@@ -2,8 +2,11 @@
     <?php
     $previousHeading = null;
     $previousSubHeading = null;
+	$segments = $note->segments->filter(function($_x) {
+		return !!$_x->is_active;
+	});
     ?>
-    @foreach($note->segments as $segment)
+    @foreach($segments as $segment)
 		@if($segment->segmentTemplate->internal_name !== 'medrisk_vigilence' && $segment->left_or_right !== 'RIGHT')
 		<?php
         if ($segment->heading !== $previousHeading) {

+ 20 - 3
resources/views/app/patient/note/segment-resolve.blade.php

@@ -10,10 +10,27 @@
 
     <!-- title -->
 
-        <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;">
+        <span class="font-weight-bold d-flex align-items-center {{$isLSSegment || $iName === 'medrisk_vigilence' ? '' : 'xxxmb-2'}}">
+            <span style="color: black; text-decoration: underline; font-size: 13px;" class="{{!$segment->is_active ? 'opacity-35' : ''}}">
                 {{$segment->display_title}}
             </span>
+            @if($note->is_signed_by_hcp && $pro->pro_type === 'ADMIN')
+                @if($segment->is_active)
+                    <div moe class="ml-3">
+                        <form url="/api/segment/deactivate" show>
+                            <input type="hidden" name="uid" value="{{$segment->uid}}">
+                            <button submit class="p-0 border-0 bg-transparent text-primary text-sm outline-0">Deactivate</button>
+                        </form>
+                    </div>
+                @else
+                    <div moe class="ml-3">
+                        <form url="/api/segment/reactivate" show>
+                            <input type="hidden" name="uid" value="{{$segment->uid}}">
+                            <button submit class="p-0 border-0 bg-transparent text-primary text-sm outline-0">Reactivate</button>
+                        </form>
+                    </div>
+                @endif
+            @endif
         </span>
 
         @if($isLSSegment)
@@ -57,7 +74,7 @@
         ]) === TRUE);
     ?>
 
-    @if(!$isLSSegment)
+    @if(!$isLSSegment && $segment->is_active)
         <?php
             $html = '';
             if($note->is_signed_by_hcp && $segment->accepted_suggestion_summary_html) {

+ 36 - 15
resources/views/app/patient/note/segment-slim.blade.php

@@ -20,26 +20,29 @@ $isOmegaHistorySegment = strpos($iName, 'omega_history_') === 0;
             ?>
 
             @if(!!$segment->display_title)
-            <div class="text-dark font-weight-bold font-size-13 mr-2 {{$extraClass}}">
+            <div class="text-dark font-weight-bold font-size-13 mr-2 {{$extraClass}} {{!$segment->is_active ? 'opacity-35' : ''}}">
                 {{$segment->display_title}}:
             </div>
             @endif
 
             <div class="flex-grow-1">
-                <div class="d-none if-not-edit inset-comment summary-container">
-                    @if($note->is_signed_by_hcp && $segment->accepted_suggestion_summary_html)
-                        {!! $segment->accepted_suggestion_summary_html !!}
-                    @else
-                        {!! $segment->summary_html !!}
-                    @endif
-                </div>
-
-                <?php if($iName !== 'ros' && $iName !== 'omega_ros' && !$isOmegaHistorySegment) { ?>
-                <div class="d-none if-edit edit-container">
-                    {!! $segment->edit_html !!}
-                </div>
-                <?php } ?>
-
+                @if($segment->is_active)
+                    <div class="d-none if-not-edit inset-comment summary-container">
+                        @if($note->is_signed_by_hcp && $segment->accepted_suggestion_summary_html)
+                            {!! $segment->accepted_suggestion_summary_html !!}
+                        @else
+                            {!! $segment->summary_html !!}
+                        @endif
+                    </div>
+
+                    <?php if($iName !== 'ros' && $iName !== 'omega_ros' && !$isOmegaHistorySegment) { ?>
+                    <div class="d-none if-edit edit-container">
+                        {!! $segment->edit_html !!}
+                    </div>
+                    <?php } ?>
+                @else
+                    <span class="text-warning-dark">Deactivated</span>
+                @endif
             </div>
 
 
@@ -71,6 +74,24 @@ $isOmegaHistorySegment = strpos($iName, 'omega_history_') === 0;
             </a>
         @endif
 
+        @if($note->is_signed_by_hcp && $pro->pro_type === 'ADMIN')
+            @if($segment->is_active)
+                <div moe class="ml-2">
+                    <form url="/api/segment/deactivate" show>
+                        <input type="hidden" name="uid" value="{{$segment->uid}}">
+                        <button submit class="p-0 border-0 bg-transparent text-primary text-sm outline-0">Deactivate</button>
+                    </form>
+                </div>
+            @else
+                <div moe class="ml-2">
+                    <form url="/api/segment/reactivate" show>
+                        <input type="hidden" name="uid" value="{{$segment->uid}}">
+                        <button submit class="p-0 border-0 bg-transparent text-primary text-sm outline-0">Reactivate</button>
+                    </form>
+                </div>
+            @endif
+        @endif
+
     </div>