6526 Commits

Author SHA1 Message Date
Leo
25b7724fe5 fixed a clumsy error with the tabs 2013-12-05 10:35:32 +01:00
Leo
1d968b1a16 removed unnecessary javascript and listener, fixed a test 2013-12-05 09:47:56 +01:00
Leo
11085b9e26 tabs now work again, while still saving 2013-12-05 09:27:37 +01: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
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
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
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
Richard
5c76ff81e6 - Changes to the sneaky sneak script to make it work in more than one tab.
- Changes to the scipro.js file which fixed an issue where the fixed div on the gradingReportPanel only worked in the first tab.
2013-12-03 17:47:21 +01:00
a6c24e7ecc Merge remote-tracking branch 'origin/develop' into develop 2013-12-03 17:00:31 +01:00
a3214e3559 Creating GradingReports is done from a template. 2013-12-03 17:00:25 +01:00
Richard
bb9a89c5dc CSS changes to the feedbackPanel on the gradingReportPanel. 2013-12-03 16:26:31 +01:00
29a06665ea Removed description from GradingReportTemplate. 2013-12-03 16:23:25 +01:00
Richard
47bd177ba3 Merge remote-tracking branch 'origin/develop' into develop 2013-12-03 16:04:59 +01:00
Richard
8b100925bf Continued styling of the gradereportpanel. 2013-12-03 16:04:52 +01:00
Leo
6269b22474 timestamp in feedback 2013-12-03 15:44:19 +01:00
Leo
627aad567c Merge remote-tracking branch 'origin/develop' into develop 2013-12-03 15:29:35 +01:00
Leo
32f0662336 fixed the null pointer when saving twice 2013-12-03 15:28:46 +01:00
Richard
901755dde4 Continued styling of the gradereportpanel. 2013-12-03 15:18:49 +01:00
Leo
553be33292 fixed Download pdf button bug 2013-12-03 14:58:11 +01:00
Leo
2d20172c0c moved feedback panel inside form 2013-12-03 14:51:44 +01:00
Leo
d4dfcb224e only content of first tab is shown when going to the grading page 2013-12-03 10:41:37 +01:00
Leo
2a3c1f737f tabs now link to each authors GradingForm 2013-12-03 10:21:25 +01:00
fred-fri
837e1d7093 finished moving 2013-12-03 16:32:03 +09:00
fred-fri
23d00673a5 moved activity plan templates into new submenu 2013-12-03 16:20:16 +09:00
fred-fri
54d91bdfaf added new highlighting interface 2013-12-03 16:08:59 +09:00
fred-fri
07f6924536 added new abstractsupervisorallprojectspage 2013-12-03 16:08:14 +09:00
fred-fri
a591cfa1dd more detailed removed string 2013-12-03 15:53:50 +09:00
fred-fri
ea30e41644 fixed latestuploadpanel crash when no userid on file 2013-12-03 14:12:53 +09:00
Leo
72bb87b106 dynamic tabs in FillOutGradingReportPanel 2013-12-02 17:19:40 +01:00
Leo
da6d050afd grading report is one per author and project 2013-12-02 16:52:32 +01:00