3533 Commits

Author SHA1 Message Date
Daniel Hasselrot
7c1b096a5f Added find methods to excemptio dao 2011-12-05 11:47:13 +01:00
Daniel Hasselrot
714907627a Added possibility to get excemptions from min and max authors 2011-12-05 11:47:12 +01:00
Daniel Hasselrot
abb0357113 Added possibility to limit authors 2011-12-05 11:47:12 +01:00
Emil Siverhall
6bf01e656c character encoding fixes 2011-12-05 11:37:46 +01:00
Emil Siverhall
c5a2e7d9fc Merge branch 'projectIdeaSubmission' into develop
* projectIdeaSubmission:
  added default keyword types to data initialiser
  removed group selector from language check boxes
  changed from radio choices to checkboxes when selecting supervision languages
  added creation of default languages to DataInitialiser
  working on some submission logic
  some changes in output data from auto completion of supervisors and small improvements on facade
  minor code cleanup
  refactoring when choosing project partner. it now uses its own panel
  started working on facade class that is used to save project ideas
  added properties file for customized feedback messages on project idea submission. also some changes when populating lists for keywords.
  Keyword selection now works properly. All keyword selection now has its own panel inside the form.
  started to add keyword selection for project idea submission
  code refactoring
  more changes to property models to work better with project ideas
  some model changes to form components
  changes in auto completion of supervisor so it now works with project class and language capabilities.
  some model changes to form components
  changes in auto completion of supervisor so it now works with project class and language capabilities.
2011-12-05 11:32:37 +01:00
Emil Siverhall
0ebb8aeab0 Merge branch 'develop' into projectIdeaSubmission
* develop:
  changed a test to use a new methodname
  small changes
  added filter functionality for projectIdea dataview
  half done with the projectIdea dataprovider and the 3 dataViews on the projectManagementpage
  started with admin dataviews
  added dataproviders for match and project idea
  added improvements to add all algorithm
  changed sentence, request from janne
2011-12-05 11:30:47 +01:00
Emil Siverhall
b188d29696 added default keyword types to data initialiser 2011-12-05 11:11:52 +01:00
Emil Siverhall
d6451f33ad removed group selector from language check boxes 2011-12-05 11:07:31 +01:00
Fredrik Norberg
8163ce70bc changed a test to use a new methodname 2011-12-05 11:06:56 +01:00
Fredrik Norberg
2dfe31f537 Merge branch 'matchDataviews' into develop
* matchDataviews:
  small changes
  added filter functionality for projectIdea dataview
  half done with the projectIdea dataprovider and the 3 dataViews on the projectManagementpage
  started with admin dataviews
  added dataproviders for match and project idea
2011-12-05 10:50:21 +01:00
Emil Siverhall
c0f9b95376 changed from radio choices to checkboxes when selecting supervision languages 2011-12-05 10:50:14 +01:00
Fredrik Norberg
e5dad2d816 small changes 2011-12-05 10:49:54 +01:00
Fredrik Norberg
5687ba7b2a added filter functionality for projectIdea dataview 2011-12-05 09:35:39 +01:00
Fredrik Norberg
4071fc3670 half done with the projectIdea dataprovider and the 3 dataViews on the projectManagementpage 2011-12-05 09:35:39 +01:00
Fredrik Norberg
169f90d7d9 started with admin dataviews 2011-12-05 09:35:39 +01:00
Fredrik Norberg
eaed2f368f added dataproviders for match and project idea 2011-12-05 09:35:39 +01:00
Fredrik Norberg
c0f21df315 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 improvements to add all algorithm
  changed sentence, request from janne
2011-12-05 09:35:08 +01:00
Fredrik Friis
a602981be2 some gui changes 2011-12-05 17:03:33 +09:00
Fredrik Friis
9f2c822ee4 some refactoring... multiple filtering seems to work 2011-12-05 16:55:27 +09:00
Emil Siverhall
7bf1500152 added creation of default languages to DataInitialiser 2011-12-05 08:48:27 +01:00
Fredrik Friis
976db8b5c0 fixed a filtering bug 2011-12-05 16:27:00 +09:00
Fredrik Friis
ec81959e0a sql exception when filtering and then removing filtering on a category 2011-12-05 16:08:46 +09:00
Fredrik Friis
d99d2c3059 peer filtering implemented 2011-12-05 15:49:43 +09:00
Fredrik Friis
ec94d9cf7e added improvements to add all algorithm 2011-12-05 09:32:30 +09:00
Fredrik Friis
62214d4d44 changed sentence, request from janne 2011-12-05 08:45:22 +09:00
Emil Siverhall
3e4fe99069 working on some submission logic 2011-12-04 23:34:18 +01:00
Emil Siverhall
c32b77997e Merge branch 'develop' into projectIdeaSubmission
* develop:
  Fixed preferred supervisor database storage
  added functionality to order checklistTemplates and they are now added in the correct order
  Added so that only available supervisors are forwarded to matching strategy
  Changed so that availabily uses real object
  Added matcher and matching strategy
