Merge branch 'dev-vj' of rav.triplestart.com:jmudaka/stagfe2 into dev-josh

resources/views/app/patient/appointment-calendar.blade.php

@@ -442,6 +442,7 @@
                                 selectable: true,
                                 navLinks: true,
                                 dayMaxEvents: false,
+                                slotDuration: '00:15:00',
                                 events: function(info, successCallback, failureCallback) {
                                     if(!self.proIds || !self.proIds.length) {
                                         successCallback([]); // no events if no pro selected
@@ -535,6 +536,10 @@
                                 ("0" + _dateTime.getMinutes()).slice(-2);
                         },
                         eventMovedOrResized: function (info) {
+                            if(!window.confirm('Are you sure?')) {
+                                this.refreshEvents();
+                                return;
+                            }
                             let date = this.dateStr(info.event.start);
                             let startTime = this.timeStr(info.event.start);
                             let endTime = null;

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

@@ -18,6 +18,7 @@
                 </a>
                 <form url="/api/proGeneralAvailability/create">
                     <input type="hidden" name="proUid" value="{{$pro->uid}}">
+                    <input type="hidden" name="timezone" value="EASTERN">
                     <div class="form-group">
                         <?php $daysOfWeek = ['MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY'] ?>
                         @foreach($daysOfWeek as $dayOfWeek)
@@ -48,6 +49,7 @@
                 </a>
                 <form url="/api/proSpecificAvailability/create">
                     <input type="hidden" name="proUid" value="{{$pro->uid}}">
+                    <input type="hidden" name="timezone" value="EASTERN">
                     <div class="mb-2">
                         <input type="text" class="form-control form-control-sm" name="title" placeholder="Title">
                     </div>
@@ -81,6 +83,7 @@
                 </a>
                 <form url="/api/proSpecificUnavailability/create">
                     <input type="hidden" name="proUid" value="{{$pro->uid}}">
+                    <input type="hidden" name="timezone" value="EASTERN">
                     <div class="mb-2">
                         <input type="text" class="form-control form-control-sm" name="title" placeholder="Title">
                     </div>
@@ -114,7 +117,7 @@
 </div>
 <script>
      (function() {
-       
+
         function initAvailabilityCalendar() {
             var calendarEl = document.getElementById('pro-availability-calendar');
             var calendar = new FullCalendar.Calendar(calendarEl, {
@@ -125,4 +128,4 @@
         addMCInitializer('pro-availability-calendar', initAvailabilityCalendar);
     })();
 </script>
-@endsection
+@endsection