Commit Graph

5105 Commits

Author SHA1 Message Date
Marcus Höjvall
da769962d1 Merge branch 'worker_last_run' into develop
* worker_last_run:
  Fixed spelling
  Added methods for adding and removing runningworkers
  Code refactoring
  Fixed spelling
  Fixed warnings
  Workers now always handle their own transactions and have a last successfullrun field. SystemMaintenancePage also show this field instead of first started field
2011-11-28 12:59:53 +01:00
Marcus Höjvall
f1c01d54fe Fixed spelling 2011-11-28 12:58:36 +01:00
Marcus Höjvall
828b18d67c Added methods for adding and removing runningworkers 2011-11-28 12:58:36 +01:00
Marcus Höjvall
580987564b Code refactoring 2011-11-28 12:58:36 +01:00
Marcus Höjvall
72abe73fb4 Fixed spelling 2011-11-28 12:58:36 +01:00
Marcus Höjvall
562fb01d73 Fixed warnings 2011-11-28 12:58:36 +01:00
Marcus Höjvall
98ecfcf439 Workers now always handle their own transactions and have a last successfullrun field. SystemMaintenancePage also show this field instead of first started field 2011-11-28 12:58:36 +01:00
Daniel Hasselrot
bff7b622c8 Added languages to project ideas 2011-11-28 11:41:35 +01:00
Robin Eklund
2cfed28a31 Added really basic testing capabilities via a simple form. 2011-11-28 11:27:23 +01:00
Robin Eklund
5d81c29bba Merge branch 'develop' into importers 2011-11-28 10:27:58 +01:00
Emil Siverhall
db23973b2f some model changes to form components 2011-11-28 10:24:25 +01:00
Daniel Hasselrot
38790ca152 Project idea now only has one preferd supervisor and possibility to add external supervisor info 2011-11-28 10:06:25 +01:00
Emil Siverhall
edb8d7576e changes in auto completion of supervisor so it now works with project class and language capabilities. 2011-11-27 22:19:49 +01:00
Fredrik Friis
9e608a7ef6 unfinished panel commented out 2011-11-27 18:07:52 +09:00
Fredrik Friis
f93b2595ce working on method for looping through categories and adding filtering for them automatically 2011-11-27 17:55:39 +09:00
Fredrik Friis
890c42cdd3 minor refactoring 2011-11-27 17:15:10 +09:00
Fredrik Friis
31f0b76d59 some refactoring 2011-11-26 15:57:31 +09:00
Fredrik Friis
cdbd72366e sorting works 2011-11-26 15:42:46 +09:00
Fredrik Friis
c5e16b8ad0 paging and filtering works 2011-11-26 15:08:47 +09:00
Fredrik Friis
b93d3743cc new fresh branch 2011-11-26 14:07:26 +09:00
Fredrik Norberg
ef5dc5836e 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 for checking if project has been created and refactored away redundant code
  Added support for filtering on unmatched project ideas
  Added filtering by author
  Added filtering by supervisor
  Created top waiting query
  Added support for date filtering
  Added support for filtering on title
  Added filtering on project classes and match status
  Added support for multiple categories in query
  Refactored out sortable query set
  Added support for sort order
  Added new way of querying checklist templates
  Added simple query set for lazy execution of querys and added named parameters
  Fixed role dao query
  Added getOrCreate methods for author and supervisor
2011-11-25 09:25:17 +01:00
Daniel Hasselrot
387440ed28 Added support for checking if project has been created and refactored away redundant code 2011-11-24 17:53:32 +01:00
Daniel Hasselrot
a400482146 Added support for filtering on unmatched project ideas 2011-11-24 17:31:22 +01:00
Daniel Hasselrot
f58ecfc668 Added filtering by author 2011-11-24 16:35:45 +01:00
Daniel Hasselrot
ed075b2700 Added filtering by supervisor 2011-11-24 16:18:23 +01:00
Daniel Hasselrot
216a67cea7 Created top waiting query 2011-11-24 15:22:16 +01:00
Daniel Hasselrot
78ac24e80c Added support for date filtering 2011-11-24 13:41:42 +01:00
Daniel Hasselrot
515f310599 Added support for filtering on title 2011-11-24 13:10:46 +01:00
Daniel Hasselrot
cda4ecfa0b Added filtering on project classes and match status 2011-11-24 12:49:39 +01:00
Daniel Hasselrot
97c005bfd3 Added support for multiple categories in query
Conflicts:

	src/main/java/se/su/dsv/scipro/data/dao/interfaces/CheckListTemplateDao.java
2011-11-24 11:03:43 +01:00
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