Selaa lähdekoodia

Psych visit - layout, ui

Vijayakrishnan 3 vuotta sitten
vanhempi
commit
9ec70f791a

+ 1 - 1
config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 80,
+    'asset_version' => 81,
 
     'temp_dir' => env('TEMP_DIR'),
 

+ 13 - 0
public/css/style.css

@@ -436,6 +436,9 @@ body>nav.navbar {
 .mcp-theme-1 .min-width-140px {
     min-width: 140px !important;
 }
+.mcp-theme-1 .max-width-140px {
+    max-width: 140px !important;
+}
 .mcp-theme-1 .min-width-200px {
     min-width: 200px !important;
 }
@@ -3496,3 +3499,13 @@ table.v-top th {
     text-overflow: ellipsis;
     display: inline-block;
 }
+.note_template_psych_visit .edit-container .ql-editor[contenteditable] {
+    min-height: 80px;
+    background: #fff;
+}
+.note_template_psych_visit .edit-container .ql-toolbar {
+    height: 0;
+    overflow: hidden;
+    padding: 0;
+    border-bottom: 0;
+}

+ 5 - 1
resources/views/app/patient/note/note-segment-list-slim.blade.php

@@ -30,7 +30,11 @@
                 @if($suggestionModeOn)
                     @include('app.patient.note.segment.suggestions_and_updates')
                 @else
-                    @include('app.patient.note.segment-slim')
+                    @if($note->visitTemplate->segments_always_open && !$note->is_signed_by_hcp)
+                        @include('app.patient.note.segment-always-open')
+                    @else
+                        @include('app.patient.note.segment-slim')
+                    @endif
                 @endif
             </div>
            

+ 74 - 0
resources/views/app/patient/note/segment-always-open.blade.php

@@ -0,0 +1,74 @@
+<?php
+$iName = $segment->segmentTemplate->internal_name;
+$wizardPowered = [
+    'omega_medications',
+    'omega_problems',
+    'omega_allergies',
+    'omega_ros'
+];
+?>
+
+<div class="border-bottom note-section visit-segment outline-0 {{$note->is_signed_by_hcp ? 'events-none' : (in_array($iName, $wizardPowered) !== FALSE ? 'edit-trigger' : 'edit')}}"
+     data-segment-uid="{{ $segment->uid }}"
+     data-segment-template-uid="{{ $segment->segmentTemplate->uid }}"
+     data-segment-template-name="{{ $segment->segmentTemplate->internal_name }}">
+
+    <div class="bg-light text-dark px-2 py-1">
+        <div class="d-flex align-items-baseline">
+
+            @if(!!$segment->display_title)
+                <div class="text-dark font-weight-bold font-size-13 mr-2 mt-2">
+                    {{$segment->display_title}}:
+                </div>
+            @endif
+
+            @if(!$note->is_signed_by_hcp)
+                @if(!$note->visitTemplate->segments_always_open)
+                    <a class="edit-trigger d-none if-edit c-pointer ml-3">
+                        <i class="fas fa-caret-up font-size-16"></i>
+                    </a>
+                @endif
+
+            <!-- refresh -->
+                <a class="ml-3 font-weight-normal refresh-segment c-pointer {{$iName === 'medrisk_vigilence' ? 'on-hover-only' : ''}} screen-only"
+                   data-segment-uid="{{$segment->uid}}"
+                   title="Update with latest patient data">
+                    <i class="fa fa-sync on-hover-opaque"></i>
+                </a>
+
+            @endif
+
+            {{-- if segment has log feature, link --}}
+            @if($pro->pro_type === 'ADMIN' && file_exists(resource_path("views/app/patient/segment-templates/{$segment->segmentTemplate->internal_name}/log.blade.php")))
+                <a native="" target="_blank"
+                   class="c-pointer ml-2 text-decoration-none"
+                   open-in-stag-popup=""
+                   title="{{$segment->display_title}} - Change Log"
+                   popup-style="medium"
+                   href="/note-segment-view/{{$patient->uid}}/{{$note->uid}}/{{$segment->uid}}/<?= $segment->segmentTemplate->internal_name ?>/log">
+                    <i class="fas fa-history on-hover-opaque"></i>
+                </a>
+            @endif
+
+        </div>
+
+        <div class="py-1">
+            @if(in_array($iName, $wizardPowered) !== FALSE)
+                <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>
+            @else
+                <div class="{{!$note->visitTemplate->segments_always_open ? 'd-none if-edit' : ''}} edit-container">
+                    {!! $segment->edit_html !!}
+                </div>
+            @endif
+
+        </div>
+
+    </div>
+
+</div>

+ 5 - 5
resources/views/app/patient/segment-templates/biopsychosocial_assessment/edit.blade.php

@@ -210,7 +210,7 @@ $labels = [
 	'other_important_information' => 'Other Important Information', 
 ];
 ?>
-<div class="p-3">
+<div class="">
 	@foreach($contents as $field => $content)
 		<div visit-moe close-on-save close-on-cancel class="d-block" id="biopsychosocial_assessment-{{$field}}-{{$note->id}}">
 			<form show url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 frm-upsert-review-psych-intake-current-mental-status">
@@ -219,12 +219,12 @@ $labels = [
 				<input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
 				<input type="hidden" name="data" value="{{json_encode($content)}}">
 
-				<div class="row align-items-center mb-1">
-					<div class="col-md-4">
+				<div class="row align-items-center mb-1 mx-0">
+					<div class="col-md-4 pl-0">
 						<label class="control-label mb-0" style="font-size:13px;">{{$labels[$field]}}:</label>
 					</div>
-					<div class="col-md-8">
-						<input type="text" name="value" class="form-control input-sm" placeholder="{{$placeholders[$field]}}" value="{{$content['value']}}" data-name="value">
+					<div class="col-md-8 pr-0">
+						<input type="text" name="value" class="form-control form-control-sm" placeholder="{{$placeholders[$field]}}" value="{{$content['value']}}" data-name="value">
 					</div>
 				</div>
 			</form> 

+ 21 - 22
resources/views/app/patient/segment-templates/current_mental-status/edit.blade.php

@@ -190,7 +190,7 @@ $keyToLabelMap = [
 	'insight' => 'Insight',
 	'judgment' => 'Judgment/Impulse Control',
 	'memory' => 'Memory',
-	'attentionConcentration' => 'Attention/Concentration',
+	'attentionConcentration' => 'Attention / Concentration',
 	'thoughtProcess' => 'Thought Process',
 	'thoughtContent' => 'Thought Content',
 	'perception' => 'Perception',
@@ -247,7 +247,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 $submitFormUrl = "/api/visitPoint/upsertChildReview";
 ?>
 
-<div visit-moe close-on-save close-on-cancel class="d-block p-3" id="psych-intake-current-mental-status-{{$note->id}}">
+<div visit-moe close-on-save close-on-cancel class="d-block" id="psych-intake-current-mental-status-{{$note->id}}">
     <form id="pychIntakeForm" show url="{{ $submitFormUrl }}" class="mcp-theme-1 frm-upsert-review-typical-day-ls">
         <input type="hidden" name="uid" value="<?= $point->uid ?>">
         <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
@@ -255,7 +255,7 @@ $submitFormUrl = "/api/visitPoint/upsertChildReview";
         <input type="hidden" name="data" value="{{json_encode($contentData)}}">
 
         <div class="mb-2 d-flex align-items-center justify-content-between">
-			<p class="mb-0 font-weight-bold">Psych Intake Current Mental Status</p>
+			<p class="mb-0 font-weight-bold">&nbsp;</p>
 			<div>
 				<a class="mr-2 font-weight-bold c-pointer" all-normal><i class="fas fa-thumbs-up"></i> All Normal</a>
 				<a class="font-weight-bold c-pointer" all-not-assessed><i class="fas fa-times-circle"></i> All Not assessed</a>
@@ -263,43 +263,42 @@ $submitFormUrl = "/api/visitPoint/upsertChildReview";
 		</div>
 
         <div>
-            <div class="row">
+            <div class="row mx-0">
                 
-                <div class="col-md-6">
+                <div class="col-md-6 pl-0">
                     @foreach($keyToInputMap as  $field => $options)
                         @if(in_array($field, $displayColumns['left']))
-							<div class="row align-items-center mb-1">
-								<div class="col-md-4">
+							<div class="row align-items-center mb-1 mx-0">
+								<div class="col-md-4 pl-0">
 									<label class="control-label mb-0">{{$keyToLabelMap[$field]}}:</label>
 								</div>
-								<div class="col-md-8">
-									<input type="text" list="{{$field}}s" data-name="{{$field}}" name="{{$field}}" id="{{$field}}" class="form-control" value="{{ @$contentData[$field] }}">
-									<datalist id="{{$field}}s">
+								<div class="col-md-8 pr-0">
+									<input type="text" list="{{$field}}s" data-option-list data-name="{{$field}}" name="{{$field}}" id="{{$field}}" class="form-control form-control-sm" value="{{ @$contentData[$field] }}">
+									<div class="data-option-list">
 										@foreach($options as $option)
-											<option value="{{$option}}">{{$option}}</option>
+											<div>{{$option}}</div>
 										@endforeach
-									</datalist>
-									
+									</div>
 								</div>
 							</div>
                         @endif
                     @endforeach
                 </div>
                     
-                <div class="col-md-6">
+                <div class="col-md-6 px-0">
                     @foreach($keyToInputMap as  $field => $options)
                         @if(in_array($field, $displayColumns['right']))
-						<div class="row align-items-center mb-1">
-							<div class="col-md-4">
+						<div class="row align-items-center mb-1 mx-0">
+							<div class="col-md-4 pl-0">
 								<label class="control-label mb-0">{{$keyToLabelMap[$field]}}:</label>
 							</div>
-							<div class="col-md-8">
-								<input type="text" list="{{$field}}s" data-name="{{$field}}" name="{{$field}}" id="{{$field}}" class="form-control" value="{{ @$contentData[$field] }}">
-								<datalist id="{{$field}}s">
+							<div class="col-md-8 pr-0">
+								<input type="text" list="{{$field}}s" data-option-list data-name="{{$field}}" name="{{$field}}" id="{{$field}}" class="form-control form-control-sm" value="{{ @$contentData[$field] }}">
+								<div class="data-option-list">
 									@foreach($options as $option)
-                                        <option value="{{$option}}">{{$option}}</option>
-                                    @endforeach
-								</datalist>
+										<div>{{$option}}</div>
+									@endforeach
+								</div>
 							</div>
 						</div>
                         @endif

+ 4 - 1
resources/views/app/patient/segment-templates/medication_comments/edit.blade.php

@@ -1 +1,4 @@
-Hello
+<?php
+$category = 'MEDICATION_COMMENTS';
+$endPoint = 'upsertNoteSingleton';
+include resource_path('views/app/patient/segment-templates/_simple_text_segment/edit.php');

+ 3 - 1
resources/views/app/patient/segment-templates/medication_comments/summary.blade.php

@@ -1 +1,3 @@
-Coming soon
+<?php
+$category = 'MEDICATION_COMMENTS';
+include resource_path('views/app/patient/segment-templates/_simple_text_segment/summary.php');

+ 1 - 1
resources/views/app/patient/segment-templates/omega_cc/edit.blade.php

@@ -50,7 +50,7 @@ if(!$parsed || !@$parsed->free_text) {
              class="form-group mb-2 border-left border-right rte-holder"
              data-field-name="free_text"
         ><?= $parsed && @$parsed->free_text ? $parsed->free_text : '' ?></div>
-        <div class="m-2">
+        <div class="my-2">
             <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
             <div class="d-inline-flex align-self-stretch align-items-center">
                 <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>

+ 4 - 1
resources/views/app/patient/segment-templates/physical_exam/edit.blade.php

@@ -1 +1,4 @@
-Hello
+<?php
+$category = 'PHYSICAL_EXAM';
+$endPoint = 'upsertNoteSingleton';
+include resource_path('views/app/patient/segment-templates/_simple_text_segment/edit.php');

+ 3 - 1
resources/views/app/patient/segment-templates/physical_exam/summary.blade.php

@@ -1 +1,3 @@
-Coming soon
+<?php
+$category = 'PHYSICAL_EXAM';
+include resource_path('views/app/patient/segment-templates/_simple_text_segment/summary.php');