Commit Graph

872 Commits

Author SHA1 Message Date
b530ea47d9 Graph in exercise statistics 2016-03-22 09:23:21 +01:00
cc0a541add do not render instructions (as they are not used / filled) any longer.
Instead, render markdown from the description.
2016-03-11 15:49:06 +01:00
f79e24c77d Merge pull request #47 from openHPI/testruns
Testruns
2016-03-11 10:44:14 +01:00
2db3793883 Merge pull request #46 from openHPI/collapse-files
Collapse files
2016-03-11 10:42:14 +01:00
4891c6f55b Merge remote-tracking branch 'origin/master' into testruns 2016-03-10 16:53:56 +01:00
0d7d350581 Collapse files in exercise index view 2016-03-10 16:51:19 +01:00
7477376457 Collapse files in exercise edit view 2016-03-10 16:30:45 +01:00
757efeaf02 minor UI changes, removed elements not needed, replaced text-area for description with an ace editor. 2016-03-10 14:58:50 +01:00
972b63c03e Test sending LA events to openhpi 2016-03-10 14:52:59 +01:00
1f106e6d62 Don't fail if the assessor does not support error messages 2016-03-09 18:33:52 +01:00
56207e6351 Add error message grabbing support for JUnit 2016-03-09 18:32:54 +01:00
99ee7337ed Add python adapter error messages to score output 2016-03-09 18:01:30 +01:00
26d2b11d9f Add visual indicators for test run results 2016-03-09 17:57:18 +01:00
dcb05b9169 Fix testrun result for docker container depletion 2016-03-09 16:21:32 +01:00
16346fa732 Show testrun results in statistics 2016-03-09 15:20:38 +01:00
087b2bdf93 Persist assessments in the testrun model 2016-03-09 14:49:44 +01:00
0b349489b4 Merge pull request #45 from openHPI/flowr
Flowr
2016-03-02 17:31:39 +01:00
9d6c746e48 Merge branch 'master' into flowr 2016-03-02 17:29:02 +01:00
fb9e8c48a0 Merge pull request #33 from openHPI/fix-ctrl-alt-0
Unbind ace shortcut for code folding. Fixes #31
2016-03-02 17:27:20 +01:00
7fed15b49d Merge branch 'master' into fix-ctrl-alt-0 2016-03-02 17:26:55 +01:00
cdb686ea1d Merge pull request #44 from openHPI/request-for-comments-multiple-files
Request for comments multiple files
2016-03-02 17:23:56 +01:00
dc7aeda2ba Merge pull request #43 from openHPI/statistics
Statistics
2016-03-02 17:22:24 +01:00
948de1ebb9 Order requests for comment 2016-03-02 17:07:16 +01:00
1decf62897 Merge remote-tracking branch 'origin/master' into request-for-comments-multiple-files
# Conflicts:
#	app/views/request_for_comments/show.html.erb
2016-03-02 16:33:45 +01:00
e3ec54562d Delete scaffolded stylesheets 2016-03-02 16:29:58 +01:00
b66e9fc05d Add Testrun to schema 2016-03-02 14:52:39 +01:00
551552279b Update schema.rb 2016-03-02 12:17:20 +01:00
f17ae9ad2f Merge remote-tracking branch 'origin/master' into statistics 2016-03-02 12:01:16 +01:00
7dee100665 Hide actions that are not available to teachers 2016-03-02 11:55:26 +01:00
da3339ecbb Hide file types, execution environments, and teams from teachers 2016-03-02 10:57:13 +01:00
ebdc5dcd6e Merge pull request #41 from leoselig/master
Import exercise meta data from CodeHarbour
2016-03-01 13:03:12 +01:00
ed63a9dfd8 accidentially added websocket_gem on master branch. This commit removes it again. 2016-03-01 11:39:41 +01:00
fe37cdce77 Merge branch 'master' of https://github.com/openHPI/codeocean 2016-03-01 11:34:59 +01:00
b31a5b37f4 renamed execute_websocket_command to open_websocket_connection, because we now run the command after all listeners in the submissions controller were attached 2016-03-01 11:34:07 +01:00
b269a738f5 renamed execute_websocket_command to open_websocket_connection, because we now run the command after all listeners in the submissions controller were attached 2016-03-01 11:30:03 +01:00
94c31e35a4 Some comments and cleanup of exercise.rb percentage calculation 2016-03-01 11:14:53 +01:00
0a5301a595 Make statistics teacher-safe 2016-02-24 14:23:15 +01:00
1c5cf0facb Deserialize feedback message
- this fixes the validation error for test files

(leoselig/codeocean#4)
2016-02-18 18:32:03 +01:00
f8c5d2ad96 Serialize test files from ProFormA-XML
(leoselig/codeocean#4)
2016-02-18 17:26:29 +01: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
71dda088d1 Associate code harbor links with current user always
- this applies to creations and updates
- code harbor links are only every edited in the context of the
  authenticated user

(leoselig/codeocean#1)
2016-02-12 11:05:30 +01:00
943355d9c7 Add #from_proforma_xml to exercise (only meta data import)
- method only considers title and description for now
- sets up relation to execution environment with id 1, just to pass
  validation for now

(leoselig/codeocean#1)
2016-02-12 11:05:14 +01:00
5a190c0c79 Fix wrong belongs_to :user
- because of polymorphic user model this didn't work
- changed to :internal_user because that's anyway the only type of user we
  want to impoprt from

(leoselig/codeocean#1)
2016-02-12 10:57:44 +01:00
63502831aa Change forgotten schema.rb
(leoselig/codeocean#2)
2016-02-04 13:34:55 +01:00
c3df7ff482 Remove empty .coffee file
- was scaffolded

(leoselig/codeocean#2)
2016-02-04 13:34:18 +01:00
aee5585189 Change German i18n "CodeHarbor-Verknüpfung(en)" to "...Link(s)"
(leoselig/codeocean#2)
2016-02-04 13:32:50 +01:00
68e74a9d85 Add association User has many CodeHarborLink
- add migration tht associates User with CodeHarborLink
- add belongs_to from CodeHarborLink to User
- changed CodeHarborLinkController#index to only serve current user's
  CodeHarborLinks

(leoselig/codeocean#2)
2016-02-04 12:38:46 +01:00