Skip to content
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

Jump to bottom

Add teacher filter and checkbox to grid based class changes #3186

Merged
merged 2 commits into from
Dec 24, 2020
Merged

Add teacher filter and checkbox to grid based class changes #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae1086a
Add teacher filter and checkbox to grid based class changes
willgearty Dec 17, 2020
e5406aa
Fix OR operator
willgearty Dec 17, 2020
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
4 changes: 2 additions & 2 deletions esp/public/media/default_styles/onsite_ajax_status.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ span {
font-weight: bold;
}

.tooltip_teachers {
.tooltip_teachers, .teacher {
font-style: italic;
}

Expand Down Expand Up @@ -270,7 +270,7 @@ span {
width: 600px !important;
}

.title {
.title, .teacher {
padding-left: 5px;
padding-right: 5px;
}
16 changes: 13 additions & 3 deletions esp/public/media/scripts/onsite/ajax_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ var settings = {
override_full: false,
disable_grade_filter: false,
show_class_titles: false,
show_class_teachers: false,
show_class_rooms: false,
show_closed_reg: false,
hide_past_time_blocks: false,
Expand Down Expand Up @@ -156,6 +157,7 @@ function setup_settings()
$j("#override_control").unbind("change");
$j("#grade_limits_control").unbind("change");
$j("#show_class_titles").unbind("change");
$j("#show_class_teachers").unbind("change");
$j("#show_class_rooms").unbind("change");
$j("#show_closed_reg").unbind("change");
$j("#hide_past_time_blocks").unbind("change");
Expand All @@ -167,6 +169,7 @@ function setup_settings()
settings.override_full = $j("#override_control").prop("checked");
settings.disable_grade_filter = $j("#grade_limits_control").prop("checked");
settings.show_class_titles = $j("#show_class_titles").prop("checked");
settings.show_class_teachers = $j("#show_class_teachers").prop("checked");
settings.show_class_rooms = $j("#show_class_rooms").prop("checked");
settings.show_closed_reg = $j("#show_closed_reg").prop("checked");
settings.hide_past_time_blocks = $j("#hide_past_time_blocks").prop("checked");
Expand All @@ -176,6 +179,7 @@ function setup_settings()
$j("#override_control").change(handle_settings_change);
$j("#grade_limits_control").change(handle_settings_change);
$j("#show_class_titles").change(handle_settings_change);
$j("#show_class_teachers").change(handle_settings_change);
$j("#show_class_rooms").change(handle_settings_change);
$j("#show_closed_reg").change(handle_settings_change);
$j("#hide_past_time_blocks").change(handle_settings_change);
Expand Down Expand Up @@ -209,8 +213,9 @@ function update_search_filter()
var section = data.sections[section_id];

// check if the class matches the search
var section_key = section.emailcode + ": " + section.title;
if (section_key.toLowerCase().indexOf(settings.search_term.toLowerCase()) != -1)
if (section.emailcode.toLowerCase().indexOf(settings.search_term.toLowerCase()) != -1 ||
section.title.toLowerCase().indexOf(settings.search_term.toLowerCase()) != -1 ||
data.classes[section.class_id].teacher_names.toLowerCase().indexOf(settings.search_term.toLowerCase()) != -1)
continue;

// no match; hide the class
Expand Down Expand Up @@ -955,10 +960,15 @@ function render_table(display_mode, student_id)
new_td.append($j("<div/>").addClass("title").html(section.title));
}

var class_data = data.classes[section.class_id];
if (settings.show_class_teachers)
{
new_td.append($j("<div/>").addClass("teacher").html(class_data.teacher_names));
}

// Create a tooltip with more information about the class
new_td.addClass("tooltip");
var tooltip_div = $j("<span/>").addClass("tooltip_hover");
var class_data = data.classes[section.class_id];
var short_data = section.title + " - Grades " + class_data.grade_min.toString() + "--" + class_data.grade_max.toString();
if(class_data.hardness_rating) short_data = class_data.hardness_rating + " " + short_data;
tooltip_div.append($j("<div/>").addClass("tooltip_title").html(short_data));
Expand Down
3 changes: 2 additions & 1 deletion esp/templates/program/modules/onsiteclasslist/ajax_status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<div><input type="checkbox" id="override_control"/>Override size limits</div>
<div><input type="checkbox" id="grade_limits_control"/>Show classes outside student's grade range</div>
<div><input type="checkbox" id="show_class_titles"/>Display class titles</div>
<div><input type="checkbox" id="show_class_teachers"/>Display class teachers</div>
<div><input type="checkbox" id="show_class_rooms"/>Display class rooms</div>
<div><input type="checkbox" id="show_closed_reg"/>Show sections that are closed to registration</div>
<div><input type="checkbox" id="hide_past_time_blocks"/>Hide past timeblocks</div>
Expand All @@ -62,7 +63,7 @@
<td>
<div id="class_search_controls">
<b>Find a class</b>
<input type="text" id="class_search" placeholder="class ID or title"/></input>
<input type="text" id="class_search" placeholder="class ID, title, or teacher"/></input>
</div>
</td>
</tr>
Expand Down