CanvasData cleanup

app/Http/Controllers/NoteController.php

@@ -216,119 +216,6 @@ class NoteController extends Controller
         ];
     }
 
-    public function processFormSubmit(Request $request)
-    {
-        // guest_access_code, section_uid, data
-        // REMEMBER, if this is an hcp scoped canvas section, data will not be the ENTIRE node...
-        // ... it will only be the hcp scope within that node
-
-        $guestAccessCode = $request->get('guest_access_code');
-        if($guestAccessCode){
-            //its from guest
-            $sectionForToken = Section::where('guest_access_code', $guestAccessCode)->first();
-            abort_if(!$sectionForToken, 401, 'Unauthorized');
-        }else{
-            //its not from guest so require performer
-            abort_if(!$this->performer, 401, 'Unauthorized');
-            abort_if(!$this->performer->is_active, 401, 'Unauthorized');
-        }
-
-        // TODO require
-        $section_uid =  $request->get('section_uid');
-
-        $section = Section::where('uid', $section_uid)->first();
-        $note = Note::where('id', $section->note_id)->first();
-        $client = null;
-        if($note){
-            $client = Client::where('id', $note->client_id)->first();
-        }else{
-            $client = Client::where('id', $section->client_id)->first();
-        }
-
-        $patient = $client;
-        $sectionTemplate = SectionTemplate::where('id', $section->section_template_id)->first();
-
-        $newContentData = [];
-        $newSummaryHtml = "";
-
-        $sectionInternalName = $sectionTemplate->internal_name;
-        if ($sectionTemplate->is_canvas) {
-
-            $key = $sectionTemplate->internal_name;
-
-            // Because sectionTemplate is_canvas, any update to the section will require updating the canvas.
-            // ... there are TWO possibilities.
-            // ...... 1) if !is_hcp_scoped, then what comes in from the section simply swaps out the entire node
-            // ...... 2) if is_hcp_scoped, then what comes in from the section is incoprorated into that scope in the node
-
-            $newCanvasNodeData = null;
-            if($sectionTemplate->is_hcp_scoped){
-                $currentCanvasData = json_decode($client->canvas_data, true);
-                $currentCanvasDataNode = isset($currentCanvasData[$key]) ? $currentCanvasData[$key] : [];
-                $currentCanvasDataNode[$note->hcpPro->id] = json_decode($request->get('data'), true);
-                $newCanvasNodeData = json_encode($currentCanvasDataNode);
-            }else{
-                $newCanvasNodeData = $request->get('data');
-            }
-
-            $response = null;
-            $data = [
-                'uid' => $client->uid,
-                'noteUid'=> $note?$note->uid:null,
-                'key' => $key,
-                'data' => $newCanvasNodeData
-            ];
-
-            $response = $this->calljava($request, '/client/updateCanvasData', $data, $guestAccessCode);
-            //TODO: handle $response->success == false
-
-            if($note){
-                $client = Client::where('id', $note->client_id)->first();
-            }else{
-                $client = Client::where('id', $section->client_id)->first();
-            }
-
-            $patient = $client;
-            if (file_exists(resource_path("views/app/patient/canvas-sections/{$sectionInternalName}/processor.php"))) {
-                include(resource_path("views/app/patient/canvas-sections/{$sectionInternalName}/processor.php"));
-            } else {
-                $newContentData = json_decode($request->get('data'), true);
-            }
-
-            ob_start();
-            include(resource_path("views/app/patient/canvas-sections/{$sectionInternalName}/summary.php"));
-            $newSummaryHtml = ob_get_contents();
-            ob_end_clean();
-            // TODO call Java to update the canvas
-        } elseif (file_exists(storage_path('sections/' . $sectionTemplate->internal_name . '/form.blade.php'))) {
-
-            include(storage_path('sections/' . $sectionTemplate->internal_name . '/processor.php'));
-
-            ob_start();
-            include(storage_path('sections/' . $sectionTemplate->internal_name . '/summary.php'));
-            $newSummaryHtml = ob_get_contents();
-            ob_end_clean();
-        } else {
-
-            $newContentData = json_decode($request->get('data'), true);
-            if (isset($newContentData['value'])) {
-                $newSummaryHtml = $newContentData['value'];
-            }
-        }
-
-        $response = null;
-        $data = [
-            'uid' => $section->uid,
-            'contentData' => json_encode($newContentData),
-            'summaryHtml' => $newSummaryHtml
-        ];
-        $response = $this->calljava($request, '/section/update', $data, $guestAccessCode);
-        return [
-            'success' => $response['success'],
-            'newSummaryHtml' => $newSummaryHtml
-        ];
-    }
-
     // edit hpi (structured)
     public function editHPI(Note $note, Point $point) {
         return view('app.patient.note.edit-hpi', compact('note', 'point'));

resources/views/app/patient/canvas-sections/canvas-editor-modal.blade.php

@@ -1,28 +0,0 @@
-@if(!@$noEditLink)
-    <a class="py-0 font-weight-normal c-pointer" onclick="showStagPopup('client-{{ $key }}')">Edit</a>
-@endif
-<div class="stag-popup mcp-theme-1 {{ isset($class) ? $class : '' }}" stag-popup-key="client-{{ $key }}">
-    <?php
-    $contentData = false;
-    if ($patient->canvas_data) {
-        $canvasData = json_decode($patient->canvas_data, true);
-        if (isset($canvasData[$key])) {
-            $contentData = $canvasData[$key];
-        }
-    }
-    ?>
-    <form method="POST" action="/api/client/updateCanvasData">
-        <input type="hidden" name="uid" value="{{$patient->uid}}">
-        <input type="hidden" name="key" value="{{$key}}">
-        @if(isset($note))
-        <input type="hidden" name="noteUid" value="{{$note->uid}}">
-        @endif
-
-        @include("app.patient.canvas-sections.{$key}.form")
-
-        <div class="form-group m-0 d-flex">
-            <button type="button" class="btn btn-sm btn-primary mr-2" onclick="return submitStagPopup($(this).closest('form'))">Submit</button>
-            <button type="button" class="btn btn-sm btn-default border" onclick="return closeStagPopup()">Cancel</button>
-        </div>
-    </form>
-</div>

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

@@ -1,598 +0,0 @@
-@extends ('layouts.patient')
-
-@section('inner-content')
-<?php
-$shortCutsObject = [];
-foreach ($pro->allShortcuts() as $shortcut) {
-
-    // %replaceables%
-    $shortcut->text = str_replace("%AGE%", $patient->age_in_years, $shortcut->text);
-    $shortcut->text = str_replace("%GENDER%", $patient->sex, $shortcut->text);
-    $shortcut->text = str_replace("%NAME%", $patient->displayName(), $shortcut->text);
-
-    $shortCutsObject[] = [
-        "name" => $shortcut->shortcut,
-        "value" => $shortcut->text
-    ];
-}
-?>
-<script>
-    window.userShortcuts = <?= json_encode($shortCutsObject); ?>;
-</script>
-<link href="/select2/select2.min.css" rel="stylesheet" />
-<script src="/select2/select2.min.js"></script>
-<div>
-
-    {{-- CARE PLAN START --}}
-    <?php $infoLines = json_decode($patient->info_lines); ?>
-    <?php $infoLines = !$infoLines ? [] : $infoLines; ?>
-    <?php $vitalLabels = ['Ht. (in.)', 'Wt. (lbs.)', 'Temp. (F)', 'Pulse', 'Resp.', 'Pulse Ox.', 'SBP', 'DBP', 'Smoking Status', 'BMI']; ?>
-    <?php $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_create($patient->created_at))->invert === 1); ?>
-
-    <?php $nonCoreVisitNotes = $patient->nonCoreVisitNotes; ?>
-    <?php $disallowPointEdits = $nonCoreVisitNotes && count($nonCoreVisitNotes); ?>
-
-    <div class="row client-single-dashboard">
-        <div class="col-6">
-            <?php
-            $myCurrentClientReviewRequest = $performer->pro->currentMonthClientReviewRequest($patient->id);
-            ?>
-            @if($myCurrentClientReviewRequest)
-            <div class="pt-2 mt-2">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Client Review Request - {{ friendly_date(date('Y-m-01')) }}</h6>
-                </div>
-                @if($myCurrentClientReviewRequest->status === 'PENDING')
-                <div class="alert alert-danger">
-                    <div class="d-flex align-items-center justify-content-between">
-                        <p class="mb-0">Please review this chart</p>
-                        <div>
-                            @include('app.patient.review-requests.partials.physician-update-status', ['record' =>$myCurrentClientReviewRequest ])
-                        </div>
-                    </div>
-                </div>
-                @endif
-                @if($myCurrentClientReviewRequest->status === 'DONE')
-                <div class="alert alert-success">
-                    <div class="d-flex align-items-center justify-content-between">
-                        <div>
-                            <p class="mb-1">You have already reviewed this chart.</p>
-                            @if($myCurrentClientReviewRequest->status_memo)
-                            <div class="d-flex align-items-start">
-                                <span class="mr-3"><i class="fas fa-calendar"></i> {{ friendly_date_time($myCurrentClientReviewRequest->status_updated_at) }}</span>
-                                <small class="text-muted">{{ $myCurrentClientReviewRequest->status_memo }}
-                                    @if(!$myCurrentClientReviewRequest->generic_bill_id)
-                                        @include('app.patient.review-requests.partials.physician-update-status', ['record' =>$myCurrentClientReviewRequest, 'updateMemo' => true ])
-                                    @endif
-                                </small>
-                            </div>
-
-                            @endif
-                        </div>
-                        <div>
-                            @if($myCurrentClientReviewRequest->generic_bill_id)
-                            <button class="btn btn-sm btn-success"><i class="fas fa-check-circle"></i> Bill Submitted</button>
-                            @else
-                                @include('app.patient.review-requests.partials.physician-submit-client-review-bill', ['record' =>$myCurrentClientReviewRequest ])
-                            @endif
-                        </div>
-                    </div>
-                </div>
-                @endif
-            </div>
-            @endif
-            {{-- rpm summary for current caremonth --}}
-            @if($patient->currentCareMonth() && $patient->currentCareMonth()->is_client_enrolled_in_rm)
-                @include('app/patient/partials/caremonth-summary', ['careMonth' => $patient->currentCareMonth()])
-            @endif
-
-            {{-- appointments --}}
-            @include('app/patient/partials/appointments')
-
-            <?php $hasAllergiesInCanvas = $patient->hasDataInCanvas('allergies'); ?>
-
-            {{-- canvas based allergies --}}
-            @if($isOldClient && $hasAllergiesInCanvas)
-            <div class="pt-2 mt-2 border-top">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Allergies</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.allergies.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- allergies - point -->
-            @include('app.patient.point-based-partials.allergies')
-
-            <?php $hasRxInCanvas = $patient->hasDataInCanvas('rx'); ?>
-
-            {{-- canvas based rx --}}
-            @if($isOldClient && $hasRxInCanvas)
-            <div class="pt-2 mt-2 border-top">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Current Medications</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.rx.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- meds - point -->
-            @include('app.patient.point-based-partials.rx')
-
-            {{-- devices --}}
-            <?php
-            $availableDevices = count($devices);
-            $patientDeviceIDs = \App\Models\ClientBDTDevice::select('id')->where('client_id', $patient->id)->where('is_active', true)->get()->toArray();
-            $patientDeviceIDs = array_map(function ($_x) {
-                return $_x["id"];
-            }, $patientDeviceIDs);
-            ?>
-            <div class="mt-2 pb-1" id="patient-dashboard-devices">
-                <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
-                    <h6 class="my-0 font-weight-bold">Devices</h6>
-                    @if($availableDevices > 0 && $pro->pro_type === 'ADMIN')
-                    <span class="mx-2 text-secondary">|</span>
-                    <span moe>
-                        <a start show>Add</a>
-                        <form url="/api/clientBdtDevice/create" class="mcp-theme-1">
-                            <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Device</label>
-                                <select name="deviceUid" class="form-control form-control-sm">
-                                    <option value=""> --select-- </option>
-                                    @foreach($devices as $device)
-                                    @if(!in_array($device->id, $patientDeviceIDs))
-                                    <option value="{{$device->uid}}">
-                                        {{$device->imei}} ({{$device->category}})
-                                    </option>
-                                    @endif
-                                    @endforeach
-                                </select>
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Instructions</label>
-                                <input type="text" name="instructions" class="form-control form-control-sm">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Internal Memo</label>
-                                <input type="text" name="internalMemo" class="form-control form-control-sm">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Status</label>
-                                <input type="text" name="status" class="form-control form-control-sm">
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm">Status Memo</label>
-                                <input type="text" name="statusMemo" class="form-control form-control-sm">
-                            </div>
-                            <div>
-                                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                            </div>
-                        </form>
-                    </span>
-                    @endif
-                </div>
-                <table class="table table-sm border-0 my-0 mx-2">
-                    <tbody>
-                        @foreach($patient->devices as $device)
-                        <tr>
-                            <td class="text-black p-0 border-0">
-                                <div class="pb-0">
-                                    <span relative moe>
-                                        <a class="on-hover-opaque" start show title="Update">
-                                            <i class="font-size-11 fa fa-edit text-primary"></i>
-                                        </a>
-                                        <form url="/api/clientBdtDevice/update">
-                                            <input type="hidden" name="uid" value="{{ $device->uid }}">
-                                            <div class="mb-2">
-                                                <label class="text-secondary text-sm">Instructions</label>
-                                                <input type="text" name="instructions" value="{{$device->instructions}}" class="form-control form-control-sm">
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="text-secondary text-sm">Internal Memo</label>
-                                                <input type="text" name="internalMemo" value="{{$device->internal_memo}}" class="form-control form-control-sm">
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="text-secondary text-sm">Status</label>
-                                                <input type="text" name="status" value="{{$device->status}}" class="form-control form-control-sm">
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="text-secondary text-sm">Status Memo</label>
-                                                <input type="text" name="statusMemo" value="{{$device->status_memo}}" class="form-control form-control-sm">
-                                            </div>
-                                            <div>
-                                                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                            </div>
-                                        </form>
-                                    </span>
-                                    <b>{{$device->device->category}}</b>&nbsp;/&nbsp;IMEI: {{$device->device->imei}}
-                                </div>
-                            </td>
-                        </tr>
-                        @endforeach
-                        @if(!$patient->devices || count($patient->devices) === 0)
-                        <tr>
-                            <td class="text-secondary p-0 border-0">
-                                No devices
-                            </td>
-                        </tr>
-                        @endif
-                    </tbody>
-                </table>
-            </div>
-
-            {{-- device measurements --}}
-            {{-- @include('app/patient/partials/device-measurements') --}}
-
-            {{-- measurements --}}
-            @include('app/patient/partials/measurements')
-
-            {{-- vitals --}}
-            {{--@include('app/patient/partials/vitals')--}}
-
-            <?php $hasVitalsInCanvas = $patient->hasDataInCanvas('vitals'); ?>
-
-            {{-- canvas based vitals --}}
-            @if($isOldClient && $hasVitalsInCanvas)
-            <div class="pt-2 border-top">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Vitals</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.vitals.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- vitals - point -->
-            <?php $latestVitals = \App\Models\Point::where('client_id', $patient->id)->where('category', 'VITALS')->orderBy('id', 'DESC')->first(); ?>
-            <div class="pt-2 mt-2">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Vitals
-                        @if(!!$latestVitals && $latestVitals->note && $latestVitals->note->effective_dateest)
-                        <span class="text-secondary font-weight-normal pl-1">(as on
-                            <a href="{{route('patients.view.notes.view.dashboard', ['patient' => $patient, 'note' => $latestVitals->note])}}">{{friendlier_date($latestVitals->note->effective_dateest)}}</a>)
-                        </span>
-                        @endif
-                    </h6>
-                    @if($isOldClient && $hasVitalsInCanvas)
-                    <div class="px-2 font-weight-bold alert alert-info text-sm my-0 ml-2 py-1">New</div>
-                    @endif
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @if(!!$latestVitals)
-                    @include('app.patient.partials.latest-vitals', ['patient' => $patient, 'point' => $latestVitals])
-                    @else
-                    <div class="text-secondary">Nothing here yet</div>
-                    @endif
-                </div>
-            </div>
-
-        </div>
-        <div class="col-6">
-
-            <?php $hasDxInCanvas = $patient->hasDataInCanvas('dx'); ?>
-
-            {{-- canvas based dx --}}
-            @if($isOldClient)
-            <div class="pt-2 mb-2 border-top">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Current Problems / Focus Areas</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.dx.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- probs - point -->
-            @include('app.patient.point-based-partials.dx')
-
-            <?php $hasCareTeamInCanvas = $patient->hasDataInCanvas('care-team'); ?>
-
-            {{-- canvas based careteam --}}
-            @if($isOldClient && $hasCareTeamInCanvas)
-            <div class="pt-2 mt-2 border-top">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Care Team</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.care-team.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- careteam - point -->
-            @include('app.patient.point-based-partials.care-team')
-
-            <?php $hasPmhxInCanvas = $patient->hasDataInCanvas('pmhx'); ?>
-
-            {{-- history_medical --}}
-            @if($isOldClient && $hasPmhxInCanvas)
-            <div class="pt-2 mt-2 border-top">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Medical History</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.pmhx.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- pmhx - point -->
-            @include('app.patient.point-based-partials.pmhx')
-
-            <?php $hasPshxInCanvas = $patient->hasDataInCanvas('pshx'); ?>
-
-            {{-- history_surgical --}}
-            @if($isOldClient && $hasPshxInCanvas)
-            <div class="mt-2 border-top pt-2">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Surgical History</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.pshx.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- pshx - point -->
-            @include('app.patient.point-based-partials.shx')
-
-            <?php $hasFhxInCanvas = $patient->hasDataInCanvas('fhx'); ?>
-
-            {{-- history_family --}}
-            @if($isOldClient && $hasFhxInCanvas)
-            <div class="mt-2 border-top pt-2">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Family History</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.fhx.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- fhx - point -->
-            @include('app.patient.point-based-partials.fhx')
-
-            <?php $hasSochxInCanvas = $patient->hasDataInCanvas('sochx'); ?>
-
-            {{-- history_social --}}
-            @if($isOldClient && $hasSochxInCanvas)
-            <div class="mt-2 border-top pt-2">
-                <div class="d-flex align-items-center pb-2">
-                    <h6 class="my-0 font-weight-bold">Social History</h6>
-                    <div class="px-2 font-weight-bold alert alert-warning text-sm my-0 ml-2 py-1">Deprecated</div>
-                </div>
-                <div class="bg-light border p-2 mb-3">
-                    @include('app.patient.canvas-sections.sochx.summary')
-                </div>
-            </div>
-            @endif
-
-            <!-- sochx - point -->
-            @include('app.patient.point-based-partials.sochx')
-
-
-        </div>
-    </div>
-
-    <div class="row my-3">
-        <div class="col-md-9">
-            {{-- memos --}}
-            <div class="mb-2 pt-3 pb-2 border-top">
-                <div class="">
-                    <div class="d-flex align-items-start pb-2">
-                        <h6 class="my-0 font-weight-bold">Client Memos</h6>
-                    </div>
-                    <div moe class="w-100 p-2 border mb-3">
-                        <form url="/api/clientMemo/create" show>
-                            <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
-                            <label class="text-secondary font-weight-bold">+ New Memo</label>
-                            <div class="mb-2">
-                                <select class="form-control form-control-sm" name="category" required>
-                                    <option value="">-- select --</option>
-                                    <option value="Incoming Call">Incoming Call</option>
-                                    <option value="Outgoing Call">Outgoing Call</option>
-                                    <option value="Call Unspecified">Call Unspecified</option>
-                                    <option value="Other">Other</option>
-                                </select>
-                            </div>
-                            <div class="mb-2">
-                                <textarea class="form-control form-control-sm" rows="5" name="content" placeholder="Content"></textarea>
-                            </div>
-                            @if($performer->pro->pro_type === 'ADMIN')
-                            <div class="mb-2">
-                                <label for="" class="checkbox">
-                                    <input type="checkbox" name="isAdminOnly">
-                                    Admins only
-                                </label>
-                            </div>
-                            @endif
-                            <div class="d-flex align-items-center">
-                                <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
-                            </div>
-                        </form>
-                    </div>
-                    <table class="table table-striped table-sm table-bordered mb-0">
-                        @if($patient->memos && count($patient->memos))
-                        <thead class="bg-light">
-                            <tr class="text-nowrap">
-                                <th class="border-0 text-secondary">Category</th>
-                                <th class="border-0 text-secondary w-50">Summary</th>
-                                <th class="border-0 text-secondary">Created</th>
-                                @if($performer->pro->pro_type === 'ADMIN')
-                                <th class="border-0 text-secondary">Admins Only</th>
-                                @endif
-                                <th class="border-0 text-secondary">Ack. by MCP</th>
-                                <th class="border-0 text-secondary delete-column">&nbsp;</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach($patient->memos as $memo)
-                            @if(!$memo->is_admin_only || ($memo->is_admin_only && $performer->pro->pro_type === 'ADMIN') )
-                            <tr>
-                                <td class="text-nowrap">{{ $memo->category }}</td>
-                                <td class="px-2">
-                                    <pre class="m-0 break-spaces">{{ $memo->content }}</pre>
-                                </td>
-                                <td class="text-nowrap">
-                                    <strong>{{$memo->createdBy->pro->name_first}} {{$memo->createdBy->pro->name_last}}</strong><br />
-                                    {{ friendly_date_time($memo->created_at) }}
-                                </td>
-                                @if($performer->pro->pro_type === 'ADMIN' )
-                                <td class="text-secondary">
-                                    @if($memo->is_admin_only)
-                                    <span class="text-success"><i class="fas fa-lock"></i> YES</span>
-                                    @else
-                                    <span><i class="fas fa-unlock"></i> NO</span>
-                                    @endif
-                                </td>
-                                @endif
-                                <td>
-                                    @if($memo->mcp_stamp_id)
-                                    <span class="text-success">YES <i class="fas fa-info-circle c-pointer" data-toggle="tooltip" data-placement="bottom" title="{{ friendly_date_time($memo->stamp->created_at) }}"></i></span>
-                                    @else
-                                    <span class="text-secondary">NO</span>
-                                    @endif
-                                </td>
-                                <td class="text-center delete-column">
-                                    @if($performer->pro->pro_type == 'ADMIN')
-                                    <div moe relative bottom class="mr-2">
-                                        <a start show><i class="fa fa-history"></i></a>
-                                        <div action="" url right bottom>
-                                            <table class="table table-condensed table-striped table-sm">
-                                                <thead>
-                                                    <th>Category</th>
-                                                    <th>Summary</th>
-                                                    <th>Created</th>
-
-                                                </thead>
-                                                <tbody>
-                                                    @foreach($memo->updates as $update)
-                                                    <tr>
-                                                        <td>{{$update->category}}</td>
-                                                        <td>{{$update->content}}</td>
-                                                        <td><strong>{{$update->createdBy->proname_first}} {{$update->createdBy->pro->name_last}}</strong><br />{{ friendly_date_time($update->created_at) }}</td>
-
-                                                    </tr>
-                                                    @endforeach
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                    @endif
-                                    <div moe wide 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/clientMemo/update" right>
-                                            <input type="hidden" name="uid" value="{{ $memo->uid }}">
-                                            <div class="mb-2">
-                                                <select class="form-control form-control-sm" name="category" required>
-                                                    <option value="">-- select --</option>
-                                                    <option {{ $memo->category === "Incoming Call" ? "selected" : "" }} value="Incoming Call">Incoming Call</option>
-                                                    <option {{ $memo->category === "Outgoing Call" ? "selected" : "" }} value="Outgoing Call">Outgoing Call</option>
-                                                    <option {{ $memo->category === "Call Unspecified" ? "selected" : "" }} value="Call Unspecified">Call Unspecified</option>
-                                                    <option {{ $memo->category === "Other" ? "selected" : "" }} value="Other">Other</option>
-                                                </select>
-                                            </div>
-                                            <div class="mb-2">
-                                                <textarea class="form-control form-control-sm" name="content" rows="5" placeholder="Content"><?= $memo->content ?></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 moe relative>
-                                        <a start show class="on-hover-opaque"><i class="fa fa-trash-alt text-danger"></i></a>
-                                        <form url="/api/clientMemo/cancel" right>
-                                            <input type="hidden" name="uid" value="{{ $memo->uid }}">
-                                            <p class="small">Are you sure you want to cancel this memo?</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>
-                                    </div>
-                                </td>
-                            </tr>
-                            @endif
-                            @endforeach
-                        </tbody>
-                        @else
-                        <tbody>
-                            <tr>
-                                <td class="text-secondary p-3">No memos have been created for this patient</td>
-                            </tr>
-                        </tbody>
-                        @endif
-                    </table>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="mb-2 pt-3 pb-2 border-top">
-                @include('app.patient.intake-data.intake-data')
-            </div>
-        </div>
-    </div>
-
-</div>
-<script>
-    (function() {
-        function init() {
-            $('select[name="deviceUid"]').select2({
-                width: '100%'
-            });
-
-            // refresh once ticket popup is closed
-            $('body').off('stag-popup-closed')
-            /*$('body').on('stag-popup-closed', function() {
-                if($('#client-rx-container').length) {
-                    fastReload();
-                }
-            });*/
-            // ticket-popup
-            $(document)
-                .off('click', '.ticket-popup-trigger')
-                .on('click', '.ticket-popup-trigger', function() {
-                    showMask();
-                    window.noMc = true;
-                    $.get(this.href, (_data) => {
-                        $('.ticket-popup').html(_data);
-                        showStagPopup('ticket-popup', true);
-                        // $('.ticket-popup .stag-popup.stag-slide').attr('close-all-with-self', 1);
-                        runMCInitializer('patient-tickets'); // run specific mc initer
-                        hideMask();
-                    });
-                    return false;
-                });
-
-            addMCHook('onHxPopupClosure', function() {
-                closeStagPopup();
-            });
-
-        }
-        addMCInitializer('patient-dashboard-devices', init, '#patient-dashboard-devices');
-
-    }).call(window);
-</script>
-@endsection

