DMC/scipro
7
0
Fork 0
Code Issues 33 Pull Requests 5 Actions Projects 1 Wiki Activity
3,718 Commits 9 Branches 414 Tags
Commit Graph

3418 Commits

Author SHA1 Message Date
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
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
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
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
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
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