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

E2105. Track the time students look at other submissions #1898

Closed
wants to merge 264 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
264 commits
Select commit Hold shift + click to select a range
10a840f
Basic structure and methods, using placeholder before controller is i…
Hatsukikeika Mar 10, 2021
9b9c200
Merge remote-tracking branch 'origin/E2080-code' into merge-2080-code
boergerj Mar 12, 2021
ca7f900
Update r to reviewer based on current Expertiza
boergerj Mar 12, 2021
378db32
Add chart render, waiting on integration with API End point
Hatsukikeika Mar 12, 2021
4d7de3a
Remove edits from unused response/_submitted_content
boergerj Mar 13, 2021
7e89708
Remove added index variable
boergerj Mar 13, 2021
6d039e8
Reorganize JS methods
boergerj Mar 13, 2021
3ac04ee
Improve comments for mouse events
boergerj Mar 13, 2021
115181e
Improve readability of user events
boergerj Mar 13, 2021
26d3c7e
Fix comment typos
boergerj Mar 13, 2021
5196e5b
Remove Note: from hyperlink partial
boergerj Mar 13, 2021
825e5a1
Fix checkbox to be set by default
boergerj Mar 13, 2021
182a194
Merge pull request #9 from AvlWx2014/merge-2080-code
Hatsukikeika Mar 13, 2021
57c9b6c
Refactored, js and css are moved to new files
Hatsukikeika Mar 13, 2021
23b5c2a
Create helper file
boergerj Mar 14, 2021
9962bc4
Initial setup of getTotalTime function
boergerj Mar 14, 2021
4be0368
fix whitespace change
Hatsukikeika Mar 14, 2021
486c67d
Refactor - Extract Duplicated JavaScript Functions
AvlWx2014 Mar 14, 2021
8fc4a8e
Refactor - Remove Duplicate Functions
AvlWx2014 Mar 14, 2021
0ab0691
merged from beta and solved conflict
Hatsukikeika Mar 14, 2021
8e5fc2d
run migration
Hatsukikeika Mar 14, 2021
22c63a9
Remove now defunct, and duplciated, ISODateString functions
AvlWx2014 Mar 14, 2021
7780499
Reorganize and comment _hyperlinks.html.erb Javascript
boergerj Mar 14, 2021
a0d7cab
Merge remote-tracking branch 'origin/js-refactor' into js-refactor
AvlWx2014 Mar 14, 2021
8606b66
Add a WindowManager prototype for DRY'ing up view code
AvlWx2014 Mar 14, 2021
14241ee
Refactoring
AvlWx2014 Mar 14, 2021
67778a5
Add new javascript files to precompiled assets
AvlWx2014 Mar 14, 2021
e37cfef
Simplify boolean logic
AvlWx2014 Mar 14, 2021
f318dc2
Adding body to getTotalTime
boergerj Mar 14, 2021
220d0c9
Merge pull request #16 from AvlWx2014/display-statistic-on-report
boergerj Mar 15, 2021
09ec7bf
Reformat and comment controller
boergerj Mar 15, 2021
d83a810
Merge branch 'beta' into total-time-helper
boergerj Mar 15, 2021
2a6ebee
Return record_start_time to previous implementation
boergerj Mar 15, 2021
5a9b7b5
Fix render in record_start_time as to not throw error in console
boergerj Mar 15, 2021
7d93ed7
Fix line spacing
boergerj Mar 15, 2021
6123174
Convert datetime to integer before adding
boergerj Mar 15, 2021
8014807
Improved readability
boergerj Mar 15, 2021
6a01f5a
Add basic helper to convert time in seconds to readable text
boergerj Mar 15, 2021
dba5cd0
Improved Readability
boergerj Mar 15, 2021
da6d512
Use helper functions to display time taken and replace {time_placehol…
boergerj Mar 15, 2021
c11c8df
Display times per round
boergerj Mar 15, 2021
831677f
Fix abbreviation of hour
boergerj Mar 15, 2021
63d7bf0
Remove s for abbreviations
boergerj Mar 15, 2021
c69eaec
Add a database migration to add the total time column
AvlWx2014 Mar 15, 2021
09ef98e
Fix misspelling
AvlWx2014 Mar 15, 2021
eea6c34
Add default value of 0; add not null constraint
AvlWx2014 Mar 15, 2021
f8882e4
Refactor View Code
AvlWx2014 Mar 16, 2021
72e2974
Move one function to the bottom of the block to be consistent
AvlWx2014 Mar 16, 2021
644533e
Minor refactoring; use let vs var to be consistent with other refactors
AvlWx2014 Mar 16, 2021
dbcaddf
Merge pull request #18 from AvlWx2014/total-time-helper
boergerj Mar 16, 2021
ad00584
Add a classes directory and README for justification
AvlWx2014 Mar 16, 2021
9d57b55
Extract LocalStorage out of the view helper
AvlWx2014 Mar 16, 2021
d1adcd9
Reformat according to Ruby Mine style guidelines
AvlWx2014 Mar 16, 2021
ddc137c
More reformatting for readability
AvlWx2014 Mar 16, 2021
06700b7
Fix a bug in the == implementation
AvlWx2014 Mar 16, 2021
308e58f
Remove block of unreachable code
AvlWx2014 Mar 16, 2021
dc5966b
Initial re-implementation of record_start_time
AvlWx2014 Mar 16, 2021
065ec8b
Add some comments
AvlWx2014 Mar 16, 2021
09e85e7
Remove TODO, add more comments
AvlWx2014 Mar 16, 2021
f38207c
Replace URL placeholder and change to POST method
boergerj Mar 16, 2021
6de5398
Add params to ajax call
boergerj Mar 16, 2021
7d6c6cd
Define initial getTimingDetails function in controller
boergerj Mar 16, 2021
9c4b0ef
Pass round to displayTimeDetail()
boergerj Mar 16, 2021
0ea6a89
Add getTimingDetails to routes
boergerj Mar 16, 2021
f024ed7
Layout JSON structure for reseponse
boergerj Mar 16, 2021
c307176
Get all review rows for requested map and round
boergerj Mar 16, 2021
3e64de6
Extract labels for JSON
boergerj Mar 16, 2021
c309bf7
Insert labels into JSON
boergerj Mar 16, 2021
2549178
Print entire JSON for debug
boergerj Mar 16, 2021
54fabdb
Include SubmissionViewingEventHelper in controller
boergerj Mar 16, 2021
ea1c345
Calculate percentage spent per entry
boergerj Mar 16, 2021
e0ced78
Add tables to JSON giving breakdown of times per link
boergerj Mar 16, 2021
a261281
UI variable name fixes
boergerj Mar 16, 2021
bb89bfe
Add total review time to JSON
boergerj Mar 16, 2021
0b7cbb9
Remove debug logging
boergerj Mar 16, 2021
690d997
Add comments
boergerj Mar 16, 2021
1a44975
Merge branch 'beta' into js-refactor
AvlWx2014 Mar 16, 2021
3ecfef7
Debug and fix the UI rendering errors
Hatsukikeika Mar 16, 2021
5c65f0e
Move some functions around to be consistent with ES Lint
AvlWx2014 Mar 16, 2021
bf1fe4e
Implement new record_end_time method
AvlWx2014 Mar 16, 2021
24c7685
Implement hard_save method to replace mark_end_time
AvlWx2014 Mar 16, 2021
b0bfe27
For start_time, use Ruby DateTime and return a 200 status
AvlWx2014 Mar 16, 2021
e8f41bc
fixed issue of missing '>' on time_canvas_handler ln:28
Hatsukikeika Mar 16, 2021
8101e70
fixed issue that total time and total avg cannot be rendered
Hatsukikeika Mar 16, 2021
ef5e2b7
Total field in JSON now text
boergerj Mar 16, 2021
1938ee5
Merge branch 'display-statistic-on-report' of https://github.com/AvlW…
boergerj Mar 16, 2021
0042b4c
Merge pull request #19 from AvlWx2014/updated_database_schema
AvlWx2014 Mar 16, 2021
0ec6cca
Merge pull request #20 from AvlWx2014/UI-controller-functions
boergerj Mar 17, 2021
81d3070
Adjust for loop to use table
boergerj Mar 17, 2021
7d6c48c
Update LocalSubmittedContent
AvlWx2014 Mar 17, 2021
46ba711
Update start_time logic
AvlWx2014 Mar 17, 2021
cfd3471
Merge pull request #21 from AvlWx2014/display-statistic-on-report
Hatsukikeika Mar 17, 2021
56324ce
Add total_time to to_h method. This should shortened somehow.
AvlWx2014 Mar 17, 2021
65d49f7
Add a merge method that will merge the total_time with a viewing event
AvlWx2014 Mar 17, 2021
6db49d9
Add documentation
AvlWx2014 Mar 17, 2021
0744128
Update hard_save
AvlWx2014 Mar 17, 2021
8610986
Merge pull request #17 from AvlWx2014/js-refactor
AvlWx2014 Mar 17, 2021
d1f0edb
Merge branch 'beta' into backend-refactor
AvlWx2014 Mar 17, 2021
6f02173
Add a new request params filter
AvlWx2014 Mar 17, 2021
28a95d2
Extract the bulk of functionality to private functions
AvlWx2014 Mar 17, 2021
0033978
Add an end_round_and_save function
AvlWx2014 Mar 17, 2021
2ab4a02
Add avgClassTime variable
boergerj Mar 17, 2021
2296bb7
Change JSON to only show average class time for entire class
boergerj Mar 17, 2021
9535895
Created getAvgClassTime
boergerj Mar 17, 2021
af07e08
Call getAvgRevTime for JSON creation
boergerj Mar 17, 2021
ec1fb9d
Merge branch 'beta' into UI-controller-functions
boergerj Mar 17, 2021
e5cb2b3
Refactor getTotalTime to remove local variable
boergerj Mar 17, 2021
4a9f472
Refactor getAvgRevTime to use current getTotalTime function
boergerj Mar 17, 2021
3a6c7d4
Refactor to remove local variable from getAvgRevTime
boergerj Mar 17, 2021
fc859ff
Average time now returned in human
boergerj Mar 17, 2021
0df7186
Remove null from table
boergerj Mar 17, 2021
1edab28
Average class time returns integer, not float
boergerj Mar 17, 2021
e487d48
Remove require json call
boergerj Mar 17, 2021
9b4afc9
Adjust comments
boergerj Mar 17, 2021
a945048
Refactor to remove local variable
boergerj Mar 17, 2021
22488ce
Refactor to getTimingDetails to remove local variables
boergerj Mar 17, 2021
4b2c7fe
Finish up controller timing methods
AvlWx2014 Mar 17, 2021
71b1ef3
Format time diff method in a better way
AvlWx2014 Mar 17, 2021
ed0d45c
Add deprecated annotations for clarity for now
AvlWx2014 Mar 17, 2021
d2ff2aa
Extract LocalSubmittedContent to its own file
AvlWx2014 Mar 17, 2021
2faf438
Add new controller methods as routes
AvlWx2014 Mar 17, 2021
2fd0ae3
Add entrypoints for new routes in JS
AvlWx2014 Mar 17, 2021
1869990
Use new timing functions; reformat code in some places
AvlWx2014 Mar 17, 2021
f5e163c
Add logging and attempt to fix errors with timing routes
AvlWx2014 Mar 17, 2021
e5ba328
Attempt to remove clutter in web console
AvlWx2014 Mar 17, 2021
06e52c2
We love remote debugging
AvlWx2014 Mar 17, 2021
dfb5de4
Fix old route names I thought refactor would get
AvlWx2014 Mar 17, 2021
126576e
Out with the old timing event routes and methods
AvlWx2014 Mar 17, 2021
c7f2f08
Rename to endRoundAndSave
AvlWx2014 Mar 18, 2021
edf439d
Go back to using jQuery way instead of stringify
AvlWx2014 Mar 18, 2021
85f5baa
Hopefully fix parameter filters
AvlWx2014 Mar 18, 2021
234860f
Total time now accepts link as an option arg
boergerj Mar 18, 2021
bc19d5c
Attempt to fix parameter filters
AvlWx2014 Mar 18, 2021
ec78790
Refactor secondsToHuman to be more DRY
boergerj Mar 18, 2021
34cbe1d
Fix whitespace that might be causing an issue
AvlWx2014 Mar 18, 2021
f79d171
Refector helper func: Move finding reviews to seperate function
boergerj Mar 18, 2021
4cade81
Fix undefined local variable
AvlWx2014 Mar 18, 2021
6a0f052
Return reviewerTimes array
boergerj Mar 18, 2021
f0203f5
Create seperate functions to get average times for single submission …
boergerj Mar 18, 2021
fcb9a2c
Get median of review times for class
boergerj Mar 18, 2021
55d2e7e
Get standard dev of review times for assignment
boergerj Mar 18, 2021
5c7a05d
Fix undefined locals
AvlWx2014 Mar 18, 2021
8f0a454
Push all class stats into an array for JSON
boergerj Mar 18, 2021
01e52ce
Add stats table to display
boergerj Mar 18, 2021
b66a718
Remove .log statement
boergerj Mar 18, 2021
40f5359
Adjust popup size for new table
boergerj Mar 18, 2021
dd092a3
Add css needed for stat table
boergerj Mar 18, 2021
3f6e0d5
Fix jQuery button references
AvlWx2014 Mar 18, 2021
d13e2c3
Replace leftover markEndTime function
AvlWx2014 Mar 18, 2021
0e1010f
More logging
AvlWx2014 Mar 18, 2021
bc0001f
Fix spelling mistake
AvlWx2014 Mar 18, 2021
ee7f02d
Use @store rather than undefined local
AvlWx2014 Mar 18, 2021
ad13ef9
Explicitly specify actions for before_action filter
AvlWx2014 Mar 18, 2021
90c5a6e
More logging
AvlWx2014 Mar 18, 2021
9149c3e
LocalStorage is being created on every method call
AvlWx2014 Mar 18, 2021
89894e3
Add private attr_accessor for store
AvlWx2014 Mar 18, 2021
558a216
More logging...
AvlWx2014 Mar 18, 2021
243a2af
Fix malformed ifs
AvlWx2014 Mar 18, 2021
7979a84
Fix conditional expressions throughout
AvlWx2014 Mar 18, 2021
0ed6854
Allow Expertiza Review to be capture in end round
AvlWx2014 Mar 18, 2021
47597e4
BugFix: Requires loop as using .where not .find
boergerj Mar 18, 2021
6b1ad30
Fix typo
boergerj Mar 18, 2021
2351970
Add viewing window factory
AvlWx2014 Mar 18, 2021
619f6f4
Try viewing window factory
AvlWx2014 Mar 18, 2021
0207a1c
Merge remote-tracking branch 'origin/backend-refactor' into backend-r…
AvlWx2014 Mar 18, 2021
aefa157
Fix array membership testing
AvlWx2014 Mar 18, 2021
a508d5e
Use file_path rather than link
AvlWx2014 Mar 18, 2021
2a9e0b4
Try console logging on focus and blue
AvlWx2014 Mar 19, 2021
765db5f
Merge pull request #22 from AvlWx2014/UI-controller-functions
Hatsukikeika Mar 19, 2021
ae668b8
Schema update
boergerj Mar 19, 2021
755ed0f
Try timing using focus
AvlWx2014 Mar 19, 2021
39d19e4
Use addEventListener rather than focus and blur
AvlWx2014 Mar 19, 2021
87cdde9
Typo fix
boergerj Mar 19, 2021
7e44c55
We treasure remote debugging
AvlWx2014 Mar 19, 2021
ef61b72
wrap listener code in onload function
AvlWx2014 Mar 19, 2021
1a93898
Wrap this call in $()
AvlWx2014 Mar 19, 2021
1134723
This sucks
AvlWx2014 Mar 19, 2021
5e110e6
MOar remote debugging
AvlWx2014 Mar 19, 2021
24cd100
See if focus will even work in response window
AvlWx2014 Mar 19, 2021
40ca1e4
Trying this straight from MDN
AvlWx2014 Mar 19, 2021
e58a414
Swap timing logic functions
AvlWx2014 Mar 19, 2021
86eb922
Start timer on window load
AvlWx2014 Mar 19, 2021
5bcfbdf
Add logging statement
AvlWx2014 Mar 19, 2021
64ea054
Add checkWindowClosed function to window manager
AvlWx2014 Mar 19, 2021
8d376af
Add all timing code to response.html.erb
AvlWx2014 Mar 19, 2021
75a35ec
Re-instate timing code in _hyperlink and _submitted.
AvlWx2014 Mar 21, 2021
96fe3cc
Remove commented code; Add submit button click handler
AvlWx2014 Mar 21, 2021
d545bec
Move files out of classes; Add require for them in controller
AvlWx2014 Mar 21, 2021
33697bb
Attempt to resolve LoadError
AvlWx2014 Mar 21, 2021
7d17429
Fix require statements
AvlWx2014 Mar 21, 2021
1b1cfb5
Refactor and Docstrings
AvlWx2014 Mar 22, 2021
e88d6f7
Remove unused JS functions
AvlWx2014 Mar 22, 2021
ca63ff6
Remove calls to ExpertizaLogger
AvlWx2014 Mar 22, 2021
8f008bc
remove 2 suffix from request_params
AvlWx2014 Mar 22, 2021
8cb4ed0
Add some comments, and remove some console.log stmts
AvlWx2014 Mar 22, 2021
026af68
Add some comments
AvlWx2014 Mar 22, 2021
18c06a4
Merge branch 'beta' into backend-refactor
AvlWx2014 Mar 22, 2021
b688ca6
Update app/controllers/submission_viewing_events_controller.rb
AvlWx2014 Mar 22, 2021
5f377bf
Update app/controllers/submission_viewing_events_controller.rb
AvlWx2014 Mar 22, 2021
283305b
Update app/controllers/submission_viewing_events_controller.rb
AvlWx2014 Mar 22, 2021
891fd30
Update app/controllers/submission_viewing_events_controller.rb
AvlWx2014 Mar 22, 2021
92e232d
Merge pull request #29 from AvlWx2014/backend-refactor
AvlWx2014 Mar 22, 2021
bde6a9a
Gray out the link if no time data is avaliable
Hatsukikeika Mar 23, 2021
311241d
Update app/views/reports/_review_report.html.erb
Hatsukikeika Mar 23, 2021
74f5176
Merge pull request #31 from AvlWx2014/UI-fix
Hatsukikeika Mar 24, 2021
47200bf
Remove console.log and replace with window.alert
AvlWx2014 Mar 24, 2021
8454f50
Refactor logic to remove nested loop
AvlWx2014 Mar 24, 2021
1463b97
Add missing docstring; Update outdated docstring
AvlWx2014 Mar 24, 2021
eeba67b
Merge branch 'beta' into final-controller-cleanup
AvlWx2014 Mar 24, 2021
ab12080
Remove console log statements in onError callbacks
AvlWx2014 Mar 24, 2021
e29ae22
Remove unused timeHash variable
boergerj Mar 24, 2021
6c6abe1
Use total_time column
boergerj Mar 24, 2021
083d08c
Fix spacing in helper functions
boergerj Mar 24, 2021
2ec41ca
Fix getReviewTimes logic using true/false
boergerj Mar 24, 2021
f5b68f8
Add minimal controller method tests
AvlWx2014 Mar 25, 2021
d4e96ab
Add a LocalStorage instance to tests, make @args instance variable
AvlWx2014 Mar 25, 2021
792697e
Try to fix start_timing test
AvlWx2014 Mar 25, 2021
f552511
Fix tests
AvlWx2014 Mar 25, 2021
9dda87c
Fix bug thanks to unit test
AvlWx2014 Mar 25, 2021
bd4cecc
Trying to write more meaningful tests
AvlWx2014 Mar 25, 2021
0975e14
Fix tests
AvlWx2014 Mar 25, 2021
75ea058
Hopefully fix faililng hard_save test
AvlWx2014 Mar 25, 2021
21f8690
Remove bunk test code
AvlWx2014 Mar 25, 2021
3855c5c
Fix failing test code
AvlWx2014 Mar 25, 2021
a9b1705
Remove render template expectation
AvlWx2014 Mar 25, 2021
c0cf018
Trying to increase coverage
AvlWx2014 Mar 25, 2021
e7689c7
Try adding links before resetting them
AvlWx2014 Mar 25, 2021
da64587
Try to get more coverage for save function
AvlWx2014 Mar 25, 2021
ad43895
Simplify logic for one test case
AvlWx2014 Mar 25, 2021
796c5b1
Merge pull request #32 from AvlWx2014/final-controller-cleanup
AvlWx2014 Mar 25, 2021
e03fd9e
Merge branch 'beta' into update-rspec-tests
AvlWx2014 Mar 25, 2021
61ad377
Attempt using mocks for the getTimingDetails test
AvlWx2014 Mar 25, 2021
da038d8
update tests replacing not_to be_nil
Hatsukikeika Mar 25, 2021
5505783
Remove code starting to try mocks
AvlWx2014 Mar 25, 2021
70cd7f8
Merge pull request #33 from AvlWx2014/working-on-test-LocalStorage
AvlWx2014 Mar 26, 2021
cd9f736
Merge pull request #34 from AvlWx2014/update-rspec-tests
AvlWx2014 Mar 26, 2021
cb19605
Remove unused submission_viewing_events views
AvlWx2014 Mar 26, 2021
ffe2e92
Remove changes to spec_helper per Travis report
AvlWx2014 Mar 26, 2021
847a75f
Add pstore file to .gitignore; this never should have been tracked
AvlWx2014 Mar 26, 2021
e2dcf04
Remove ignored pstore file
AvlWx2014 Mar 26, 2021
f598022
Remove TODO lines to resolve Travis complaints
AvlWx2014 Mar 26, 2021
ef75f9e
Un-do changes to .gitignore since that fails CI for some reason
AvlWx2014 Mar 26, 2021
aa5b938
Remove lingering todo
AvlWx2014 Mar 26, 2021
1670ba2
Kick off a new CI build
AvlWx2014 Mar 26, 2021
5e9b15d
Move local storage to db/ and un-update application.rb
AvlWx2014 Mar 26, 2021
6045c43
Move local storage and associated specs to app/helpers
AvlWx2014 Mar 26, 2021
1052822
Merge branch 'fix-tests' into beta
AvlWx2014 Mar 26, 2021
8d93c13
Add pstore files back to .gitignore
AvlWx2014 Mar 28, 2021
edcbff4
Trigger new Travis build
Mar 31, 2021
4761149
Merge branch 'beta' into beta
johnbumgardner Jun 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