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
Richard
49e9b7a666
Removed h2 from final seminar title. Added h3 instead.
2014-01-23 13:27:30 +01:00
Leo
3f492fc592
new entity FinalSeminarRespondent with services and repo.
2014-01-23 11:36:41 +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
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
674cf84b1d
test fix and cleanup
2014-01-23 14:59:17 +09: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
fred-fri
053b55ddd4
pressing submit on preliminary grading report now saves answers in final grading report too, but when reviewer does a preliminary grading report the final grading report answers get overwritten, e.g. the copy isnt user specific
2014-01-23 12:32:47 +09:00
Emil Siverhall
7495fcaaf0
daily issues..
2014-01-22 22:13:56 +01:00
Leo
bfd2b241bb
Merge remote-tracking branch 'origin/develop' into develop
2014-01-22 17:02:06 +01:00
Leo
61cd2029ed
added BETA view
2014-01-22 17:01:45 +01:00
Leo
407a01356e
added radiobuttons
2014-01-22 16:54:06 +01:00
Richard
10e0e993a5
Removed css-classes that wasn't being used.
2014-01-22 16:05:06 +01:00
Richard
99ea0acb73
Merge remote-tracking branch 'origin/develop' into develop
2014-01-22 15:37:01 +01:00
Richard
46d4b9b020
Minor changes in the css-file.
...
Removed a commented line that wasn't needed.
2014-01-22 15:36:53 +01:00
Leo
72c9689fed
Merge remote-tracking branch 'origin/develop' into develop
2014-01-22 15:01:00 +01:00
