Fredrik Friis
|
7bf171b4e8
|
removed project deletion because it causes problems at login
20120229
|
2012-02-29 11:47:34 +09:00 |
|
Tom Vahlman
|
97e8922599
|
Merge remote-tracking branch 'origin/develop' into develop
|
2012-02-28 17:15:57 +01:00 |
|
Tom Vahlman
|
38cf63626d
|
Removed faulty Java doc.
|
2012-02-28 17:15:37 +01:00 |
|
Tom Vahlman
|
27f9c42b72
|
Removed duplicate match-tests.
|
2012-02-28 17:04:57 +01:00 |
|
Tom Vahlman
|
95308fc113
|
calculateTotalAvailability should be done before sorting the list NOT after
|
2012-02-28 15:32:21 +01:00 |
|
Emil Siverhall
|
7f134b25a1
|
Merge branch 'keywordsWithSupervisorDetails' into develop
|
2012-02-28 10:28:58 +01:00 |
|
Emil Siverhall
|
0c2344feaf
|
refactoring of close button for better performance and removed irrelevant form component
|
2012-02-28 10:28:35 +01:00 |
|
Fredrik Friis
|
a9e417ae98
|
fixed comment
|
2012-02-28 17:49:02 +09:00 |
|
Emil Siverhall
|
b91adacd6f
|
Merge branch 'keywordsWithSupervisorDetails' into develop
|
2012-02-28 09:22:53 +01:00 |
|
Emil Siverhall
|
388b77beaf
|
added label with number of supervisors for each keyword and made some changes to dialog sizes
|
2012-02-28 09:22:19 +01:00 |
|
Fredrik Friis
|
22f9617896
|
keywords are in order now
|
2012-02-28 17:03:52 +09:00 |
|
Fredrik Friis
|
92b1908d5b
|
made popup bigger
|
2012-02-28 11:39:26 +09:00 |
|
Fredrik Friis
|
c840034094
|
fixed the issue with repeated results
|
2012-02-28 11:17:22 +09:00 |
|
Fredrik Friis
|
2ecf6ff435
|
added match manually to a popup
|
2012-02-28 10:21:46 +09:00 |
|
Fredrik Friis
|
cb00edb412
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-02-28 09:34:27 +09:00 |
|
Fredrik Friis
|
847c07c919
|
some fixes to profile panel
|
2012-02-28 09:02:40 +09:00 |
|
Tom Vahlman
|
91f9a4584b
|
Moved the availability comparison to the class Pair. Tests should be written for this...
|
2012-02-27 21:57:27 +01:00 |
|
Tom Vahlman
|
604a38152c
|
We must sort on the highest (individual availability) when the project classes are the same.
|
2012-02-27 21:33:06 +01:00 |
|
Tom Vahlman
|
f10718e5b4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2012-02-27 16:32:19 +01:00 |
|
Tom Vahlman
|
f547468a50
|
Added a test with three project ideas which where matched against three supervisors. There is a need for more extensive tests for covering all cases.
|
2012-02-27 16:32:01 +01:00 |
|
Emil Siverhall
|
b79ac663ec
|
added link to details dialog for manage keyword panels
|
2012-02-27 16:02:02 +01:00 |
|
Emil Siverhall
|
882b7849d2
|
added dao method for retrieving supervisors based on specific keyword
|
2012-02-27 16:01:28 +01:00 |
|
Emil Siverhall
|
1b38a5e172
|
added new panel for keyword detail dialog with supervisor info
|
2012-02-27 16:00:41 +01:00 |
|
Emil Siverhall
|
e48f16cdb7
|
Merge branch 'keywordSort' into develop
|
2012-02-27 14:04:07 +01:00 |
|
Emil Siverhall
|
974f95864c
|
unit test for new keyword dao method
|
2012-02-27 13:44:20 +01:00 |
|
Emil Siverhall
|
9d7f9e4343
|
Switched to new param implementation when retrieving keywords on a few pages
|
2012-02-27 13:43:50 +01:00 |
|
Emil Siverhall
|
e21b6c7039
|
changes in keyword data provider to match new params
|
2012-02-27 13:42:11 +01:00 |
|
Emil Siverhall
|
a29ca62bae
|
Added support for sortable params to KeywordDao
|
2012-02-27 13:41:36 +01:00 |
|
Fredrik Friis
|
8a32e4a763
|
added warning
|
2012-02-27 16:38:04 +09:00 |
|
Fredrik Friis
|
1bd44a6c90
|
checklists can now be removed even though they are started and linked to activities
|
2012-02-27 16:34:28 +09:00 |
|
Fredrik Friis
|
55d52cbce0
|
changed the profile panel to the new one in the admin manage supervisor gui
|
2012-02-27 15:42:40 +09:00 |
|
Fredrik Friis
|
45f487f790
|
fixed proper identifiers for exemption creation
|
2012-02-27 14:46:59 +09:00 |
|
Fredrik Friis
|
8337cf2b21
|
changed spelling in footer
|
2012-02-27 12:55:45 +09:00 |
|
Fredrik Friis
|
7ea0cab93f
|
fixed conflict
|
2012-02-27 12:51:50 +09:00 |
|
Fredrik Friis
|
da56c4c899
|
Merge branch 'profile' into develop
20120227
|
2012-02-27 11:57:06 +09:00 |
|
Fredrik Friis
|
7cfba3d236
|
some fixes
|
2012-02-27 11:53:35 +09:00 |
|
Fredrik Friis
|
5a91b9d7f3
|
some fixes
|
2012-02-27 11:42:46 +09:00 |
|
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
20120224b
|
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
20120224
|
2012-02-24 12:30:34 +09:00 |
|
Fredrik Friis
|
16d48e64cd
|
some gui changes
|
2012-02-24 12:24:11 +09:00 |
|