Bläddra i källkod

Optimize pro dashboard - selective event loading [wip-1]

Vijayakrishnan 4 år sedan
förälder
incheckning
5c6b0b2a91
2 ändrade filer med 12 tillägg och 6 borttagningar
  1. 11 4
      app/Http/Controllers/HomeController.php
  2. 1 2
      resources/views/app/dashboard.blade.php

+ 11 - 4
app/Http/Controllers/HomeController.php

@@ -259,6 +259,17 @@ class HomeController extends Controller
         $totalExpectedAmount =  $expectedForHcp + $expectedForCm + $expectedForRme + $expectedForRmm + $expectedForNa;
         $reimbursement['nextPaymentAmount'] =  $totalExpectedAmount;
 
+        $milliseconds = strtotime(date('Y-m-d')) . '000';
+
+        return view('app/dashboard', compact('keyNumbers', 'reimbursement', 'milliseconds'));
+    }
+
+    public function dashboardAppointments(Request $request, $_from, $_to) {
+
+        $performer = $this->performer();
+        $performerProID = $performer->pro->id;
+        $isAdmin = ($performer->pro->pro_type === 'ADMIN');
+
         if(!$isAdmin) {
             $appointments = Appointment::where("pro_id", $performerProID)
                 ->orderBy('start_time', 'asc')
@@ -296,10 +307,6 @@ class HomeController extends Controller
             $appointment->proUid = $appointment->pro->uid;
             $appointment->proName = $appointment->pro->displayName();
         }
-
-        $milliseconds = strtotime(date('Y-m-d')) . '000';
-
-        return view('app/dashboard', compact('keyNumbers', 'reimbursement', 'appointments', 'milliseconds'));
     }
 
     public function patients(Request $request, $filter = '')

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

@@ -201,7 +201,7 @@
             data: {
                 selectedDate: '{{ date('Y-m-d') }}',
                 selectedStatus: 'CREATED',
-                events: {!! json_encode($appointments) !!},
+                events: [],
                 numEventsForDate: 0,
                 filterStatus: '',
             },
@@ -296,7 +296,6 @@
                 });
                 self.selectToday();
                 self.updateNumEventsForDate();
-                console.log(this.events)
             }
         });
     });