Commit Graph

5105 Commits

Author SHA1 Message Date
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
Robin Eklund
7e58fb23be Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-12 11:03:59 +01:00
Robin Eklund
5f8fa85a00 Added some SQL-updates needed before deployment.
Extreme caution must be used when deploying this since tables have to
be dropped, re-created and repopulated.
2011-12-12 11:03:54 +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
fd6ba05af9 Merge branch 'exemptions' into develop 2011-12-12 10:27:57 +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
Fredrik Norberg
10fa77210a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  cant resolve the test issue
  notification set to firsttimers onl
  notification url fixed
  first time login notification almost done, also now notification counter implemented
  aggregate fixed on supervisor section
  fixed minor bug when changing project partner after validation failed
  validation now fails if you try to add yourself as project partner.
  Added link to for admins to edit project ideas
  Cleaned up automatic match panel
  disabled the possibility to edit project ideas if a match object exists. may need some changes to handle ideas that's been sent back to authors.
  Added current match status to the table with my project ideas in student view
2011-12-12 10:20:49 +01:00
Marcus Höjvall
aa48487cbd Merge branch 'manage_keywords' into develop
There is now a method in LazyDeleteDao that takes a boolean includeDeleted

* manage_keywords:
  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
  Added panels for editing keywords
  Added the ManageKeywordPanel to markup and page
  Added method for getting ALL rows including where deleted = 1
  KeywordDao now extends LazyDeleteDao
  Fix for setting default value for lastsuccessfulrun. Done with approach as in DomainObject
2011-12-12 09:50:40 +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
ddc3744ae1 Merge branch 'myIdeas' into develop
* myIdeas:
  fixed minor bug when changing project partner after validation failed
  validation now fails if you try to add yourself as project partner.
  disabled the possibility to edit project ideas if a match object exists. may need some changes to handle ideas that's been sent back to authors.
  Added current match status to the table with my project ideas in student view
2011-12-11 20:42:16 +01: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
Fredrik Norberg
318770c782 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 tests for GreedyMatchingAlgorithm
  Fixes for GreedyMatchingAlgorithm
  Added unit-selection to employee profiles.
2011-12-09 17:09:07 +01:00
Fredrik Norberg
1509d61244 changed a parameter in a testmethod 2011-12-09 17:08:43 +01:00
Alex Robsahm
08407d2826 Merge branch 'match' into develop 2011-12-09 16:46:53 +01:00
Alex Robsahm
b8dda22845 Added tests for GreedyMatchingAlgorithm 2011-12-09 16:45:56 +01:00
Alex Robsahm
a19858d891 Fixes for GreedyMatchingAlgorithm 2011-12-09 16:41:04 +01:00
Robin Eklund
5b41f6977d Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-09 16:15:27 +01:00
Robin Eklund
4ca205749b Added unit-selection to employee profiles.
Could be refactored, the code here is pretty abstract and hard to understand.
2011-12-09 16:14:35 +01:00
Fredrik Norberg
1f7bd0cc66 Merge branch 'matchSupervisor' into develop
* matchSupervisor:
  saving the capabilities of supervisors now actually work
  saving dropdown changes
2011-12-09 16:06:18 +01:00
Fredrik Norberg
4ff3c97043 saving the capabilities of supervisors now actually work 2011-12-09 16:05:08 +01:00
Fredrik Norberg
46a513d059 saving dropdown changes 2011-12-09 15:07:50 +01:00
Fredrik Norberg
90dcbe8bdc Merge branch 'matchSupervisor' into develop
* matchSupervisor:
  added a dropdownchoice for supervisor avalability
  finished the filtering for matchSupervisor dataview
2011-12-09 11:32:49 +01:00
Fredrik Norberg
905d64ee7d added a dropdownchoice for supervisor avalability 2011-12-09 11:27:26 +01:00
Fredrik Norberg
d0a5bf8ab5 finished the filtering for matchSupervisor dataview 2011-12-09 11:21:20 +01:00