11837 Commits

Author SHA1 Message Date
fred-fri
8cc851b349 fix 2013-12-05 17:10:02 +09:00
fred-fri
b4cf25ce2b fix 2013-12-05 17:00:24 +09:00
fred-fri
4e552d9a95 removed unused stuff 2013-12-05 16:49:26 +09:00
fred-fri
2e6562bb59 removed externalsupervisorinfo from idea 2013-12-05 16:47:20 +09:00
fred-fri
38da7e553a cleanup 2013-12-05 16:45:51 +09:00
fred-fri
4148c4ffa3 cleanup 2013-12-05 15:55:26 +09:00
fred-fri
9eaa0c197e fixing tests... verify can only be used on mocks 2013-12-05 15:29:35 +09:00
fred-fri
8230da89fc hooked up new addmatch method to partner confirmation 2013-12-05 15:09:22 +09:00
fred-fri
7b4300ffaa hooked up new addmatch method to change supervisor 2013-12-05 14:52:45 +09:00
fred-fri
6103ef230f hooked up new addmatch method to create project 2013-12-05 14:51:24 +09:00
fred-fri
369100e47c hooked up new addmatch method to save student idea 2013-12-05 14:48:58 +09:00
fred-fri
3d50b94551 hooked up new addmatch method to savesupervisoridea 2013-12-05 14:26:02 +09:00
fred-fri
5dffc03fcb removed unused addnewmatch method with source 2013-12-05 14:19:32 +09:00
fred-fri
29deae45bb hooked up new addmatch method to admin unmatch matched student idea 2013-12-05 14:17:24 +09:00
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
717ae57c0b Attempt at fixing broken tabs. 2013-12-04 17:23:02 +01:00
7e1f1c0f96 Fixed double feedback. 2013-12-04 17:19:40 +01:00
82deeff0d5 Refactored FillOutGradingReportPanel so that it saves all the report when clicking on a tab. 2013-12-04 16:52:08 +01:00
6de66d5ac3 Clean up around grading report and made sure no one can modify it. 2013-12-04 15:59:40 +01:00
3a9a163118 Added grade label to grading report panel. 2013-12-04 15:14:19 +01:00
4990683768 Removed stupid code. 2013-12-04 14:59:45 +01:00
0de9342880 Removed dead code. 2013-12-04 14:57:19 +01:00
938a6c6cee Changed test to not randomly failed if test execution takes too long. 2013-12-04 14:52:11 +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
6675753a44 Merge remote-tracking branch 'origin/develop' into develop 2013-12-04 13:38:59 +01:00
99c2b306ff Grade is automatically calculated for A-F (but not Fx) 2013-12-04 13:38:54 +01:00
fred-fri
41b219551c fixed date filtering boolean 2013-12-04 20:59:48 +09:00
fred-fri
41321fe4aa Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-12-04 20:25:52 +09:00
fred-fri
45a820339c removed duplicate status column 2013-12-04 20:21:29 +09: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
Leo
d17b68528f fixed a test 2013-12-04 10:56:02 +01: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
8fbc6100de Merge remote-tracking branch 'origin/develop' into develop 2013-12-04 08:58:10 +01:00
04bbff4987 Removed ability to set a manual grade. 2013-12-04 08:58:05 +01:00
fred-fri
703fa879ae removed logging of password in clear text 2013-12-04 14:16:43 +09:00
8c08be14a8 Removed some package tangling. 2013-12-03 22:05:25 +01:00
1b4ff67a4d Merge remote-tracking branch 'origin/develop' into develop 2013-12-03 17:59:27 +01:00