Commit Graph

1763 Commits

Author SHA1 Message Date
53df8f9d92 correct method call 2017-11-29 16:35:18 +01:00
c62e9f53e5 fixed broken methodname (missing questionmark...) 2017-11-29 16:06:45 +01:00
32c274d455 Rename attribute and restructure conditions 2017-11-29 10:39:05 +01:00
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
34b2bf9eb1 Fix styling and link to exercise 2017-11-22 13:22:10 +01:00
23a804a6eb Link to user statistics from feedback 2017-11-20 15:05:25 +01:00
a9439a4df5 Message for no feedback 2017-11-20 15:01:34 +01:00
762a8233ab Link to exercise and show exercise description 2017-11-20 14:48:13 +01:00
2dcaf9d155 Show feedback creation date alongside username 2017-11-20 14:45:42 +01:00
8a94905f17 merged with current master 2017-11-16 17:16:22 +01:00
851beac4e7 removed == true in condition 2017-11-16 17:11:37 +01:00
9733d32665 switched ! to not and && to and 2017-11-15 22:53:18 +01:00
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
0a66a5b758 Merge pull request #134 from openHPI/user_exercise_feedback_backend
User exercise feedback backend UI
2017-11-15 14:19:04 +01:00
6161d6caaf clean up code, use method instead of magic constant. 2017-11-15 14:17:55 +01:00
c5c42ca3bc Show list of feedback messages for specific exercises 2017-11-08 22:31:01 +01:00
69250901a1 Fix typo 2017-11-08 21:24:46 +01:00
c4cf11f299 Refactor user redirect after submission 2017-11-08 15:39:04 +01:00
1551498358 Merge branch 'master' into user_exercise_feedback_backend
# Conflicts:
#	app/views/application/_navigation.html.slim
2017-11-01 10:29:43 +01:00
97d8409557 add association between exercise and user_exercise_feedback 2017-11-01 10:14:52 +01:00
08c7154708 removed duplicate logging statement 2017-11-01 10:14:03 +01:00
dbd6db69b7 Merge pull request #136 from openHPI/fix-tests
Fix Tests
2017-11-01 10:10:04 +01:00
04baf6c5d5 Make paths explicit to fix tests 2017-10-26 16:14:40 +02:00
0bade2c2e7 Fix recommending too difficult questions if user has too low level 2017-10-25 14:05:10 +02:00
87f280089d Fix return value of logger being assigned to exercise 2017-10-25 12:07:16 +02:00
01aad0a4a6 fixed problem in ProxyExercise that caused: ActiveRecord::AssociationTypeMismatch (Exercise(#51937940) expected, got TrueClass(#7943420)): 2017-10-25 11:28:27 +02:00
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
d162f78b67 Add filters to index page 2017-10-16 11:45:23 +02:00
74a4313949 Add feedback to navigation 2017-10-16 11:34:57 +02:00
12b9365e6e Implement show action 2017-10-15 18:55:33 +02:00
d353dbaf5b Implement index action. Repair destroy 2017-10-15 18:23:58 +02:00
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
577f157996 extracted number of interventions per exercise into own variable 2017-10-04 16:51:41 +02:00
f7e013ed89 allow only one intervention per user and exercise but 3 interventions per user and day 2017-10-04 16:47:25 +02:00
e52c9213a1 try to activate interpretation of carriage return 2017-10-04 16:42:42 +02:00
b078cddc68 enhance testrun output 2017-10-04 16:18:24 +02:00
f4506dcaad Merge pull request #131 from openHPI/fix-empty-question-in-rfc
Fix empty questions in new RFC UI
2017-10-04 15:44:12 +02:00
85ee40f118 Merge pull request #130 from openHPI/exercise-collections-ui
Exercise Collections UI
2017-10-04 15:43:01 +02:00
ee5825c71b Order exercises in form 2017-10-04 15:42:33 +02:00
2582f55b1e Add navigation link to exercise collections 2017-10-04 14:12:54 +02:00
e7adb00dc1 Fix empty questions in new RFC UI 2017-10-04 13:22:47 +02:00
06e99059d4 Add new lines at eof 2017-10-04 12:53:09 +02:00
70eb0d19b8 Link to exercises contained in collections 2017-10-04 12:47:59 +02:00
e74c25746c Implement new action 2017-10-04 12:40:37 +02:00
95a849e9f5 removed expected working time from show/create/index and database since we do not use it 2017-10-04 11:41:08 +02:00
8e4a694690 Add title 2017-10-04 11:37:21 +02:00
7cb7146e7e Implement update 2017-10-04 11:35:51 +02:00
f0c0621b31 Implement show route 2017-09-27 16:52:42 +02:00
93797a665d Implement index page 2017-09-27 16:37:52 +02:00
44a3cabe98 Scaffold exercise collection routes 2017-09-27 16:08:56 +02:00