Commit Graph

1217 Commits

Author SHA1 Message Date
Ralf Teusner
6c77b0743d updated schema with indexes. 2017-03-24 18:48:02 +01:00
rteusner
114f3799c8 Merge pull request #100 from ThommyH/seperate_user_in_ABC
Seperate user in groups for experiment in OOP2017
2017-03-24 15:42:13 +01:00
rteusner
18bd8072cc Merge pull request #98 from ThommyH/add_index_submissions
added index to submissions for better performance in recommending exe…
2017-03-24 15:31:17 +01:00
Thomas Hille
f1a9b0613f remove puts 2017-03-24 14:11:08 +01:00
Thomas Hille
a7effa7eb3 do now show intervention message for rfc modal if clicked on the button 2017-03-24 14:07:24 +01:00
Thomas Hille
7f6c433fe8 fixed time for interventions 2017-03-24 12:17:18 +01:00
Thomas Hille
94a4937854 removed puts 2017-03-24 12:15:41 +01:00
Thomas Hille
ef5ebc3b69 splitted user in groups for assigning bonus exercises 2017-03-24 12:14:53 +01:00
Thomas Hille
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
Ralf Teusner
47693cd62f revert fixes for IE, it made the banners invisible for all other browsers, too. 2017-03-23 18:17:14 +01:00
Thomas Hille
4ff600ff45 added index to submissions for better performance in recommending exercises 2017-03-23 14:10:09 +01:00
Ralf Teusner
420d8b3844 minor wording changes in locale for german beak intervention 2017-03-23 14:09:11 +01:00
Ralf Teusner
028876da60 fix javascript for autosave on beginning 2017-03-23 14:08:37 +01:00
rteusner
2663142013 Merge pull request #96 from ThommyH/add_autosave_on_open
creates an autosave submission on opening of the editor.
2017-03-22 15:19:09 +01:00
Thomas Hille
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
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