Inc. reports inside note as popup

resources/views/app/patient/incoming-reports.blade.php

@@ -75,7 +75,7 @@
                                 {{$document->hcp ? $document->hcp->displayName() : '-'}}
                             </td>
                             <td class="px-2">
-                                <a href="{{route('patients.view.incoming-reports', ['patient' => $patient, 'currentReport' => $document])}}"
+                                <a mc-initer="incoming-reports" href="{{route('patients.view.incoming-reports', ['patient' => $patient, 'currentReport' => $document])}}"
                                    class="{{@$currentReport->uid === $document->uid ? 'font-weight-bold' : ''}}">
                                     {{ $document->title ? $document->title : '(not set)' }}
                                 </a>
@@ -181,7 +181,7 @@
                                 </div>
                                 @if(!$currentReport->is_entry_error)
                                     <div moe relative class="mr-2 pr-1">
-                                        <a start show class="on-hover-opaque" title="Mark as entry-error"><i class="fa fa-ban text-danger"></i></a>
+                                        <a href="#" start show class="on-hover-opaque" title="Mark as entry-error"><i class="fa fa-ban text-danger"></i></a>
                                         <form url="/api/incomingReport/setIsEntryErrorToTrue" right>
                                             <input type="hidden" name="uid" value="{{ $currentReport->uid }}">
                                             <p class="small">Are you sure you want to set this report as entry error?</p>
@@ -193,7 +193,7 @@
                                     </div>
                                 @else
                                     <div moe relative class="mr-2">
-                                        <a start show class="on-hover-opaque" title="Undo mark as entry-error"><i class="fa fa-undo"></i></a>
+                                        <a href="#" start show class="on-hover-opaque" title="Undo mark as entry-error"><i class="fa fa-undo"></i></a>
                                         <form url="/api/incomingReport/setIsEntryErrorToFalse" right>
                                             <input type="hidden" name="uid" value="{{ $currentReport->uid }}">
                                             <p class="small">Are you sure you want to set unset this report as entry error?</p>
@@ -206,268 +206,17 @@
                                 @endif
                             @endif
                         </div>
-                        <a class="ml-auto" href="{{route('patients.view.incoming-reports', ['patient' => $patient, 'currentReport' => null])}}">
+                        <a class="ml-auto" mc-initer="incoming-reports" href="{{route('patients.view.incoming-reports', ['patient' => $patient, 'currentReport' => null])}}">
                             <i class="fa fa-times-circle on-hover-opaque"></i>
                         </a>
                     </div>
                     <hr class="mt-3 mb-0 row">
