htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,066 Commits 2 Branches 0 Tags
289f98496f1cee5720b4548c8c29c6b91d37f79c
Commit Graph

409 Commits

Author SHA1 Message Date
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
bd0721da2e deleted search modal. reused roc modal for search modal. also added translations 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
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
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
904868394a added interventions being saved once they are fired 2017-03-21 10:31:33 +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
2caf4b123e added intervention modals back into editor.js and html 2017-03-21 10:31:32 +01:00
Thomas Hille
0db11884bc Extended Exercises by worktime, difficulty and tags, added ProxyExercises as prework for recommendations 
Tags can be added to exercises in the edit view. Tags can monitored under /tags.
Added the concept of ProxyExercises which are a collection of Exercises. They can be found under /proxy_exercises
Added Interventions as prework to show interventions later to the user.
Added exercise/[:id]/working_time to return the working time of the user in this exercise and the average working time of all users in this exercise
 2017-03-21 10:31:32 +01:00
Tom Staubitz
5fe12bfa78 fixing tests p1 2017-01-12 18:12:36 +01:00
Tom Staubitz
dd4c789fed replaced session_paramerters with server params for security reasons 
cleaned up comments
 2017-01-12 15:10:34 +01:00
Tom Staubitz
325ea25849 Replaced session[:lti_parameters] with proper LtiParameter object. 
Removed all tests that would be failing

TODO: decision if all LtiParameter objects for a certain user/consumer will be deleted when the user/consumer is deleted from the session, or only the LtiParameter object for the current exercise of the user/consumer.

TODO: replace removed tests with proper tests
 2016-12-30 09:45:39 +01:00
Tom Staubitz
f4c01879bf preparations to replace session with lti_parameters object 2016-12-27 00:13:41 +01:00
Ralf Teusner
5b00f41c10 Fix request for comments. Scope of the function call was incorrect, and the correct cause was not passed to the rails and the database afterwards. This is both fixed now. 2016-12-02 15:25:54 +01:00
Ralf Teusner
accf0550d7 reworked the exercise edit dialog. Moved javascript part from editor_edit.js.erb to exercises.js.erb. 
Manipulated some further javascript as necessary. It is not super elegant, but this is due to the former structure of the code which uses cloned dummy forms.
Integrating the ace editor made some strange calls necessary.
Also fixed toggling the input area and the file upload dialog
 2016-10-12 16:35:21 +02:00
Ralf Teusner
d26a0fa6a4 Enhance codeocean events with user agent and external-id if present 2016-09-27 17:56:16 +02:00
Ralf Teusner
2b621e2de6 some more code cleanup and UI optimizations 2016-09-09 16:10:43 +02:00
Ralf Teusner
77452e6c2b move progress into sidebar 2016-09-09 15:40:09 +02:00
Ralf Teusner
0f76b1cb90 Merge branch 'master' into editor-frontend-refactor 
Conflicts:
	app/assets/javascripts/editor.js.erb
---> kept refactored one
 2016-09-09 14:17:42 +02:00
Alexander Kastius
8fe9303288 Merge pull request #80 from openHPI/recommend_request_for_comment 
Some tidy up in request for comments (bugfix: removed leftover parts …
 2016-09-09 14:12:47 +02:00
Alexander Kastius
952cc5ec24 Moved buttons to the top. 2016-09-09 13:21:51 +02:00
Ralf Teusner
8f499b72da Feature: Auto-Completion in Source Code 
+ allow flags for exercises
 2016-09-07 17:34:20 +02:00
Ralf Teusner
b8da4dea17 Merge branch 'master' into editor-frontend-refactor 
Conflicts:
	app/assets/javascripts/editor.js.erb
	app/views/exercises/implement.html.slim
 2016-09-02 15:04:18 +02:00
Ralf Teusner
ddaed5929b Naming of sidebars 2016-09-01 18:47:16 +02:00
Alexander Kastius
c2bdcc7915 Added more height! 2016-09-01 17:54:04 +02:00
Alexander Kastius
f170fee6a9 Replaced hr with enforced margin. 2016-09-01 17:49:59 +02:00
Alexander Kastius
1670839ecf Fixed part of prompt. 2016-09-01 17:41:00 +02:00
Alexander Kastius
11d284b166 Disabled file tree and collapsed sidebar when filetree should be disabled. 2016-09-01 17:31:18 +02:00
Ralf Teusner
1f159ce0bd some cleanup, 
reducing size of questions sidebar
 2016-09-01 16:48:55 +02:00
Alexander Kastius
e42330cf1b Added tooltip to request-comments button. 
Added locale for all new texts.
 2016-09-01 16:27:40 +02:00
Alexander Kastius
0ca1cbaa14 Fixed file-creation-modal 2016-09-01 15:41:56 +02:00
Alexander Kastius
858bbdab95 Fixed button. 2016-09-01 15:34:54 +02:00
Alexander Kastius
b24db1dca0 Toggle description 
Tooltips fixed
Buttons moved
 2016-09-01 15:23:58 +02:00
Alexander Kastius
fc1266d0d1 Added tooltips to sidebar buttons. 2016-09-01 14:35:08 +02:00
Alexander Kastius
dca26cf237 Refactored frontend. 
Moved output to editor tab.
Added collapse function to sidebar.
 2016-09-01 10:49:55 +02:00
Ralf Teusner
21699952ff some renaming 2016-08-29 13:00:12 +02:00
yqbk
8abc0bb15a cleanup 2016-08-26 13:22:16 +02:00
yqbk
112a8bde42 done 2016-08-26 13:19:39 +02:00
yqbk
e17782b18d done 2016-08-26 13:16:38 +02:00
yqbk
0b6dc5e409 Merge branch 'master' into ace-editor-exercise-edit 2016-08-26 11:41:07 +02:00
yqbk
cba44680ef save properly 2016-08-26 11:38:17 +02:00
yqbk
f757737606 fields for instead form for (solved problem with sibmission button) 2016-08-26 11:37:57 +02:00
yqbk
12cec1ac22 fields for instead form for (solved problem with sibmission button) 2016-08-24 14:08:07 +02:00
yqbk
7bead2c473 implementation ready for testing 2016-08-17 15:53:16 +02:00
yqbk
476188990f separate file for editor in edit view 2016-08-17 15:37:36 +02:00
yqbk
9a47f126e4 routing error 2016-08-17 13:50:01 +02:00