Skip to content

Fix #3781: Resolve JS crashes and prevent legend panel collapse on in… #6007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aasthag01-26 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix #3781: Resolve JS crashes and prevent legend panel collapse on in… #6007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1049636
Fix #3781: Resolve JS crashes and prevent legend panel collapse on in…
aasthag01-26 Sep 9, 2026
2c95a2b
fix: address review feedback on Cell.js cleanup and comments
aasthag01-26 Sep 9, 2026
9d07bef
Merge branch 'main' into fix-legend-panel
aasthag01-26 Oct 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 76 additions & 41 deletions esp/public/media/scripts/ajaxschedulingmodule/ESP/Cell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,45 +66,51 @@ function Cell(el, section, room_id, timeslot_id, matrix) {
this.el.removeData("section");
this.el.removeClass("available-cell occupied-cell selectable-cell locked-cell selected-section ghost-section");
this.el[0].innerHTML = "";
this.el.css("background-color", "");
this.el.css("background", "");
this.el.css("color", "");

// 1. Keep selected highlight intact on click
if (this.selected) {
this.el.addClass("selected-section");
}

if(this.ghostSection || !this.section) {
this.el.addClass("available-cell");

if(this.ghostSection) {
if (this.ghostSection) {
var color = this.cellBackground(this.ghostSection);
if(this.ghostSection.flags.indexOf("Special scheduling needs") !== -1) {
if (this.ghostSection.flags && this.ghostSection.flags.indexOf("Special scheduling needs") !== -1) {
this.el.css("background", "linear-gradient(to bottom right, " + this.cellColors.specialColor + " 0%," +
this.cellColors.RGBToString(color) + " 50%," + this.cellColors.specialColor + " 100%)");
} else {
this.el.css("background", this.cellColors.RGBToString(color));
}
this.el.css("color", this.cellColors.textColor(color));
this.el.addClass("ghost-section");
this.el[0].innerHTML = this.ghostSection.emailcode;
this.el[0].innerHTML = this.ghostSection.emailcode || "";
} else {
// Preserve default styling for empty/available cell so it doesn't vanish
this.el.css({"background": "", "background-color": "", "color": ""});
}
} else {
this.el.data("section", this.section);
this.el.addClass("occupied-cell");
this.el.addClass("selectable-cell");
if(this.section.schedulingLocked) {
this.el.addClass("occupied-cell selectable-cell");

if (this.section.schedulingLocked) {
this.el.addClass("locked-cell");
}
if(this.selected) {
this.el.addClass("selected-section");
}

var color = this.cellBackground(this.section);
if(this.section.flags.indexOf("Special scheduling needs") !== -1) {
var colorString = this.cellColors.RGBToString(color);

if (this.section.flags && this.section.flags.indexOf("Special scheduling needs") !== -1) {
this.el.css("background", "linear-gradient(to bottom right, " + this.cellColors.specialColor + " 0%," +
this.cellColors.RGBToString(color) + " 50%," + this.cellColors.specialColor + " 100%)");
colorString + " 50%," + this.cellColors.specialColor + " 100%)");
} else {
this.el.css("background", this.cellColors.RGBToString(color));
this.el.css("background", colorString);
}

this.el.css("color", this.cellColors.textColor(color));
this.el.css("background-size", "cover");
this.el[0].innerHTML = "<a>" + this.section.emailcode + "</a>";
this.el[0].innerHTML = "<a>" + (this.section.emailcode || "") + "</a>";
}
};

Expand Down Expand Up @@ -139,8 +145,12 @@ function Cell(el, section, room_id, timeslot_id, matrix) {
}
case "category":
// Color cell based on the class category
if (!section.category_id || !this.matrix.categories[section.category_id]) {
return grey;
}
var cat_ind = Object.keys(this.matrix.categories).indexOf(section.category_id.toString());
return this.cellColors.hexToRGB(this.cellColors.colors[Math.round(cat_ind / Object.keys(this.matrix.categories).length * 100)]);
var colorIndex = Math.round(cat_ind / Object.keys(this.matrix.categories).length * 100);
return this.cellColors.hexToRGB(this.cellColors.colors[colorIndex] || "#777777");
case "lunch":
// Check if section overlaps with all lunch timeslots for a single day
for(var day in this.matrix.timeslots.lunch_timeslots){
Expand Down Expand Up @@ -326,43 +336,68 @@ function Cell(el, section, room_id, timeslot_id, matrix) {
* Note: This has to be bound to the cell for the tooltip jquery function to
* work. It would be nice if this was in Sections instead.
*/
/**
* Create data for the tooltip
*/
this.tooltip = function(){
var currentSection = this.section || this.ghostSection;

// Guard check: Return empty string if the cell is empty
if (!currentSection) return "";

var tooltip_parts = {};
if(this.section.schedulingComment) {
tooltip_parts['Scheduling Comment'] = this.section.schedulingComment +
(this.section.schedulingLocked ? ' <b><i>(locked)</i></b>' : '');

if(currentSection.schedulingComment) {
tooltip_parts['Scheduling Comment'] = currentSection.schedulingComment +
(currentSection.schedulingLocked ? ' <b><i>(locked)</i></b>' : '');
}

// 2. Category lookup with safety check
if (currentSection.category_id && this.matrix.categories[currentSection.category_id]) {
tooltip_parts['Category'] = this.matrix.categories[currentSection.category_id].name;
}
tooltip_parts['Category'] = this.matrix.categories[this.section.category_id || this.ghostSection.category_id].name;
tooltip_parts['Teachers'] = this.matrix.sections.getTeachersString(this.section);
if(has_moderator_module === "True") tooltip_parts[moderator_title + 's'] = this.matrix.sections.getModeratorsString(this.section);
tooltip_parts['Style'] = this.section.class_style;
tooltip_parts['Class size max'] = this.section.class_size_max;

// 3. Safe access using currentSection instead of this.section
tooltip_parts['Teachers'] = this.matrix.sections.getTeachersString(currentSection);

if (typeof has_moderator_module !== "undefined" && has_moderator_module === "True") {
tooltip_parts[(typeof moderator_title !== "undefined" ? moderator_title : 'Moderator') + 's'] =
this.matrix.sections.getModeratorsString(currentSection);
}

tooltip_parts['Style'] = currentSection.class_style;
tooltip_parts['Class size max'] = currentSection.class_size_max;

var length_str = '';
if(Math.floor(this.section.length) > 0){
length_str += Math.floor(this.section.length);
if (Math.floor(currentSection.length) > 0) {
length_str += Math.floor(currentSection.length);
length_str += ' hour';
if(Math.floor(this.section.length) > 1) length_str += 's';
if (Math.floor(currentSection.length) > 1) length_str += 's';
}
if ((currentSection.length % 1) * 60 > 0) {
length_str += ' ' + Math.round((currentSection.length % 1) * 60) + ' minutes';
}
if((this.section.length % 1) * 60 > 0) length_str += ' ' + Math.round((this.section.length % 1) * 60) + ' minutes';
tooltip_parts['Length'] = length_str;
tooltip_parts['Grades'] = this.section.grade_min + "-" + this.section.grade_max;
tooltip_parts['Room Request'] = this.section.requested_room;
tooltip_parts['Resource Requests'] = this.matrix.sections.getResourceString(this.section);
tooltip_parts['Flags'] = this.section.flags;
if(this.section.comments) {
tooltip_parts['Comments'] = this.section.comments;
tooltip_parts['Grades'] = currentSection.grade_min + "-" + currentSection.grade_max;
tooltip_parts['Room Request'] = currentSection.requested_room;
tooltip_parts['Resource Requests'] = this.matrix.sections.getResourceString(currentSection);
tooltip_parts['Flags'] = currentSection.flags;

if (currentSection.comments) {
tooltip_parts['Comments'] = currentSection.comments;
}
if(this.section.special_requests && this.section.special_requests.length > 0) {
tooltip_parts['Room Requests'] = this.section.special_requests;
if (currentSection.special_requests && currentSection.special_requests.length > 0) {
tooltip_parts['Room Requests'] = currentSection.special_requests;
}

var tooltipText = "<b>" + this.section.emailcode + ": " + this.section.title + "</b>";
for(var header in tooltip_parts) {
tooltipText += "<br/><b>" + header + "</b>: " + tooltip_parts[header];
var tooltipText = "<b>" + (currentSection.emailcode || '') + ": " + (currentSection.title || '') + "</b>";
for (var header in tooltip_parts) {
if (tooltip_parts[header] !== undefined && tooltip_parts[header] !== null) {
tooltipText += "<br/><b>" + header + "</b>: " + tooltip_parts[header];
}
}
return tooltipText;
};

/**
* Add a section to the cell and update associated data
*
Expand Down
12 changes: 7 additions & 5 deletions esp/public/media/scripts/ajaxschedulingmodule/ESP/Scheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,17 +223,19 @@ function Scheduler(
});

// set up handler for legend button
$j("body").on("click", "#legend_button", function(evt, ui) {
$j("body").on("click", "#legend_button", function(evt) {
evt.stopPropagation();
$j("#legend").toggle();
if ($j("#legend_button").html() == "Show Legend") {
if ($j("#legend").is(":visible")) {
$j("#legend_button").html("Hide Legend");
} else {
$j("#legend_button").html("Show Legend");
}
});
$j("body").on("click", "#legend", function(evt, ui) {
$j("#legend").hide();
$j("#legend_button").html("Show Legend");

// Explicitly prevent click inside legend from hiding it
$j("body").on("click", "#legend", function(evt) {
evt.stopPropagation();
});
};

Expand Down
Loading