Note single - Dx inline CRUD

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

@@ -354,141 +354,7 @@
             <div class="col-6">
 
                 {{-- dx --}}
-                <div class="mt-2 pb-1">
-                    <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
-                        <h6 class="my-0 font-weight-bold text-secondary">Current Problems / Focus Areas</h6>
-                        <span class="mx-2 text-secondary">|</span>
-                        <div moe>
-                            <a start show class="py-0 font-weight-normal">Add</a>
-                            <form url="/api/clientInfoLine/create">
-                                <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                                <input type="hidden" name="category" value="dx">
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="ICD" value="" placeholder="ICD"></div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Title"></div>
-                                <div class="mb-2">
-                                    <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
-                                        <option>Chronic or Acute (select one)</option>
-                                        <option value="Chronic">Chronic</option>
-                                        <option value="Acute">Acute</option>
-                                    </select>
-                                </div>
-                                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Prognosis" value="" placeholder="Prognosis"></div>
-                                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Goal" value="" placeholder="Treatment Goal"></textarea></div>
-                                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Plan" value="" placeholder="Treatment Plan"></textarea></div>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" type="button" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-
-                        <span class="mx-2 text-secondary">|</span>
-
-                        <div moe>
-                            <a start show class="">Multi</a>
-                            <form url="/api/clientInfoLine/createMultiple">
-                                <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                                <input type="hidden" name="category" value="dx">
-                                <div class="mb-2"><textarea class="form-control form-control-sm" rows="8" name="contentTexts" value="" placeholder="Dx & Focus Areas"></textarea></div>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-
-                        <span class="mx-2 text-secondary">|</span>
-                        <a start show class="py-0 font-weight-normal"
-                           href="/patients/view/{{ $patient->uid }}/dx-and-focus-areas">
-                            View All
-                        </a>
-                    </div>
-                    <table class="table table-sm border-0 m-0">
-                        <tbody>
-                        <?php $itemCount = 0; ?>
-                        @foreach($infoLines as $category => $lines)
-                            @if($category === "dx")
-                                @foreach ($lines as $line)
-                                    <?php $itemCount++; ?>
-                                    <tr>
-                                        <td class="text-black p-0 border-0">
-                                            <div class="d-flex">
-                                                <span moe relative class="mr-2">
-                                                    <a class="on-hover-opaque" start show title="Delete">
-                                                        <i class="font-size-11 fa fa-trash-alt text-danger"></i>
-                                                    </a>
-                                                    <form url="/api/clientInfoLine/remove">
-                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                        <p class="small">Are you sure you want to delete this entry?</p>
-                                                        <div class="d-flex align-items-center">
-                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                        </div>
-                                                    </form>
-                                                </span>
-                                                <div moe relative class="mr-2">
-                                                    <a class="on-hover-opaque" start show title="Edit">
-                                                        <i class="font-size-11 fa fa-edit"></i>
-                                                    </a>
-                                                    <form url="/api/clientInfoLine/updateContent">
-                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                        <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                                                        <input type="hidden" name="category" value="dx">
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="ICD" value="{{ getVal($line->contentDetail, "ICD") }}" placeholder="ICD">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="contentText" value="{{$line->contentText}}" placeholder="Title">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
-                                                                <option>Chronic or Acute (select one)</option>
-                                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Chronic' ? 'selected' : '' }} value="Chronic">Chronic</option>
-                                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Acute' ? 'selected' : '' }} value="Acute">Acute</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="Prognosis" value="{{ getVal($line->contentDetail, "Prognosis") }}" placeholder="Prognosis">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Goal" placeholder="Treatment Goal">{{ getVal($line->contentDetail, "Treatment Goal") }}</textarea>
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Plan" placeholder="Treatment Plan">{{ getVal($line->contentDetail, "Treatment Plan") }}</textarea>
-                                                        </div>
-                                                        <div class="d-flex align-items-center">
-                                                            <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
-                                                            <button class="btn btn-sm btn-default mr-2 border" type="button" cancel>Cancel</button>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                                <div>
-                                                    <span class="font-weight-bold">{{$line->contentText}}</span>
-                                                    @if(!empty(getVal($line->contentDetail, "Chronic or Acute")))
-                                                    <span class="text-secondary mx-1">/</span>
-                                                    <span class="text-secondary">{{ getVal($line->contentDetail, "Chronic or Acute") }}</span>
-                                                    @endif
-                                                    @if(!empty(getVal($line->contentDetail, "ICD")))
-                                                    <span class="text-secondary mx-1">/</span>
-                                                    <span class="text-secondary">ICD: {{ getVal($line->contentDetail, "ICD") ? getVal($line->contentDetail, "ICD") : '-' }}</span>
-                                                    @endif
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                @endforeach
-                            @endif
-                        @endforeach
-                        @if($itemCount === 0)
-                            <tr>
-                                <td class="text-secondary p-0 border-0">
-                                    No items to show
-                                </td>
-                            </tr>
-                        @endif
-                        </tbody>
-                    </table>
-                </div>
+                @include('app/patient/partials/dx')
 
                 <div class="mt-2">
                     <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">

