Merge branch 'dev-josh' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -141,10 +141,14 @@ class PracticeManagementController extends Controller
         return view('app.practice-management.my-text-shortcuts', compact('myTextShortcuts'));
     }
 
-    public function proAvailability(Request $request)
+    public function proAvailability(Request $request, $proUid = null)
     {
         $performer = $this->performer();
         $pro = $performer->pro;
+
+        if($proUid){
+            $pro = Pro::where('uid', $proUid)->first();
+        }
         
         if($request->get('pro_uid')){
             $proUid = $request->get('pro_uid');
@@ -219,6 +223,11 @@ class PracticeManagementController extends Controller
         return $eventsData;
     }
 
+    public function proAvailabilityFilter(Request $request){
+        $proUid = $request->get('proUid');
+        return ['success'=>true, 'data'=>$proUid];
+    }
+
     // video call page (RHS)
     // generic call handle (no uid)
     // specific call handle (uid of client)

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

@@ -5,6 +5,22 @@
 <script src='/fullcalendar-5.3.2/lib/main.js'></script>
 <div class="container-fluid">
     <div class="row mt-4">
+        <div class="col-md-12" moe>
+            <form show url="{{route('pro-availability-filter')}}" method="POST" class="form-inline" redir="/practice-management/pro-availability/[data]">
+                @csrf
+                <div class="form-group">
+                    <select name="proUid" class="form-control">
+                        <option value="">-- select pro --</option>
+                        @foreach($pros as $apro)
+                        <option value="{{$pro->uid}}">{{$apro->name_first}} {{$apro->name_last}}</option>
+                        @endforeach
+                    </select>
+                </div>
+                <div class="form-group">
+                    <button class="btn btn-sm btn-outline-secondary">Filter</button>
+                </div>
+            </form>
+        </div>
         <div class="col-md-6">
             <div class="card mb-2">
                 <div class="card-header d-flex">
@@ -90,33 +106,51 @@
                                         <td>{{$ga->start_time}}</td>
                                         <td>{{$ga->end_time}}</td>
                                         <td>
-                                        @if(isset($generalAvailabilities[$dow]))
-                                        <div moe wide class="mr-2">
-                                            <a start show>
-                                                update
-                                            </a>
-                                            <form url="/api/proGeneralAvailability/update">
-                                                <input type="hidden" name="uid" value="{{$ga->uid}}">
-                                                <input type="hidden" name="timezone" value="EASTERN">
-                                                <div class="form-group">
-                                                    {{$ga->day_of_week}}
-                                                </div>
-                                                <div class="form-group">
-                                                    <label for="" class="control-label">Start Time </label>
-                                                    <input class="form-control" type="time" name="startTime" value="{{military_time($ga->start_time)}}">
-                                                </div>
-                                                <div class="form-group">
-                                                    <label for="" class="control-label">End Time </label>
-                                                    <input class="form-control" type="time" name="endTime" value="{{military_time($ga->end_time)}}">
-                                                </div>
-                                                <div class="form-group m-0">
-                                                    <button submit class="btn btn-primary btn-sm mr-2">Submit</button>
-                                                    <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                        @endif
-                            </td>
+                                            @if(isset($generalAvailabilities[$dow]))
+                                            <div moe wide class="mr-2">
+                                                <a start show>
+                                                    update
+                                                </a>
+                                                <form url="/api/proGeneralAvailability/update">
+                                                    <input type="hidden" name="uid" value="{{$ga->uid}}">
+                                                    <input type="hidden" name="timezone" value="EASTERN">
+                                                    <div class="form-group">
+                                                        {{$ga->day_of_week}}
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="" class="control-label">Start Time </label>
+                                                        <input class="form-control" type="time" name="startTime" value="{{military_time($ga->start_time)}}">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="" class="control-label">End Time </label>
+                                                        <input class="form-control" type="time" name="endTime" value="{{military_time($ga->end_time)}}">
+                                                    </div>
+                                                    <div class="form-group m-0">
+                                                        <button submit class="btn btn-primary btn-sm mr-2">Submit</button>
+                                                        <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                            <span class="text text-secondary">|</span>
+                                            @endif
+                                            <div moe wide class="mr-2">
+                                                <a start show>
+                                                    cancel
+                                                </a>
+                                                <form url="/api/proGeneralAvailability/cancel">
+                                                    <input type="hidden" name="uid" value="{{$ga->uid}}">
+                                                    
+                                                    <div class="form-group">
+                                                        Cancel record?
+                                                    </div>
+                                                   
+                                                    <div class="form-group m-0">
+                                                        <button submit class="btn btn-primary btn-sm mr-2">Submit</button>
+                                                        <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </td>
                                     </tr>
                                     @endforeach
                                 </table>
@@ -211,6 +245,25 @@
                                         </div>
                                     </form>
                                 </div>
+
+                                <div moe wide class="mr-2">
+                                    <a start show>
+                                        cancel
+                                    </a>
+                                    <form url="/api/proSpecificAvailability/cancel">
+                                        <input type="hidden" name="uid" value="{{$sa->uid}}">
+                                        
+                                        <div class="form-group">
+                                            Cancel record?
+                                        </div>
+                                        
+                                        <div class="form-group m-0">
+                                            <button submit class="btn btn-primary btn-sm mr-2">Submit</button>
+                                            <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+
                             </td>
                         </tr>
                         @endforeach
@@ -304,6 +357,24 @@
                                         </div>
                                     </form>
                                 </div>
+
+                                <div moe wide class="mr-2">
+                                    <a start show>
+                                        cancel
+                                    </a>
+                                    <form url="/api/proSpecificUnavailability/cancel">
+                                        <input type="hidden" name="uid" value="{{$su->uid}}">
+                                        
+                                        <div class="form-group">
+                                            Cancel record?
+                                        </div>
+                                        
+                                        <div class="form-group m-0">
+                                            <button submit class="btn btn-primary btn-sm mr-2">Submit</button>
+                                            <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
                             </td>
                         </tr>
                         @endforeach

routes/web.php

@@ -72,9 +72,8 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('notes/{filter?}', 'PracticeManagementController@notes')->name('notes');
         Route::get('bills/{filter?}', 'PracticeManagementController@bills')->name('bills');
         Route::get('my-text-shortcuts', 'PracticeManagementController@myTextShortcuts')->name('myTextShortcuts');
-        Route::get('pro-availability', 'PracticeManagementController@proAvailability')->name('proAvailability');
+        Route::get('pro-availability/{proUid?}', 'PracticeManagementController@proAvailability')->name('proAvailability');
 
-        Route::post('/availability/load', 'PracticeManagementController@loadAvailability')->name('loadAvailability');
     });
 
     Route::name('patients.view.')->prefix('patients/view/{patient}')->group(function () {
@@ -124,6 +123,7 @@ Route::middleware('pro.auth')->group(function () {
 
     //events for availability
     Route::post('/availability/load', 'PracticeManagementController@loadAvailability')->name('loadAvailability');
+    Route::post('/pro-availability/filter', 'PracticeManagementController@proAvailabilityFilter')->name('pro-availability-filter');
 
     // load template set
     Route::get('/note-template-set/exam/{exam}/{template}', 'HomeController@noteExamTemplateSet');