Fix recently discovered issues for events in calendars

Author: labkey-jeckels

resources/views/scheduleAllInstruments.html

@@ -247,10 +247,13 @@
                         if (calendar && calendar.rerenderEvents) {
                             calendar.rerenderEvents();
                         } else if (calendar) {
-                            // Fallback: remove and re-add sources to force rerender
-                            const sources = Array.from(instruments.keys());
-                            sources.forEach(function(id) { removeEventSourceForInstrument(id); });
-                            sources.forEach(function(id) { addEventSourceForInstrument(id); });
+                            // Fallback: remove and re-add only currently active sources to force rerender
+                            const activeIds = [];
+                            instruments.forEach(function(info, id) {
+                                if (info && info.source) activeIds.push(id);
+                            });
+                            activeIds.forEach(function(id) { removeEventSourceForInstrument(id); });
+                            activeIds.forEach(function(id) { addEventSourceForInstrument(id); });
                         }
                     });
                 }

resources/views/scheduleInstrument.html

@@ -266,7 +266,7 @@ <h3>Time Scheduled</h3>
                         },
                         eventMouseEnter: function (mouseEnterInfo) {
                             removeEventLog();
-                            let instrumentID = instrument ? instrument : $('#instrumentDropDown select[name="instrumentDropDown"]').val();
+                            let instrumentID = instrument ? instrument : $('#instrumentDropDown').val();
                             fetchInstrumentCosts(instrumentID, mouseEnterInfo.event.start, mouseEnterInfo.event.end, false);
                             let content = '';
                             let dateStr = DateFormat.format.date(mouseEnterInfo.event.start, LABKEY.container.formats.dateTimeFormat) + ' - ' + DateFormat.format.date(mouseEnterInfo.event.end, LABKEY.container.formats.dateTimeFormat);
@@ -688,12 +688,13 @@ <h3>Time Scheduled</h3>
 
         function loadInstrumentSchedule(callback) {
             let instrumentSchedule = [];
+            const currentInstrument = instrument ? instrument : parseInt($('#instrumentDropDown').val());
             LABKEY.Query.selectRows({
                 schemaName: 'targetedms',
                 queryName: 'instrumentSchedule',
-                columns: 'Id,startTime,endTime,name,notes,instrument/color,project/Id, project/title',
+                columns: 'Id,startTime,endTime,name,notes,instrument/color,instrument/Id,project/Id, project/title',
                 filterArray: [
-                    LABKEY.Filter.create('instrument', instrument ? instrument : $('#instrumentDropDown select[name="instrumentDropDown"]').val()),
+                    LABKEY.Filter.create('instrument', instrument ? instrument : $('#instrumentDropDown').val()),
                 ],
                 success: function (data) {
                     let rows = data.rows;