6916 Commits

Author SHA1 Message Date
Emil Siverhall
eb0a34ea53 added logger that informs us when notification compilation worker starts 2014-01-28 09:19:11 +01:00
Richard
235718cd2e Merge remote-tracking branch 'origin/develop' into develop 2014-01-28 09:15:06 +01:00
fred-fri
0431be1b0d lazy bug fixed 2014-01-28 15:15:56 +09:00
fred-fri
915abc24f3 fixed bug 2014-01-28 13:10:42 +09:00
Richard
e260157335 Design changes to the final seminar page. 2014-01-27 17:47:14 +01:00
77a990f4a4 Made switch user the default page when clicking on Users under admin. 2014-01-27 16:53:50 +01:00
049df7d37b Moved bulk import from daisy to 01:30 from 00:05 to prevent overlap with database backup.
Moved idea export to daisy to 01:00 from 00:005 to prevent overlap with both import job and database backup.
2014-01-27 16:36:44 +01:00
de16c3a705 Post approve events when a final seminar participant gets approved. 2014-01-27 15:11:49 +01:00
Emil Siverhall
b2a66d3bf9 removed ShowChecklistFilePanel 2014-01-27 14:53:39 +01:00
Emil Siverhall
ed1c771fae null check checklist parameters when entering view checklist page 2014-01-27 14:40:17 +01:00
Emil Siverhall
b58a54cd18 hide approve radiochoice before seminar has passed 2014-01-27 14:07:16 +01:00
db04ab2362 Merge branch 'develop' into refactoringgradingreports 2014-01-27 13:31:13 +01:00
4bd285e4f8 Domain objects are now more or less correct.
Broke out creation of report into separate factories (SRP).
Report now owns criteria and they have no knowledge of the report they belong to.
2014-01-27 13:31:07 +01:00
fred-fri
2d6598756d arguments to constructor were in wrong order 2014-01-27 19:12:14 +09:00
fred-fri
9914f04cc8 created page for editing internal user research areas. 2014-01-27 16:52:30 +09:00
Emil Siverhall
8ab1b5d4f4 cleanup 2014-01-26 23:06:09 +01:00
6194e7761e Continued refactoring. (Still chaos) 2014-01-24 16:08:27 +01:00
Emil Siverhall
fa10d1f1e4 lazy loading exception when aborting grading on final seminar participations 2014-01-24 15:56:34 +01:00
67962dbc51 Merge branch 'develop' into refactoringgradingreports 2014-01-24 15:35:28 +01:00
7293724f38 Bad Richard. 2014-01-24 15:33:41 +01:00
ccc27ec660 Fixed templates field declaration. 2014-01-24 15:05:45 +01:00
Richard
2ea772d653 Merge remote-tracking branch 'origin/develop' into develop 2014-01-24 14:38:34 +01:00
Richard
ce44eaf480 Initial styling of the approve-function.
Removed string "Upload new" from UploadFormPanel.
2014-01-24 14:38:26 +01:00
Emil Siverhall
a99a966c40 fixed bug when updating the same final seminar participation grade more than once. 2014-01-24 14:25:48 +01:00
fred-fri
bd526d3652 refactoring 2014-01-24 20:04:14 +09:00
Leo
e8a63654f5 Merge remote-tracking branch 'origin/develop' into develop 2014-01-24 12:03:21 +01:00
Leo
52e92a61e6 feedback for approving opposition, active participation and respondents 2014-01-24 12:03:07 +01:00
ccc0a355c3 Fixed templates to use criteria instead of answers. 2014-01-24 11:46:27 +01:00
Leo
2e494d6049 removed unnecessary form 2014-01-24 11:36:00 +01:00
Leo
4280c03e61 confirmation dialogs for radio buttons 2014-01-24 11:26:45 +01:00
fred-fri
e9923abd2d spelling error 2014-01-24 19:12:05 +09:00
Leo
fff363e839 removed submit button 2014-01-24 10:57:29 +01:00
Leo
9010c8e01d changed radios to ajax 2014-01-24 10:55:00 +01:00
fred-fri
c7486c58ff fixed bug that made the overview grading component tell the reviewer that grading was completed when supervisor had handed in both reports but reviewer still hadnt handed in any 2014-01-24 18:35:43 +09:00
Emil Siverhall
242868cdde Merge remote-tracking branch 'origin/develop' into develop 2014-01-24 08:53:48 +01:00
Emil Siverhall
1ad3ed7a21 FinalSeminarActiveParticipation refactoring 2014-01-24 08:47:37 +01:00
93a3496a39 Added total number of projects to milestone statistics. 2014-01-23 17:14:21 +01:00
b5206b7d9e Added project status filter. 2014-01-23 16:46:20 +01:00
7bac867de6 Merge remote-tracking branch 'origin/develop' into develop 2014-01-23 16:25:00 +01:00
dfb3130ce9 Created DeactivatableDatePickerPanel.
Made project created between filter optional in milestone statistics.
Minor refactorings in how the filter is updated (now with CompoundPropertyModel).
MileStoneServiceImpl uses QueryDSL predicate instead of custom Spring @Query methods.
2014-01-23 16:24:56 +01:00
Richard
c5643aa278 Removed <br> from radioButtons on the SeminarPanel.
Added bootstrap styling to save button.
2014-01-23 16:14:31 +01:00
Emil Siverhall
e42cd12e29 abstract FinalSeminarParticipation class that hold finalSeminar, student and grade. implemented on respondents and opponents 2014-01-23 15:49:07 +01:00
Leo
440867791c Merge remote-tracking branch 'origin/develop' into develop 2014-01-23 14:17:10 +01:00
Leo
784b765b16 hides radio buttons if not supervisor 2014-01-23 14:16:58 +01:00
903cea0fdb Merge remote-tracking branch 'origin/develop' into develop 2014-01-23 14:05:15 +01:00
dd1dbeaba6 Added a drop down where you can select how milestones gets activated.
Made it impossible to create events in java code to better communicate that you are not supposed to.
Lombok'd MileStoneActivity.
2014-01-23 14:05:10 +01:00
Leo
7c9328713d Merge remote-tracking branch 'origin/develop' into develop 2014-01-23 13:42:42 +01:00
Leo
870e554324 changed from user to student in FinalSeminarRespondent 2014-01-23 13:42:20 +01:00
eee7355adc Renamed variable to reflect what it actually is. (Old phase is required to calculate sort order if moving between phases) 2014-01-23 13:39:07 +01:00
Leo
0fd60b069a working radio buttons for FinalSeminarRespondent 2014-01-23 13:33:07 +01:00