5982 Commits

Author SHA1 Message Date
10c35e5872 Removed method from interface.
Removed formal parameter that was not used (was always new Date()).
2013-12-19 11:42:00 +01:00
Leo
ac83a413b8 added name labels 2013-12-19 11:40:58 +01:00
d0e1237cf2 Removed unused field. 2013-12-19 11:37:36 +01:00
0c2f1c0829 Merge remote-tracking branch 'origin/develop' into develop 2013-12-19 11:35:40 +01:00
Leo
c20b90eece inactivated submit button and anti plagiarism field after submit 2013-12-19 11:34:29 +01:00
9efa55402e Removed a bunch of serialVersionUIDs. 2013-12-19 11:29:58 +01:00
Leo
ef0fb96810 *Supervisors can no longer edit reports after submitting
*fixed a bug with saving on ReviewerFillOutGradingReportPanel
2013-12-19 11:24:41 +01:00
Leo
7bdc05f735 You can now submit grading reports 2013-12-19 10:53:58 +01:00
Emil Siverhall
cb6b295cab renamed panel 2013-12-19 10:12:07 +01:00
Leo
d2c07b97ce Merge remote-tracking branch 'origin/develop' into develop 2013-12-19 10:11:53 +01:00
Leo
9267636986 ReviewerFillOutGradingReportPanel now saves project criteria for all reports 2013-12-19 10:11:43 +01:00
ff2639e781 Removed unused page. 2013-12-19 09:24:29 +01:00
fd9a8a67c5 Merge remote-tracking branch 'origin/develop' into develop 2013-12-19 09:09:48 +01:00
fred-fri
b5d3141514 moved info 2013-12-19 14:30:51 +09:00
fred-fri
09ecad7060 redirect fix 2013-12-19 14:20:36 +09:00
Emil Siverhall
305caee788 validator for contract checkbox 2013-12-18 21:58:48 +01:00
10dcffc7a3 Removed serialVersionUID. 2013-12-18 17:08:27 +01:00
Richard
d81456200c Merge remote-tracking branch 'origin/develop' into develop 2013-12-18 16:44:26 +01:00
Richard
e04a9f6f03 Fixed issue with checkboxes not working correctly on supervisor > My ideas. 2013-12-18 16:42:44 +01:00
78dd858cf1 Merge remote-tracking branch 'origin/develop' into develop 2013-12-18 16:42:06 +01:00
2416b551ec UserImportWorker now saves supervisors as users and not just their projects and participants so that new supervisors without any projects in Daisy get imported correctly. 2013-12-18 16:41:49 +01:00
Emil Siverhall
527488ba56 replaced watson fields on student idea submission with generic counter textarea 2013-12-18 16:40:19 +01:00
Leo
9ed336f022 Merge remote-tracking branch 'origin/develop' into develop 2013-12-18 16:29:38 +01:00
Leo
7e595822ec *DataInitializer now creates individual criteria
*new service logic for reviewer grading reports
*database migration scripts
2013-12-18 16:28:49 +01:00
Richard
629a1953bb Merge remote-tracking branch 'origin/develop' into develop 2013-12-18 16:13:00 +01:00
Emil Siverhall
7508e1dced Merge remote-tracking branch 'origin/develop' into develop 2013-12-18 16:10:42 +01:00
Emil Siverhall
de71f281d7 removed IdeaService#validateSupervisorIdeaAcceptance and made the validation inside the form instead 2013-12-18 16:09:00 +01:00
Richard
5f4bb15f64 Merge remote-tracking branch 'origin/develop' into develop 2013-12-18 16:00:10 +01:00
Richard
bc703c6e13 Fixed issue with checkboxes not working on admin > project management. 2013-12-18 15:59:32 +01:00
Leo
3ede2d97ac Added save button and database migration script 2013-12-18 13:38:50 +01:00
Emil Siverhall
eb5c00ed34 removed strange validation logic from description and prerequisites field when supervisors are submitting their own ideas 2013-12-18 13:35:36 +01:00
Emil Siverhall
fdcb48cea5 reusable textarea component with attached character count 2013-12-18 13:12:26 +01:00
Leo
aa57ae73ff Merge remote-tracking branch 'origin/develop' into develop 2013-12-18 12:06:17 +01:00
Leo
8d88837a84 *Broke out GradingReportForm form FillOutGradingReport
*Implemented most view layer parts of ReviewerFillOutGradingReportPanel
2013-12-18 12:05:41 +01:00
fred-fri
75b7a21b82 fixed worker 2013-12-18 17:15:19 +09:00
fred-fri
6d63e4b525 fixed worker 2013-12-18 17:13:37 +09:00
fred-fri
e7d25325e6 fixed tests 2013-12-18 16:58:30 +09:00
fred-fri
7749966417 fixed worker 2013-12-18 16:28:21 +09:00
fred-fri
c72ddc58d2 feedbackpanel fix 2013-12-18 15:51:41 +09:00
Richard
59cce89d6d Fixed issue with checkboxes not working in firefox on admin > match. 2013-12-17 16:56:10 +01:00
Richard
7087ece907 Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 16:47:23 +01:00
Richard
fecb183262 - Changed text on show/hide filter on MyProjects.
- Overwrite of css to create a margin between checkboxes and text on MyProject filters.
2013-12-17 16:47:16 +01:00
Leo
5a5e4310e2 SupervisorGradingPage now renders different panels depending on role of logged in user 2013-12-17 16:43:29 +01:00
Leo
f6103de22c Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 16:33:09 +01:00
Emil Siverhall
78b0059c92 removed some unused methods from milestone panels 2013-12-17 16:23:23 +01:00
Leo
487e11cdc1 Broke out GradingReportPointsPanel from FillOutGradingReport 2013-12-17 16:20:08 +01:00
Leo
80c7719d99 Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 15:47:39 +01:00
Leo
fb42aa0e8b broke out ScrollingSaveButton from FillOutGradingReportPanel 2013-12-17 15:47:22 +01:00
Richard
cec1b80a3f Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 15:46:21 +01:00
Richard
23d431a4b7 Color and style changes to the feedbackpanels. 2013-12-17 15:46:13 +01:00