DMC/scipro
7
0
Fork 0
Code Issues 17 Pull Requests 2 Actions Projects 1 Wiki Activity
5,105 Commits 5 Branches 411 Tags 74 MiB
2012-09-19
Commit Graph

5105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Robsahm
f9ccccf046 Changes in CustomDateTimeField 2011-11-21 13:42:45 +01:00
Daniel Hasselrot
2b57d6fd8e Refactored can supervise to project limits 2011-11-21 13:39:24 +01:00
Daniel Hasselrot
7274c9b729 Refactored out match type 2011-11-21 13:34:52 +01:00
Fredrik Norberg
d8a3339bdc Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (67 commits)
  Spelling mistake fixed
  some gui changes
  some gui changes and optimizations
  legend added to checklist creation panel
  add question field clears after adding the question
  major gui improvements for admin checklist template creation- but major refactoring of these panels are needed
  added namefield to the panel where one can edit checklists TODO also make it possible to use the same panel for creating a checklist
  fixed popup details for activity plan templates
  GUI changed with activity plan tempaltes
  GUI changed with activity plan tempaltes
  shorter info
  some cleanup and instructions
  added emptylabel
  added emptylabel
  fixed supervisorlogpanel
  Fixed so that current user is never filtered away
  Filtered away reviewers and co-supervisors that haven't answered any questions
  Changed color on no answer bullet
  nicer looks
  some terminology fixes
  ...
 2011-11-21 13:33:24 +01:00
Emil Siverhall
15182c3bb9 Added radio choices for agreed and preferred supervisor. Both of them use autocompletion on supervisor names. 2011-11-21 11:33:45 +01:00
Robin Eklund
a3200c3765 Starting base-structure for new importers, highly likely to change multiple times. 2011-11-21 10:56:53 +01:00
Daniel Hasselrot
4e3ecebdf2 Added created by user and comments 2011-11-21 10:11:39 +01:00
Daniel Hasselrot
235e4171b9 Changed from forced to pre-approved match 2011-11-21 09:53:28 +01:00
Robin Eklund
96cb3a89b0 Spelling mistake fixed 2011-11-21 09:52:51 +01:00
Daniel Hasselrot
eb283cfcb1 Changed from supervisors to preferredSupervisors 2011-11-21 09:42:31 +01:00
Daniel Hasselrot
a621de6e20 Removed accidentaly checked in file 2011-11-21 09:28:26 +01:00
Emil Siverhall
6113044d4d Merge branch 'entities' of ssh://git.dsv.su.se/git/scipro/personal/dh into projectIdeaPage 
* 'entities' of ssh://git.dsv.su.se/git/scipro/personal/dh:
  Added match object and possibility to force a match
  Put back external supervisor flag
  Removed flag for external supervisor
  Refactored watson to embedded class
  Added filter for already created projects
  Added possibility to retrieve all project ideas for an application period
  Added so that active project ideas can be retrieved by author
  Changed keywords to set
  Added support for querying supervisors by language
  Added language
  Refactored application round into application period
  Added possibility to get supervisors that have capability for a project class
  Added application period
  Added supervisor and author
  Started working on project idea
 2011-11-21 09:27:29 +01:00
Fredrik Friis
258e27e84b some gui changes 2011-11-21 14:30:08 +09:00
Fredrik Friis
e0accc7a9b some gui changes and optimizations 2011-11-21 10:04:30 +09:00
Emil Siverhall
52612bb267 added cheat sheet to project idea page according to mockups 2011-11-20 21:40:11 +01:00
Emil Siverhall
822df6857a added dummy dropdown for select program 2011-11-20 21:21:46 +01:00
Emil Siverhall
60c552b26e Merge branch 'component' of ssh://git.dsv.su.se/git/scipro/personal/fn into projectIdea 
* 'component' of ssh://git.dsv.su.se/git/scipro/personal/fn:
  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-20 19:51:57 +01:00
Fredrik Norberg
e4041f8d5f finished adding infopopups and added a checkbox with expanding textfield for external supervisor 2011-11-18 18:16:28 +01:00
Daniel Hasselrot
1dd73adec1 Added match object and possibility to force a match 2011-11-18 17:41:03 +01:00
Daniel Hasselrot
38d2cfb0a7 Put back external supervisor flag 2011-11-18 16:12:13 +01:00