Fredrik Friis
56cd21c395
fixed the add/edit panel with abstract method too
2011-12-14 17:41:12 +09:00
Fredrik Friis
72e90b96e5
cleanup
2011-12-14 16:06:50 +09:00
Fredrik Friis
22ba8421a3
cleanup
2011-12-14 15:29:49 +09:00
Fredrik Friis
cd63b0cdd4
extensive refactoring of checklistpanel, adding generic components
2011-12-14 15:09:42 +09:00
Fredrik Friis
3c7bc01d8f
fixed generic boolean filtering panel
2011-12-14 14:21:03 +09:00
Fredrik Friis
5bdc92eec6
added generic show only my objects checkbox
2011-12-14 12:40:59 +09:00
Fredrik Friis
f799c84d50
added generic filter component... but it needs a reference to the paramsobject. is it possible to get rid of the paramsobject reference?
2011-12-14 12:10:43 +09:00
Fredrik Friis
0dd9277c91
new generic filtering component
2011-12-14 10:46:56 +09:00
Robin Eklund
7dc93257e5
Added support for fetching "all supervisors" from remote.
...
Also added a toggle switch for "include linked projects", since importing all supervisors takes c:a 25 minutes.
Some refactoring as well, and cleaned up some logging.
2011-12-13 17:43:37 +01:00
Emil Siverhall
9039033286
Merge branch 'idea_cleanup' into develop
2011-12-13 16:13:10 +01:00
Emil Siverhall
cefbeaee07
changes in menu hierarchy for project submission page. it is now under project page and is visible regardless of authors project status. also minor bug fix on partner addition.. again.
2011-12-13 16:12:41 +01:00
Emil Siverhall
895112488e
just some code cleanup
2011-12-13 15:57:02 +01:00
Emil Siverhall
0e5804f7f2
Merge branch 'partner_addition_fix' into develop
2011-12-13 14:46:43 +01:00
Emil Siverhall
8ddef02add
added info texts to help dialogs on project idea submission page
2011-12-13 14:46:20 +01:00
Emil Siverhall
8ed28d5732
more changes to partner addition. you cant change partner when idea is submitted
2011-12-13 14:22:39 +01:00
Emil Siverhall
47ffd1e940
project idea may only be edited by idea creator
2011-12-13 14:03:32 +01:00
Emil Siverhall
00ec192e42
Merge branch 'period_tests' into develop
2011-12-13 13:35:44 +01:00
Emil Siverhall
c82e8812fb
small changes to application period dao and unit tests to new methods
2011-12-13 13:35:19 +01:00
Emil Siverhall
710c338ca2
added unit tests to make sure project idea submission pages render safe
2011-12-13 13:12:26 +01:00
Fredrik Friis
f0ded9c6cd
cant use entitymanagerfactory for a controller
2011-12-13 20:45:39 +09:00
Fredrik Friis
dc12fa2c07
almost resolved all tests with issues... now seems to be something with spring and maven that is causing a fuss?
2011-12-13 20:39:43 +09:00
Robin Eklund
87e183e72a
Lots of small changes. Some refactoring is needed due to recent api-changes.
2011-12-13 11:17:56 +01:00
Tom Vahlman
5c8e086431
Added Intellij files to .gitignore.
2011-12-13 11:13:53 +01:00
Emil Siverhall
b786238e83
Merge branch 'idea_period' into develop
2011-12-13 11:05:18 +01:00
Emil Siverhall
2a1eb81a15
new panel for active application periods and upcoming periods info is available as well.
2011-12-13 10:58:00 +01:00
Emil Siverhall
57e7b53788
added support to search for next upcoming application period for a certain project class
2011-12-13 10:14:16 +01:00
Fredrik Friis
ab7944d85c
added bean to fix test issues
2011-12-13 17:43:49 +09:00
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
c32ebfd2b0
Merge branch 'matchSupervisor' into develop
...
* matchSupervisor:
added a dialog for supervisor details and added a few links to managesupervisorpanel
2011-12-12 16:55:39 +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
Fredrik Norberg
dafe1f4075
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (25 commits)
bug fix regarding student addition to project idea submissions
fixed bug that added the same project partner multiple times to project idea submission
supervisor now reject project ideas, instead of refusing them
Doesnt match if idea has been rejected before(like it used to be)
Refactored and added language selection to employee profiles
minor changes to form submission button
Project ideas may now only be submitted if there is an available application period
Added some comments
Added some comments and isCompatibleLanguage returns true if either project or supervisor hasnt specified any language
Added some SQL-updates needed before deployment.
added support to check for exemptions to write thesis alone when submitting project idea.
Removed some System.out.printlns
Added default KeywordType in edit form
Added manage keyword table
LazyDeleteDao refactor
Created InverseBooleanModel
Made a CreateKeywordPanel
Fixed EditKeywordPanel
Added panel for word keywords and one for area keywords
Moved files to correct folder and added semicolon to sql
...
2011-12-12 16:43:43 +01:00
Emil Siverhall
0ddc6ad89b
Merge branch 'idea_period' into develop
2011-12-12 16:41:10 +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
828fd5c8b9
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-12-12 15:06:06 +01:00
Robin Eklund
c751f50e43
Refactored and added language selection to employee profiles
2011-12-12 15:05:52 +01:00
