Fredrik Friis
c534532aaf
fixed bean test bug
2011-12-13 16:45:57 +09:00
Fredrik Friis
cabf233b49
fixed test bug
2011-12-13 16:34:15 +09:00
Fredrik Friis
0cd5237f05
removed println
2011-12-13 16:21:39 +09:00
Fredrik Friis
5fbd831e77
added info label
2011-12-13 16:12:31 +09:00
Fredrik Friis
c2427aa232
fixed info label for supervisor when viewing a supervisor checklist
2011-12-13 15:53:37 +09:00
Fredrik Friis
7be1581148
fixed. supervisor checklists are no longer displayed to students
2011-12-13 15:37:13 +09:00
Fredrik Friis
0c009e5425
checklists should get categories when created now, but they dont =/
2011-12-13 14:38:14 +09:00
Robin Eklund
78a1645132
Refactoring, added support for multiple remote project class names mapping to the same local values.
2011-12-12 18:02:04 +01:00
Robin Eklund
64e6ecbaab
Added project importing, will need some cleaning and loads of bug-fixes.
2011-12-12 17:48:27 +01:00
Fredrik Norberg
c5b534a97c
added a dialog for supervisor details and added a few links to managesupervisorpanel
2011-12-12 16:43:57 +01:00
Emil Siverhall
75e39b1560
bug fix regarding student addition to project idea submissions
2011-12-12 16:39:29 +01:00
Robin Eklund
267d3dc52c
Some stuff, have to look at my stashes now.
2011-12-12 16:14:21 +01:00
Emil Siverhall
ef860b7dcb
fixed bug that added the same project partner multiple times to project idea submission
2011-12-12 15:54:36 +01:00
Emil Siverhall
438ed971d5
merge conflicts
2011-12-12 15:32:38 +01:00
Emil Siverhall
20ee7e28e0
supervisor now reject project ideas, instead of refusing them
2011-12-12 15:17:41 +01:00
Marcus Höjvall
ecc3dddd5c
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Refactored and added language selection to employee profiles
Added some SQL-updates needed before deployment.
2011-12-12 15:17:32 +01:00
Marcus Höjvall
dd364efab7
Doesnt match if idea has been rejected before(like it used to be)
2011-12-12 15:17:12 +01:00
Robin Eklund
529cb2cdd6
Merge branch 'userEditLanguage' into develop
2011-12-12 15:06:15 +01:00
Robin Eklund
c751f50e43
Refactored and added language selection to employee profiles
2011-12-12 15:05:52 +01:00
Emil Siverhall
52446a8f26
minor changes to form submission button
2011-12-12 14:27:43 +01:00
Emil Siverhall
dc22d13cb2
Project ideas may now only be submitted if there is an available application period
2011-12-12 14:19:25 +01:00
Marcus Höjvall
e3a3486ab4
Added some comments
2011-12-12 13:36:44 +01:00
Marcus Höjvall
21712710e9
Added some comments and isCompatibleLanguage returns true if either project or supervisor hasnt specified any language
2011-12-12 13:36:44 +01:00
Marcus Höjvall
d303c94f41
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
added support to check for exemptions to write thesis alone when submitting project idea.
2011-12-12 11:00:23 +01:00
Emil Siverhall
9350787c93
added support to check for exemptions to write thesis alone when submitting project idea.
2011-12-12 10:24:51 +01:00
Marcus Höjvall
c91a5edd1a
Removed some System.out.printlns
2011-12-12 09:48:36 +01:00
Marcus Höjvall
f511a50b0d
Added default KeywordType in edit form
2011-12-12 09:48:36 +01:00
Marcus Höjvall
5c2a9344d4
Added manage keyword table
2011-12-12 09:48:36 +01:00
Marcus Höjvall
1f9ba9d73b
LazyDeleteDao refactor
2011-12-12 09:48:36 +01:00
Marcus Höjvall
c7443257df
Created InverseBooleanModel
2011-12-12 09:48:36 +01:00
Marcus Höjvall
3046c1b95b
Made a CreateKeywordPanel
2011-12-12 09:48:36 +01:00
Marcus Höjvall
fb4fbdafe3
Fixed EditKeywordPanel
2011-12-12 09:48:36 +01:00
Marcus Höjvall
5b019a6ce0
Added panel for word keywords and one for area keywords
2011-12-12 09:48:36 +01:00
Marcus Höjvall
97ab090ed6
Moved files to correct folder and added semicolon to sql
2011-12-12 09:48:36 +01:00
Marcus Höjvall
b285e7ac2f
Added panels for editing keywords
2011-12-12 09:48:36 +01:00
Marcus Höjvall
9696bab0df
Added the ManageKeywordPanel to markup and page
2011-12-12 09:48:36 +01:00
Marcus Höjvall
2838a8a007
Added method for getting ALL rows including where deleted = 1
2011-12-12 09:48:36 +01:00
Marcus Höjvall
0a033d1705
KeywordDao now extends LazyDeleteDao
2011-12-12 09:48:36 +01:00
Marcus Höjvall
b4a6fff3e8
Fix for setting default value for lastsuccessfulrun. Done with approach as in DomainObject
2011-12-12 09:48:35 +01:00
Fredrik Friis
7f21023701
cant resolve the test issue
2011-12-12 15:05:06 +09:00
Fredrik Friis
b9d5e5157e
notification set to firsttimers onl
2011-12-12 13:24:32 +09:00
Fredrik Friis
d41d65539a
notification url fixed
2011-12-12 13:24:03 +09:00
Fredrik Friis
0f7704439b
first time login notification almost done, also now notification counter implemented
2011-12-12 13:17:01 +09:00
Fredrik Friis
3ea62d5ff1
aggregate fixed on supervisor section
2011-12-12 12:22:15 +09:00
Emil Siverhall
21ca4e8837
fixed minor bug when changing project partner after validation failed
2011-12-11 20:35:52 +01:00
Emil Siverhall
6bf3444610
Merge branch 'develop' into myIdeas
...
* develop:
Added link to for admins to edit project ideas
Cleaned up automatic match panel
changed a parameter in a testmethod
Added tests for GreedyMatchingAlgorithm
Fixes for GreedyMatchingAlgorithm
Added unit-selection to employee profiles. Could be refactored, the code here is pretty abstract and hard to understand.
saving the capabilities of supervisors now actually work
saving dropdown changes
added a dropdownchoice for supervisor avalability
finished the filtering for matchSupervisor dataview
Added possibility to set availability
Added feedback messages
changed peer menu according to request
sort and edit bug fixed
adding dummy thing
working on edit panel
2011-12-11 20:12:52 +01:00
Emil Siverhall
e487158088
validation now fails if you try to add yourself as project partner.
2011-12-11 20:10:29 +01:00
Daniel Hasselrot
849e2a0c6f
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-12-09 17:45:25 +01:00
Daniel Hasselrot
070729be06
Added link to for admins to edit project ideas
2011-12-09 17:32:11 +01:00
Daniel Hasselrot
f64b403f9e
Cleaned up automatic match panel
2011-12-09 17:31:13 +01:00