2011-12-04 19:47:52 +01:00
Fredrik Norberg
992d67f6dd Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Fixed preferred supervisor database storage
2011-12-02 09:14:37 +01:00
Robin Eklund
78b7513f49 Minor fixes. 2011-12-01 16:34:12 +01:00
Robin Eklund
786e6b0ea0 Added a lot of stuff to support basic-auth and temporary bypassing of certificate handling (this part will need to be removed) 2011-12-01 15:58:14 +01:00
Robin Eklund
75802d47f7 Minor formatting changes 2011-12-01 13:47:37 +01:00
Robin Eklund
39a4bc936f Duplication issues resolved, started deprecating old value-objects. 2011-12-01 13:00:45 +01:00
Daniel Hasselrot
3c12262ea5 Merge branch 'preferedsupervisor' into develop 2011-12-01 09:47:22 +01:00
Daniel Hasselrot
2cf42d1742 Fixed preferred supervisor database storage 2011-12-01 09:46:48 +01:00
Emil Siverhall
faf222e48f some changes in output data from auto completion of supervisors and small improvements on facade 2011-11-30 21:33:12 +01:00
Robin Eklund
46c275a98c Numerous bug fixes concerning dates of imported data, also final seminars are automatically created to
support oppponent/participant roles.
2011-11-30 18:04:56 +01:00
Robin Eklund
b3d7a21fb7 Fixed duplicate reviewers/co-supervisors during import-procedure 2011-11-30 17:09:00 +01:00
Robin Eklund
440329e49b Some bugfixes, also coerced the "import all supervisors" to actually work. 2011-11-30 14:49:46 +01:00
Fredrik Norberg
6f1d713c3f added functionality to order checklistTemplates and they are now added in the correct order 2011-11-29 19:40:47 +01:00
Robin Eklund
eefecee068 Numerous bug-fixes 2011-11-29 17:29:51 +01:00
Robin Eklund
a90f970be6 Importers can now import named users and all supervisors (via bulk).
The API seems to be holding up pretty well, but we'll need support in the remote for ID, dated and project imports before we can move on with this.
2011-11-29 16:53:44 +01:00
Emil Siverhall
78d71c6ebe minor code cleanup 2011-11-29 16:38:07 +01:00
Emil Siverhall
742605be6f fixed merge conflicts 2011-11-29 16:22:29 +01:00
Emil Siverhall
57362c1691 refactoring when choosing project partner. it now uses its own panel 2011-11-29 15:59:04 +01:00
Fredrik Norberg
09a747dddf Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (36 commits)
  Added so that only available supervisors are forwarded to matching strategy
  Changed so that availabily uses real object
  Added matcher and matching strategy
  Fixed distinct queries and parameterized auto complete query
  Fixed queries to use safe methods to set parameters
  Match history is now accessible from project idea
  Split up availability query in two requests.
  Added capabilites to availability object
  Added so that availability object counts number of matched project ideas
  Added so that number of matches are counted
  Started implemeting DAO for retrieving availability
  Refactored tests
  Removed duplicate code in getOrCreate method
  Refactored supervisor dao to use queryset
  Yet another sql fix
  Changed SQL for altering worker_data table
  Now uses StudentPeerInfoRequestsPanel instead of the supervisor version which is now removed
  Fixed failing tests
  Added keyword type dao
  Restored many to one relation ship with keyword type
  ...
2011-11-29 15:39:08 +01:00
Daniel Hasselrot
b6878b3d1a Added so that only available supervisors are forwarded to matching strategy 2011-11-29 15:17:59 +01:00
Emil Siverhall
bf414be76e started working on facade class that is used to save project ideas 2011-11-29 14:23:00 +01:00
Emil Siverhall
d57bea3957 added properties file for customized feedback messages on project idea submission. also some changes when populating lists for keywords. 2011-11-29 14:22:58 +01:00
Emil Siverhall
829b011de4 Keyword selection now works properly. All keyword selection now has its own panel inside the form. 2011-11-29 14:22:56 +01:00
Emil Siverhall
3e66a9ea84 started to add keyword selection for project idea submission 2011-11-29 14:22:54 +01:00