Commit Graph

980 Commits

Author SHA1 Message Date
Ralf Teusner
1004acd1d5 allow numbers to be passed via std.in (numbers are valid json, but crashed when we tried to access them in a hash way. This is now prevented.) 2018-03-01 16:09:29 +01:00
rteusner
635aaae7eb Merge pull request #155 from openHPI/cleanup-rfc-controller
Cleanup RFC controller
2018-02-28 16:34:32 +01:00
Maximilian Grundke
dbb201ccad Clean up controller 2018-02-28 13:58:55 +01:00
Maximilian Grundke
6e022528a0 Move methods to model 2018-02-28 13:41:47 +01:00
Maximilian Grundke
639befe0e5 Position pop-up messages more cleanly 2018-02-28 11:43:47 +01:00
Sebastian Serth
e70897e560 working_docker_image?: Modify behavior to match spec 2018-02-22 17:19:54 +01:00
Sebastian Serth
c6882f9b96 Update Chosen 2018-02-18 23:53:04 +01:00
Sebastian Serth
f5293c4477 Downgrade turbolinks and another bundle update 2018-02-18 19:46:59 +01:00
Ralf Teusner
da23cc22aa add the required integer column and the increment statement when featured 2018-02-02 14:38:28 +01:00
rteusner
c70fbce933 Merge branch 'master' into fix-structured-errors-2 2018-01-31 15:21:48 +01:00
Ralf Teusner
efc271c4ed add column full_score_reached, fill it accordingly and show information in the rfc index 2018-01-31 11:23:30 +01:00
Maximilian Grundke
40fe5c4e69 Save submission alongside structured error 2018-01-30 11:28:29 +01:00
Maximilian Grundke
7768d34275 Fix error detection in run output 2018-01-30 11:08:00 +01:00
Maximilian Grundke
f172f168db Refactor structured error attribute creation 2018-01-30 11:06:17 +01:00
Maximilian Grundke
e51865c561 Lint 2018-01-29 16:18:40 +01:00
Maximilian Grundke
44000d2388 Merge remote-tracking branch 'origin/master' into fix-structured-errors 2018-01-29 12:54:47 +01:00
Ralf Teusner
9234f11eac remove failed option (it is not there yet) 2017-12-05 10:57:11 +01:00
Ralf Teusner
53df8f9d92 correct method call 2017-11-29 16:35:18 +01:00
Ralf Teusner
c62e9f53e5 fixed broken methodname (missing questionmark...) 2017-11-29 16:06:45 +01:00
Maximilian Grundke
32c274d455 Rename attribute and restructure conditions 2017-11-29 10:39:05 +01:00
Ralf Teusner
1369f9285b The .co file of downloaded submissions has to contain the (original) file_id of the respective files, not the "id".
Otherwise, the merge of the files does not work and will result in duplicate files...
2017-11-22 16:20:56 +01:00
Maximilian Grundke
34b2bf9eb1 Fix styling and link to exercise 2017-11-22 13:22:10 +01:00
Maximilian Grundke
23a804a6eb Link to user statistics from feedback 2017-11-20 15:05:25 +01:00
Maximilian Grundke
a9439a4df5 Message for no feedback 2017-11-20 15:01:34 +01:00
Maximilian Grundke
762a8233ab Link to exercise and show exercise description 2017-11-20 14:48:13 +01:00
Maximilian Grundke
2dcaf9d155 Show feedback creation date alongside username 2017-11-20 14:45:42 +01:00
Thomas Hille
8a94905f17 merged with current master 2017-11-16 17:16:22 +01:00
Thomas Hille
851beac4e7 removed == true in condition 2017-11-16 17:11:37 +01:00
Thomas Hille
9733d32665 switched ! to not and && to and 2017-11-15 22:53:18 +01:00
rteusner
951b71780c Merge pull request #129 from ThommyH/removeExpectedWorkingTime
removed expected working time from show/create/index of exercises
2017-11-15 14:26:12 +01:00
rteusner
0a66a5b758 Merge pull request #134 from openHPI/user_exercise_feedback_backend
User exercise feedback backend UI
2017-11-15 14:19:04 +01:00
Ralf Teusner
6161d6caaf clean up code, use method instead of magic constant. 2017-11-15 14:17:55 +01:00
Maximilian Grundke
c5c42ca3bc Show list of feedback messages for specific exercises 2017-11-08 22:31:01 +01:00
Maximilian Grundke
69250901a1 Fix typo 2017-11-08 21:24:46 +01:00
Maximilian Grundke
c4cf11f299 Refactor user redirect after submission 2017-11-08 15:39:04 +01:00
Ralf Teusner
1551498358 Merge branch 'master' into user_exercise_feedback_backend
# Conflicts:
#	app/views/application/_navigation.html.slim
2017-11-01 10:29:43 +01:00
Ralf Teusner
97d8409557 add association between exercise and user_exercise_feedback 2017-11-01 10:14:52 +01:00
Ralf Teusner
08c7154708 removed duplicate logging statement 2017-11-01 10:14:03 +01:00
rteusner
dbd6db69b7 Merge pull request #136 from openHPI/fix-tests
Fix Tests
2017-11-01 10:10:04 +01:00
Maximilian Grundke
04baf6c5d5 Make paths explicit to fix tests 2017-10-26 16:14:40 +02:00
Maximilian Grundke
0bade2c2e7 Fix recommending too difficult questions if user has too low level 2017-10-25 14:05:10 +02:00
Maximilian Grundke
87f280089d Fix return value of logger being assigned to exercise 2017-10-25 12:07:16 +02:00
Thomas Hille
01aad0a4a6 fixed problem in ProxyExercise that caused: ActiveRecord::AssociationTypeMismatch (Exercise(#51937940) expected, got TrueClass(#7943420)): 2017-10-25 11:28:27 +02:00
Ralf Teusner
539b2931c3 changed behaviour of user exercise feedback (max 20 is collected), added some constant for the integers used. 2017-10-25 10:38:27 +02:00
Maximilian Grundke
d162f78b67 Add filters to index page 2017-10-16 11:45:23 +02:00
Maximilian Grundke
74a4313949 Add feedback to navigation 2017-10-16 11:34:57 +02:00
Maximilian Grundke
12b9365e6e Implement show action 2017-10-15 18:55:33 +02:00
Maximilian Grundke
d353dbaf5b Implement index action. Repair destroy 2017-10-15 18:23:58 +02:00
Maximilian Grundke
9bebbe9a6c Merge remote-tracking branch 'origin/master' into error-info
# Conflicts:
#	app/controllers/concerns/submission_scoring.rb
#	app/views/application/_navigation.html.slim
#	config/locales/de.yml
#	config/locales/en.yml
#	db/schema.rb
2017-10-15 17:02:19 +02:00
Thomas Hille
577f157996 extracted number of interventions per exercise into own variable 2017-10-04 16:51:41 +02:00