resources/views/app/patient/intake-data/grid-patient-intake-data-display.blade.php

@@ -1,8 +0,0 @@
-<div id="gridPatientIntakeDataDisplay" class="table-responsive">
-	<table class="table table-sm table-striped table-bordered">
-		<tr>
-		<th colspan="2">Patient Intake Data</th>
-		</tr>
-		@include('app.patient.intake-data.intake-data-display')
-	</table>
-</div>

resources/views/app/patient/intake-data/grid-patient-intake-data-form.blade.php

@@ -1,94 +0,0 @@
-<?php
-$intakeDataFields = config('patient-intake-data');
-$patientCanvasData = json_decode($patient->canvas_data ?? null);
-$patientIntakeData = null;
-if ($patientCanvasData && @$patientCanvasData->INTAKE_DATA) {
-	$patientIntakeData = @$patientCanvasData->INTAKE_DATA;
-}
-?>
-
-<div id="grid-patient-intake-data-form" visit-moe moe relative wide class="ml-2 hide-inside-popup">
-	<a start show>
-		<i class="fa fa-edit"></i>
-	</a>
-	<form id="gridPatientIntakeDataForm" url="/api/client/updateCanvasData" class="mcp-theme-1" right>
-		<div id="gridPatientIntakeFormSection">
-			<div class="bg-light p-2 font-weight-bold mb-2">Update Patient Intake Data</div>
-			<input type="hidden" name="uid" value="{{$patient->uid}}">
-			<input type="hidden" name="key" value="INTAKE_DATA">
-			<input type="hidden" name="data">
-			@include('app.patient.intake-data.intake-data-form-fields')
-			<div class="mb-2">
-				<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-				<button cancel class="btn btn-sm btn-default border">
-					Cancel
-				</button>
-			</div>
-		</div>
-	</form>
-</div>
-
-<script>
-	(function() {
-		function init() {
-			(function($) {
-				var patientDataIntake = {
-					form: null,
-					data: {},
-					showForm: false,
-					patientIntakeData: <?= json_encode($patientIntakeData) ?>,
-					initOnInputChange: function() {
-						var self = this;
-						self.form.find('input, textarea').change(function(evt) {
-							var input = evt.target;
-							var name = input.name;
-							var value = input.value;
-							if($(input).is(':checkbox')){
-								var isChecked =input.checked ? true:false;
-								if(isChecked){
-									self.data[name] = value;
-								}else{
-									delete self.data[name];
-								}
-							}else{
-								self.data[name] = value;	
-							}
-							self.updateJsonStringValue();
-						});
-					},
-					updateJsonStringValue: function() {
-						var self = this;
-						self.form.find('input[name=data]').val(JSON.stringify(self.data));
-					},
-					toggleForm: function() {
-						var target = $('#gridPatientIntakeFormSection');
-						var table = $('#gridPatientIntakeDataDisplay');
-						if (this.showForm) {
-							target.removeClass('d-none');
-							table.addClass('d-none');
-						} else {
-							target.addClass('d-none');
-							table.removeClass('d-none');
-						}
-					},
-					setDefaultData: function() {
-						var self = this;
-						if (!this.patientIntakeData) return;
-						for (var f in this.patientIntakeData) {
-							var value = this.patientIntakeData[f];
-							self.data[f] = value;
-						}
-						self.updateJsonStringValue();
-					},
-					init: function() {
-						this.form = $('#gridPatientIntakeDataForm');
-						this.initOnInputChange();
-						this.setDefaultData();
-					}
-				};
-				patientDataIntake.init();
-			})(jQuery);
-		}
-		addMCInitializer('grid-patient-intake-data-form', init, '#grid-patient-intake-data-form');
-	})();
-</script>

