2925 Commits

Author SHA1 Message Date
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
Daniel Hasselrot
af90844766 Removed flag for external supervisor 2011-11-18 16:01:23 +01:00
Daniel Hasselrot
82b82fc546 Refactored watson to embedded class 2011-11-18 15:37:20 +01:00
Daniel Hasselrot
37da3b3cb9 Added filter for already created projects 2011-11-18 15:21:56 +01:00
Daniel Hasselrot
b65d91b972 Added possibility to retrieve all project ideas for an application period 2011-11-18 15:03:05 +01:00
Daniel Hasselrot
cec03b24e9 Added so that active project ideas can be retrieved by author 2011-11-18 13:24:37 +01:00
Daniel Hasselrot
a68351ccc3 Changed keywords to set 2011-11-18 11:31:52 +01:00
Daniel Hasselrot
7b7746ad22 Added support for querying supervisors by language 2011-11-18 11:00:40 +01:00
Daniel Hasselrot
14f32f4c56 Added language 2011-11-18 10:23:20 +01:00
Daniel Hasselrot
cea60f5239 Refactored application round into application period 2011-11-18 09:24:53 +01:00
Fredrik Friis
2baadc9436 legend added to checklist creation panel 2011-11-18 13:23:55 +09:00
Fredrik Friis
4a475fdc3d add question field clears after adding the question 2011-11-18 12:49:38 +09:00
Fredrik Friis
b5ff45539b major gui improvements for admin checklist template creation- but major refactoring of these panels are needed 2011-11-18 12:19:01 +09:00
Fredrik Friis
5beef87b9b added namefield to the panel where one can edit checklists TODO also make it possible to use the same panel for creating a checklist 2011-11-18 10:36:53 +09:00
Daniel Hasselrot
63282c4e09 Added possibility to get supervisors that have capability for a project class 2011-11-17 17:24:33 +01:00
Fredrik Norberg
f9a39aa6fc started to add infolinks to projectIdeaPanel 2011-11-17 17:20:24 +01:00
Daniel Hasselrot
0f019bed04 Added application period 2011-11-17 16:35:54 +01:00
Fredrik Norberg
40dba9c8b4 Merge branch 'projectIdeaPage' of ssh://git.dsv.su.se/git/scipro/personal/es into component
* 'projectIdeaPage' of ssh://git.dsv.su.se/git/scipro/personal/es: (44 commits)
  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
  Fixed so that test are independent from eachother
  Refactored test to support new question order
  Removed unnecessary %
  Made edit answer link disabled if not own answer
  Added correct styling
  Removed old summary panel
  Added standard text when no answer is available
  Cleaned up after each test
  Tests are now passing
  Fixed test
  Moved variation to alternate variation panel
  Added test for displaying comments
  Added support for alternative variations
  Both verisions now passes the test
  ...
2011-11-17 14:29:48 +01:00
Fredrik Friis
440f84376d fixed popup details for activity plan templates 2011-11-17 21:32:18 +09:00
Daniel Hasselrot
eac92acba3 Added supervisor and author 2011-11-17 08:40:02 +01:00
Daniel Hasselrot
a9d2e9cdc8 Started working on project idea 2011-11-17 08:40:02 +01:00
Fredrik Friis
a59c2ff8b0 GUI changed with activity plan tempaltes 2011-11-17 14:10:00 +09:00
Fredrik Friis
ea10d7842d GUI changed with activity plan tempaltes 2011-11-17 14:02:53 +09:00
Fredrik Friis
5b1d892965 shorter info 2011-11-17 11:48:50 +09:00
Fredrik Friis
50e364fe4f some cleanup and instructions 2011-11-17 11:40:16 +09:00
Fredrik Friis
a1eb6b6f67 added emptylabel 2011-11-17 10:40:07 +09:00
Fredrik Friis
31f163a959 added emptylabel 2011-11-17 10:27:21 +09:00
Fredrik Friis
032f1e47b2 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-17 09:56:29 +09:00
Fredrik Friis
a24b491d3d fixed supervisorlogpanel 2011-11-17 09:54:32 +09:00
Daniel Hasselrot
9ea9fa9ec8 Fixed so that current user is never filtered away 2011-11-16 18:04:27 +01:00
Daniel Hasselrot
b0bad4a59e Filtered away reviewers and co-supervisors that haven't answered any questions 2011-11-16 17:49:58 +01:00