2925 Commits

Author SHA1 Message Date
Daniel Hasselrot
9186791794 Refactored out sortable query set
Conflicts:

	src/main/java/se/su/dsv/scipro/data/dao/jpa/CheckListTemplateDaoJPAImp.java
2011-11-24 11:02:51 +01:00
Daniel Hasselrot
84e32433b7 Added support for sort order
Conflicts:

	src/main/java/se/su/dsv/scipro/data/dao/jpa/CheckListTemplateDaoJPAImp.java
2011-11-24 10:59:58 +01:00
Daniel Hasselrot
d0dfc7ef0c Added new way of querying checklist templates
Conflicts:

	src/main/java/se/su/dsv/scipro/data/dao/interfaces/CheckListTemplateDao.java
	src/main/java/se/su/dsv/scipro/data/dao/jpa/CheckListTemplateDaoJPAImp.java
2011-11-24 10:57:29 +01:00
Daniel Hasselrot
45118a693b Added simple query set for lazy execution of querys and added named parameters 2011-11-24 10:44:59 +01:00
Robin Eklund
91fd84c1e3 Partial commit, nothing really new apart from some minor alterations to the request-sender to account for HTTP-requests error-codes. 2011-11-23 16:06:38 +01:00
Daniel Hasselrot
fe1008e063 Fixed role dao query 2011-11-23 10:46:43 +01:00
Fredrik Norberg
90df718eef Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (54 commits)
  Change match sort order, and removed limit for query builder
  Fixed match order test
  Removed sysout.print
  Added autocompletion on for supervisor
  Added query builder
  Added simple query builder
  some code refactoring. moved BooleanChoiceRenderer to its own class file in the components package
  started to add correct property models to form fields for easy form submission.
  added getter and setter for title and watson box in ProjectIdea data object
  moved the cheat sheet on project idea page to its own sub panel
  Changed name of database table to avoid reseved word Match
  added dropdown for program selection. dummy data when no real dao provider is available
  added checkboxes for selecting research areas when submitting project idea. this just use hardcoded data for testing purposes and the list needs to be populated from dao instead
  Increased memory for maven test runner
  Radio choices now takes boolean values instead of string when options is yes/no. BooleanChoiceRenderer added for display values
  Added test that only last match is considered in query
  added radio choices for language selection to project idea submission
  Added query to include in reject project ideas
  Added possibility to change match status and get match history
  Started retrival of unmatched project ideas
  ...
2011-11-23 10:35:44 +01:00
Daniel Hasselrot
069a41611b Added getOrCreate methods for author and supervisor 2011-11-23 09:35:12 +01:00
Robin Eklund
21d04adcae More structure work, started implementation. 2011-11-22 21:07:25 +01:00
Daniel Hasselrot
c340fe7644 Change match sort order, and removed limit for query builder 2011-11-22 18:24:05 +01:00
Daniel Hasselrot
b9dcaae934 Fixed match order test 2011-11-22 18:05:22 +01:00
Robin Eklund
272fe75391 Fixed schedule worker api not following it's own documented contract. 2011-11-22 17:24:47 +01:00
Daniel Hasselrot
1eed2a9ad2 Removed sysout.print 2011-11-22 17:15:18 +01:00
Daniel Hasselrot
820b77e6ff Added autocompletion on for supervisor 2011-11-22 17:11:30 +01:00
Daniel Hasselrot
63ea08ac16 Added query builder 2011-11-22 17:11:30 +01:00
Daniel Hasselrot
b4fbf93c90 Added simple query builder 2011-11-22 17:11:30 +01:00
Robin Eklund
d79347bafb Refactoring preparations, added sorting to worker thread output. 2011-11-22 17:05:56 +01:00
Emil Siverhall
eb093d0f2d Merge branch 'projectIdeaPage' into develop
* projectIdeaPage:
  some code refactoring. moved BooleanChoiceRenderer to its own class file in the components package
  started to add correct property models to form fields for easy form submission.
  added getter and setter for title and watson box in ProjectIdea data object
  moved the cheat sheet on project idea page to its own sub panel
  added dropdown for program selection. dummy data when no real dao provider is available
  added checkboxes for selecting research areas when submitting project idea. this just use hardcoded data for testing purposes and the list needs to be populated from dao instead
  Radio choices now takes boolean values instead of string when options is yes/no. BooleanChoiceRenderer added for display values
  added radio choices for language selection to project idea submission
  Added radio choices for agreed and preferred supervisor. Both of them use autocompletion on supervisor names.
  added cheat sheet to project idea page according to mockups
  added dummy dropdown for select program
  finished adding infopopups and added a checkbox with expanding textfield for external supervisor
  started to add infolinks to projectIdeaPanel
  added tab menu option for ProjectIdeaPage when user does not have an active project. Only viewable by sysadmin since it is a work in progress
  switched authorization on ProjectIdeaPage to only be visible by sysadmins
  some design changes and addition of a feedback panel
  Watson boxes and submit button added to ProjectIdeaForm
  Project class dropdown, Partner autocomplete and Project title textfield added. Also some basic html styling.
  Creation of ProjectIdeaPage, ProjectIdeaPanel and ProjectIdeaForm
  started to add categories to checklists
