rteusner
|
aa8e9c9667
|
Merge pull request #94 from ThommyH/fix_proxyexercise
added missing proxyexercise which caused problems when recommending e…
|
2017-03-22 10:10:53 +01:00 |
|
rteusner
|
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 |
|
rteusner
|
6fc3d371af
|
Merge pull request #95 from ThommyH/quickfixFileAdding
quickfixed problem that no new files could be added to an exercise
|
2017-03-22 10:10:33 +01:00 |
|
Thomas Hille
|
8dad3a68e7
|
removed searches route
|
2017-03-22 10:06:40 +01:00 |
|
Thomas Hille
|
7c986f2de7
|
fixed problem that no new files could be added to an exercise
|
2017-03-21 17:35:46 +01:00 |
|
Thomas Hille
|
dbfff77a40
|
added missing proxyexercise which caused problems when recommending exercises
|
2017-03-21 16:14:49 +01:00 |
|
Thomas Hille
|
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 |
|
Ralf Teusner
|
4a9867b81b
|
only show search if parameters are set, prevent calls on nil..
|
2017-03-21 12:16:39 +01:00 |
|
Ralf Teusner
|
10bcfc998c
|
update schema.rb
|
2017-03-21 12:15:50 +01:00 |
|
Ralf Teusner
|
d1d948c71e
|
replaced ticks with string concatenation. Ticks are not possible, since execjs can't handle them.
|
2017-03-21 11:48:05 +01:00 |
|
rteusner
|
12323e165f
|
Merge pull request #91 from openHPI/RecommendingExercises
Recommending exercises
|
2017-03-21 11:36:58 +01:00 |
|
Thomas Hille
|
5729a3ba5e
|
removed this.resizeAceEditors() since it was only a test
|
2017-03-21 11:34:57 +01:00 |
|
Thomas Hille
|
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 |
|
Thomas Hille
|
76583d8082
|
final fix matching
|
2017-03-21 10:31:45 +01:00 |
|
Thomas Hille
|
3dfecc3ca8
|
fix course token parsing
|
2017-03-21 10:31:45 +01:00 |
|
Thomas Hille
|
2284c2c28b
|
fixed lti course token parsing
|
2017-03-21 10:31:45 +01:00 |
|
Thomas Hille
|
8b67a70546
|
commenting, improved readability
|
2017-03-21 10:31:45 +01:00 |
|
Thomas Hille
|
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 |
|
Thomas Hille
|
4f5c936dd6
|
changed formulas for demising return
|
2017-03-21 10:31:45 +01:00 |
|
Thomas Hille
|
1eda266159
|
fixed calculation of time until intervention pops up
|
2017-03-21 10:31:45 +01:00 |
|
Thomas Hille
|
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 |
|
Thomas Hille
|
bd0721da2e
|
deleted search modal. reused roc modal for search modal. also added translations
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
325c44c1fb
|
added finishing return value in proxy exercise
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
530916d3ef
|
added time of user to reach max score in exercise
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
c1209e4972
|
added translation for search bar
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
9761dd0a2a
|
improved search bar and search button.
added button to collapsed sidebar
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
7ef318713b
|
added reason vor proxy exercise
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
a481ec0da8
|
always show search on left side. placeholder in search input
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
0e2a22df42
|
texte angepasst
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
eb0c79a043
|
added search bar to the side col
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
5d2eb6f381
|
fixed search in firefox
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
5b50deb70d
|
split intervention modal into 2 separate modals
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
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 |
|
Thomas Hille
|
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 |
|
Thomas Hille
|
9c4b981bcb
|
removed unnecessary stuff in Ajax
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
3cc5695281
|
modal angepasst
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
350913de79
|
fixed LTI Spec
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
904868394a
|
added interventions being saved once they are fired
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
bfc96328c4
|
added interventions back to code. added post method to be able to save interventions
|
2017-03-21 10:31:33 +01:00 |
|
Thomas Hille
|
3d7f5bdf1a
|
added intervention controller and stuff
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
2456f46b2b
|
changed name of intervention modal, timer in editor.js set text now. some time calculations in editor for interventions
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
b82018dd8f
|
changed some variable names
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
2caf4b123e
|
added intervention modals back into editor.js and html
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
b41a858762
|
changed way working times are returned. builtin protection if exercise is new
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
1f141f440a
|
added fallback to recommendation if something went completely wrong
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
355e8af14b
|
privatized methods in proxy_exercise
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
66a2d8c992
|
minor change
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
7a61d5a983
|
tests
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
1eea3fab4c
|
lots of renaming to _ names instead of camelCase
|
2017-03-21 10:31:32 +01:00 |
|
Thomas Hille
|
f63b9eeb3c
|
added that users would only get exercises recommended which are max 1 level more difficult
|
2017-03-21 10:31:32 +01:00 |
|