Skip to content

Extra credit colors#1024

Merged
bmcutler merged 6 commits intomasterfrom
extra_credit_colors
Jun 9, 2017
Merged

Extra credit colors#1024
bmcutler merged 6 commits intomasterfrom
extra_credit_colors

Conversation

@AndrewMRPI
Copy link
Contributor

@AndrewMRPI AndrewMRPI commented Jun 7, 2017

The extra credit and penalty questions now have green and red colors respectively to show their differences. They also have plus and minus icons.
closes #958

@AndrewMRPI AndrewMRPI requested a review from MarisaPLee June 7, 2017 20:42
$output .= <<<HTML
if($question['gc_is_extra_credit'] == true) {
$output .= <<<HTML
<tr style="background-color: #f9f9f9;">
Copy link
Contributor

Choose a reason for hiding this comment

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

How come the row color is declared, then later each cell color is individually declared to be red/green? Just changing the row color could help readability.

Copy link
Contributor Author

@AndrewMRPI AndrewMRPI Jun 8, 2017

Choose a reason for hiding this comment

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

I believe I did it that way since the table was made up of cells. I tried changing the row color for the cells but it seems the cell's color over wrote it. Therefore I decided to change the each cell's color directly.

Copy link
Contributor

@MarisaPLee MarisaPLee left a comment

Choose a reason for hiding this comment

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

Consider putting the icon to the left of the title (for multiple extra credit/penalty, the icons would line up).

Code looks ok to me.

@bmcutler bmcutler self-requested a review June 8, 2017 21:21
Copy link
Member

@bmcutler bmcutler left a comment

Choose a reason for hiding this comment

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

Yes, please put the icons on the left of the label/title

@MasterOdin
Copy link
Member

Does the components (non-negative, non-extra credit) with no icons line up the text with the ones that do have icons or is that something we don't want?

@bmcutler
Copy link
Member

bmcutler commented Jun 9, 2017

no, they're not lined up, but i think that's fine.

@bmcutler bmcutler merged commit 308af66 into master Jun 9, 2017
@bmcutler bmcutler deleted the extra_credit_colors branch June 9, 2017 14:28
emaicus pushed a commit that referenced this pull request Jun 19, 2017
* Penalty, extra, and normal credit look diffirent now

* Extra credit and penalty have colors and icons

* The icons are now on the left
bmcutler pushed a commit that referenced this pull request Jun 26, 2017
* Added directories to path in execute.cpp. Added gfx installs and cmake permissions in install_system.sh

* added php zip file fix

* Added very rough version of window_utils

* Added support for screenshotting. Separated window code into window_utils

Author:   Evan Maicus <emaicus@outlook.com>

* Added support for delays and typed commands

* Added detection of window name based on child pid

* Added click and drag support. Added mouse support.

* Added error checking and documentation

* Large overhaul of click and drag.

* Added comments, added alt button support in click and drag, tested in prep for pull request.

* Added support for decimal delays.

* add sorting options for labs, default viewing options for labs (#992)

* add sorting options for labs, default viewing options for labs

* sorting for registration and rotation grading

* sort by more than just id

* Progress on revising navigation page with submission status (#962)

progress on issue #674

* Allow user to specify whether they should stay logged in (past browser closure), defaults to true (#1014)

* Ambersands no longer get truncated (#1022)

* Gradeable layout with only numerics (#1023)

* Looks better when there are zero numeric fields

* Looks better when there are zero numeric fields

* Electronic grader, changes names of functions and default for if instructor has grading (#1026)

* add sorting options for labs, default viewing options for labs

* sorting for registration and rotation grading

* sort by more than just id

* changed function names

* now user id not left aligned

* remove unneeded code

* Creating a new Numeric Gradeable has a total points row (#1025)

* Added a row for total points.

* total row is functional

* is updated when you make a gradeable from a template

* made suggested changes and fixed a typo.

* all updates made

* corrected some unnecessary changes

* First draft of check_everything.py -- checks directory owner/group/permissions (#1030)

* just starting

* progress

* a bit more

* edits to check_everything script

* more checks

* change requests

* rearrange logic

* add to travis after_script

* Extra credit colors (#1024)

* Penalty, extra, and normal credit look diffirent now

* Extra credit and penalty have colors and icons

* The icons are now on the left

* Create Gradeable:  check for invalid dates and gradeable_ids (#1021)

* Added checks for the form for the user

* updated with requested changes

* updated with requested changes

* check for hwcron user at the top of grade_students.sh (#1044)

* Update sample apache configuration for Ubuntu 16.04 configuration (#1020)

* Improved checking of autograding execution of local and system programs (#1050)

replace 'assignment' with 'gradeable' in grade_students.sh (improves consistency)

better error message for attempted use of system programs that are not on the whitelist

now scrapes the config.json for names of compiled_executables to improve the check for local programs

if the config.json uses an unacceptable local, now it complains at BUILD time (not delaying to submission debugging as before)

fix autograding test failures

disabled seccomp because it's broken :( will make a new issue & fix that next, in a new PR #1051.

* remove PHP 5.5 (#1054)

* Added very rough version of window_utils

* Added support for screenshotting. Separated window code into window_utils

Author:   Evan Maicus <emaicus@outlook.com>

* Added support for delays and typed commands

* Added detection of window name based on child pid

* Added click and drag support. Added mouse support.

* Added error checking and documentation

* Large overhaul of click and drag.

* Added comments, added alt button support in click and drag, tested in prep for pull request.

* Added support for decimal delays.

* Refactored comments, fixed spelling issues.

* Fixed formatting, hacked seccomp

* Fixed mislabeled allowed system programs
bmcutler pushed a commit that referenced this pull request Jul 19, 2017
… in Electronic Gradeable Uploads (#1209)

* Added directories to path in execute.cpp. Added gfx installs and cmake permissions in install_system.sh

* added php zip file fix

* Added very rough version of window_utils

* Added support for screenshotting. Separated window code into window_utils

Author:   Evan Maicus <emaicus@outlook.com>

* Added support for delays and typed commands

* Added detection of window name based on child pid

* Added click and drag support. Added mouse support.

* Added error checking and documentation

* Large overhaul of click and drag.

* Added comments, added alt button support in click and drag, tested in prep for pull request.

* Added support for decimal delays.

* add sorting options for labs, default viewing options for labs (#992)

* add sorting options for labs, default viewing options for labs

* sorting for registration and rotation grading

* sort by more than just id

* Progress on revising navigation page with submission status (#962)

progress on issue #674

* Allow user to specify whether they should stay logged in (past browser closure), defaults to true (#1014)

* Ambersands no longer get truncated (#1022)

* Gradeable layout with only numerics (#1023)

* Looks better when there are zero numeric fields

* Looks better when there are zero numeric fields

* Electronic grader, changes names of functions and default for if instructor has grading (#1026)

* add sorting options for labs, default viewing options for labs

* sorting for registration and rotation grading

* sort by more than just id

* changed function names

* now user id not left aligned

* remove unneeded code

* Creating a new Numeric Gradeable has a total points row (#1025)

* Added a row for total points.

* total row is functional

* is updated when you make a gradeable from a template

* made suggested changes and fixed a typo.

* all updates made

* corrected some unnecessary changes

* First draft of check_everything.py -- checks directory owner/group/permissions (#1030)

* just starting

* progress

* a bit more

* edits to check_everything script

* more checks

* change requests

* rearrange logic

* add to travis after_script

* Extra credit colors (#1024)

* Penalty, extra, and normal credit look diffirent now

* Extra credit and penalty have colors and icons

* The icons are now on the left

* Create Gradeable:  check for invalid dates and gradeable_ids (#1021)

* Added checks for the form for the user

* updated with requested changes

* updated with requested changes

* check for hwcron user at the top of grade_students.sh (#1044)

* Update sample apache configuration for Ubuntu 16.04 configuration (#1020)

* Improved checking of autograding execution of local and system programs (#1050)

replace 'assignment' with 'gradeable' in grade_students.sh (improves consistency)

better error message for attempted use of system programs that are not on the whitelist

now scrapes the config.json for names of compiled_executables to improve the check for local programs

if the config.json uses an unacceptable local, now it complains at BUILD time (not delaying to submission debugging as before)

fix autograding test failures

disabled seccomp because it's broken :( will make a new issue & fix that next, in a new PR #1051.

* remove PHP 5.5 (#1054)

* Added very rough version of window_utils

* Added support for screenshotting. Separated window code into window_utils

Author:   Evan Maicus <emaicus@outlook.com>

* Added support for delays and typed commands

* Added detection of window name based on child pid

* Added click and drag support. Added mouse support.

* Added error checking and documentation

* Large overhaul of click and drag.

* Added comments, added alt button support in click and drag, tested in prep for pull request.

* Added support for decimal delays.

* Refactored comments, fixed spelling issues.

* Fixed formatting, hacked seccomp

* Fixed mislabeled allowed system programs

* Added support for image diff.

* added support to view expected image file.

* fixed a regex bug in windowutils, finalized image diff functionality.

* fixed a regex bug in windowutils, finalized image diff functionality.

* checkpoint

* Got text box images working

* finished textbox images. finished image diff. fixed ta grading page image issues. fixed ta grading page error display issues.

* added borders around images.

* Added support for image resizing for textboxes. Resolved local test errors.

* formatted.

* added blue info messages and per image resizing.

* Added new autograding examples for image diffing and textbox images.

* updated travis test.

* Quick fix.

* hotfix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

rubric panel should make regular vs extra credit vs penalty items clear

4 participants