2011-11-22 16:31:49 +01:00
Emil Siverhall
f5d76b86ed some code refactoring. moved BooleanChoiceRenderer to its own class file in the components package 2011-11-22 16:27:49 +01:00
Emil Siverhall
cea3e981e8 started to add correct property models to form fields for easy form submission. 2011-11-22 15:40:51 +01:00
Emil Siverhall
093e421f3c added getter and setter for title and watson box in ProjectIdea data object 2011-11-22 15:09:37 +01:00
Emil Siverhall
20567b1ea9 fixed merge conflicts 2011-11-22 13:48:18 +01:00
Emil Siverhall
94a252e0ae moved the cheat sheet on project idea page to its own sub panel 2011-11-22 13:31:17 +01:00
Daniel Hasselrot
a63d6dc439 Changed name of database table to avoid reseved word Match 2011-11-22 13:24:07 +01:00
Emil Siverhall
495ac31fe4 added dropdown for program selection. dummy data when no real dao provider is available 2011-11-22 13:18:40 +01:00
Daniel Hasselrot
d07b420761 Merge branch 'develop' into entities 2011-11-22 12:57:02 +01:00
Emil Siverhall
cb7a57dc9a added checkboxes for selecting research areas when submitting project idea. this just use hardcoded data for testing purposes and the list needs to be populated from dao instead 2011-11-22 12:16:36 +01:00
Daniel Hasselrot
84130a0454 Increased memory for maven test runner 2011-11-22 11:32:16 +01:00
Emil Siverhall
577ed53065 Radio choices now takes boolean values instead of string when options is yes/no. BooleanChoiceRenderer added for display values 2011-11-22 10:00:20 +01:00
Daniel Hasselrot
d7263509ec Added test that only last match is considered in query 2011-11-21 17:13:43 +01:00
Emil Siverhall
ed86fca089 added radio choices for language selection to project idea submission 2011-11-21 16:40:22 +01:00
Daniel Hasselrot
5dda1c99c9 Added query to include in reject project ideas 2011-11-21 16:06:38 +01:00
Daniel Hasselrot
dc639b232c Added possibility to change match status and get match history 2011-11-21 15:24:44 +01:00
Fredrik Norberg
4945fa0356 Merge branch 'component' into develop
* component:
  Added basic page structure for Match admin
  finished adding infopopups and added a checkbox with expanding textfield for external supervisor
  started to add infolinks to projectIdeaPanel
  added tab menu option for ProjectIdeaPage when user does not have an active project. Only viewable by sysadmin since it is a work in progress
  switched authorization on ProjectIdeaPage to only be visible by sysadmins
  some design changes and addition of a feedback panel
  Watson boxes and submit button added to ProjectIdeaForm
  Project class dropdown, Partner autocomplete and Project title textfield added. Also some basic html styling.
  Creation of ProjectIdeaPage, ProjectIdeaPanel and ProjectIdeaForm
  started to add categories to checklists
2011-11-21 14:45:55 +01:00
Fredrik Norberg
5117262b3b Added basic page structure for Match admin 2011-11-21 14:45:37 +01:00
Fredrik Norberg
3d30ebd3a7 finished adding infopopups and added a checkbox with expanding textfield for external supervisor 2011-11-21 14:45:37 +01:00
Fredrik Norberg
8fe2fbd70e started to add infolinks to projectIdeaPanel 2011-11-21 14:45:37 +01:00
Emil Siverhall
43b8e03ff0 added tab menu option for ProjectIdeaPage when user does not have an active project. Only viewable by sysadmin since it is a work in progress 2011-11-21 14:45:37 +01:00
Emil Siverhall
cc7c4537e5 switched authorization on ProjectIdeaPage to only be visible by sysadmins 2011-11-21 14:45:37 +01:00
Emil Siverhall
93f949ecb5 some design changes and addition of a feedback panel 2011-11-21 14:45:37 +01:00
Emil Siverhall
944ae327bc Watson boxes and submit button added to ProjectIdeaForm 2011-11-21 14:45:36 +01:00
Emil Siverhall
3569711097 Project class dropdown, Partner autocomplete and Project title textfield added. Also some basic html styling. 2011-11-21 14:45:36 +01:00
Emil Siverhall
7f186a5e03 Creation of ProjectIdeaPage, ProjectIdeaPanel and ProjectIdeaForm 2011-11-21 14:45:36 +01:00
Fredrik Norberg
2c52fdc5f7 started to add categories to checklists 2011-11-21 14:45:36 +01:00
Fredrik Norberg
d02c2eb4c7 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  auto submit on date change in activity plan panel
  Added another file for custom date time
  Changes in CustomDateTimeField
2011-11-21 14:45:12 +01:00
Daniel Hasselrot
042459d51b Started retrival of unmatched project ideas 2011-11-21 14:27:27 +01:00
Daniel Hasselrot
22a45db72a Changed back to single match in project idea 2011-11-21 14:02:45 +01:00
Alex Robsahm
f6a75ad594 Merge branch 'customDateTime' into develop 2011-11-21 13:52:55 +01:00
Alex Robsahm
82b53ae1ce auto submit on date change in activity plan panel 2011-11-21 13:51:15 +01:00
Alex Robsahm
a083babaaf Added another file for custom date time 2011-11-21 13:45:58 +01:00