resources/views/app/patient/partials/dx.blade.php

@@ -0,0 +1,147 @@
+<?php $infoLines = json_decode($patient->info_lines);?>
+<?php $infoLines = !$infoLines ? [] : $infoLines; ?>
+<div class="<?= !@$selectable ? 'mt-2' : 'border-bottom' ?> pb-1">
+    <div class="d-flex align-items-center mb-2 py-2 <?= @$selectable ? 'px-2' : 'border-top' ?> border-bottom">
+
+        @if(!@$selectable)
+        <h6 class="my-0 font-weight-bold text-secondary">Current Problems / Focus Areas</h6>
+        <span class="mx-2 text-secondary">|</span>
+        @endif
+
+        <div moe>
+            <a start show class="py-0 font-weight-normal">Add</a>
+            <form url="/api/clientInfoLine/create">
+                <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                <input type="hidden" name="category" value="dx">
+                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="ICD" value="" placeholder="ICD"></div>
+                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="" placeholder="Title"></div>
+                <div class="mb-2">
+                    <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
+                        <option>Chronic or Acute (select one)</option>
+                        <option value="Chronic">Chronic</option>
+                        <option value="Acute">Acute</option>
+                    </select>
+                </div>
+                <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Prognosis" value="" placeholder="Prognosis"></div>
+                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Goal" value="" placeholder="Treatment Goal"></textarea></div>
+                <div class="mb-2"><textarea type="text" class="form-control form-control-sm" name="Treatment Plan" value="" placeholder="Treatment Plan"></textarea></div>
+                <div class="d-flex align-items-center">
+                    <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
+                    <button class="btn btn-sm btn-default mr-2 border" type="button" cancel>Cancel</button>
+                </div>
+            </form>
+        </div>
+
+        <span class="mx-2 text-secondary">|</span>
+        <div moe>
+            <a start show class="">Multi</a>
+            <form url="/api/clientInfoLine/createMultiple">
+                <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                <input type="hidden" name="category" value="dx">
+                <div class="mb-2"><textarea class="form-control form-control-sm" rows="8" name="contentTexts" value="" placeholder="Dx & Focus Areas"></textarea></div>
+                <div class="d-flex align-items-center">
+                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                </div>
+            </form>
+        </div>
+
+        @if(!@$selectable)
+        <span class="mx-2 text-secondary">|</span>
+        <a start show class="py-0 font-weight-normal"
+           href="/patients/view/{{ $patient->uid }}/dx-and-focus-areas">
+            View All
+        </a>
+        @endif
+    </div>
+    <table class="table table-sm border-0 my-0 mx-2">
+        <tbody>
+        <?php $itemCount = 0; ?>
+        @foreach($infoLines as $category => $lines)
+            @if($category === "dx")
+                @foreach ($lines as $line)
+                    <?php $itemCount++; ?>
+                    <tr>
+                        <td class="text-black p-0 border-0">
+                            <div class="d-flex dx-item">
+                                @if(@$selectable)
+                                    <span class="mr-2 d-inline-flex align-items-center">
+                                        <input type="checkbox" class="my-0 dx-item-checkbox">
+                                    </span>
+                                @endif
+                                <span moe relative class="mr-2">
+                                    <a class="on-hover-opaque" start show title="Delete">
+                                        <i class="font-size-11 fa fa-trash-alt text-danger"></i>
+                                    </a>
+                                    <form url="/api/clientInfoLine/remove">
+                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                        <div class="d-flex align-items-center">
+                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </span>
+                                <div moe relative class="mr-2">
+                                    <a class="on-hover-opaque" start show title="Edit">
+                                        <i class="font-size-11 fa fa-edit"></i>
+                                    </a>
+                                    <form url="/api/clientInfoLine/updateContent">
+                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                        <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                                        <input type="hidden" name="category" value="dx">
+                                        <div class="mb-2">
+                                            <input type="text" class="form-control form-control-sm" name="ICD" value="{{ getVal($line->contentDetail, "ICD") }}" placeholder="ICD">
+                                        </div>
+                                        <div class="mb-2">
+                                            <input type="text" class="form-control form-control-sm" name="contentText" value="{{$line->contentText}}" placeholder="Title">
+                                        </div>
+                                        <div class="mb-2">
+                                            <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
+                                                <option>Chronic or Acute (select one)</option>
+                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Chronic' ? 'selected' : '' }} value="Chronic">Chronic</option>
+                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Acute' ? 'selected' : '' }} value="Acute">Acute</option>
+                                            </select>
+                                        </div>
+                                        <div class="mb-2">
+                                            <input type="text" class="form-control form-control-sm" name="Prognosis" value="{{ getVal($line->contentDetail, "Prognosis") }}" placeholder="Prognosis">
+                                        </div>
+                                        <div class="mb-2">
+                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Goal" placeholder="Treatment Goal">{{ getVal($line->contentDetail, "Treatment Goal") }}</textarea>
+                                        </div>
+                                        <div class="mb-2">
+                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Plan" placeholder="Treatment Plan">{{ getVal($line->contentDetail, "Treatment Plan") }}</textarea>
+                                        </div>
+                                        <div class="d-flex align-items-center">
+                                            <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
+                                            <button class="btn btn-sm btn-default mr-2 border" type="button" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                                <div class="content-html">
+                                    <b>{{$line->contentText}}</b>
+                                    @if(!empty(getVal($line->contentDetail, "Chronic or Acute")))
+                                        <span class="text-secondary mx-1">/</span>
+                                        <span class="text-secondary">{{ getVal($line->contentDetail, "Chronic or Acute") }}</span>
+                                    @endif
+                                    @if(!empty(getVal($line->contentDetail, "ICD")))
+                                        <span class="text-secondary mx-1">/</span>
+                                        <span class="text-secondary">ICD: {{ getVal($line->contentDetail, "ICD") ? getVal($line->contentDetail, "ICD") : '-' }}</span>
+                                    @endif
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+                @endforeach
+            @endif
+        @endforeach
+        @if($itemCount === 0)
+            <tr>
+                <td class="text-secondary p-0 border-0">
+                    No items to show
+                </td>
+            </tr>
+        @endif
+        </tbody>
+    </table>
+</div>

