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

resources/views/app/dashboard.blade.php

@@ -708,7 +708,7 @@
                     this.loadMeasurements();
                 }
             });
-            // refresh once ticket popup is closed
+            /*// refresh once ticket popup is closed
             $('body').off('stag-popup-closed')
             $('body').on('stag-popup-closed', function() {
                 if($('#pro-dashboard-container').length) {
@@ -717,7 +717,7 @@
                         fastLoad('/?tab=' + activeTab);
                     }
                 }
-            });
+            });*/
             // ticket-popup
             $(document)
                 .off('click', '.ticket-popup-trigger')

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

@@ -7,7 +7,6 @@
         <th class="px-2 text-secondary">Created</th>
         <th class="px-2 text-secondary">Patient</th>
         <th class="px-2 text-secondary">Report</th>
-        <th class="px-2 text-secondary">Sign</th>
         <th class="px-2 text-secondary">Title</th>
         <th class="px-2 text-secondary">Category</th>
         <th class="px-2 text-secondary">Memo</th>
@@ -34,41 +33,11 @@
                        title="View">View</a>
                     @if($document->is_entry_error)
                         <span class="ml-auto text-danger on-hover-opaque" title="Entry Error">
-                                    <i class="fa fa-exclamation-triangle"></i>
-                                </span>
+                            <i class="fa fa-exclamation-triangle"></i>
+                        </span>
                     @endif
                 </div>
             </td>
-            <td class="px-2">
-                @if(!$document->has_hcp_pro_signed)
-                    @if($document->hcp_pro_id === $pro->id)
-                        <div moe relative class="mr-2">
-                            <a start show class="">Sign</a>
-                            <form url="/api/incomingReport/signAsHcp" right>
-                                <input type="hidden" name="uid" value="{{ $document->uid }}">
-                                <p class="small">Are you sure you want to sign this report as HCP?</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>
-                    @else
-                        -
-                    @endif
-                @else
-                    <div class="text-success mb-1">
-                        <i class="fa fa-check"></i>
-                        Signed
-                    </div>
-                    @if($document->hcp)
-                        <div class="text-secondary">
-                            <div class="text-sm font-weight-bold">{{$document->hcp->displayName()}}</div>
-                            <div class="text-sm">{{friendlier_date_time($document->hcp_pro_signed_at)}}</div>
-                        </div>
-                    @endif
-                @endif
-            </td>
             <td class="px-2">{{ $document->title }}</td>
             <td class="px-2">{{ $document->category }}{{ $document->subcategory ? ' / ' . $document->subcategory : '' }}</td>
             <td class="px-2">{{ $document->memo }}</td>

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

@@ -60,8 +60,9 @@
                     <thead>
                     <tr>
                         <th class="px-2 text-secondary">Created</th>
+                        <th class="px-2 text-secondary">Pro</th>
                         <th class="px-2 text-secondary">Title</th>
-<!--                        <th class="px-2 text-secondary">Report</th>-->
+                        <th class="px-2 text-secondary">Report Date</th>
                         <th class="px-2 text-secondary">Sign</th>
                         <th class="px-2 text-secondary">Category</th>
                     </tr>
@@ -70,24 +71,16 @@
                     @foreach($patient->incomingReports as $document)
                         <tr class="{{$document->is_entry_error ? 'entry-error' : ''}} {{@$currentReport->uid === $document->uid ? 'bg-aliceblue' : ''}}">
                             <td class="px-2">{{ friendly_date_time($document->created_at, false) }}</td>
+                            <td class="px-2">
+                                {{$document->hcp ? $document->hcp->displayName() : '-'}}
+                            </td>
                             <td class="px-2">
                                 <a 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>
                             </td>
-{{--                            <td class="px-2">--}}
-{{--                                <div class="d-flex align-items-center">--}}
-{{--                                    <a class="pdf-viewer-trigger" native target="_blank"--}}
-{{--                                       href="/api/incomingReport/download/{{ $document->uid }}"--}}
-{{--                                       title="View">View</a>--}}
-{{--                                    @if($document->is_entry_error)--}}
-{{--                                        <span class="ml-auto text-danger on-hover-opaque" title="Entry Error">--}}
-{{--                                    <i class="fa fa-exclamation-triangle"></i>--}}
-{{--                                </span>--}}
-{{--                                    @endif--}}
-{{--                                </div>--}}
-{{--                            </td>--}}
+                            <td class="px-2">{{ friendly_date_time($document->report_date, false) }}</td>
                             <td class="px-2">
                                 @if(!$document->has_hcp_pro_signed)
                                     -