htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,118 Commits 2 Branches 0 Tags
2d5125dfa23b192e978f1a775cc65219929024e5
Commit Graph

308 Commits

Author SHA1 Message Date
Tom Staubitz
59f2ff436e removed url helper from model 2017-01-18 13:35:18 +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
41a61a8507 Fixed the destroy session logic. 
1. an exercise_id is provided ==> only the LtiParameter object for the current user, consumer, and exercise is deleted.
2. no exercise_id is provided ==> external user and consumer are removed from the session, all LtiParameter objects for this user and consumer are deleted.

This enables users to have several tabs with exercises open and submitting the results to the tool consumer.
When an exercise has been submitted, the user cannot use the back button to get back to CodeOcean and work on the submitted or any other exercise.
For now a warning has been added to the info text to tell users not to do this. (As the LtiParameters have been deleted, the points can no more be submitted to the consumer.)
@TODO disable/redirect back button?
 2016-12-31 17:21:46 +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
80e3453395 Merge branch 'master' into lti_param_model 2016-12-27 00:16:32 +01:00
Tom Staubitz
f4c01879bf preparations to replace session with lti_parameters object 2016-12-27 00:13:41 +01:00
Ralf Teusner
802502935e removed debug statement... 2016-12-20 16:08:08 +01:00
Ralf Teusner
1108f954ba show admin menu on RFC page for admins 2016-12-19 18:30:39 +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
yqbk
6a6ed9f453 separate editor for each file 2016-08-15 16:06:15 +02:00
yqbk
aa254366db adjustments in file form 2016-08-15 15:39:42 +02:00
yqbk
2c23d96fae split code between editors 2016-08-12 16:43:19 +02:00
yqbk
31b0c3ba25 Ace editor for each file form 2016-08-12 15:29:06 +02:00
Ralf Teusner
728489c2fb refactor initTurtle, hiding and showing of canvas. 2016-08-12 14:41:20 +02:00
yqbk
37f4e501c5 Merge remote-tracking branch 'origin/master' into ace-editor-exercise-edit 2016-08-12 13:23:02 +02:00
Ralf Teusner
6e6c9143cd Some tidy up in request for comments (bugfix: removed leftover parts of requested_at attribute, some UI changes in comment dialog) 
Redirect to open rfc if an exercise has been solved
 2016-08-11 18:13:33 +02:00
rteusner
c4a9cd88d8 Merge pull request #78 from openHPI/admin-sumbission-remove 
[WIP]Admin sumbission remove
 2016-08-04 16:35:26 +02:00