htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,205 Commits 2 Branches 0 Tags
a142e1c73f28acd82da02b9d41f7ada2df653d37
Commit Graph

334 Commits

Author SHA1 Message Date
rteusner
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
Thomas Hille
7c986f2de7 fixed problem that no new files could be added to an exercise 2017-03-21 17:35:46 +01:00
Thomas Hille
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
Ralf Teusner
4a9867b81b only show search if parameters are set, prevent calls on nil.. 2017-03-21 12:16:39 +01:00
Thomas Hille
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
Thomas Hille
bd0721da2e deleted search modal. reused roc modal for search modal. also added translations 2017-03-21 10:31:33 +01:00
Thomas Hille
c1209e4972 added translation for search bar 2017-03-21 10:31:33 +01:00
Thomas Hille
9761dd0a2a improved search bar and search button. 
added button to collapsed sidebar
 2017-03-21 10:31:33 +01:00
Thomas Hille
a481ec0da8 always show search on left side. placeholder in search input 2017-03-21 10:31:33 +01:00
Thomas Hille
0e2a22df42 texte angepasst 2017-03-21 10:31:33 +01:00
Thomas Hille
eb0c79a043 added search bar to the side col 2017-03-21 10:31:33 +01:00
Thomas Hille
5d2eb6f381 fixed search in firefox 2017-03-21 10:31:33 +01:00
Thomas Hille
5b50deb70d split intervention modal into 2 separate modals 2017-03-21 10:31:33 +01:00
Thomas Hille
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
Thomas Hille
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
Thomas Hille
3cc5695281 modal angepasst 2017-03-21 10:31:33 +01:00
Thomas Hille
904868394a added interventions being saved once they are fired 2017-03-21 10:31:33 +01:00
Thomas Hille
3d7f5bdf1a added intervention controller and stuff 2017-03-21 10:31:32 +01:00
Thomas Hille
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
Thomas Hille
2caf4b123e added intervention modals back into editor.js and html 2017-03-21 10:31:32 +01:00
Thomas Hille
d446fcb109 fixed title in new tag 2017-03-21 10:31:32 +01:00
Thomas Hille
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
Ralf Teusner
8f927d5ac9 some howto text for request_for_comment usage, changed background color of read-only editor. 2017-03-15 16:15:29 +01:00
Ralf Teusner
c37f675893 clickthrough of alert banners, some more positioning, move them to front. 2017-03-15 11:34:27 +01:00
Alexander Kastius
3c9ecda0ad Moved error messages to top of page 2017-03-13 01:07:05 +01:00
Ralf Teusner
a52b27bb59 render html and or markdown for feedback messages 2017-02-08 16:19:41 +01:00
Tom Staubitz
59f2ff436e removed url helper from model 2017-01-18 13:35:18 +01:00
Tom Staubitz
5fe12bfa78 fixing tests p1 2017-01-12 18:12:36 +01:00
Tom Staubitz
dd4c789fed replaced session_paramerters with server params for security reasons 
cleaned up comments
 2017-01-12 15:10:34 +01:00
Tom Staubitz
41a61a8507 Fixed the destroy session logic. 
1. an exercise_id is provided ==> only the LtiParameter object for the current user, consumer, and exercise is deleted.
2. no exercise_id is provided ==> external user and consumer are removed from the session, all LtiParameter objects for this user and consumer are deleted.

This enables users to have several tabs with exercises open and submitting the results to the tool consumer.
When an exercise has been submitted, the user cannot use the back button to get back to CodeOcean and work on the submitted or any other exercise.
For now a warning has been added to the info text to tell users not to do this. (As the LtiParameters have been deleted, the points can no more be submitted to the consumer.)
@TODO disable/redirect back button?
 2016-12-31 17:21:46 +01:00
Tom Staubitz
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
Tom Staubitz
80e3453395 Merge branch 'master' into lti_param_model 2016-12-27 00:16:32 +01:00
Tom Staubitz
f4c01879bf preparations to replace session with lti_parameters object 2016-12-27 00:13:41 +01:00
Ralf Teusner
802502935e removed debug statement... 2016-12-20 16:08:08 +01:00
Ralf Teusner
1108f954ba show admin menu on RFC page for admins 2016-12-19 18:30:39 +01:00
Ralf Teusner
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
Ralf Teusner
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
Ralf Teusner
d26a0fa6a4 Enhance codeocean events with user agent and external-id if present 2016-09-27 17:56:16 +02:00
Ralf Teusner
2b621e2de6 some more code cleanup and UI optimizations 2016-09-09 16:10:43 +02:00
Ralf Teusner
77452e6c2b move progress into sidebar 2016-09-09 15:40:09 +02:00
Ralf Teusner
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
Alexander Kastius
8fe9303288 Merge pull request #80 from openHPI/recommend_request_for_comment 
Some tidy up in request for comments (bugfix: removed leftover parts …
 2016-09-09 14:12:47 +02:00
Alexander Kastius
952cc5ec24 Moved buttons to the top. 2016-09-09 13:21:51 +02:00
Ralf Teusner
8f499b72da Feature: Auto-Completion in Source Code 
+ allow flags for exercises
 2016-09-07 17:34:20 +02:00
Ralf Teusner
b8da4dea17 Merge branch 'master' into editor-frontend-refactor 
Conflicts:
	app/assets/javascripts/editor.js.erb
	app/views/exercises/implement.html.slim
 2016-09-02 15:04:18 +02:00
Ralf Teusner
ddaed5929b Naming of sidebars 2016-09-01 18:47:16 +02:00
Alexander Kastius
c2bdcc7915 Added more height! 2016-09-01 17:54:04 +02:00
Alexander Kastius
f170fee6a9 Replaced hr with enforced margin. 2016-09-01 17:49:59 +02:00
Alexander Kastius
1670839ecf Fixed part of prompt. 2016-09-01 17:41:00 +02:00
Alexander Kastius
11d284b166 Disabled file tree and collapsed sidebar when filetree should be disabled. 2016-09-01 17:31:18 +02:00