3976 Commits

Author SHA1 Message Date
fred-fri
21034ef842 hooked up new addmatch method to supervisor select student idea 2013-12-05 14:14:27 +09:00
fred-fri
b7ddcb442d hooked up new addmatch method to admin removal of students 2013-12-05 13:52:59 +09:00
fred-fri
442145a3a2 hooked up student accept of supervisor idea to new addmatch method 2013-12-05 12:42:22 +09:00
fred-fri
28772990d8 added addmatch method 2013-12-05 12:05:23 +09:00
fred-fri
118d355560 added addmatch method 2013-12-05 11:58:57 +09:00
6de66d5ac3 Clean up around grading report and made sure no one can modify it. 2013-12-04 15:59:40 +01:00
e0e2e7fe06 Automatic grading now handles Fx as well. 2013-12-04 14:47:51 +01:00
a53e123630 Split grading criterion into two types (individual and project). 2013-12-04 13:53:12 +01:00
c6cc29d3a3 Split grading criterion templates into two types (individual and project). 2013-12-04 13:46:18 +01:00
99c2b306ff Grade is automatically calculated for A-F (but not Fx) 2013-12-04 13:38:54 +01:00
283301349e Refactor of domain model related to grading reports complete. 2013-12-04 11:58:14 +01:00
b071fa3790 Merge remote-tracking branch 'origin/develop' into develop 2013-12-04 11:25:24 +01:00
fred-fri
ab87c3c8df Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-12-04 19:23:37 +09:00
fred-fri
8409fb6c02 fixed double add bug 2013-12-04 19:06:36 +09:00
97c1f9858e Refactored out a base class from GradingCriterionTemplate. 2013-12-04 10:14:15 +01:00
2649d7415b Renamed repository to match entity name. 2013-12-04 09:32:04 +01:00
07afaf8936 Renamed repository to match entity name. 2013-12-04 09:31:43 +01:00
ae99c46b04 Renamed GradingAnswer to GradingCriterion. 2013-12-04 09:30:52 +01:00
23caf5df5d Renamed GradingCriterion to GradingCriterionTemplate. 2013-12-04 09:22:24 +01:00
04bbff4987 Removed ability to set a manual grade. 2013-12-04 08:58:05 +01:00
cbab8fa3ad Started implementing getGrade() 2013-12-03 17:59:23 +01:00
c5c96f4a6b It is now possible to add criteria to a grading report template. 2013-12-03 17:22:34 +01:00
daf22e34cc Removed useless builder. 2013-12-03 17:01:28 +01:00
a3214e3559 Creating GradingReports is done from a template. 2013-12-03 17:00:25 +01:00
796429c163 Removed @Data to remove temptation to modify the object from the outside. 2013-12-03 16:26:17 +01:00
67f14a60ce Removed stray constant. 2013-12-03 16:24:29 +01:00
29a06665ea Removed description from GradingReportTemplate. 2013-12-03 16:23:25 +01:00
Leo
553be33292 fixed Download pdf button bug 2013-12-03 14:58:11 +01:00
fred-fri
131abda8a5 when filedesc userid is null, get userid from jackrabbit node 2013-12-03 17:59:37 +09:00
Leo
da6d050afd grading report is one per author and project 2013-12-02 16:52:32 +01:00
Emil Siverhall
ae26ef6c22 Grading page now only have save and download buttons. download is allowed if all criteria have points assigned 2013-12-02 15:04:24 +01:00
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