Fredrik Friis
|
f268a0ddc2
|
added dao methods for filtering on project statuses
|
2012-02-14 15:17:42 +09:00 |
|
Fredrik Friis
|
8602d9e69a
|
Merge branch 'project' into develop
|
2012-02-14 14:23:39 +09:00 |
|
Fredrik Friis
|
3c2a70deb9
|
everything works now
|
2012-02-14 14:23:24 +09:00 |
|
Fredrik Friis
|
38a163be16
|
students can now see when current application period ends
|
2012-02-14 13:50:49 +09:00 |
|
Fredrik Friis
|
5ef595ca0b
|
added filtering to panel, but there seems to be a problem with the dao implementation
|
2012-02-14 12:21:00 +09:00 |
|
Fredrik Friis
|
25df883fac
|
wrote new reusable panel for selecting projectclasses using checkboxes
|
2012-02-14 11:44:45 +09:00 |
|
Fredrik Friis
|
e9e4781fb5
|
added level filtering to project dao methods
|
2012-02-14 10:31:20 +09:00 |
|
Tom Vahlman
|
c1e7a2725c
|
A project idea that has been rejected by a certain supervisor should not be matched with that supervisor again.
|
2012-02-13 14:40:18 +01:00 |
|
Tom Vahlman
|
3b0ab5b1ae
|
Merge remote-tracking branch 'origin/develop' into develop
|
2012-02-13 10:45:37 +01:00 |
|
Tom Vahlman
|
26df98c732
|
Just added a final statement.
|
2012-02-13 10:45:02 +01:00 |
|
Fredrik Friis
|
cc3cd71012
|
algorithm wont match idea to supervisor who is the same user as any of the authors
|
2012-02-13 17:00:52 +09:00 |
|
Fredrik Friis
|
7efb676936
|
date created added to supervisor my projects panel
|
2012-02-13 16:19:14 +09:00 |
|
Fredrik Friis
|
f06c4da33e
|
example link added
|
2012-02-13 14:43:47 +09:00 |
|
Fredrik Friis
|
ac040f0568
|
match application periods are now displayed with time of day
|
2012-02-13 12:11:09 +09:00 |
|
Fredrik Friis
|
864f3af788
|
new db update file
|
2012-02-13 11:17:13 +09:00 |
|
Fredrik Friis
|
d70ca77c20
|
edited a comment
|
2012-02-13 11:13:13 +09:00 |
|
Fredrik Friis
|
db004aba0b
|
editing only allowed for new project ideas (e.g. unsubmitted ones) and refused project ideas
|
2012-02-13 11:05:06 +09:00 |
|
Tom Vahlman
|
869870c6f1
|
Adding a test that is showing that project class is more important then preferred supervisor.
|
2012-02-12 14:03:30 +01:00 |
|
Tom Vahlman
|
122c732838
|
Simplifying the name of the tests....
|
2012-02-12 13:41:00 +01:00 |
|
Tom Vahlman
|
dbdb9cb34b
|
Refactoring of tests.
|
2012-02-12 12:08:33 +01:00 |
|
Tom Vahlman
|
efdc62dc98
|
Refactoring of tests.
|
2012-02-12 12:02:53 +01:00 |
|
Tom Vahlman
|
caf70e2db8
|
Refactoring of tests.
|
2012-02-12 12:01:20 +01:00 |
|
Tom Vahlman
|
6f6a202b62
|
Refactoring of tests.
|
2012-02-12 11:58:54 +01:00 |
|
Tom Vahlman
|
c9ecb7aea7
|
Refactoring of tests.
|
2012-02-12 11:39:55 +01:00 |
|
Tom Vahlman
|
3cee49eaec
|
Refactoring of tests.
|
2012-02-12 11:37:04 +01:00 |
|
Tom Vahlman
|
08be318726
|
Objects were not saved in the tests.
|
2012-02-11 19:33:17 +01:00 |
|
Tom Vahlman
|
6e5fddd656
|
Refactored duplicate code in test.
|
2012-02-11 19:24:09 +01:00 |
|
Tom Vahlman
|
4cd13c739c
|
Added a check for not empty.
|
2012-02-11 19:06:23 +01:00 |
|
Tom Vahlman
|
b7a428a0a2
|
Added a null check.
|
2012-02-11 19:01:51 +01:00 |
|
Tom Vahlman
|
1e72ba3087
|
Removed code duplication in test data.
|
2012-02-11 18:35:20 +01:00 |
|
Tom Vahlman
|
96a16a4c6a
|
A comparison should be based on equals and not the "=="-operator.
|
2012-02-11 16:17:02 +01:00 |
|
Tom Vahlman
|
29d42cdb2d
|
A comparison should be based on equals and not the "=="-operator.
|
2012-02-11 16:15:39 +01:00 |
|
Tom Vahlman
|
4a03a2400d
|
The test objects were not saved correctly.
|
2012-02-11 15:54:58 +01:00 |
|
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 |
|