Commit Graph

3021 Commits

Author SHA1 Message Date
Fredrik Friis
961572e4de some name changes on request 2011-12-15 11:43:02 +09:00
Robin Eklund
27206093bd Minor refactoring and scheduling of bulk-supervisor imports. 2011-12-14 17:44:31 +01:00
Fredrik Norberg
0a31fa51e0 Merge branch 'matchSupervisor' into develop
* matchSupervisor:
  fixed a bug where supervisor profile worked with a stale object
2011-12-14 16:45:12 +01:00
Fredrik Norberg
1ff5d1b27e fixed a bug where supervisor profile worked with a stale object 2011-12-14 16:44:38 +01:00
Fredrik Norberg
5a63d0d44e Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Temporarily removed call to null pointer-throwing method
  Problem two 'fixed'
  Problem one 'fixed', continued
  Problem one 'fixed'
  fixed the add/edit panel with abstract method too
  cleanup
  cleanup
  extensive refactoring of checklistpanel, adding generic components
  fixed generic boolean filtering panel
  added generic show only my objects checkbox
  added generic filter component... but it needs a reference to the paramsobject. is it possible to get rid of the paramsobject reference?
  new generic filtering component
  cant use entitymanagerfactory for a controller
  almost resolved all tests with issues... now seems to be something with spring and maven that is causing a fuss?
2011-12-14 16:44:25 +01:00
Robin Eklund
f6d4c4e2cc Added import of projects based on title 2011-12-14 16:37:53 +01:00
Robin Eklund
5bc2fd374e Major refactoring, old importers has been completely removed. 2011-12-14 16:30:11 +01:00
Robin Eklund
c8e0d60289 Temporarily removed call to null pointer-throwing method 2011-12-14 13:00:31 +01:00
Robin Eklund
132d70a202 Added manual import of projects via identifier queries. 2011-12-14 12:58:02 +01:00
Fredrik Friis
aab53984f5 Merge branch 'projectmanage' into develop 2011-12-14 18:31:59 +09:00
Tom Vahlman
cfb266ceae Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-14 10:23:32 +01:00
Fredrik Friis
bc1783ca09 Merge branch 'test' into develop 2011-12-14 18:16:34 +09:00
Fredrik Norberg
ab80cc977f Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  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.
  just some code cleanup
  added info texts to help dialogs on project idea submission page
  more changes to partner addition. you cant change partner when idea is submitted
  project idea may only be edited by idea creator
  small changes to application period dao and unit tests to new methods
  added unit tests to make sure project idea submission pages render safe
  new panel for active application periods and upcoming periods info is available as well.
  added support to search for next upcoming application period for a certain project class
  added bean to fix test issues
  fixed bean test bug
  fixed test bug
  removed println
  added info label
  fixed info label for supervisor when viewing a supervisor checklist
  fixed. supervisor checklists are no longer displayed to students
  checklists should get categories when created now, but they dont =/
2011-12-14 10:07:29 +01:00
Robin Eklund
7bd42bba88 Problem two 'fixed' 2011-12-14 10:02:05 +01:00
Robin Eklund
aa4b04bac0 Problem one 'fixed', continued 2011-12-14 09:55:45 +01:00
Robin Eklund
69518a96b4 Problem one 'fixed' 2011-12-14 09:55:04 +01:00
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