Emil Siverhall
d9ead7dc5d
suppress warning on mile stone activity
2014-01-24 16:06:30 +01:00
Emil Siverhall
fa10d1f1e4
lazy loading exception when aborting grading on final seminar participations
2014-01-24 15:56:34 +01:00
8aedd8b4f1
Test tested nothing. lol
...
(There were no authors on the project and therefore no reports which means no report can be unfinished.)
2014-01-24 15:43:17 +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
b2570de2e9
Updated to latest Guava version.
2014-01-24 11:04:13 +01: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
274e9db1a9
suppresswarning for unused private field in final seminar participation
2014-01-24 08:52:07 +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
527a9d3d26
Merge remote-tracking branch 'origin/develop' into develop
2014-01-23 15:49: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
5121583cf4
Simplified logic.
2014-01-23 15:21:12 +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
5949db324d
Refactored.
2014-01-23 14:16:42 +01:00
ea60eb683a
Automatic activation of milestones when a respondent approved event is raised.
2014-01-23 14:13:40 +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
30d77516b4
added deletaAll() to projectTypeRepo
2014-01-23 13:56:55 +01:00
Leo
bb8619f734
75 -> 77
2014-01-23 13:43:50 +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
Richard
8a155a5702
Merge remote-tracking branch 'origin/develop' into develop
2014-01-23 13:27:41 +01:00
Richard
49e9b7a666
Removed h2 from final seminar title. Added h3 instead.
2014-01-23 13:27:30 +01:00
75f67bd012
Added ParticipationApprovedEvent and automatic milestone activation for it.
2014-01-23 13:20:13 +01:00
2cc461d56d
Created some reusable defaults in ObjectMother.
2014-01-23 11:42:19 +01:00
Leo
3f492fc592
new entity FinalSeminarRespondent with services and repo.
2014-01-23 11:36:41 +01:00
3a9bcbb64e
Added EventBus to the test spring context.
2014-01-23 11:26:10 +01:00
428aa7ba2f
Merge remote-tracking branch 'origin/develop' into develop
2014-01-23 11:22:13 +01:00