storage/sections/assessment/actions.blade.php

@@ -0,0 +1,34 @@
+<div class="position-relative d-none if-edit ml-3 pl-3 border-left">
+    <a href="#" onclick="$(this).siblings('.embed-section, .embed-mask').removeClass('d-none'); return false;">Include from Symptoms</a>
+    <div class="embed-section min-width-300px bg-white position-absolute d-none current-symptoms-form">
+        <div>
+            @include('app/patient/partials/dx', ['selectable' => true])
+        </div>
+        <div class="m-2">
+            <form url="/no-op">
+                <button class="btn btn-primary btn-sm mr-1" type="button" onclick="return applySelectedDx()">Apply</button>
+                <button class="btn btn-default border btn-sm" type="button" onclick="return cancelDxPopup()">Cancel</button>
+            </form>
+        </div>
+    </div>
+</div>
+
+<script>
+    function applySelectedDx() {
+        let html = [];
+        $('.dx-item-checkbox:checked').each(function() {
+            html.push('<p style="white-space: normal;">' + $.trim($(this).closest('.dx-item').find('.content-html').first().html()) + '</p>');
+        });
+        $('.embed-section, .embed-mask').addClass('d-none');
+        $('.ql-editor[contenteditable]:visible').first().html(html.join('')).focus();
+        return false;
+    }
+    function cancelDxPopup() {
+        $('.embed-section, .embed-mask').addClass('d-none');
+        hideMask();
+        hideMoeFormMask();
+        $('.ql-editor[contenteditable]:visible').first().focus();
+        return false;
+    }
+</script>
+

storage/sections/assessment/actions.php

@@ -1,45 +0,0 @@
-<?php
-$infoLines = json_decode($patient->info_lines);
-$infoLines = !$infoLines ? [] : $infoLines;
-$rows = [];
-foreach ($infoLines as $category => $lines):
-    if ($category === "dx"):
-        foreach ($lines as $line):
-            $rows[] = '<label class="d-flex align-items-center current-symptoms-item mb-1 c-pointer">' .
-                '<input type="checkbox" checked class="my-0 mr-2">' .
-                '<span><b>' . $line->contentText . '</b>' .
-                (isset($line->contentDetail->{"Chronic or Acute"}) ? '<span class="text-secondary">&nbsp/&nbsp</span>' . @$line->contentDetail->{"Chronic or Acute"} : '') .
-                (isset($line->contentDetail->{"ICD"}) ? '<span class="text-secondary mx-1">&nbsp/&nbsp</span>' . @$line->contentDetail->{"ICD"} : '') .
-                '</span></label>';
-        endforeach;
-    endif;
-endforeach;
-?>
-
-<div moe class="position-relative d-none if-edit ml-3 pl-3 border-left">
-    <a start show href="#">Include from Symptoms</a>
-    <form url="/no-op" class="current-symptoms-form">
-        <div class="min-width-300px">
-            <?= implode("", $rows) ?>
-            <div class="mt-2 mb-0">
-                <button class="btn btn-primary btn-sm mr-1" type="button" onclick="return applySelectedSymptoms()">Apply</button>
-                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-            </div>
-        </div>
-    </form>
-</div>
-
-<script>
-    function applySelectedSymptoms() {
-        let html = [];
-        $('.current-symptoms-item input:checkbox:checked').each(function() {
-            html.push('<p>' + $(this).next().html() + '</p>');
-        });
-        $('.current-symptoms-form').hide();
-        hideMask();
-        hideMoeFormMask();
-        $('.ql-editor[contenteditable]:visible').first().html(html.join('')).focus();
-        return false;
-    }
-</script>
-