Commit Graph

82 Commits

Author SHA1 Message Date
da23cc22aa add the required integer column and the increment statement when featured 2018-02-02 14:38:28 +01:00
8a94905f17 merged with current master 2017-11-16 17:16:22 +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
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
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
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
8d1c846fae changes to newrelic 2017-09-20 13:29:26 +02:00
9ce29d211b Cleanup of Intervention and Bonus Exercise Experiments 2017-09-14 16:53:59 +02:00
d053850572 fixed response in order to redirect correctly on ajax requests. Fixed policy 2017-04-18 16:51:02 +02:00
51b4f1acbc redirect only external user to feedback page after submission 2017-04-12 11:49:47 +02:00
60e587b690 removed comment on exercise in the RFC view. redirect 10% of user instead of redirecting to the RFC view to the feedback view. redirect all users how submitted to the feedback view if score is less than 100% 2017-04-12 11:47:39 +02:00
e4d28452bf save progress 2017-04-11 16:29:29 +02:00
516d29d40d only redirect if there are less than 5 comments on a RFC yet. 2017-04-03 20:27:59 +02:00
686abd6fe0 3 interventions per day 2017-04-03 18:52:17 +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
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
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
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
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
3a07e7d5f6 Updated nokogiri 2017-01-13 13:46:36 +01:00
6bf73757ae fixing tests p3 2017-01-13 09:56:36 +01:00
5fe12bfa78 fixing tests p1 2017-01-12 18:12:36 +01:00
dd4c789fed replaced session_paramerters with server params for security reasons
cleaned up comments
2017-01-12 15:10:34 +01:00
edb813ab14 added separate value for the actual external_id of the external user. 2016-12-31 00:58:36 +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
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
0a795b521f only show RFCs that have a question set 2016-12-19 18:30:06 +01:00
1511941d3d Merge branch 'master' into editor-frontend-refactor
Conflicts:
	codeocean-dockerconfig.md
2016-11-09 18:00:40 +01:00
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