-                    <?php /*
-                    <div class="mb-3">
-                        <label class="text-secondary text-sm mb-1">Reason</label>
-                        <div moe class="d-block">
-                            <a start show>{{$supplyOrder->reason ? $supplyOrder->reason : '(not set)'}}</a>
-                            <form url="/api/supplyOrder/updateReason">
-                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                <div class="mb-2">
-                                    <label class="text-secondary mb-1 text-sm">Reason *</label>
-                                    <input type="text" class="form-control form-control-sm" required
-                                           name="reason" value="{{$supplyOrder->reason}}">
-                                </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>
-                    </div>
-                    <div class="mb-3">
-                        <label class="text-secondary text-sm mb-1">Address</label>
-                        <div moe class="d-block">
-                            <a start show>
-                                {{$supplyOrder->mailing_address_full ? implode(" ", [$supplyOrder->mailing_address_line1, $supplyOrder->mailing_address_line2, $supplyOrder->mailing_address_city, $supplyOrder->mailing_address_state, $supplyOrder->mailing_address_zip]) : '(not set)'}}
-                            </a>
-                            <form url="/api/supplyOrder/updateMailingAddress">
-                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">Address Line1</label>
-                                    <input type="text" class="form-control form-control-sm" name="mailingAddressLine1" value="{{$supplyOrder->mailing_address_line1}}">
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">Address Line2</label>
-                                    <input type="text" class="form-control form-control-sm" name="mailingAddressLine2" value="{{$supplyOrder->mailing_address_line2}}">
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">Address City</label>
-                                    <input type="text" class="form-control form-control-sm" name="mailingAddressCity" value="{{$supplyOrder->mailing_address_city}}">
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">Address State</label>
-                                    <input type="text" class="form-control form-control-sm" name="mailingAddressState" value="{{$supplyOrder->mailing_address_state}}">
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">Address Zip</label>
-                                    <input type="text" class="form-control form-control-sm" name="mailingAddressZip" value="{{$supplyOrder->mailing_address_zip}}">
-                                </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>
-                    </div>
-                    <div class="mb-3 d-none">
-                        <label class="text-secondary text-sm mb-1">Requested Ship Date</label>
-                        <div moe class="d-block">
-                            <a start show>{{$supplyOrder->requested_date ? friendlier_date_time($supplyOrder->requested_date) : '(not set)'}}</a>
-                            <form url="/api/supplyOrder/updateRequestedDate">
-                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                <div class="mb-2">
-                                    <label class="text-secondary mb-1 text-sm">Requested Ship Date</label>
-                                    <input type="date" class="form-control form-control-sm"
-                                           name="requestedDate" value="">
-                                </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>
-                    </div>
-                    <div class="mb-3">
-                        <label class="text-secondary text-sm mb-1">Client Understanding Memo</label>
-                        <div moe class="d-block">
-                            @if($supplyOrder->client_understanding_memo)
-                                <a start show>{{$supplyOrder->client_understanding_memo}}</a>
-                            @else
-                                <a start show>(not set)</a>
-                            @endif
-                            <form url="/api/supplyOrder/updateClientUnderstandingMemo">
-                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                <div class="mb-2">
-                                    <label class="text-secondary mb-1 text-sm">Client Understanding Memo</label>
-                                    <input type="text" class="form-control form-control-sm"
-                                           name="clientUnderstandingMemo" value="{{$supplyOrder->client_understanding_memo}}">
-                                </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>
-
-                    </div>
-                    <div class="mb-3">
-                        <label class="text-secondary text-sm mb-1">Pro Signature</label>
-                        <div class="d-flex align-items-center">
-                            @if($supplyOrder->is_signed_by_pro)
-                                <div class="text-info">
-                                    Signed by <b>{{$supplyOrder->signedPro->displayName()}}</b>
-                                    on {{friendlier_date_time($supplyOrder->pro_signed_at)}}
-                                </div>
-                            @else
-                                <div class="text-warning-mellow font-weight-bold">Not Signed</div>
-                                <div class="ml-3">
-                                    <div moe>
-                                        <a start show class="py-0">Sign</a>
-                                        <form url="/api/supplyOrder/signAsPro">
-                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                            <p class="small">Sign this supply order?</p>
-                                            <div class="d-flex align-items-center">
-                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            @endif
-                        </div>
-                    </div>
-                    <div class="mb-3">
-                        <label class="text-secondary text-sm mb-1">Patient Signature</label>
-                        <div class="d-flex align-items-center">
-                            @if($supplyOrder->is_signed_by_client)
-                                <div class="text-info">
-                                    Signed by <b>{{$patient->displayName()}}</b>
-                                    on {{friendlier_date_time($supplyOrder->client_signed_at)}}
-                                </div>
-                            @elseif($supplyOrder->is_client_signature_waived)
-                                <div class="text-info">
-                                    Waived by <b>{{$supplyOrder->waiverPro->displayName()}}</b>
-                                    on {{friendlier_date_time($supplyOrder->client_signature_waived_at)}}
-                                </div>
-                                <div class="ml-3">
-                                    <div moe bottom relative="">
-                                        <a start show class="py-0">Undo</a>
-                                        <form url="/api/supplyOrder/undoWaiveClientSignature" right>
-                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                            <p class="small">Undo waiving patient signature?</p>
-                                            <div class="d-flex align-items-center">
-                                                <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
-                                                <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            @else
-                                <div class="text-warning-mellow font-weight-bold">Not Signed</div>
-                                <div class="ml-3">
-                                    <div moe bottom relative="">
-                                        <a start show class="py-0">Email</a>
-                                        <form url="/api/supplyOrder/sendClientSignatureRequestByEmail">
-                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                            <p class="small">Request patient signature via email?</p>
-                                            <div class="d-flex align-items-center">
-                                                <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
-                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                                <span class="mx-2 text-secondary">|</span>
-                                <div class="">
-                                    <div moe bottom relative="">
-                                        <a start show class="py-0">SMS</a>
-                                        <form url="/api/supplyOrder/sendClientSignatureRequestBySms">
-                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                            <p class="small">Request patient signature via SMS?</p>
-                                            <div class="d-flex align-items-center">
-                                                <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
-                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                                <span class="mx-2 text-secondary">|</span>
-                                <div class="">
-                                    <a href="#" class="text-secondary on-hover-opaque">Problem Signing</a>
-                                </div>
-                                <span class="mx-2 text-secondary">|</span>
-                                <div class="">
-                                    <div moe bottom relative="">
-                                        <a start show class="py-0">Waive</a>
-                                        <form url="/api/supplyOrder/waiveClientSignature" right>
-                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                            <p class="small mb-2">Waive patient signature?</p>
-                                            <div class="mb-2">
-                                                <label class="text-secondary mb-1 text-sm">Memo</label>
-                                                <input type="text" class="form-control form-control-sm"
-                                                       name="memo" value="{{$supplyOrder->client_signature_waiver_memo}}">
-                                            </div>
-                                            <div class="d-flex align-items-center">
-                                                <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
-                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            @endif
-                        </div>
-                        @if($supplyOrder->client_signature_last_requested_at &&
-                            !$supplyOrder->is_signed_by_client &&
-                            !$supplyOrder->is_client_signature_waived)
-                            <div class="text-sm my-1 text-info">Client signature last requested on {{friendlier_date_time($iSupplyOrder->client_signature_last_requested_at)}}</div>
-                        @endif
-                        @if($supplyOrder->does_client_have_problem_signing &&
-                            !$supplyOrder->is_signed_by_client &&
-                            !$supplyOrder->is_client_signature_waived)
-                            <div class="text-sm my-1 text-warning-mellow">
-                                Client has problem signing
-                                @if($supplyOrder->client_problem_signing)
-                                    <i class="text-sm">{{$supplyOrder->client_problem_signing}}</i>
-                                @endif
-                            </div>
-                        @endif
-                    </div>
-                    <hr class="my-3">
-                    <div class="d-flex align-items-center">
-                        @if($supplyOrder->is_cleared_for_shipment)
-                            <div class="text-info mb-2">
-                                <i class="fa fa-check"></i> Cleared for shipment by <b>{{$supplyOrder->clearedForShipmentPro->displayName()}}</b>
-                                on {{friendlier_date_time($supplyOrder->cleared_for_shipment_at)}}
-                            </div>
-                        @elseif($supplyOrder->is_signed_by_pro && ($supplyOrder->is_signed_by_client || $supplyOrder->is_client_signature_waived))
-                            <div moe bottom relative="" class="mb-2">
-                                <a start show class="py-0 text-success font-weight-bold">Clear for Shipment</a>
-                                <form url="/api/supplyOrder/clearForShipment">
-                                    <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                    <p class="small mb-2">Clear this supply order for shipment?</p>
-                                    <div class="d-flex align-items-center">
-                                        <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
-                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                        @endif
-                    </div>
-                    <div class="d-flex align-items-center">
-                        <div moe bottom relative="">
-                            <a start show class="py-0 text-danger">Cancel Supply Order</a>
-                            <form url="/api/supplyOrder/cancel">
-                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
-                                <p class="small text-nowrap mb-2">Cancel this supply order?</p>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    */ ?>
                     <div class="pdf-viewer-auto row px-3" pdf-url="/api/incomingReport/download/{{ $currentReport->uid }}"></div>
                 </div>
             @endif
         </div>
     </div>