resources/views/app/patient/intake-data/intake-data-display.blade.php

@@ -1,15 +0,0 @@
-@foreach($intakeDataFields as $key=>$label)
-	@if($key == 'ethnicity_checkboxes')
-		@foreach($label as $eKey => $eLabel)
-		<tr>
-			<td>{{ $eLabel }}</td>
-			<td>{{ $patientIntakeData ? @$patientIntakeData->{$eKey}:'' }}</td>
-		</tr>
-		@endforeach
-	@else
-	<tr>
-		<td>{{ $label }}</td>
-		<td>{{ $patientIntakeData ? @$patientIntakeData->{$key}:'' }}</td>
-	</tr>
-	@endif
-@endforeach

resources/views/app/patient/intake-data/intake-data-form-fields.blade.php

@@ -1,31 +0,0 @@
-<div class="row">
-	@foreach($intakeDataFields as $key=>$label)
-	@if($key == 'stickyNote')
-	<div class="col-md-12 mb-2">
-		<label class="text-secondary text-sm font-weight-bold">{{ $label }}</label>
-		<textarea name="{{$key}}" class="form-control">{{ $patientIntakeData ? @$patientIntakeData->{$key}:'' }}</textarea>
-	</div>
-	@elseif($key == 'emailAddress')
-	<div class="col-md-12 mb-2">
-		<label class="text-secondary text-sm font-weight-bold">{{ $label }}</label>
-		<input name="{{$key}}" class="form-control" value="{{ $patientIntakeData ? @$patientIntakeData->{$key}:'' }}" />
-	</div>
-	@elseif($key == 'ethnicity_checkboxes')
-	<div class="col-md-12 mt-2 mb-2">
-		@foreach($label as $eKey => $eLabel)
-		<div class="form-check form-check-inline">
-			<label class="form-check-label">
-				<input name="{{$eKey}}" class="form-check-input" type="checkbox" value="YES" <?= $patientIntakeData && @$patientIntakeData->{$eKey} === 'YES' ? 'checked':'' ?> />
-				{{$eLabel}}
-			</label>
-		</div>
-		@endforeach
-	</div>
-	@else
-	<div class="col-md-6 mb-2">
-		<label class="text-secondary text-sm font-weight-bold">{{ $label }}</label>
-		<input name="{{$key}}" class="form-control" value="{{ $patientIntakeData ? @$patientIntakeData->{$key}:'' }}" />
-	</div>
-	@endif
-	@endforeach
-</div>

