ソースを参照

Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2

= 3 年 前
コミット
38300d6db5

+ 2 - 1
public/css/style.css

@@ -524,7 +524,8 @@ body [note-rte][data-field-name="planValue"] .ql-editor[contenteditable] {
     display: block !important;
 }
 .note-section:not(.edit) div.if-not-edit {
-    padding-left: 1rem;
+    /* padding-left: 1rem; */
+    padding-left: 0;
 }
 .note-section:not(.edit):hover {
     background: #f6f9fc;

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

@@ -14,7 +14,7 @@
             </div>
 
             <div class="flex-grow-1">
-                <div class="d-none if-not-edit inset-comment summary-container p-2xxx pl-4">
+                <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 

+ 2 - 0
resources/views/app/practice-management/visit-templates/visit-template-segment-templates/segment-templates-list.blade.php

@@ -1,6 +1,7 @@
 <table data-position="{{ @$position }}" class="table table-sm table-striped border-top p-0 m-0 table-dnd">
 	<thead class="bg-light">
 		<tr>
+			<th class="border-0">Position Index</th>
 			<th class="border-0">Display title</th>
 			<th class="border-0">Heading</th>
 			<th class="border-0">Sub-heading</th>
@@ -15,6 +16,7 @@
 			@if(@$position === $template->left_or_right && $template->is_active)
 				<?php $rowsCount++; ?>
 				<tr id="{{ $template->uid }}" data-uid="{{ $template->uid }}" data-positionindex="{{ $template->position_index }}" data-heading="{{ $template->heading }}" data-subheading="{{ $template->subheading }}" data-displaytitle="{{ $template->display_title }}" data-leftorright="{{ $template->left_or_right }}">
+					<td>{{ $template->position_index }}</td>
 					<td class="text-nowrap">&boxH; &nbsp; &nbsp; {{ $template->display_title }}</td>
 					<td>{{ $template->heading }}</td>
 					<td>{{ $template->subheading }}</td>