+    @include('app/pdf/viewer')
     <script>
         function submitIncomingReport(_form) {
             showMask();
@@ -504,6 +253,7 @@
                     .datepicker({
                         dateFormat: 'yy-mm-dd'
                     });
+                runMCInitializer('inline-pdf-viewer');
             }
             addMCInitializer('incoming-reports', init, '#incoming-reports')
         }).call(window);

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

@@ -2344,6 +2344,17 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                            <div native target="_blank"
+                                 class="c-pointer d-inline-flex align-items-center incoming-reports-trigger px-2 py-1"
+                                 open-in-stag-popup
+                                 mc-initer="incoming-reports"
+                                 title="Incoming Reports"
+                                 popup-style="wide overflow-visible"
+                                 href="/patients/view/{{$patient->uid}}/incoming-reports">
+                                <span>Inc. Reports</span>
+                            </div>
+                        </div>
                         <div class="ml-auto mr-5 nbt-container border-info d-inline-flex align-self-stretch align-items-center">
                             <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
                             <span class="autosave-indicator saved text-sm text-secondary">

resources/views/app/pdf/viewer.blade.php

@@ -1,3 +1,4 @@
+<?php $viewerID = rand(10000, 99999); ?>
 <script>
     (function () {
 
@@ -7,7 +8,7 @@
             $('body').append(
                 '<div class="stag-popup stag-popup-md stag-popup-right mcp-theme-1" ' +
                 'stag-popup-key="pdf-viewer" ' +
-                'id="stagPdfViewer">' +
+                'id="stagPdfViewer-{{$viewerID}}">' +
                 '<form>' +
                 '<h3 class="stag-popup-title">' +
                 '<span>PDF Viewer</span>' +
@@ -20,7 +21,7 @@
             );
 
             new Vue({
-                el: '#stagPdfViewer',
+                el: '#stagPdfViewer-{{$viewerID}}',
                 data: {
                     loadedPDF: null,
                     page: 1,
@@ -89,7 +90,7 @@
                     $(document)
                         .off('click.pdf-viewer', '.pdf-viewer-trigger')
                         .on('click.pdf-viewer', '.pdf-viewer-trigger', function () {
-                            self.parent = $('#stagPdfViewer>form');
+                            self.parent = $('#stagPdfViewer-{{$viewerID}}>form');
                             self.load(this.href, $(this).attr('pdf-viewer-element'));
                             if(!$(this).attr('pdf-viewer-element')) {
                                 showStagPopup('pdf-viewer');

resources/views/layouts/patient.blade.php

@@ -304,8 +304,8 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 						</div>
 					</div>
 				@endif
-				<div class="card {{$isVisitNote ? 'card m-0 border-0 rounded-0' : 'mt-3'}}" id="patient-header">
-					<div class="card-header py-1 hide-inside-ticket-popup">
+				<div class="card {{$isVisitNote ? 'card m-0 border-0 rounded-0' : 'my-3'}}" id="patient-header">
+					<div class="card-header py-1 hide-inside-ticket-popup hide-inside-popup">
 						<?php
 						$thumbnail = $patient->profile_picture_base64;
 						$initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
@@ -808,7 +808,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 						</div> <!-- z -->
 					</div>
 					@if($pro->pro_type === 'ADMIN')
-						<div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue">
+						<div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue hide-inside-popup">
 							<b class="">Tags ({{count($patient->clientTags)}}):</b>
 							@foreach($patient->clientTags as $tag)
 								<div class="d-inline-flex align-items-center ml-2 py-1 px-2 rounded bg-aliceblue text-info">