resources/views/app/patient/intake-data/intake-data.blade.php

@@ -1,15 +0,0 @@
-<?php
-	$intakeDataFields = config('patient-intake-data');
-	$patientCanvasData = json_decode($patient->canvas_data ?? null);
-	$patientIntakeData = null;
-	if($patientCanvasData && @$patientCanvasData->INTAKE_DATA){
-		$patientIntakeData = @$patientCanvasData->INTAKE_DATA;
-	}
-?>
-<div class="d-flex align-items-center pb-2">
-	<h6 class="my-0 font-weight-bold text-secondary mr-2">Intake Data</h6>
-	@include('app.patient.intake-data.grid-patient-intake-data-form')
-</div>
-<div>
-	@include('app.patient.intake-data.grid-patient-intake-data-display')
-</div>

resources/views/app/patient/intake-data/patient-intake-data-display.blade.php

@@ -1,8 +0,0 @@
-<div id="patientIntakeDataDisplay" class="table-responsive">
-	<table class="table table-sm table-striped table-bordered">
-		<tr>
-		<th colspan="2">Patient Intake Data</th>
-		</tr>
-		@include('app.patient.intake-data.intake-data-display')
-	</table>
-</div>

resources/views/app/patient/intake-data/patient-intake-data-form.blade.php

