Commit Graph

86 Commits

Author SHA1 Message Date
c937a1a9ef clean pull request 2016-10-24 23:02:44 +02:00
44aca293e9 make travis green again 2016-10-08 20:37:20 +02:00
4183a16178 merge with master 2016-08-03 12:09:58 +02:00
ed3526a578 Merge branch 'master' into feature-file-templates
Conflicts:
	app/views/application/_navigation.html.slim
	config/locales/de.yml
	config/locales/en.yml
	db/schema.rb
2016-07-28 15:16:11 +02:00
09533a5556 download complete submission as one zip file 2016-07-15 18:25:58 +02:00
39a253997d use submission from model 2016-07-14 16:59:42 +02:00
8282820974 removed requested_at
partly using submission_id
some cleanup
2016-07-14 16:22:22 +02:00
f5868a4fa2 merge master 2016-07-14 13:22:24 +02:00
223df2ffa8 some cleanup of request for comments. Work in progress.
Noticed a flaw when fetching the last submission, which is caused by timezone differences. First step to solve this.
Existing Request for Comments still need to be updated with their current submissionId, the SQL to do that is not yet finished.
2016-07-04 17:44:22 +02:00
ddc78f334c fixed usage of Rails cache call. 2016-06-27 18:01:58 +02:00
2ff12dbeb6 Cached displaynames of users
Added solved state and #comments to index of request_for_comments
Added translations
2016-06-27 16:46:26 +02:00
2a52b66daa rfc can now be solved.
show.html still needs to be finished
2016-06-24 16:44:34 +02:00
1cd879bcb6 Scaffold file templates 2016-06-09 22:38:19 +02:00
7bc3c4e27c Fix tests in models/execution_environment_spec.rb, uncomment @image in lib/docker_client.rb 2016-05-25 15:56:49 +02:00
b5c3d8170d Fix in models/exercise_spec.rb, repair average_percentage without submission 2016-05-25 14:39:48 +02:00
c69ab69c46 Fix exercise update 2016-05-12 14:39:00 +02:00
9fc974af20 Implement file name validation based on path, name, and filetype upon file creation 2016-05-10 16:03:52 +02:00
c9b2af0fdb show question instead of execution environement 2016-05-06 17:24:38 +02:00
8ba67c68c0 retrieve correct displaynames for users (from consumer if it is openHPI, otherwise use internal name) 2016-04-27 18:33:27 +02:00
2998d63d13 Add human readable label 2016-04-27 18:02:37 +02: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
b66e9fc05d Add Testrun to schema 2016-03-02 14:52:39 +01:00
f17ae9ad2f Merge remote-tracking branch 'origin/master' into statistics 2016-03-02 12:01:16 +01:00
ebdc5dcd6e Merge pull request #41 from leoselig/master
Import exercise meta data from CodeHarbour
2016-03-01 13:03:12 +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
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
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
f2a1a748d5 Replace CodeHarbourLink .erb wtih .slim templates
- this is consistent with the remaining view architecture

(leoselig/codeocean#2)
2016-02-04 12:06:59 +01:00
ca9a9c7e85 Merge branch 'master' of https://github.com/openHPI/codeocean 2016-02-04 11:02:56 +01:00
76bf3dd3f0 Scaffold CodeHarbourLink with field oauth2token
(leoselig/codeocean#2)
2016-02-04 11:02:26 +01:00
2a1862f39a Merge branch 'master' into statistics 2016-01-25 11:22:58 +01:00
a24e29345d Fix NaN error for exercises without scores 2016-01-21 14:03:42 +01:00
2777b64b0f cleanup of request for comment view, shifted logic to controller. 2016-01-13 15:26:34 +01:00
a508d47e3e Retrieve user statistics in an execution environment for all exercises at once 2016-01-07 15:42:53 +01:00
b10323b5a4 Make working time queries fire only once 2015-12-17 11:45:55 +01:00
1a738a2a06 Refine working time query 2015-12-16 14:00:51 +01:00
f3acc426ac Refactor average worktime and add it to exercise statistics per user 2015-11-05 11:17:45 +01:00
d4031c363f Fix number of runs 2015-11-05 10:57:07 +01:00
baed5bcc03 Add first draft of cleansed average working time 2015-11-01 15:54:01 +01:00
7baff6ddaf Group statistics per user type 2015-11-01 14:47:52 +01:00
c41818e324 Push statistics features to model 2015-10-29 15:08:02 +01:00
57d1c9b129 altered class: to class_name: (class seems to be deprecated?) 2015-10-21 16:44:13 +02:00
d292fec47c Code Cleanup: Usage of Polymorphic User instead of ExternalUser and InternalUser
Renamed requestor_user_id -> user_id
Index of request_for_comments now returns the n (5?) newest requests per user. Solved via sliding windows in postgres, code added to model.
Added route to /my_request_for_comments/ that shows all requests for the current user.
Changed view from ERB to slim
2015-09-04 14:05:30 +02:00