Commit Graph

162 Commits

Author SHA1 Message Date
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
0f76b1cb90 Merge branch 'master' into editor-frontend-refactor
Conflicts:
	app/assets/javascripts/editor.js.erb
---> kept refactored one
2016-09-09 14:17:42 +02:00
e67f1f78c4 cleanup logging statements. 2016-09-09 14:11:38 +02:00
8f499b72da Feature: Auto-Completion in Source Code
+ allow flags for exercises
2016-09-07 17:34:20 +02:00
6e6c9143cd Some tidy up in request for comments (bugfix: removed leftover parts of requested_at attribute, some UI changes in comment dialog)
Redirect to open rfc if an exercise has been solved
2016-08-11 18:13:33 +02:00
b0d468c0e0 remove rest of teams code -- NEED TO REMOVE TEAMS FROM DATABASE! 2016-06-30 12:17:19 +02:00
aba6d56a87 Enable exercise forms to manipulate file creation flag 2016-05-10 17:14:07 +02:00
7cc612ddaf Deserialize exercises files in ProFormA-XML
- includes determining main file property via comment and template
  attributes in XML

(closes leoselig/codeocean#3)
2016-02-18 16:03:25 +01:00
773088798c Fix array to string cast error
- accidental trailing comma caused this (apparently that's a thing in
  Ruby...)
- cleaned up attribute assignments a little bit
  (persisted/validated/neither assignments)

(leoselig/codeocean#1)
2016-02-13 11:54:30 +01:00
f787445e5b Rename #import_thin_common_cartridge to #import_proforma_xml
- everywhere

(leoselig/codeocean#1)
2016-02-12 11:11:20 +01:00
1c3a1a6aab Authenticate action import_proforma_xml via OAuth2
- currently done manually, we should definitely consider a gem here
  (doorkeeper)
- right now, the provided Bearer token from the Authorization header is
  just looked up in the configured code harbor links of the current user,
  if one is found -> authenticated -> exercise gets imported

(leoselig/codeocean#1)
2016-02-12 11:11:09 +01:00
855abe25a6 Merge branch 'issue-1-codeharbor-endpoint' 2016-02-04 12:26:15 +01:00
aa8870b8c8 Add endpoint for import (leoselig/codeocean#1)
- currently route is still named /thin_common_cartridge
- points to exercise controller for simplicity (open for discussion)
2016-02-04 09:28:50 +01:00
cb98f6d0fa Fix controller 2016-01-07 17:44:43 +01:00
e1e6eb04f4 Make user stats in exercise statistics faster 2016-01-07 17:01:47 +01:00
95ec5b0231 Routes, empty views and controller changes for statistics concerning external_users, exercises and external_users having exercises 2015-11-25 18:47:49 +01:00
10da12f950 option to hide the file tree in exercises. 2015-09-22 18:22:25 +02:00
cc400989ee added ids to new relic error messages 2015-04-24 18:12:42 +02:00
8697c8b23a Added mor new relic debugging 2015-04-23 18:14:20 +02:00
9c8d0b01eb Fix reset of tasks 2015-04-20 22:30:31 +02:00
4fe60d5f94 set correct user_id for internal users 2015-04-09 16:54:03 +02:00