16729 Commits

Author SHA1 Message Date
137b2606e6 Display grading reports in the reviewer approval process panel. 2015-01-14 16:05:12 +01:00
71f9a01c77 Prepare for project delete phase 1fix 2015-01-14 15:49:31 +01:00
6a0f7185d2 Made it possible to attach a snapshot of the grading report when denying a request. 2015-01-14 15:36:23 +01:00
37c59cb60e Made it possible to attach a snapshot of the grading report when approving a request. 2015-01-14 15:27:43 +01:00
f830cb61d0 Prepare for project delete phase 1 2015-01-14 14:30:41 +01:00
71858369c2 Moved Scala files to src/main/scala from src/main/java 2015-01-14 11:07:58 +01:00
c0adfdba3a Fixed CSS warnings. 2015-01-13 16:33:50 +01:00
9f02c1931b Added descriptive texts in the final seminar approval form. 2015-01-13 16:33:10 +01:00
269a470568 Removed unnecessary unit return value since the warning is turned off now. 2015-01-13 15:56:35 +01:00
34af437d2e Move HTML file to resources directory. No point keeping it in the Java hierarchy when the code version is Scala. 2015-01-13 15:44:31 +01:00
b4ba8da169 Move Scala file to the src/main/scala hierarchy. 2015-01-13 15:43:04 +01:00
dcfc1b535d Fixed problem with trying to re-initialize a DataTable when the old one already existing on completed AJAX calls. Now checks that one isn't already present. 2015-01-13 14:55:10 +01:00
d100698143 Updated grading criteria for bachelor projects. 2015-01-13 13:53:54 +01:00
48dd3661e9 Fixed placement of the grading in Daisy link on the supervisor grading page. 2015-01-13 12:56:15 +01:00
Andreas Svanberg
9786b10384 Fixed bug that caused the individual criteria to appear twice in the downloaded grading template. release-2015-01-12_19-19-12 2015-01-12 14:59:51 +01:00
Andreas Svanberg
464c4feef0 Pushed member down from GradeCalculator interface since it was never used as a part of the interface. 2015-01-12 11:55:21 +01:00
Andreas Svanberg
29a3a2c137 Added status and type filter to interact with supervisors page. 2015-01-12 08:14:08 +01:00
Andreas Svanberg
0770d526cf Made HTML more readable. 2015-01-12 07:20:13 +01:00
Andreas Svanberg
40417699a6 Pulled the "Interact with supervisor" tab to the right to indicate that it is separate from the rest. 2015-01-12 07:18:16 +01:00
Andreas Svanberg
9079c51009 Made links to Daisy grading and TurnItIn analysis open in new windows. 2015-01-12 07:16:23 +01:00
Andreas Svanberg
cec1ac5a1d Converted interact with supervisor to javascript-based sorting to enable sorting on "unread posts". 2015-01-12 07:11:11 +01:00
bdaf1ff990 Changed link text on the link to Daisy grading. 2015-01-09 15:23:06 +01:00
fddf51db4b Changed to JavaConversions when doing the conversion on the Java side of things. 2015-01-07 07:04:43 +01:00
191469ce0f Merge remote-tracking branch 'origin/develop' into develop release-2015-01-05_14-42-00 2014-12-19 21:46:50 +01:00
aa3715d9ab Removed unused private field. 2014-12-19 10:34:36 +01:00
63fca8657e Made peer request deleted notification event based. 2014-12-19 10:27:14 +01:00
0e61024eaa Removed unnecessary dependencies. 2014-12-19 10:15:55 +01:00
01e493265d IntelliJ 14 highlighting bug. 2014-12-19 10:03:41 +01:00
93c147dd57 Use passed in wicket id parameter instead of referencing some constant. 2014-12-19 10:03:04 +01:00
3f512b10f7 Changed from DisplayMultiplesPanel to simple ListView. 2014-12-19 09:57:58 +01:00
1b88382c1d Changed from DisplayMultiplesPanel to simple ListView. 2014-12-19 09:55:04 +01:00
bc28922b6f Removed sub-package to peer containing the two workers. 2014-12-18 15:27:00 +01:00
159f26ae9a Added start date column.
I wonder how many tweaks we're going to have to add before Janne realizes this is a stupid way to do it and we should have gone the API route instead.
2014-12-18 14:36:42 +01:00
362c0176d6 Added SciPro header to the public projects page. 2014-12-18 14:34:44 +01:00
6d251b66fc Fixed circular dependency between peer and workerthreads. 2014-12-18 13:04:08 +01:00
4dad62c797 Fixed circular dependency between forummail and workerthreads. 2014-12-18 12:40:40 +01:00
524e36b155 Removed unused test matchers for google.Optional. 2014-12-18 12:13:44 +01:00
6ced389243 Migrated final reference to google.Optional 2014-12-18 12:13:15 +01:00
952d6ef0cd Removed unused import. 2014-12-18 12:11:21 +01:00
00db12b7e1 Removed fromOptional smart constructor in WicketFileUpload. 2014-12-18 12:10:46 +01:00
caa855f6c2 Removed unnecessary implicit conversion after FinalSeminarApprovalService got migrated. 2014-12-18 11:59:59 +01:00
a0ef8d5b7b Migrated thesis reviews to scala.Option from google.Optional 2014-12-18 11:56:34 +01:00
cbceb08d47 Upgraded to Wicket 6.18.0 2014-12-18 11:51:57 +01:00
14f2acbd43 Added smart constructor to WicketFileUpload. 2014-12-18 11:46:36 +01:00
3e69974f0f Migrated report related functions to scala.Option from google.Optional 2014-12-18 11:39:14 +01:00
80b03d5c97 Migrated peer related functions to scala.Option from google.Optional 2014-12-18 10:59:59 +01:00
cb5f5057a6 Removed duplicate class. 2014-12-18 10:45:51 +01:00
0f09bd9315 Fixed some tests. 2014-12-18 10:00:19 +01:00
4c09e9908d Migrated more parts of reviewer approvals to scala.Option from google.Optional 2014-12-17 16:29:27 +01:00
2e87840b70 Migrated some missing parts of reviewer approvals to scala.Option from google.Optional 2014-12-17 16:01:33 +01:00