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.

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

E2100. Tagging report for Students #1895

Merged
merged 82 commits into from
May 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
b518cb2
Initial commit of answer_tags.js for 517Sp21 TeamTuffy
smdupor Mar 5, 2021
454ba1d
Implement basic review tag counter in view_team to count number of ta…
smdupor Mar 6, 2021
aa5c9d6
Create very basic heatmap of tagged/untagged reviews.
smdupor Mar 6, 2021
6fb4aa5
Extend Heatmap Functionality: now autoloads and updates with each tag…
smdupor Mar 7, 2021
134b9c3
Enable Show/Hide of Tag HeatGrid from toggle button; Hide on Load if …
smdupor Mar 7, 2021
8f4636d
Fixed #7 Move majority of new JS code into view_team_in_grades.js fro…
smdupor Mar 7, 2021
82aa77b
CSS change for heatgrid
jmhurst1 Mar 8, 2021
47e6dff
Updated comment
jmhurst1 Mar 8, 2021
306d0f0
Added css to updateTable in addition to generateTable
jmhurst1 Mar 8, 2021
cf4adfc
First table CSS changes
jmhurst1 Mar 8, 2021
5b3748b
Implemented tag counters and display on page.
JialinC Mar 10, 2021
1e3b8e5
CSS change for heatgrid
jmhurst1 Mar 8, 2021
eef4c30
Updated comment
jmhurst1 Mar 8, 2021
be7bfcc
Added css to updateTable in addition to generateTable
jmhurst1 Mar 8, 2021
0bf8602
First table CSS changes
jmhurst1 Mar 8, 2021
6f66dda
Add new tag counting algorithm that counts by question and review num…
smdupor Mar 11, 2021
e28bbe6
Deleted deprecated heatgrid functions in view_team_in_grades.js
smdupor Mar 11, 2021
4cb3cf0
Clean up comments and remove commented-out debug code from countTags(…
smdupor Mar 11, 2021
15a8500
Added more CSS style inputs for table
jmhurst1 Mar 11, 2021
b34c67c
Merge branch 'beta' into jmhurst/Heatgrid_Table_CSS
jmhurst1 Mar 11, 2021
481cdd1
Make heatgrid sizing more flexible for future changes in number / typ…
smdupor Mar 11, 2021
8645409
Revise heading of heatgrid table text -- ReviewTags Completed.
smdupor Mar 11, 2021
9c8da31
Merge pull request #20 from smdupor/jmhurst/Heatgrid_Table_CSS
smdupor Mar 11, 2021
256bc42
Revise view_team.html.erb to move heatgrid anchor on page.
smdupor Mar 11, 2021
6e746d6
Revise view_team.html.erb to resolve newlines at eof causing build fa…
smdupor Mar 11, 2021
9b90962
Merge branch 'beta' into beta
smdupor Mar 11, 2021
67b483b
Handle heatgrid hiding bug when all tags are already done in view_tea…
smdupor Mar 11, 2021
03ed5e6
Troubleshoot build errors introduced after merge of E2057 Time travel…
smdupor Mar 11, 2021
55f428a
Add new HeatGrid state (collapsed) that only shows the row with the t…
smdupor Mar 12, 2021
fab8127
Change Tag Heatgrid CSS so grid respects layout rules of existing tab…
smdupor Mar 12, 2021
14e7534
Added color legend to view_team heatgrid using tooltips.
smdupor Mar 13, 2021
a657755
Refactor rowData[] objects to an array of Maps instead of an array of…
smdupor Mar 13, 2021
1063d56
Revert "Troubleshoot build errors introduced after merge of E2057 Tim…
smdupor Mar 13, 2021
ce45684
Add jQuery toggle() call when Show/Hide tags is clicked to show/hide …
smdupor Mar 13, 2021
81e20af
Add Review Round handling to tag heatgrid for multi-round reviews.
smdupor Mar 13, 2021
11805a2
Code Cleanup -- Remove commented debug code and unnecessary comments …
smdupor Mar 13, 2021
c69e189
Address Question/Criterion Inconsistency in legacy code on view_team.…
smdupor Mar 13, 2021
e037664
Fixed issue with React row sorter breaking heatgrid color updates.
smdupor Mar 13, 2021
6fcd018
Remove debug <span> tag above heatgrid anchor from view_team.html.erb
smdupor Mar 14, 2021
451c145
Removed extra whitespace in several HTML tags to match zero-space con…
smdupor Mar 14, 2021
d9b7399
Add countRounds() function and implement toggling of Round # -- prefi…
smdupor Mar 15, 2021
31fdf09
Accessibility for R/G Colorblind users: Add unicode symbols to tag he…
smdupor Mar 15, 2021
b800991
Add "if" statement in view_team.html.erb to ensure tagging report onl…
smdupor Mar 16, 2021
3d1c756
Correct scores view bug introduced with commit by laburges on Novembe…
smdupor Mar 16, 2021
bfd2469
Removed hard-coded query against round 2, in Assignment model method,…
smdupor Mar 16, 2021
2b52b09
Remove debug code: Restored dynamic population of data-roundnum field…
smdupor Mar 16, 2021
aa085b7
Merge remote-tracking branch 'origin/beta' into beta
smdupor Mar 16, 2021
8ae4074
Revert changes in grades_controller, Assignment model, and _feedback_…
smdupor Mar 16, 2021
fb183a6
Reverting minor whitespace commit on _feedback_report.html.erb.
smdupor Mar 17, 2021
4b162ac
Reverting EOF whitespace in _feedback_report.html.erb
smdupor Mar 17, 2021
5ad7cb0
Revert minor whitespace change in assignment.rb
smdupor Mar 17, 2021
a189916
Revert changes in view_team.html.erb (Hex Code Capitalization) and wh…
smdupor Mar 17, 2021
10b4980
Revert final EOF whitespace change in _feedback_report.html.erb
smdupor Mar 17, 2021
6bf9567
Correct toggleFunction() javascript style in view_team.html.erb
smdupor Mar 17, 2021
f5c4953
Correct toggleFunction() javascript style in view_team.html.erb
smdupor Mar 17, 2021
94e8c15
Merge remote-tracking branch 'origin/beta' into beta
smdupor Mar 17, 2021
80aea99
Refactor method names for clarity: getGridWidth(), getRowData()
smdupor Mar 17, 2021
3f8cf78
Refactor drawTagGrid() to separate drawing of header, question rows, …
smdupor Mar 17, 2021
eff22ca
Amend comments in view_team_in_grades.js from E1788_OSS
smdupor Mar 17, 2021
3923832
New tests for Javascript calls and HTML elements in view_team.html.erb
smdupor Mar 18, 2021
1cda9c5
Change heatgrid header to two rows to support # out of # and scale wi…
smdupor Mar 18, 2021
f37fa81
Change heatgrid tooltip text to consistent capitalization, punctuation
smdupor Mar 18, 2021
404084c
Refactor html data- attribs to use correct style, clean up whitespace
smdupor Mar 18, 2021
c97279c
Fix layout issue with Question Toggle zebra table jumping below tag g…
smdupor Mar 18, 2021
9dcd8d9
Fix round counting bug in Round # Question # Rows
smdupor Mar 18, 2021
50af631
Clean up unnecessary comments in view_team_in_grades.js
smdupor Mar 18, 2021
7aacd64
Address reviews-not-rendering bug in view_team.html.erb introduced by…
smdupor Mar 18, 2021
6dcbcdb
Update grades controller spec to expect testing round [1, 2] instead …
smdupor Mar 18, 2021
212f3b9
Update grades controller spec to expect testing round [1,2] instead o…
smdupor Mar 18, 2021
43278b7
Merge remote-tracking branch 'origin/beta' into beta
smdupor Mar 18, 2021
463e445
Added link
jmhurst1 Mar 18, 2021
382d4c4
Hides info when no reviews to tag
jmhurst1 Mar 18, 2021
02c4b55
Merge pull request #49 from smdupor/jmhurst/Added_link_to_main
smdupor Mar 19, 2021
c7e9406
Split oversized <td <%= ruby %>> tag on line 178 of view_team.html.er…
smdupor Mar 19, 2021
5de6565
Delete unused stub function collapseHeatGrid() in view_team_in_grades.js
smdupor Mar 19, 2021
63b54cf
Patch "Average peer review score: ##.##" not showing in view_team whe…
smdupor Mar 19, 2021
a5a99bd
Sync with expertiza/beta 'upstream/beta' into beta
smdupor Mar 20, 2021
cd872c5
Revert grades_controller and Assignment model changes
smdupor Mar 24, 2021
6c38ff4
Finalize comment and formatting cleanup.
smdupor Mar 25, 2021
bb1a54a
Add function comment to drawQuestionRow()
smdupor Mar 25, 2021
7d1577b
Add and clarify comments within view_team
smdupor Mar 25, 2021
fb224ed
Revert "Patch "Average peer review score: ##.##" not showing in view_…
smdupor Mar 25, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/assets/javascripts/answer_tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ save_tag = function(answer_id, tag_prompt_deployment_id, control){
tag_prompt_deployment_id: tag_prompt_deployment_id.toString(),
value: control.value.toString()
}));
// Update Heatmap -- Line added March 2021 Project E2100
if (document.URL.includes("view_team")){ //Only display the heatmap on the view_team page, the update table only happens when conduct tag save action on view_team page.
tagActionOnUpdate();
}

if (document.URL.includes("view_my_scores")){ //On view_my_scores page, no heatmap exists, should not update table, but a simple counter is displayed for tagging progress.
var total_tags = countTotalTags();
var tagged_tages = countTaggedTags();
document.getElementById("tag_stats").innerHTML = "Tag Finished: " + tagged_tages + "/" + total_tags
}
}

toggleLabel = function(range) {
Expand Down
22 changes: 22 additions & 0 deletions app/assets/javascripts/view_my_scores_helper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Added as part of E2100, Tagging Report for Students, March 2021
* Queries the page for completed tags and sets up the mini-tagging-report on Alternate View
*/

// Count total number of tag prompts on the page
function countTotalTags() {
var tagPrompts = document.getElementsByName("tag_checkboxes[]");
return tagPrompts.length;
}

// Count number of tags which have been clicked
function countTaggedTags() {
var TaggedTags = 0;
var tagPrompts = document.getElementsByName("tag_checkboxes[]");

for (index = 0; index < tagPrompts.length; ++index) {
if (tagPrompts[index].value != 0) {
TaggedTags++;
}
}
return TaggedTags;
}