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

631 Commits

Author SHA1 Message Date
Tom Staubitz
59f2ff436e removed url helper from model 2017-01-18 13:35:18 +01:00
Tom Staubitz
3a07e7d5f6 Updated nokogiri 2017-01-13 13:46:36 +01:00
Tom Staubitz
e634caf408 fixing tests final nice-up 2017-01-13 11:11:15 +01:00
Tom Staubitz
6bf73757ae fixing tests p3 2017-01-13 09:56:36 +01:00
Tom Staubitz
4af24d4317 fixing tests p2 lti_spec tests all passed 2017-01-13 00:37:07 +01:00
Tom Staubitz
5fe12bfa78 fixing tests p1 2017-01-12 18:12:36 +01:00
Tom Staubitz
e4daa7ece3 only destroy LTI_parameter when exercise is submitted 2017-01-12 16:03:30 +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
edb813ab14 added separate value for the actual external_id of the external user. 2016-12-31 00:58:36 +01:00
Tom Staubitz
f318c62818 session[:external_user_id] has a somewhat misleading name. 
As the tests fail however, when the value that  fits the name is entered, I switched it back to the old version.
 2016-12-31 00:51:07 +01:00
Tom Staubitz
ca28e0aa87 updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5 
@Ralf
TODO: migration /Users/groucho/Documents/HPI/workspace/Xikolo-CodeOcean/codeocean/db/migrate/20160204111716_add_user_to_code_harbor_link.rb
is broken. A reference is made to table users which does not exist.
Workaround: run rake db:schema:load before running db:migrate. Still this should be fixed.
 2016-12-31 00:05:23 +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
6f1d8b2d38 Marked more locations that might require to be changed when we switch from session to LtiParameters Object 2016-12-27 07:48:59 +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
0a795b521f only show RFCs that have a question set 2016-12-19 18:30:06 +01:00
Ralf Teusner
a03d604861 fix points rounding in results view, clear results view on new scoring attempt. 2016-12-19 18:29:33 +01:00
Tom Staubitz
44380c0cc1 added model for lti_parameters 2016-12-14 15:53:16 +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
40b386662c made loading of config values more fault tolerant. 2016-11-24 11:56:53 +01:00
Ralf Teusner
84b9b4a622 only send learning analytics events when specified in config. 2016-11-23 17:06:14 +01:00
Ralf Teusner
d9cc9d17cf remove already merged files. All content is now in participantsupport.js.erb 2016-11-23 16:26:17 +01:00
Ralf Teusner
f65b1b3991 remove old comment... 2016-11-23 16:19:20 +01:00
Ralf Teusner
f2db88f952 Merge branch 'master' into travis-green-docker 
took all the newer versions. Only thing I deleted is the part #to pass the test "it executes the run command" ...
We need to shortly discuss this yqbk.

Conflicts:
	lib/docker_client.rb
 2016-11-09 18:25:02 +01:00
Ralf Teusner
1511941d3d Merge branch 'master' into editor-frontend-refactor 
Conflicts:
	codeocean-dockerconfig.md
 2016-11-09 18:00:40 +01:00
Ralf Teusner
ff7446fde6 redirect to RFCs on max score: redirect users to their own RFCs if they are open, fixed wrong usage of user_id (external_id is not used in RFCs, normal id has to be used!). 2016-11-09 17:58:10 +01:00
Ralf Teusner
b0ceeea650 fix retrieval of relative_url_root also for other calls. 2016-10-28 17:22:31 +02:00
Ralf Teusner
181578ca87 change call to retrieve relative_url_root 2016-10-28 17:13:21 +02:00
yqbk
c937a1a9ef clean pull request 2016-10-24 23:02:44 +02:00
Ralf Teusner
ac88956d27 Put blocking score submission call into a thread to keep the puma server responsive 2016-10-12 18:15:16 +02: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
4cf192d0f3 fix wrong link in refactor, since "this" is no longer available in javascript calls. 2016-10-12 14:37:09 +02:00
yqbk
1945a47109 apply changes after review 2016-10-11 12:44:16 +02:00
yqbk
44aca293e9 make travis green again 2016-10-08 20:37:20 +02:00
Ralf Teusner
1dfd6f61dc some more relative url roots in editor_edit, removed javascript uglifying for staging, added debug message for docker websocket connection url. 
added doku for setting up docker daemon for codeocean
 2016-10-07 14:16:24 +02:00
Ralf Teusner
59119e43d5 added relative_url_root to some more javascript calls (ace file path, file template path). 2016-10-06 16:32:20 +02:00
Ralf Teusner
58dac37d77 added relative_url_root to URL for websocket call, needed for staging server 2016-10-06 16:14:51 +02:00
Ralf Teusner
d26a0fa6a4 Enhance codeocean events with user agent and external-id if present 2016-09-27 17:56:16 +02:00
Alexander Kastius
31c4f4b608 FIxed typo. 2016-09-09 18:10:08 +02:00
Alexander Kastius
70040b3c6b Reordered everything again. 2016-09-09 18:08:41 +02:00
Alexander Kastius
87d1b2388d Moved codepilot into dedicated file. 
Renamed prompt.js
Moved requestComments out of flowr.js
 2016-09-09 17:24:04 +02:00
Alexander Kastius
493bf98850 Removed unused functions. 2016-09-09 17:17:54 +02:00
Alexander Kastius
6ff3d36809 Fixed container-ending on exit. 2016-09-09 17:06:30 +02:00
Alexander Kastius
3fd43fdee2 Sending command 'client_kill' on stop button click now. 
Killing a container only if command client_kill was send.
Moved propmpt to prompt.js
 2016-09-09 16:41:20 +02:00
Ralf Teusner
2b621e2de6 some more code cleanup and UI optimizations 2016-09-09 16:10:43 +02:00
Ralf Teusner
542ec78076 remove some more tab code not used any longer. 2016-09-09 15:43:50 +02:00
Ralf Teusner
46cb071503 remove code that showed tabs and leftovers of serversend events (runmode) 2016-09-09 15:40:53 +02:00