Fredrik Friis
|
981e8dc5cc
|
some fixes
|
2012-02-27 11:39:24 +09:00 |
|
Fredrik Friis
|
d5c228389c
|
better markup now
|
2012-02-27 10:57:55 +09:00 |
|
Fredrik Friis
|
50069ca7eb
|
almost finished, just need to put the active on the right an inactive on the left
|
2012-02-27 10:48:39 +09:00 |
|
Tom Vahlman
|
8ac38646b1
|
Making a test commit.
|
2012-02-26 16:47:31 +01:00 |
|
Tom Vahlman
|
9ce03fcaa1
|
Points, total availability (bachelor + master) and type of project class must be considered when sorting a list of Pair representing matches.
|
2012-02-25 21:47:03 +01:00 |
|
Tom Vahlman
|
09dbafb5b6
|
Removed compareTo because it has moved to GreedyMatchingAlgorithm#Pair#compareTo
|
2012-02-25 21:45:29 +01:00 |
|
Tom Vahlman
|
686347b64c
|
Added API doc.
|
2012-02-25 21:44:38 +01:00 |
|
Tom Vahlman
|
3661061ed0
|
Rewrote the matching algorithm which didnt work.
|
2012-02-24 20:58:35 +01:00 |
|
Fredrik Friis
|
b7816cb7da
|
info about broken stuff
|
2012-02-25 00:51:26 +09:00 |
|
Fredrik Friis
|
44b25c139e
|
adding if statement to supervisorprofilepage
|
2012-02-24 19:37:37 +09:00 |
|
Fredrik Friis
|
e1a8bb09cf
|
added a new profile panel thats halfway done. todo: fix nullpointer for users who are not employees
|
2012-02-24 19:28:22 +09:00 |
|
Fredrik Friis
|
06be88e3bc
|
new db update file
|
2012-02-24 12:30:34 +09:00 |
|
Fredrik Friis
|
16d48e64cd
|
some gui changes
|
2012-02-24 12:24:11 +09:00 |
|
Tom Vahlman
|
5326624c7e
|
Dirty solution for test increase slot. _All_ supervisor Availability objects are put under the Bachelor key in the sorted availability map. And some under Master _as_well_.
|
2012-02-23 17:32:14 +01:00 |
|
Tom Vahlman
|
4fd328845c
|
Dirty solution for test increase slot. _All_ supervisor Availability objects are put under the Bachelor key in the sorted availability map. And some under Master _as_well_.
|
2012-02-23 17:31:29 +01:00 |
|
Fredrik Friis
|
3643f94dd3
|
Merge branch 'mytemp' into develop
|
2012-02-23 17:44:04 +09:00 |
|
Fredrik Friis
|
aef4f2538e
|
admins can now see but not edit projects
|
2012-02-23 17:43:29 +09:00 |
|
Emil Siverhall
|
5a340fa896
|
Merge branch 'unitImportFix' into develop
* unitImportFix:
units is now being removed from scipro employees that does not have a remote unit
|
2012-02-22 20:22:30 +01:00 |
|
Emil Siverhall
|
a314deb970
|
units is now being removed from scipro employees that does not have a remote unit
|
2012-02-22 20:20:47 +01:00 |
|
Tom Vahlman
|
8bb31b0cb7
|
Test that the number Availability#numMatched has increased with one and that the supervisor with highest available slots are chosen.
|
2012-02-22 20:10:04 +01:00 |
|
Tom Vahlman
|
380822ed8d
|
Test that the number Availability#numMatched has increased with one and that the supervisor with highest available slots are chosen.
|
2012-02-22 20:07:55 +01:00 |
|
Tom Vahlman
|
4549370ea0
|
Just changed a TODO statement.
|
2012-02-22 19:38:45 +01:00 |
|
Tom Vahlman
|
40127f8bed
|
Added Unit-test to test that the supervisor with highest available slots gets chosen. + tests that shows neither a bachelor or a master supervisor are preferred to handle a bachelor idea when compatibility, keywords, scores etc are equal.
|
2012-02-22 19:37:56 +01:00 |
|
Tom Vahlman
|
c3e0bfb3a0
|
Added Unit-test to see if a supervisor is deleted or not + added unit-test to check that a supervisor not can supervise herself + test that the supervisor with available slots gets chosen.
|
2012-02-22 18:51:03 +01:00 |
|
Tom Vahlman
|
40c3aad331
|
We should test if a supervisor is deleted or not irrespectively if the supervisor is a student or not.
|
2012-02-22 18:19:18 +01:00 |
|
Tom Vahlman
|
4bfdd1897b
|
Tests should begin with the word "test..." + removed duplicate test.
|
2012-02-22 14:35:06 +01:00 |
|
Tom Vahlman
|
55204b34fb
|
It should not be possible to edit or delete application periods that are connected to project ideas.
|
2012-02-22 11:18:07 +01:00 |
|
alekoz
|
25a95beb16
|
changed some privileges
|
2012-02-22 10:30:33 +01:00 |
|
Fredrik Friis
|
2ea599696c
|
deleting projects seems to work after adding orphan removal on a bunch of stuff
|
2012-02-22 18:08:48 +09:00 |
|
anto-gom
|
a4e13589e2
|
Fixed broken CSS selectors for menu in Admin > Match.
|
2012-02-22 06:13:24 +01:00 |
|
anto-gom
|
6ae94d7beb
|
Changed some incorrect CSS attribute and value pairs, fixed two syntax errors and changed a few incorrect usages of shorthand properties.
|
2012-02-22 05:52:20 +01:00 |
|
anto-gom
|
f67a8bdef5
|
Fixed broken CSS selectors for horizontal-menu rules. Was using descendant selectors as if they were child selectors.
|
2012-02-22 05:48:14 +01:00 |
|
Tom Vahlman
|
c78992f69e
|
Not possible to edit dates for application periods that are connected to project ideas.
|
2012-02-21 18:02:26 +01:00 |
|
Emil Siverhall
|
20cbbe3f4f
|
Merge branch 'scriptFix' into develop
|
2012-02-21 16:18:46 +01:00 |
|
Emil Siverhall
|
4de8e95d67
|
updating db scripts
|
2012-02-21 16:18:21 +01:00 |
|
Emil Siverhall
|
af1f93b959
|
Merge branch 'massmail' into develop
|
2012-02-21 16:12:57 +01:00 |
|
Emil Siverhall
|
aeb0b84bf3
|
added unit test for project dao to make sure params to check between two start dates works fine
|
2012-02-21 16:00:52 +01:00 |
|
Emil Siverhall
|
84732a41c0
|
fixed merge problems and project dao may now filter on both dateCreated and daisyStartDate
|
2012-02-21 15:03:18 +01:00 |
|
Emil Siverhall
|
273b5900d6
|
minor changes to project dao jpa implementation
|
2012-02-21 14:41:05 +01:00 |
|
Emil Siverhall
|
19e439295b
|
removed comment that was there for testing purposes
|
2012-02-21 14:38:35 +01:00 |
|
Emil Siverhall
|
d5a42b7972
|
minor cleanup
|
2012-02-21 14:38:33 +01:00 |
|
Emil Siverhall
|
06f0378d28
|
code refactoring and addition of missing recipient sets
|
2012-02-21 14:38:31 +01:00 |
|
Emil Siverhall
|
039d72ed41
|
added button for refreshing list of recipients, since date picker panel can't be updated with on change behavior
|
2012-02-21 14:38:29 +01:00 |
|
Emil Siverhall
|
29cd1286c0
|
changed to bcc recipients to hide other recipients e-mails
|
2012-02-21 14:38:27 +01:00 |
|
Emil Siverhall
|
3c0cc1d5c9
|
Added option to only have thesis support as recipient for both projects and project ideas. This needs a user with thesis support e-mail in the database to work with the current mail event model.
|
2012-02-21 14:38:25 +01:00 |
|
Emil Siverhall
|
19f19af1a4
|
date picker start date is 6 months before todays date
|
2012-02-21 14:38:23 +01:00 |
|
Emil Siverhall
|
d8c7a9e436
|
added null check to avoid npe when choosing to show recipients before doing choices
|
2012-02-21 14:38:21 +01:00 |
|
Emil Siverhall
|
3ebad8d03b
|
added different labels for the date picker depending on if recipients is filtered by project or project ideas
|
2012-02-21 14:38:19 +01:00 |
|
Emil Siverhall
|
50f470d25d
|
added date filtering for projects as well. Filtering on daisy start date for the active projects
|
2012-02-21 14:38:17 +01:00 |
|
Emil Siverhall
|
e195700624
|
added userset for test purposes with only one e-mail. also made all sets that concern project ideas use date filter as well.
|
2012-02-21 14:33:31 +01:00 |
|