leosu
a554b5ac8c
pleasing sonar
2014-01-28 15:58:01 +01:00
Emil Siverhall
9afd563120
Merge remote-tracking branch 'origin/develop' into develop
2014-01-28 15:49:04 +01:00
Emil Siverhall
623f3f851e
checkbox for switching between ProjectStatus.ACTIVE and ProjectStatus.INACTIVE on projects without external identifiers
2014-01-28 15:18:10 +01:00
e93e4cc34b
Renamed hasException() to isAutomatic() and included activatedBy events.
...
Checkboxes in the milestone overview will therefore now get disabled if they are activated by an event.
2014-01-28 14:55:19 +01:00
545e119534
Merge remote-tracking branch 'origin/develop' into develop
2014-01-28 14:18:30 +01:00
e1087dafb5
Changed back showSql
2014-01-28 14:16:53 +01:00
7e20b8eeb0
We win!
2014-01-28 14:06:47 +01:00
Emil Siverhall
d28c567f3c
Merge remote-tracking branch 'origin/develop' into develop
2014-01-28 12:50:22 +01:00
041768dfb2
Merge branch 'develop' into refactoringgradingreports
2014-01-28 12:19:21 +01:00
d427e8ebc3
Fixed grading report service and fill out reviewer grading panel.
...
Updated migration script to move the old boolean to the new type.
2014-01-28 12:19:15 +01:00
leosu
c5aab5d8bb
Merge remote-tracking branch 'origin/develop' into develop
2014-01-28 11:27:02 +01:00
9b513c6b28
Production code done (hopefully).
2014-01-28 11:17:28 +01:00
Emil Siverhall
2a6b1fe38d
auto complete component for users
2014-01-28 10:02:19 +01:00
fred-fri
0431be1b0d
lazy bug fixed
2014-01-28 15:15:56 +09:00
leosu
9591694b16
pleasing sonar
2014-01-27 16:54:56 +01:00
leosu
6d4a9384e3
Merge remote-tracking branch 'origin/develop' into develop
2014-01-27 16:42:43 +01:00
leosu
a4627d4aef
project_id i thesislink unique
2014-01-27 16:42:31 +01:00
Emil Siverhall
7b6e671b2f
removed transactional annotation that caused problems with updating projects.
2014-01-27 16:39:49 +01:00
67d536d71b
Renamed test since it tests supervisor report, not the abstract class.
2014-01-27 13:43:38 +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
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
d9ead7dc5d
suppress warning on mile stone activity
2014-01-24 16:06:30 +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
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
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
