Commit Graph

240 Commits

Author SHA1 Message Date
c5c42ca3bc Show list of feedback messages for specific exercises 2017-11-08 22:31:01 +01:00
04baf6c5d5 Make paths explicit to fix tests 2017-10-26 16:14:40 +02:00
c9eb2be911 Merge remote-tracking branch 'origin/master' into rfc_run_assess_messages
# Conflicts:
#	app/assets/stylesheets/request-for-comments.css.scss
2017-09-27 15:09:24 +02:00
f2decf421b Merge pull request #127 from openHPI/collapsable-tags
Exercise editor improvements
2017-09-21 17:46:35 +02:00
f62b8f12c4 remove email adress from statistics view (also for admins) 2017-09-21 17:35:48 +02:00
194984a620 add cause to testruns
trigger run and assess on request_for_comment
2017-09-21 17:21:10 +02:00
d5aed4f7b6 Don't rely on parameter; use non-existing file name as indicator instead 2017-09-21 17:15:01 +02:00
10600045f4 Auto-expand new files 2017-09-21 17:09:27 +02:00
bbf94859eb Enable expanding multiple files at the same time 2017-09-21 16:31:30 +02:00
acf2bfb28e Collapse files by default 2017-09-21 16:24:21 +02:00
a6bc971659 Add I18n for tags 2017-09-21 16:15:17 +02:00
827f30b9e7 Wrap tags in collapsable container 2017-09-21 16:01:07 +02:00
df5e8133d2 Move subscribe box out of other comments container 2017-09-20 17:27:47 +02:00
be5b1df76a Make subscriptions insert-only 2017-09-20 17:14:55 +02:00
b1f790dcde Implement subscribe and unsubscribe 2017-09-13 14:22:46 +02:00
f628774995 Add checkbox to subscribe to author's comments 2017-09-06 14:25:18 +02:00
2869c0d7b8 Allow modal content to grow 2017-09-05 16:39:40 +02:00
73ec4d0902 Remove old delete all button 2017-08-25 18:31:47 +02:00
8a2a4c2b51 Add container for new comment visuals 2017-08-23 17:52:28 +02:00
86495bec7c Restructure modal 2017-08-23 17:43:13 +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
870549944d added intervention to statistics of exercises of external users 2017-04-05 12:08:27 +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
cff46f963d added close button for requestForCommand-modal 2017-04-03 17:33:52 +02:00
865bd59127 quickfix: wrong text on comment button. 2017-03-31 20:36:51 +02:00
3f398c6047 add feedback for exercises 2017-03-30 22:06:17 +02: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
f10af1f45b Merge pull request #93 from ThommyH/fixing_searches
search is now saved asynchron and without a form
2017-03-22 10:10:44 +01:00
7c986f2de7 fixed problem that no new files could be added to an exercise 2017-03-21 17:35: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
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
bd0721da2e deleted search modal. reused roc modal for search modal. also added translations 2017-03-21 10:31:33 +01:00
c1209e4972 added translation for search bar 2017-03-21 10:31:33 +01:00
9761dd0a2a improved search bar and search button.
added button to collapsed sidebar
2017-03-21 10:31:33 +01:00
0e2a22df42 texte angepasst 2017-03-21 10:31:33 +01:00
eb0c79a043 added search bar to the side col 2017-03-21 10:31:33 +01:00
5b50deb70d split intervention modal into 2 separate modals 2017-03-21 10:31:33 +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
2456f46b2b changed name of intervention modal, timer in editor.js set text now. some time calculations in editor for interventions 2017-03-21 10:31:32 +01:00
2caf4b123e added intervention modals back into editor.js and html 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
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
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
f4c01879bf preparations to replace session with lti_parameters object 2016-12-27 00:13:41 +01:00
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
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