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

[Feature:RainbowGrades] Adding hover text to bad status cells #77

Merged
merged 11 commits into from
Jul 18, 2024
Merged

[Feature:RainbowGrades] Adding hover text to bad status cells #77

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
356a3fc
Initial change for bad status hover
oliiso Jun 26, 2024
ba4665b
edit words in hover box
oliiso Jul 1, 2024
23c8202
Update extension logic
oliiso Jul 2, 2024
3237791
Merge branch 'main' into bad-status-hover-text
oliiso Jul 2, 2024
07ac6de
remove duplicate code
oliiso Jul 5, 2024
c3528db
Move hover text
oliiso Jul 9, 2024
52d06c1
Update logic for extension
oliiso Jul 10, 2024
a7eefe9
Fix indentation
oliiso Jul 16, 2024
77f1112
Re-adding unspecified reason for extension
oliiso Jul 16, 2024
06ba5a8
Merge branch 'main' into bad-status-hover-text
oliiso Jul 16, 2024
f9402f2
Update indentation
oliiso Jul 17, 2024
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
25 changes: 14 additions & 11 deletions table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ TableCell::TableCell(const std::string& c, float d, int precision, const std::st
rotate = 0;
}


TableCell::TableCell(float d, const std::string& c, int precision, const std::string& n, int ldu,
CELL_CONTENTS_STATUS v,const std::string& e,bool ai, const std::string& a,
int s, int /*r*/,const std::string& reason,const std::string& gID,const std::string& userName, int daysExtended) {
Expand All @@ -95,11 +94,16 @@ TableCell::TableCell(float d, const std::string& c, int precision, const std::st
academic_integrity = ai;
event = e;

if (reason != "") {
hoverText = "class=\"hoverable-cell\" data-hover-text=\""+userName+" received a "+std::to_string(daysExtended)+" day extension due to "+reason+" on "+gID+"\" ";
} else {
hoverText = "class=\"hoverable-cell\" data-hover-text=\""+userName+" received a "+std::to_string(daysExtended)+" day extension without specified reason on "+gID+"\" ";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like we lost the unspecified reason hover text in the refactor. please re-add below

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in 77f1112

}
if (event == "Extension" && reason != "") {
extension = true;
inquiry = bad_status = override = version_conflict = cancelled = false;
hoverText = "class=\"hoverable-cell\" data-hover-text=\"" + userName + " received a " + std::to_string(daysExtended) + " day extension due to " + reason + " on " + gID + "\" ";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I was suggesting is to move the hoverText inside the if statement below, which is line 109

Copy link
Contributor Author

@oliiso oliiso Jul 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in c3528db

} else if (event == "Bad") {
bad_status = true;
override = inquiry = extension = version_conflict = cancelled = false;
hoverText = "class=\"hoverable-cell\" data-hover-text=\"" + userName + " received a bad status on " + gID + "\" ";
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason you are adding this in a separate if statement? Right below this code snippet we have existing if statements that are identical to your addition. I would say it is better to put it in there instead of duplicating the code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 07ac6de


// Bool in order of priority - top to bottom
// Don't think we need this logic, but leaving it as sort of assert
Expand All @@ -124,11 +128,11 @@ TableCell::TableCell(float d, const std::string& c, int precision, const std::st
} else {
inquiry = bad_status = override = extension = version_conflict = cancelled = false;
}

}




Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary addition?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 07ac6de

std::ostream& operator<<(std::ostream &ostr, const TableCell &c) {
assert (c.color.size() == 6);

Expand All @@ -151,11 +155,10 @@ std::ostream& operator<<(std::ostream &ostr, const TableCell &c) {
outline = "outline:4px solid #fc0303; outline-offset: -4px;";
}

if (c.extension){
ostr << "<td " << c.hoverText << "style=\"border:1px solid #aaaaaa; background-color:#" << c.color << "; " << outline << " \" align=\"" << c.align << "\">";
if (c.extension || c.bad_status) {
ostr << "<td " << c.hoverText << "style=\"border:1px solid #aaaaaa; background-color:#" << c.color << "; " << outline << "\" align=\"" << c.align << "\">";
} else {
ostr << "<td style=\"border:1px solid #aaaaaa; background-color:#" << c.color << "; " << outline << " \" align=\"" << c.align << "\">";

ostr << "<td style=\"border:1px solid #aaaaaa; background-color:#" << c.color << "; " << outline << "\" align=\"" << c.align << "\">";
}

if (0) { //rotate == 90) {
Expand Down