Jelajahi Sumber

Proper and full fastLoad for dashboard links

Vijayakrishnan 4 tahun lalu
induk
melakukan
afa76aa108

+ 19 - 17
resources/views/app/dashboard.blade.php

@@ -19,23 +19,23 @@
                             <tbody>
                                 <tr>
                                     <th class="border-top-0 px-2 text-center">{{$keyNumbers['totalPatients']}}</th>
-                                    <th class="border-top-0 pl-2"><a native target="_top" href="/patients">Total patients</a></th>
+                                    <th class="border-top-0 pl-2"><a href="/patients">Total patients</a></th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$keyNumbers['patientsNotSeenYet']}}</th>
-                                    <th class="pl-2"><a native target="_top" href="/patients/not-yet-seen">Patients I have not seen yet</a></th>
+                                    <th class="pl-2"><a href="/patients/not-yet-seen">Patients I have not seen yet</a></th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$keyNumbers['pendingBillsToSign']}}</th>
-                                    <th class="pl-2"><a native target="_top" href="/practice-management/bills/not-yet-signed">Pending bills to sign</a></th>
+                                    <th class="pl-2"><a href="/practice-management/bills/not-yet-signed">Pending bills to sign</a></th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$keyNumbers['pendingNotesToSign']}}</th>
-                                    <th class="pl-2"><a native target="_top" href="/practice-management/notes/not-yet-signed">Pending notes to sign</a></th>
+                                    <th class="pl-2"><a href="/practice-management/notes/not-yet-signed">Pending notes to sign</a></th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$keyNumbers['numOpenTickets']}}</th>
-                                    <th class="pl-2"><a native target="_top" href="/practice-management/my-tickets/open">Open tickets</a></th>
+                                    <th class="pl-2"><a href="/practice-management/my-tickets/open">Open tickets</a></th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$keyNumbers['measurementsToBeStamped']}}</th>
@@ -60,7 +60,7 @@
                             <tbody>
                                 <tr>
                                     <th class="border-top-0 px-2">${{friendly_money($reimbursement['currentBalance'])}}</th>
-                                    <th class="border-top-0 pl-2 w-100"><a target="_top" href="/mc/practice-management/financial-transactions">Current balance</a></th>
+                                    <th class="border-top-0 pl-2 w-100"><a href="/practice-management/financial-transactions">Current balance</a></th>
                                 </tr>
                                 <!-- <tr>
                                     <th class="px-2">{{friendly_date_time($reimbursement['nextPaymentDate'], false)}}</th>
@@ -97,13 +97,13 @@
                             <tr>
                                 <th class="border-top-0 px-2 text-center">{{$businessNumbers['notesWithBillsToResolve']}}</th>
                                 <th class="border-top-0 pl-2">
-                                    <a native target="_top" href="/practice-management/billing-manager">Notes with bills to resolve</a>
+                                    <a href="/practice-management/billing-manager">Notes with bills to resolve</a>
                                 </th>
                             </tr>
                             <tr>
                                 <th class="border-top-0 px-2 text-center">{{$businessNumbers['notesPendingBillingClosure']}}</th>
                                 <th class="border-top-0 pl-2">
-                                    <a native target="_top" href="/practice-management/billing-manager">Notes pending billing closure</a>
+                                    <a href="/practice-management/billing-manager">Notes pending billing closure</a>
                                 </th>
                             </tr>
                             </tbody>
@@ -116,31 +116,31 @@
 
                 <ul class="nav nav-tabs">
                     <li class="nav-item">
-                        <a class="nav-link" :class="tab == 'appointments' ? 'active' : ''" href="#" v-on:click.prevent="tab='appointments'">Appointments</a>
+                        <a native class="nav-link" :class="tab == 'appointments' ? 'active' : ''" href="#" v-on:click.prevent="tab='appointments'">Appointments</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" :class="tab == 'measurements' ? 'active' : ''" href="#" v-on:click.prevent="tab='measurements'">Measurements</a>
+                        <a native class="nav-link" :class="tab == 'measurements' ? 'active' : ''" href="#" v-on:click.prevent="tab='measurements'">Measurements</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {{count($incomingReports) ? 'text-danger font-weight-bold' : ''}}"
+                        <a native class="nav-link {{count($incomingReports) ? 'text-danger font-weight-bold' : ''}}"
                            :class="tab == 'incoming_reports' ? 'active' : ''" href="#" v-on:click.prevent="tab='incoming_reports'">
                             Incoming Reports ({{count($incomingReports)}})
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {{$numERx ? 'text-danger font-weight-bold' : ''}}"
+                        <a native class="nav-link {{$numERx ? 'text-danger font-weight-bold' : ''}}"
                            :class="tab == 'erx' ? 'active' : ''" href="#" v-on:click.prevent="tab='erx'">
                             ERx ({{$numERx}})
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {{$numLabs ? 'text-danger font-weight-bold' : ''}}"
+                        <a native class="nav-link {{$numLabs ? 'text-danger font-weight-bold' : ''}}"
                            :class="tab == 'labs' ? 'active' : ''" href="#" v-on:click.prevent="tab='labs'">
                             Labs ({{$numLabs}})
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {{$numImaging ? 'text-danger font-weight-bold' : ''}}"
+                        <a native class="nav-link {{$numImaging ? 'text-danger font-weight-bold' : ''}}"
                            :class="tab == 'imaging' ? 'active' : ''" href="#" v-on:click.prevent="tab='imaging'">
                             Imaging ({{$numImaging}})
                         </a>
@@ -177,13 +177,13 @@
                                     <span class="d-inline-block ml- 2 text-secondary font-weight-bold">@{{ event.title }}</span>
                                 </div>
                                 <div class="pb-1">
-                                    <a target="_top" :href="'/mc/patients/view/' + event.clientUid" class="font-weight-bold">@{{ event.clientName }}</a>
+                                    <a :href="'/patients/view/' + event.clientUid" class="font-weight-bold">@{{ event.clientName }}</a>
                                     <span class="small d-inline-block pl-2 text-secondary font-weight-normal">@{{ event.clientSummary }}</span>
                                 </div>
                                 <div>
                                     Status: <b class="text-secondary">@{{ event.status }}</b>
                                     &nbsp;/&nbsp;
-                                    <a target="_top" :href="'/patients/view/' + event.clientUid + '/calendar/' + event.uid">
+                                    <a :href="'/patients/view/' + event.clientUid + '/calendar/' + event.uid">
                                         <i class="fa fa-edit"></i>
                                         Edit Appointment
                                     </a>
@@ -295,6 +295,9 @@
                                 this.numEventsForDate++;
                             }
                         }
+                        Vue.nextTick(() => {
+                            initFastLoad($('#pro-dashboard-container'));
+                        });
                     },
                     updateStatus: function(_event) {
                         $.post('/api/appointment/updateStatus', {
@@ -447,7 +450,6 @@
                     initMoes();
 
                     // init fast load
-                    $('#pro-dashboard-container a[native]').removeAttr('native');
                     initFastLoad($('#pro-dashboard-container'));
                 }
             });

+ 1 - 1
resources/views/app/dashboard/measurements.blade.php

@@ -19,7 +19,7 @@
                 <?php if(in_array($measurement->label, ['SBP', 'DBP']) ) continue; ?>
                 <tr>
                     <td class="px-2">
-                        <a native target="_top" href="/mc/patients/view/{{$measurement->client->uid}}" class="font-weight-bold">
+                        <a href="/patients/view/{{$measurement->client->uid}}" class="font-weight-bold">
                             {{ $measurement->client->name_first }} {{ $measurement->client->name_last }}
                         </a>
                     </td>