Commit Graph

3021 Commits

Author SHA1 Message Date
Daniel Hasselrot
3f7e70d2b5 Supervisors are now queryable by keywords 2011-12-06 13:16:47 +01:00
Emil Siverhall
fd102682eb added correct menu highlighting to project idea pages 2011-12-06 12:17:52 +01:00
Emil Siverhall
68cadb0b30 refactoring to make different pages for project ideas and submission 2011-12-06 12:06:32 +01:00
Emil Siverhall
4f75381501 added links to idea submission and date field to table with project ideas 2011-12-06 12:04:45 +01:00
Emil Siverhall
9a742d5876 added support for project idea model to be submitted in keyword selection panel 2011-12-06 11:56:27 +01:00
Emil Siverhall
1b13718d7b some changes in dataprovider to be more flexible 2011-12-06 11:54:21 +01:00
Fredrik Norberg
6ea2723da1 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 casing
2011-12-06 11:01:08 +01:00
Fredrik Friis
d7bba528e3 reload was needed by JPA 2011-12-06 18:22:37 +09:00
Robin Eklund
9129c232a8 Fixed casing 2011-12-06 10:00:03 +01:00
Fredrik Friis
372c825d97 adding filepanel for checklistpanel 2011-12-06 17:53:56 +09:00
Fredrik Norberg
80cbe0ff4a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (38 commits)
  Added automatic match page and weights
  point 4 fixed
  point 2&3 fixed
  point 1 fixed
  Added basic functionality for crud'ing application periods.
  Added confirmation dialog to removal of activity plan events, pretty basic stuff.
  minor bug fix when selecting project class on project idea submission
  Fixed test error
  Pre-aproved matches are now published directly
  Added remove exemption grant
  Added comment
  Added project and student selector
  Added possibility to create excemptions
  Started working on admin exemption panel
  Added a generic way to create a data provider for queryset based daos, and first draft of exemption page
  Added exemption data provider
  Added find methods to excemptio dao
  Added possibility to get excemptions from min and max authors
  Added possibility to limit authors
  character encoding fixes
  ...
2011-12-06 09:28:37 +01:00
Daniel Hasselrot
ba6141b925 Added automatic match page and weights 2011-12-06 09:15:30 +01:00
Fredrik Friis
68d145a77c trying to implement editing, sessionrelated bug 2011-12-06 16:58:15 +09:00
Fredrik Friis
8ce93169da added panel for creating new 2011-12-06 15:13:29 +09:00
Fredrik Friis
c4bb2492bb point 4 fixed 2011-12-06 12:23:44 +09:00
Fredrik Friis
bf75a80fb9 point 2&3 fixed 2011-12-06 11:34:48 +09:00
Fredrik Friis
260d37e342 point 1 fixed 2011-12-06 11:17:49 +09:00
Fredrik Friis
e5b0449d59 shut down auto hibernate 2011-12-06 10:54:49 +09:00
Fredrik Friis
ebea7d0ade took care of a persistence bug, everyting all set and seems to work 2011-12-06 10:43:11 +09:00
Fredrik Friis
24e266491d almost finished taking care of creation of checklist and adding it to a event when generating events from template 2011-12-06 10:40:37 +09:00
Fredrik Friis
253d0f1951 added optional checklisttemplate to the project_event_template table, and artifacts for selecting a checklisttemplate when creating activity plan template events. 2011-12-06 10:21:48 +09:00
Fredrik Friis
6d15827566 added delete function, it needs to use a model? 2011-12-06 08:58:28 +09:00
Robin Eklund
a63e05eb25 Added basic functionality for crud'ing application periods.
Some stuff in here should be refactored out of the components, and the now "standard"
filtering/sorting functionality might need to be added.
2011-12-05 20:39:53 +01:00
Robin Eklund
3684bd5fd6 Added confirmation dialog to removal of activity plan events, pretty basic stuff. 2011-12-05 16:53:51 +01:00
Emil Siverhall
7ca779f6b7 started to work on panel for students project ideas 2011-12-05 16:33:16 +01:00
Robin Eklund
d3a7868544 Minor refactoring, the intention is to better support failures coming from the remote host. 2011-12-05 16:15:39 +01:00
Robin Eklund
5db567e7b4 Added dependency on external b64 api 2011-12-05 15:34:12 +01:00
Emil Siverhall
4fb275839d Merge branch 'projectClassFix' into develop
* projectClassFix:
  minor bug fix when selecting project class on project idea submission
2011-12-05 15:04:48 +01:00
Emil Siverhall
da00af2a71 minor bug fix when selecting project class on project idea submission 2011-12-05 15:04:24 +01:00
Daniel Hasselrot
8ac0a85a26 Fixed test error 2011-12-05 14:44:41 +01:00
Daniel Hasselrot
9638c9b692 Pre-aproved matches are now published directly 2011-12-05 14:34:53 +01:00
Daniel Hasselrot
784d955aee Added remove exemption grant 2011-12-05 11:52:40 +01:00
Daniel Hasselrot
56acb3f387 Added comment 2011-12-05 11:52:40 +01:00
Daniel Hasselrot
1a6e7c3e3b Added project and student selector 2011-12-05 11:52:39 +01:00
Daniel Hasselrot
17499f0bdb Added possibility to create excemptions 2011-12-05 11:47:14 +01:00
Daniel Hasselrot
10964330c4 Started working on admin exemption panel 2011-12-05 11:47:14 +01:00
Daniel Hasselrot
35a58199e7 Added a generic way to create a data provider for queryset based daos, and first draft of exemption page 2011-12-05 11:47:13 +01:00
Daniel Hasselrot
dcdc55b6ef Added exemption data provider 2011-12-05 11:47:13 +01:00
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