Tom Vahlman
|
018f721045
|
An NPE occurred during the tests because the test objects were not correctly constructed (the return value from dao.save should be used instead of the argument).
|
2012-02-11 13:40:12 +01:00 |
|
Tom Vahlman
|
1a7f831858
|
Added java docs and changed a complicated return statement.
|
2012-02-11 13:37:32 +01:00 |
|
Tom Vahlman
|
c6131c50bd
|
Added check against NPEs in toString.....
|
2012-02-10 17:34:35 +01:00 |
|
Tom Vahlman
|
6989e646d6
|
Constructor parameters should be final....
|
2012-02-10 17:31:33 +01:00 |
|
Tom Vahlman
|
73c02f6e0e
|
The partner field disappears after submit. + It is not possible to edit the partner field after a submit.
|
2012-02-10 16:37:37 +01:00 |
|
Tom Vahlman
|
c305509e34
|
IsEditble should check that idea.getId() was NULL for new project ideeas..
|
2012-02-10 11:36:33 +01:00 |
|
Fredrik Friis
|
3b38f11dfe
|
removed status from supervisor my projectspanel
|
2012-02-10 14:24:27 +09:00 |
|
Fredrik Friis
|
636b28acca
|
latest project now made active upon login
|
2012-02-10 13:54:09 +09:00 |
|
Fredrik Friis
|
6137c285c5
|
made if statement into if else statement
|
2012-02-10 13:12:14 +09:00 |
|
Fredrik Friis
|
2c2c7fdcac
|
login if statement bug fixed
|
2012-02-10 12:34:40 +09:00 |
|
Fredrik Friis
|
0fb46d158c
|
supervisor is now removed when unmathing a project idea through admin interface
|
2012-02-10 12:16:42 +09:00 |
|
Niklas Herder
|
167761d8e2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2012-02-09 16:25:13 +01:00 |
|
Niklas Herder
|
e12d70060d
|
Commenting out the cargo plugin. Deployment is handled by Jenkins.
|
2012-02-09 16:25:04 +01:00 |
|
Fredrik Friis
|
8ed76b80ab
|
if statement in correct order
|
2012-02-09 16:19:15 +09:00 |
|
Fredrik Friis
|
00b68aa5a9
|
unit is no longer removed when saving a supervisor profile
|
2012-02-09 16:13:33 +09:00 |
|
Fredrik Friis
|
b034253933
|
Merge branch 'target' into develop
|
2012-02-09 14:04:40 +09:00 |
|
Fredrik Friis
|
bd4d56634a
|
inactive ideas counted as occupying a slot
|
2012-02-09 14:00:28 +09:00 |
|
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 |
|