Fredrik Friis
|
88c53ac8d6
|
Merge branch 'target' into develop
|
2012-02-09 13:27:15 +09:00 |
|
Fredrik Friis
|
c236a717a2
|
final fixes and preparations for merge
|
2012-02-09 13:26:22 +09:00 |
|
Fredrik Friis
|
66bfe87cc6
|
some gui rearrangements
|
2012-02-09 13:15:56 +09:00 |
|
Fredrik Friis
|
fb899d0fc2
|
some gui rearrangements
|
2012-02-09 12:26:01 +09:00 |
|
Fredrik Friis
|
7db3af2bec
|
some gui changes
|
2012-02-09 11:39:31 +09:00 |
|
Tom Vahlman
|
e89ff533bd
|
NPE when setting supervisor for a Match (Employee was Null).
|
2012-02-08 19:57:28 +01:00 |
|
Tom Vahlman
|
a1aec28a59
|
Added null checks in toString.
|
2012-02-08 19:54:50 +01:00 |
|
Tom Vahlman
|
a14f393004
|
Some refactoring...
|
2012-02-08 17:44:25 +01:00 |
|
Tom Vahlman
|
083de84643
|
Refactored ApplicationPeriod out of StringUtil bacause StringUtil should only be aware of Strings.
|
2012-02-08 15:02:18 +01:00 |
|
Tom Vahlman
|
ae2165955e
|
Added Java Docs to the API for checking that application periods not overlap
|
2012-02-08 13:07:02 +01:00 |
|
Tom Vahlman
|
8fff1fb783
|
Instance variable should be local if possible, to save memory usage.
|
2012-02-08 12:12:03 +01:00 |
|
Tom Vahlman
|
674ab0dcf1
|
IsEditable should also handle the situation when no project idea exists, i. e. when the model is null.
|
2012-02-08 12:11:21 +01:00 |
|
Fredrik Friis
|
12906caf39
|
added some comments
|
2012-02-08 19:04:48 +09:00 |
|
Fredrik Friis
|
5bdedd7a24
|
minor cleanup
|
2012-02-08 18:59:31 +09:00 |
|
Fredrik Friis
|
7e56b81482
|
algorithm now uses same method for counting as GUI
|
2012-02-08 18:49:20 +09:00 |
|
Fredrik Friis
|
5e763d8860
|
removed old hard coded level dates
|
2012-02-08 15:03:50 +09:00 |
|
Fredrik Friis
|
17946b117c
|
master added also
|
2012-02-08 14:46:40 +09:00 |
|
Fredrik Friis
|
30da9bed86
|
counting now works with the map
|
2012-02-08 14:41:03 +09:00 |
|
Fredrik Friis
|
dd91beafea
|
using a map instead of hard coded projectlevels
|
2012-02-08 14:35:47 +09:00 |
|
Fredrik Friis
|
f058712029
|
count only project ideas with match which createdDate is after supervisors resetDate
|
2012-02-08 13:52:37 +09:00 |
|
Fredrik Friis
|
71e1a09a46
|
when counting active ideas we want to count ideas with corresponding projects also
|
2012-02-08 13:42:03 +09:00 |
|
Fredrik Friis
|
38fa5ba049
|
added reset dates to gui
|
2012-02-08 12:45:22 +09:00 |
|
Fredrik Friis
|
aaa69ba3f3
|
added dao method for batch resetting bachelor level supervisor target count numbers and added button for it. seems to work fine.
|
2012-02-08 12:29:56 +09:00 |
|
Tom Vahlman
|
386292066d
|
Must test for equals on dates, otherwise the user might create two identical periods.
|
2012-02-07 21:21:33 +01:00 |
|
Tom Vahlman
|
d63767aadc
|
It should not be allowed to edit an expired application period.
|
2012-02-07 20:05:37 +01:00 |
|
Tom Vahlman
|
991bd68637
|
It should not be possible to remove an expired application period.
|
2012-02-07 20:03:13 +01:00 |
|
Tom Vahlman
|
f1de667f0b
|
A student should be allowed to edit a submitted project idea when an open application period exists for the project class.
|
2012-02-07 15:06:35 +01:00 |
|
Tom Vahlman
|
f69914b158
|
Refactored tests instance variables should be converted to locals if possible.
|
2012-02-07 14:53:41 +01:00 |
|
Tom Vahlman
|
147836540a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2012-02-07 11:53:46 +01:00 |
|
Tom Vahlman
|
535d8eb82b
|
Refactored tests instance variables should be converted to locals if possible.
|
2012-02-07 11:53:35 +01:00 |
|
Fredrik Friis
|
3cc9127f45
|
Merge branch 'dialog' into develop
|
2012-02-07 19:03:57 +09:00 |
|
Fredrik Friis
|
fffaab108d
|
epic win. everything works
|
2012-02-07 19:01:43 +09:00 |
|
Rasmus Ivö
|
80d35091bc
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-02-07 09:30:01 +01:00 |
|
Fredrik Friis
|
b0c68b0999
|
list with project ideas is ajax update upon declining
|
2012-02-07 16:32:03 +09:00 |
|
Fredrik Friis
|
51823d352c
|
admin page now shows comment for admin
|
2012-02-07 15:58:40 +09:00 |
|
Fredrik Friis
|
01a4a64c9e
|
rejecting now works only if correct amount of characters entered
|
2012-02-07 15:56:16 +09:00 |
|
Fredrik Friis
|
efca037ec3
|
ajax closing of dialog works
|
2012-02-07 15:07:20 +09:00 |
|
Fredrik Friis
|
de7a291890
|
dialog should close on button press
|
2012-02-07 13:43:25 +09:00 |
|
Fredrik Friis
|
94c527156b
|
added new panel files
|
2012-02-07 13:39:53 +09:00 |
|
Fredrik Friis
|
a66a7b80d9
|
trying to add new attribute to entity, is not reflected in database
|
2012-02-07 13:14:30 +09:00 |
|
Tom Vahlman
|
9fe8970b5b
|
FIxed failed test.
|
2012-02-06 21:31:45 +01:00 |
|
Tom Vahlman
|
1cf0927d45
|
FIxed failed test.
|
2012-02-06 21:25:57 +01:00 |
|
Tom Vahlman
|
2856007573
|
A student should be allowed to edit a submitted project idea when an application period exists.
|
2012-02-06 21:19:05 +01:00 |
|
Tom Vahlman
|
410ef4e647
|
The StringUtil class should not be aware of ApplicationPeriods.
|
2012-02-06 20:04:59 +01:00 |
|
Tom Vahlman
|
c1d48a0e24
|
Added new tests eg. "create a period1 with a start date before the start date of period2 and with an end date after the end date of period2".
|
2012-02-06 19:16:17 +01:00 |
|
Tom Vahlman
|
fbd9cf3922
|
Not create a period1 with a start date before the start date of period2 and with an end date after the end date of period2.
|
2012-02-06 18:52:12 +01:00 |
|
Tom Vahlman
|
27cd416cc7
|
It is possible to create an application period with end date before the start date. + The FeedBack messages should only be written on one panel or page.
|
2012-02-06 18:01:32 +01:00 |
|
FredrikNorberg
|
e7de068045
|
Merge branch 'supervisorSettingsGui' into develop
|
2012-02-06 15:35:54 +01:00 |
|
FredrikNorberg
|
25dc4b84ab
|
changed supervisor settings in match to show 10 supervisors per page to increase performence, also increased the maximum number to 24 for target projects
|
2012-02-06 15:35:38 +01:00 |
|
Tom Vahlman
|
5222f35914
|
Application Periods: Dont render any error messages about levels that already exists, when no levels has been selected. + Formatting the output messages.
|
2012-02-06 12:11:14 +01:00 |
|