3995 Commits

Author SHA1 Message Date
Emil Siverhall
66a3baaf18 hasFinishedGradingReport now checks if all questions are answered instead of finished flag 2013-12-02 14:04:30 +01:00
fred-fri
0c41617b7e cleanup 2013-12-02 19:46:56 +09:00
fred-fri
c6cabfdd04 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-12-02 18:47:20 +09:00
fred-fri
c2cf5fecd1 tests 2013-12-02 18:46:45 +09:00
Emil Siverhall
06657e8c64 Merge remote-tracking branch 'origin/develop' into develop 2013-12-02 10:45:03 +01:00
Emil Siverhall
042a4012e6 sort answers by criterion sort order 2013-12-02 10:44:38 +01:00
fred-fri
157f768b7c adding components, hooking up 2013-12-02 18:13:53 +09:00
fred-fri
98462a4d06 fixed methods 2013-12-02 17:57:28 +09:00
fred-fri
ab27e8ffe4 removed unused attribute 2013-12-02 13:17:36 +09:00
fred-fri
29bcae61e9 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-12-02 12:58:52 +09:00
niklas3
4042bba02f Merge remote-tracking branch 'origin/develop' into develop 2013-11-29 16:21:47 +01:00
Emil Siverhall
b453f31515 Merge remote-tracking branch 'origin/develop' into develop 2013-11-29 16:19:55 +01:00
1692fc3fde Fixed retrieve file when path contains stupid characters. 2013-11-29 16:19:03 +01:00
niklas3
51b7a59074 Grade is shown and editable in the grading report. 2013-11-29 16:17:53 +01:00
Emil Siverhall
29f6dccea3 reintroduced ExternalUserLoginModule 2013-11-29 15:49:03 +01:00
fred-fri
69e08a15d2 removed unused peer request lazy deletion 2013-11-29 16:36:34 +09:00
fred-fri
b48d7cdb8a made second peer review milestone work 2013-11-29 16:01:50 +09:00
188e069f24 Massaged the test a bit. 2013-11-28 20:54:53 +01:00
ca4ab492f2 Minor clean up of test method. 2013-11-28 19:31:06 +01:00
789be26d74 Renamed method. 2013-11-28 17:56:28 +01:00
c08b9a0d41 When a peer review is completed the first milestone is automatically completed. 2013-11-28 17:53:05 +01:00
19e39415b1 Moved test to the proper package. 2013-11-28 17:34:31 +01:00
4116ec247d Renamed test class to match subject. 2013-11-28 17:34:19 +01:00
ea2350b9bd Fixed stupid repo. 2013-11-28 17:30:13 +01:00
b687768ec9 Renamed migration scripts since there was already a 24. 2013-11-28 16:52:12 +01:00
b280d4f7f0 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 16:51:43 +01:00
15fa0179e5 Removed submitted and aborted properties from PeerReview. 2013-11-28 16:51:38 +01:00
niklas3
0f2a38ce52 Re-added V24__ 2013-11-28 16:20:00 +01:00
niklas3
506dc429b6 Added sortOrder. 2013-11-28 16:00:06 +01:00
niklas3
0273a7c8d8 Sorting asc. 2013-11-28 15:57:43 +01:00
niklas3
53a010206b Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 15:54:18 +01:00
niklas3
9bc37556df Added sort order to grading criterion.
Sorting questions by that order now.
2013-11-28 15:54:16 +01:00
fdb8a1773d Removed setStatus(ReviewStatus) from PeerReview and replaced it with methods that describe what you want to do. 2013-11-28 15:37:40 +01:00
67ee58284c Added status column to PeerReview. 2013-11-28 15:18:36 +01:00
fcf6b1c2ef Renamed schema migration to prevent conflicts. 2013-11-28 15:15:00 +01:00
ca6dba4576 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 15:14:40 +01:00
Leo
9314a0f314 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 14:02:44 +01:00
niklas3
736d8fc0ab GradingAnswer points is now converted to 0 instead of null in getTotalPoints. 2013-11-28 14:01:29 +01:00
Leo
3d0ebd449a Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 13:53:44 +01:00
Leo
515b801cec fixed a missing test case for searchFiles (path not ending with "/") 2013-11-28 13:53:09 +01:00
niklas3
27b8687b89 Total points are always shown.
Testing different approach to getTotalPoints.
2013-11-28 13:30:42 +01:00
niklas3
57fd80f3eb Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 12:29:45 +01:00
niklas3
f1aabdd158 Grading form now has a row for total points. 2013-11-28 12:29:40 +01:00
de2b215439 Fixed compilation errors after removing lazy deletion. 2013-11-28 11:41:31 +01:00
bd9f22750d Fixed compilation errors in test. 2013-11-28 11:37:32 +01:00
b73bdd2fb1 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 11:34:14 +01:00
6031073ce3 Peer review is no longer lazy deleted. 2013-11-28 11:21:10 +01:00
Emil Siverhall
8636cf3d38 Merge remote-tracking branch 'origin/develop' into develop 2013-11-28 11:09:02 +01:00
Leo
3911e04ae6 ignored tests for jenkins 2013-11-28 11:00:39 +01:00
8e9399f676 Removed presentation toString() from ReviewStatus. 2013-11-28 10:56:58 +01:00