Commit Graph

930 Commits

Author SHA1 Message Date
ad29551bb4 added code to test bonus exercise with different descriptions. 2017-03-30 16:54:22 +02:00
d4a9df709a quickfixed not working Exercise.accumulated_working_time_for_only(user) 2017-03-30 15:02:44 +02:00
15c0020f8c Merge pull request #102 from ThommyH/ignoreDummyExerciseForRecommendation
ignore dummy exercise in recommendation
2017-03-28 13:53:25 +02:00
80f8bddab1 Merge pull request #103 from ThommyH/fixWorkingTimeCalculation
Fix working time calculation
2017-03-28 13:53:03 +02:00
c8609ffa81 improved quantile calculation by using only times until user has reached max points 2017-03-28 12:29:36 +02:00
b9e93a5b21 fixed accumulated_working_time_for_only in exercise 2017-03-28 12:13:47 +02:00
e1f1134992 ignore dummy exercise in recommendation 2017-03-28 11:51:51 +02:00
d6a25b8496 do now assign dummy exercise to random group 2017-03-27 18:52:44 +02:00
4fab791e7f Update submissions_controller.rb 2017-03-27 15:52:06 +02:00
bdbc372c0c fixed saving run results. also fixed websocket closing. 2017-03-24 18:47:30 +01:00
5aeda988b7 Merge branch 'master' into save-run-results 2017-03-24 16:15:07 +01:00
f1a9b0613f remove puts 2017-03-24 14:11:08 +01:00
a7effa7eb3 do now show intervention message for rfc modal if clicked on the button 2017-03-24 14:07:24 +01:00
7f6c433fe8 fixed time for interventions 2017-03-24 12:17:18 +01:00
ef5ebc3b69 splitted user in groups for assigning bonus exercises 2017-03-24 12:14:53 +01:00
4798ffcfcf - added abc group separator class to split users into different groups for testing proxy exercises and interventions
- shows 2 interventions per user and exercise max now
- only show break or rfc intervention to user
2017-03-23 18:52:46 +01:00
0930cba095 changed position of saving the run output, so it catches timeouts as well 2017-03-23 14:12:26 +01:00
028876da60 fix javascript for autosave on beginning 2017-03-23 14:08:37 +01:00
a142e1c73f save messages returned from runs 2017-03-22 17:30:20 +01:00
c13c169657 creates an autosave submission on opening of the editor. otherwise we lose track of the time between opening the exercise and the first submission 2017-03-22 15:07:13 +01:00
f10af1f45b Merge pull request #93 from ThommyH/fixing_searches
search is now saved asynchron and without a form
2017-03-22 10:10:44 +01:00
7c986f2de7 fixed problem that no new files could be added to an exercise 2017-03-21 17:35:46 +01:00
b05bb27ed9 search is now saved asynchron and without a form which caused some redirection through searches_controller
added asynchronous save of search, removed searches_controller,
2017-03-21 14:37:32 +01:00
4a9867b81b only show search if parameters are set, prevent calls on nil.. 2017-03-21 12:16:39 +01:00
d1d948c71e replaced ticks with string concatenation. Ticks are not possible, since execjs can't handle them. 2017-03-21 11:48:05 +01:00
5729a3ba5e removed this.resizeAceEditors() since it was only a test 2017-03-21 11:34:57 +01:00
26e93c4b23 changed puts methods in proxy_exercise.rb to Rails.logger.debug. also changed Rails.logger.info to Rails.logger.debug 2017-03-21 11:25:11 +01:00
76583d8082 final fix matching 2017-03-21 10:31:45 +01:00
3dfecc3ca8 fix course token parsing 2017-03-21 10:31:45 +01:00
2284c2c28b fixed lti course token parsing 2017-03-21 10:31:45 +01:00
8b67a70546 commenting, improved readability 2017-03-21 10:31:45 +01:00
12adfde6c2 search bar now searches in forum of the course from where the LTI request came from. alternatively searches in the java 2017 course.
show interventions only in the current java course
2017-03-21 10:31:45 +01:00
4f5c936dd6 changed formulas for demising return 2017-03-21 10:31:45 +01:00
1eda266159 fixed calculation of time until intervention pops up 2017-03-21 10:31:45 +01:00
f1bf313280 changed times for rfc and break intervention to minimum 15 and 20 minutes. roc modal shows some additional text to the modal for less confusion 2017-03-21 10:31:33 +01:00
bd0721da2e deleted search modal. reused roc modal for search modal. also added translations 2017-03-21 10:31:33 +01:00
325c44c1fb added finishing return value in proxy exercise 2017-03-21 10:31:33 +01:00
530916d3ef added time of user to reach max score in exercise 2017-03-21 10:31:33 +01:00
c1209e4972 added translation for search bar 2017-03-21 10:31:33 +01:00
9761dd0a2a improved search bar and search button.
added button to collapsed sidebar
2017-03-21 10:31:33 +01:00
7ef318713b added reason vor proxy exercise 2017-03-21 10:31:33 +01:00
a481ec0da8 always show search on left side. placeholder in search input 2017-03-21 10:31:33 +01:00
0e2a22df42 texte angepasst 2017-03-21 10:31:33 +01:00
eb0c79a043 added search bar to the side col 2017-03-21 10:31:33 +01:00
5d2eb6f381 fixed search in firefox 2017-03-21 10:31:33 +01:00
5b50deb70d split intervention modal into 2 separate modals 2017-03-21 10:31:33 +01:00
695b8946f6 added search intervention. search opens new tab with search in the java course (at least in chrome)
send only 3 interventions per exercise at maximum
2017-03-21 10:31:33 +01:00
17d09accb7 only show interventions if condition is met. right now, only show one intervention per user and exercise 2017-03-21 10:31:33 +01:00
9c4b981bcb removed unnecessary stuff in Ajax 2017-03-21 10:31:33 +01:00
3cc5695281 modal angepasst 2017-03-21 10:31:33 +01:00