@@ -1,121 +0,0 @@
-<?php
-	$intakeDataFields = config('patient-intake-data');
-	$patientCanvasData = json_decode($patient->canvas_data ?? null);
-	$patientIntakeData = null;
-	if($patientCanvasData && @$patientCanvasData->INTAKE_DATA){
-		$patientIntakeData = @$patientCanvasData->INTAKE_DATA;
-	}
-?>
-
-<div id="patient-intake-data-form" visit-moe moe relative wide class="ml-2 hide-inside-popup">
-	<a start show>
-		@if($patientIntakeData)
-			<i class="fas fa-eye on-hover-opaque"></i>
-		@else
-			<i class="fa fa-edit on-hover-opaque"></i>
-		@endif
-		</a>
-	<form id="patientIntakeDataForm" url="/api/client/updateCanvasData" class="mcp-theme-1" right>
-		@if($patientIntakeData)
-			@include('app.patient.intake-data.patient-intake-data-display')
-			<div class="text-center">
-				<button type="button" class="btn btn-sm btn-primary mb-2 hide-form" id="patientIntakeToggleForm">Update Data</button>
-			</div>
-		@endif
-		<div id="patientIntakeFormSection" class="{{ $patientIntakeData ? 'd-none':'' }}">
-			<div class="bg-light p-2 font-weight-bold mb-2">Update Patient Intake Data</div>
-			<input type="hidden" name="uid" value="{{$patient->uid}}">
-			<input type="hidden" name="key" value="INTAKE_DATA">
-			<input type="hidden" name="data">
-				@include('app.patient.intake-data.intake-data-form-fields')
-			<div class="mb-2">
-				<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-				<button cancel class="btn btn-sm btn-default border">
-					Cancel
-				</button>
-			</div>
-		</div>
-	</form>
-</div>
-
-<script>
-	(function() {
-		function init() {
-			(function($){
-				var patientDataIntake = {
-					form: null,
-					data:{},
-					showForm: false,
-					patientIntakeData: <?= json_encode($patientIntakeData) ?>,
-					initOnInputChange: function(){
-						var self = this;
-						self.form.find('input, textarea').change(function(evt){
-							var input = evt.target;
-							var name = input.name;
-							var value = input.value;
-							if($(input).is(':checkbox')){
-								var isChecked =input.checked ? true:false;
-								if(isChecked){
-									self.data[name] = value;
-								}else{
-									delete self.data[name];
-								}
-							}else{
-								self.data[name] = value;	
-							}
-							
-							self.updateJsonStringValue();
-						});
-					},
-					updateJsonStringValue: function(){
-						var self = this;
-						self.form.find('input[name=data]').val(JSON.stringify(self.data));
-					},
-					initDisplay: function(){
-						var self = this;
-						$('#patientIntakeToggleForm').click(function(){
-							var isFormHidden = $(this).hasClass('hide-form');
-							self.showForm = isFormHidden ? true:false;
-							if(self.showForm){
-								$(this).removeClass('hide-form');
-								$(this).text('Show Data');
-							}else{
-								$(this).addClass('hide-form');
-								$(this).text('Update Data');
-							}
-							self.toggleForm();
-						});
-					},
-					toggleForm: function(){
-						var target = $('#patientIntakeFormSection');
-						var table = $('#patientIntakeDataDisplay');
-						if(this.showForm){
-							target.removeClass('d-none');
-							table.addClass('d-none');
-						}else{
-							target.addClass('d-none');
-							table.removeClass('d-none');
-						}
-					},
-					setDefaultData: function(){
-						var self = this;
-						if(!this.patientIntakeData) return;
-						for(var f in this.patientIntakeData){
-							var value = this.patientIntakeData[f];
-							self.data[f] = value;
-						}
-						self.updateJsonStringValue();
-					},
-					init: function(){
-						this.form = $('#patientIntakeDataForm');
-						this.initOnInputChange();
-						this.initDisplay();
-						this.setDefaultData();
-					}
-				};
-				patientDataIntake.init();
-			})(jQuery);
-		}
-		addMCInitializer('patient-intake-data-form', init, '#patient-intake-data-form');
-	})();
-</script>

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

