Skip to content

Commit

Permalink
[Feature:RainbowGrades] Adding hover text to bad status cells (#77)
Browse files Browse the repository at this point in the history
**What is the current behavior?**
Students aren't sure what the red outline on the grade report means
since the description is at the bottom of the grade report page.

**What is the new behavior?**
A hover feature is now implemented to notify that the red outline cells
are bad status, including the username of the student with a bad status
and the homework/assignment that a bad status was received.

**Other information?**
Fixes #10439 (Submitty/Submitty#10439)

When the cursor is over the bad status cell this is the hover text that
appears:
![Image 7-1-24 at 3
55 PM](https://github.com/Submitty/RainbowGrades/assets/105466628/a4cf5eb1-e036-4806-817e-c246fee9f424)

---------

Co-authored-by: Jaeseok Kang <[email protected]>
  • Loading branch information
oliiso and ziesski authored Jul 18, 2024
1 parent 35e52ac commit 912cfdf
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions table.cpp
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,12 +94,6 @@ 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+"\" ";
}

// Bool in order of priority - top to bottom
// Don't think we need this logic, but leaving it as sort of assert
if (event == "Overridden"){
Expand All @@ -109,6 +102,11 @@ TableCell::TableCell(float d, const std::string& c, int precision, const std::st
} else if (event == "Extension"){
extension = true;
inquiry = bad_status = override = version_conflict = cancelled = false;
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+"\" ";
}
} else if (event == "Open"){
inquiry = true;
bad_status = override = extension = version_conflict = cancelled = false;
Expand All @@ -121,10 +119,10 @@ TableCell::TableCell(float d, const std::string& c, int precision, const std::st
} 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 + "\" ";
} else {
inquiry = bad_status = override = extension = version_conflict = cancelled = false;
}

}


Expand All @@ -151,11 +149,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

0 comments on commit 912cfdf

Please sign in to comment.