Jelajahi Sumber

Add appt. implementation updates

Vijayakrishnan 4 tahun lalu
induk
melakukan
afe65ed676

+ 4 - 1
resources/views/app/patient/appointment-calendar.blade.php

@@ -312,6 +312,7 @@
                                     center: 'title',
                                     right: 'dayGridMonth,timeGridWeek,timeGridDay'
                                 },
+                                initialView: 'timeGridWeek',
                                 initialDate: '{{ date('Y-m-d') }}',
                                 editable: true,
                                 selectable: true,
@@ -416,12 +417,13 @@
                         showAddAppointmentModal: function() {
                             // setup model data
                             let startTime = this.timeStr(this.selectedSlot.start);
+                            let endTime = this.timeStr(this.selectedSlot.end);
                             this.newAppointment.clientUid = this.client.uid;
                             this.newAppointment.proUid = '';
                             this.newAppointment.referringProUid = '';
                             this.newAppointment.date = this.dateStr(this.selectedSlot.start);
                             this.newAppointment.startTime = startTime === '00:00' ? '' : startTime;
-                            this.newAppointment.endTime = '';
+                            this.newAppointment.endTime = (this.selectedSlot.allDay || endTime === '00:00') ? '' : endTime;
                             this.newAppointment.timeZone = this.timezone;
                             this.newAppointment.title = '';
                             this.newAppointment.description = '';
@@ -429,6 +431,7 @@
                                 $('#addApptPro').find('option').prop('selected', false);
                                 $('#addApptPro').trigger('change');
                                 showStagPopup('client-add-appointment');
+                                $('#addApptPro').select2('open');
                             });
                         },
                         addAppointment: function() {