@@ -1713,7 +1713,6 @@ use App\Models\Handout;
     <div class="note-templates-underlay"></div>
     @include('app.patient.note.dashboard_script')
     @if(!$isVisitTemplateBased)
-    @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'rx', 'class' => 'wide', 'noEditLink' => true])
     <script>
         (function() {
             function init() {

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

@@ -401,32 +401,6 @@
                         @endif
                     </div>
 
-                    <div class="mb-1">
-                        RMS: <b>{{ $patient->rms->name_display ??'' }}</b>
-                        @if($pro->pro_type === 'ADMIN')
-                        <div moe wide>
-                            <a start show><i class="fa fa-edit"></i></a>
-                            <form url="/api/client/putRmsPro" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <div class="mb-2">
-                                    <label class="mb-1 text-secondary text-sm">RMS Pro</label>
-
-                                    <select class="form-control form-control-sm" name="rmsProUid">
-                                        <option value="">--select--</option>
-                                        @foreach($pros as $rmsPro)
-                                        <option value="{{$rmsPro->uid}}">{{$rmsPro->name_display}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                        @endif
-                    </div>
-
                     <div class="mb-1">
                         <label>Care Coordinator:</label> <b>{{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}</b>
                         @if($pro->pro_type == 'ADMIN')

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

@@ -72,9 +72,6 @@
 
         @include('app.patient.tickets.ticket_send_fax_form')
     </div>
-    @if(!request()->input('popupmode'))
-        @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'rx', 'class' => 'wide', 'noEditLink' => true])
-    @endif
     <script>
         (function() {
             const debounce = (func, delay) => {

resources/views/layouts/patient-header.blade.php

@@ -563,12 +563,6 @@ $addressParts .= implode(", ", $addressPart2);
                     </div>
                 @endif
             </div>
-            @if($pro->pro_type === 'ADMIN')
-                <div>
-                    <label>Intake Data: - </label> <span class="text-secondary"></span>
-                    @include('app.patient.intake-data.patient-intake-data-form')
-                </div>
-            @endif
         </div>
         <div class="bg-light p-2 border">
             <ul class="vbox align-self-start patient-header-address mb-0">

resources/views/layouts/patient-old.blade.php

@@ -783,12 +783,6 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 												</form>
 											</div>
 										</div>
-										@if($pro->pro_type === 'ADMIN')
-										<div class="mt-1">
-											<label>Intake Data: - </label> <span class="text-secondary"></span>
-											@include('app.patient.intake-data.patient-intake-data-form')
-										</div>
-										@endif
 									</section>
 									<ul class="vbox mt-2 align-self-start patient-header-address ">
 										<li class="d-flex align-items-start">

routes/web.php

@@ -792,7 +792,6 @@ Route::middleware('pro.auth')->group(function () {
 
 });
 
-Route::post("/process_form_submit", 'NoteController@processFormSubmit')->name('process_form_submit');
 Route::get("/get-default-section-data/{patientID}/{sectionTemplateID}", 'NoteController@getDefaultValueForSection')->name('get_default_section_data');
 
 Route::get("/get-segment-html/{segmentUid}/{sessionKey}", 'NoteController@getHtmlForSegment')->name('get_segment_html');