Fixing calendar's events not being removed when a booking was deleted

Fixing busy slots appearing in different dates
UNEDLabs · Nov 18, 2019 · 66040fa · 66040fa
1 parent 3369020
commit 66040fa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/amd/src/date_picker.js b/amd/src/date_picker.js
@@ -187,11 +187,10 @@ define(['jquery','jqueryui'], function($){
 
         $.getJSON(busy_slots_url, function( data ){
             dpicker.log( 'GET ' + busy_slots_url);
-
-            if (data['busy-slots'].length  == 0 ) {
+            if (data['busy-slots'].length  === 0 ) {
                 tpickr.clear_busy_interv();
                 dpicker.log('No busy slots this day');
-            } else if ( tpickr.is_interval_picker_init()) {
+            } else if (tpickr.is_interval_picker_init()) {
                 tpickr.set_busy(data['busy-slots']);
                 tpickr.disable_busy_interv();
                 tpickr.next_free_interv(scroll);

diff --git a/amd/src/time_picker.js b/amd/src/time_picker.js
@@ -145,6 +145,7 @@ tpicker.prototype.clear_interv = function(){
 };
 
 tpicker.prototype.clear_busy_interv = function(){
+    this.busy_slots = null;
     this.icells().removeClass('interv-busy');
     this.icells().not('.interv-past').removeClass('disabled').on('click', { tpicker: this }, this.on_interv_click );
 };
@@ -355,7 +356,6 @@ tpicker.prototype.disable_busy_interv = function( ){
         if ( time_picker.busy_slots.includes(time) ) { // busy, disable
             time_picker.log('Disabling ' + time);
             time_picker.set_busy_interv($(this));
-
         } 
         /*
         else {

diff --git a/ejsappbooking_model.class.php b/ejsappbooking_model.class.php
@@ -283,8 +283,9 @@ public function delete_booking($bookid) { // Check and delete booking
             $name = get_string('book_message', 'ejsappbooking') . ' ' . $lab->name .
                 '. ' . $prac->practiceintro;
             $inittime = DateTime::createFromFormat('Y-m-d H:i:s', $record->starttime, $this->get_user_timezone());
+            //$inittime = DateTime::createFromFormat('Y-m-d H:i:s', "2019-11-18 22:15:00", $this->get_user_timezone());
             $time = make_timestamp($inittime->format('Y'), $inittime->format('m'),
-                $inittime->format('d'), $inittime->format('H'));
+                $inittime->format('d'), $inittime->format('H'), $inittime->format('i'));
             $event = $DB->get_record_sql('SELECT * FROM {event} WHERE userid = ? AND name = ? AND timestart = ?',
                 array($USER->id, $name, $time));
             // Delete calendar´s event.