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
b2570de2e9
Updated to latest Guava version.
2014-01-24 11:04:13 +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
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
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
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
Leo
0fd60b069a
working radio buttons for FinalSeminarRespondent
2014-01-23 13:33:07 +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
ca538aa6e1
Milestones can now have an event assigned to them that activates them when the event is raised.
...
Added OppositionApprovedEvent and MilestoneActivator which handles those events and activates any associated milestone.
2014-01-23 11:22:08 +01:00
Emil Siverhall
7db2f44169
Merge remote-tracking branch 'origin/develop' into develop
2014-01-23 10:38:15 +01:00
Emil Siverhall
b8011e9120
passing course start from application period when exporting ideas to projects
2014-01-23 10:37:56 +01:00
e82758b77a
Added Google´s EventBus and bootstrapped it. @Inject a dependency on EventBus to post events. Use @Subscribe on a method to listen for events (determined by argument type).
...
See: http://code.google.com/p/guava-libraries/wiki/EventBusExplained
2014-01-23 10:09:52 +01:00
94f63f3187
Merge remote-tracking branch 'origin/develop' into develop
2014-01-23 09:56:41 +01:00
0d25e87655
Fixed logging (no more stack overflows and only includes relevant information in Idea#toString).
2014-01-23 09:56:31 +01:00
fred-fri
912bf75bba
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-01-23 16:43:00 +09:00
fred-fri
fc1acac02e
test
2014-01-23 16:40:30 +09:00
Emil Siverhall
76faa50bc9
Merge remote-tracking branch 'origin/develop' into develop
2014-01-23 08:16:31 +01:00
Emil Siverhall
1e0691a309
refactoring to make first meeting submission work properly
2014-01-23 08:16:15 +01:00
fred-fri
93ea2d380e
cleanup
2014-01-23 14:46:50 +09:00
fred-fri
7484bdf650
made the final grading report copy of the preliminary grading reports user centric, e.g. differ between supervisor and reviewer ones
2014-01-23 14:09:23 +09:00
Leo
407a01356e
added radiobuttons
2014-01-22 16:54:06 +01:00
Leo
72c9689fed
Merge remote-tracking branch 'origin/develop' into develop
2014-01-22 15:01:00 +01:00
Leo
87d319eeef
added new list to ViewThesisCommentsPanel
2014-01-22 14:54:35 +01:00
Emil Siverhall
80660a55e4
Merge remote-tracking branch 'origin/develop' into develop
2014-01-22 14:15:52 +01:00
Emil Siverhall
5ba69e5882
avoid duplicated answers when submitting peer reviews
2014-01-22 14:15:38 +01:00
Leo
45a968f628
added download link for opposition report
2014-01-22 13:36:45 +01:00
Leo
e9a0f289f0
refactored GradingReportPdfResource
2014-01-22 10:27:48 +01:00
Leo
d225f5e148
*refactored PreliminaryGradingReportPdfResource into abstract hierarchy
...
*added template for opposition report
*prepared OppositionReport for template with getters
2014-01-22 10:10:46 +01:00
fred-fri
4fbf012084
removed flyway script 74 which deletes projecttype unknown. we don't actually want to run this script as a flyway file, it should be run on production as is manually after having been double checked to work locally with a prod db dump.
2014-01-22 11:43:24 +09:00
c18cfd160c
Removed commented out code.
2014-01-21 16:56:16 +01:00
