Commit Graph

605 Commits

Author SHA1 Message Date
58f76f53e6 added a search for request_for_comments.
fixed translation of model for request_for_comments
2017-04-03 19:49:03 +02:00
73a7d9ef4d Merge pull request #110 from ThommyH/reduceInterventionAmount
do not show interventions on solved exercises, reduce to 2 interventions per day
2017-04-03 18:52:51 +02:00
686abd6fe0 3 interventions per day 2017-04-03 18:52:17 +02:00
5a099a42b8 changed working time calculation to only consider submissions within 5 minutes instead of 30 2017-04-03 18:09:30 +02:00
392dd77b4a do not show interventions on solved exercises
do not show more than 2 interventions per day
2017-04-03 17:17:34 +02:00
ce2823e871 restrict name to be set to lis_person_name_full (should be display name) or to lis_person_name_given (should be first name).
don't use xikolo api any longer for consumer openHPI, use the values in CodeOcean.
2017-04-03 15:26:02 +02:00
3f398c6047 add feedback for exercises 2017-03-30 22:06:17 +02:00
ed485f32e6 change mail sending 2017-03-30 19:02:09 +02:00
4fab791e7f Update submissions_controller.rb 2017-03-27 15:52:06 +02:00
bdbc372c0c fixed saving run results. also fixed websocket closing. 2017-03-24 18:47:30 +01:00
5aeda988b7 Merge branch 'master' into save-run-results 2017-03-24 16:15:07 +01:00
f1a9b0613f remove puts 2017-03-24 14:11:08 +01:00
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
0930cba095 changed position of saving the run output, so it catches timeouts as well 2017-03-23 14:12:26 +01:00
a142e1c73f save messages returned from runs 2017-03-22 17:30:20 +01:00
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
4a9867b81b only show search if parameters are set, prevent calls on nil.. 2017-03-21 12:16:39 +01:00
76583d8082 final fix matching 2017-03-21 10:31:45 +01:00
3dfecc3ca8 fix course token parsing 2017-03-21 10:31:45 +01:00
2284c2c28b fixed lti course token parsing 2017-03-21 10:31:45 +01:00
8b67a70546 commenting, improved readability 2017-03-21 10:31:45 +01:00
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
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
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
904868394a added interventions being saved once they are fired 2017-03-21 10:31:33 +01:00
bfc96328c4 added interventions back to code. added post method to be able to save interventions 2017-03-21 10:31:33 +01:00
3d7f5bdf1a added intervention controller and stuff 2017-03-21 10:31:32 +01:00
b82018dd8f changed some variable names 2017-03-21 10:31:32 +01:00
b41a858762 changed way working times are returned. builtin protection if exercise is new 2017-03-21 10:31:32 +01:00
1eea3fab4c lots of renaming to _ names instead of camelCase 2017-03-21 10:31:32 +01:00
d5b2ea4269 added proxy exercise dispatching to LTI module. Submissions now set user before the exercise token gets validated. this we need to set the exercise behind the proxy exercise 2017-03-21 10:31:32 +01:00
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
9b8027e4c0 replaced exit-command for containers from 'exit' to '#exit', otherwise it will always really exit the container (which is then in state: exited) if we execute it in bash. 2017-02-14 13:35:21 +01:00
a52b27bb59 render html and or markdown for feedback messages 2017-02-08 16:19:41 +01:00
4d314317ae parse target url to .co file, update remote scripts 2017-02-03 09:13:59 +01:00
3562aa9103 create remote evaluation 2017-02-02 18:14:33 +01:00
3a07e7d5f6 Updated nokogiri 2017-01-13 13:46:36 +01:00
6bf73757ae fixing tests p3 2017-01-13 09:56:36 +01:00
4af24d4317 fixing tests p2 lti_spec tests all passed 2017-01-13 00:37:07 +01:00
5fe12bfa78 fixing tests p1 2017-01-12 18:12:36 +01:00
e4daa7ece3 only destroy LTI_parameter when exercise is submitted 2017-01-12 16:03:30 +01:00
dd4c789fed replaced session_paramerters with server params for security reasons
cleaned up comments
2017-01-12 15:10:34 +01:00
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
edb813ab14 added separate value for the actual external_id of the external user. 2016-12-31 00:58:36 +01:00
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
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
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
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
80e3453395 Merge branch 'master' into lti_param_model 2016-12-27 00:16:32 +01:00
f4c01879bf preparations to replace session with lti_parameters object 2016-12-27 00:13:41 +01:00