Przeglądaj źródła

fixed loading events from server

Josh 4 lat temu
rodzic
commit
ee2bcdcd76

+ 5 - 0
app/Http/Controllers/PracticeManagementController.php

@@ -197,13 +197,18 @@ class PracticeManagementController extends Controller
     public function loadAvailability(Request $request){
         $performer = $this->performer();
         $pro = $performer->pro;
+        $startDate = $request->get('start');
+        $endDate = $request->get('end');
         
         if($request->get('pro_uid')){
             $proUid = $request->get('pro_uid');
             $pro = Pro::where('uid', $proUid)->first();
         }
 
+        $eventsData = $pro->getAvailabilityEvents($startDate, $endDate);
+        //$events = json_encode($eventsData);
         
+        return $eventsData;
     }
 
     // video call page (RHS)

+ 2 - 1
app/Http/Middleware/VerifyCsrfToken.php

@@ -12,6 +12,7 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        "/process_form_submit"
+        "/process_form_submit",
+        "/availability/load"
     ];
 }

+ 8 - 17
resources/views/app/practice-management/pro-availability.blade.php

@@ -341,28 +341,19 @@
                 navLinks: true,
                 dayMaxEvents: false,
                // slotDuration: '00:15:00',
-                events: function(start, end, timezone, callback) {
+                events: function(info, successCallback, failureCallbackk) {
+                    console.log("loading envents:", info.startStr.substr(0, 10), info.endStr.substr(0, 10))
                     jQuery.ajax({
-                        url: '/practice-management/availability/load',
+                        url: '/availability/load',
                         type: 'POST',
                         dataType: 'json',
                         data: {
-                            start: start.format(),
-                            end: end.format()
+                            start: info.startStr.substr(0, 10),
+                            end: info.endStr.substr(0, 10)
                         },
-                        success: function(doc) {
-                            var events = [];
-                            if(!!doc.result){
-                                $.map( doc.result, function( r ) {
-                                    events.push({
-                                        id: r.id,
-                                        title: r.title,
-                                        start: r.date_start,
-                                        end: r.date_end
-                                    });
-                                });
-                            }
-                            callback(events);
+                        success: function(events) {
+                            console.log(events);
+                            successCallback(events);
                         }
                     });
                 }

+ 4 - 1
routes/web.php

@@ -74,7 +74,7 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('my-text-shortcuts', 'PracticeManagementController@myTextShortcuts')->name('myTextShortcuts');
         Route::get('pro-availability', 'PracticeManagementController@proAvailability')->name('proAvailability');
 
-        Route::get('/availability/load', 'PracticeManagementController@loadAvailability')->name('loadAvailability');
+        Route::post('/availability/load', 'PracticeManagementController@loadAvailability')->name('loadAvailability');
     });
 
     Route::name('patients.view.')->prefix('patients/view/{patient}')->group(function () {
@@ -122,6 +122,9 @@ Route::middleware('pro.auth')->group(function () {
     // events for fc
     Route::get('/appointment/getAllAppointmentsForPros', 'AppointmentController@events')->name('events');
 
+    //events for availability
+    Route::post('/availability/load', 'PracticeManagementController@loadAvailability')->name('loadAvailability');
+
     // load template set
     Route::get('/note-template-set/exam/{exam}/{template}', 'HomeController@noteExamTemplateSet');
     Route::get('/note-template-set/{section}/{template}', 'HomeController@noteTemplateSet');