Fredrik Friis
3b896c7c55
fixed some bugs
2012-01-20 18:25:38 +09:00
Fredrik Friis
e94f2bd9fd
added add from template link and panel
2012-01-20 17:45:21 +09:00
Fredrik Friis
44e405d35e
view, edit and new works
2012-01-20 17:28:35 +09:00
Fredrik Friis
6cc490ee4c
added checklist chooser
2012-01-20 17:11:49 +09:00
Fredrik Friis
b6e9576e16
added more stuff to edit panel
2012-01-20 16:31:42 +09:00
Fredrik Friis
e8bf4e9154
added functioning date
2012-01-20 14:29:34 +09:00
Fredrik Friis
26db39d3c4
added button that closes dialog
2012-01-20 14:20:10 +09:00
Fredrik Friis
e8912d81b6
added namefield to form
2012-01-20 14:14:49 +09:00
Fredrik Friis
7f72b95c16
begun implementing new dialogs
2012-01-20 14:10:40 +09:00
Fredrik Friis
44271db333
commented out all old dialogs
2012-01-20 13:44:21 +09:00
Fredrik Friis
5be9c74f75
added panel for editing events
2012-01-20 13:37:27 +09:00
Fredrik Friis
2981946b54
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2012-01-20 13:23:18 +09:00
Fredrik Friis
cde3510f14
fixed time bug in application period panel
2012-01-20 13:21:44 +09:00
Tom Vahlman
e7ccb4be73
Changing the annotation of ProjectIdea#match from @ManyToOne to @OneToOne.
2012-01-19 20:31:19 +01:00
Tom Vahlman
b049f978a4
The new Match#rejectedBy property; a supervisor is rejecting a project idea.
2012-01-19 18:45:10 +01:00
Tom Vahlman
85c2a36c99
It is better that the status is passed as a parameter than as a property in the Match object (less code etc.)
2012-01-19 18:43:05 +01:00
Tom Vahlman
d70599caf4
Added required changes for the new property Match#rejectedBy + CommentForAdmin must be set when creating a match, rejected by a supervisor.
2012-01-19 18:41:39 +01:00
Tom Vahlman
6742b0aff3
Added new property Match#rejectedBy + added rejectedBy to equals and hashCode.
2012-01-19 18:39:57 +01:00
Tom Vahlman
36af6b6046
Required refactorizations for the new property Match#rejectedBy.
2012-01-19 18:38:13 +01:00
Tom Vahlman
b54213240f
Required database changes for the new property Match#rejectedBy.
2012-01-19 18:37:15 +01:00
Tom Vahlman
7d85c81d89
Get the data from the new property Match#rejectedBy.
2012-01-19 18:34:47 +01:00
Tom Vahlman
3e695ee530
Avoiding the "internal server error" using the project class dropdown (bachelor/master) when creating a new project idea.
2012-01-18 13:52:52 +01:00
Fredrik Friis
861e3bae2b
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2012-01-18 18:51:03 +09:00
Fredrik Friis
1bda3b1235
submit new project idea button hidden for users who are already in a project idea
2012-01-18 16:18:37 +09:00
Fredrik Friis
27bc8827a7
removed ajax development setting
2012-01-18 14:53:04 +09:00
Fredrik Friis
7c9817c6ae
hiding and submitting master without partner works
2012-01-18 14:44:43 +09:00
Fredrik Friis
f52f81e025
now hiding works properly
2012-01-18 14:31:09 +09:00
Fredrik Friis
756272d5c8
added some logic to project idea submit panel. now, partner is only required if level is bachelor and no exemption has been granted. or else, no partner is required and the partner panel is hidden
2012-01-18 13:49:45 +09:00
Fredrik Friis
ae48489cb9
trying to hide the partnerpanel when level is bachelor and exemption has been granted
2012-01-17 20:47:46 +09:00
Fredrik Friis
407aecd30d
added hide function for partner panel
2012-01-17 20:33:56 +09:00
Emil Siverhall
daa8877ac0
Merge branch 'unit_import' into develop
2012-01-17 11:10:35 +01:00
Emil Siverhall
17d72fb6cc
added new unit test for retrieving keyword by name and type from dao
2012-01-17 11:06:58 +01:00
Fredrik Friis
9b5b05b15f
author limits commented out, not implemented yet
2012-01-17 18:49:41 +09:00
Fredrik Friis
57acfb43bc
better comments in filterstringpanel
2012-01-17 12:35:54 +09:00
Fredrik Friis
46559f8925
added new completedprojectstatuspanel to supervisorprojectdetailspage
2012-01-17 11:09:40 +09:00
Emil Siverhall
4f80730689
added unit import to existing supervisor bulk import worker thread
2012-01-16 15:05:32 +01:00
Emil Siverhall
bcea12324b
manual unit import for supervisors is now working. if a supervisor is already attached to a unit, this is being overwritten with the data from daisy. if a supervisor is attached to more than one unit, the first added will be overwritten by the next one.
2012-01-16 14:22:26 +01:00
Fredrik Friis
40f8a1889e
added new completedprojectstatuspanel to projectstartpage
2012-01-16 16:28:18 +09:00
Fredrik Friis
ea25fa95fd
new panel for completed projects project state
2012-01-16 16:03:15 +09:00
Fredrik Friis
1a38569a5a
added project facade method
2012-01-16 15:30:24 +09:00
Fredrik Friis
cc6e453646
added 5 character requirement to project idea watson boxes
2012-01-16 13:28:42 +09:00
Emil Siverhall
875b56b304
Merge branch 'gui_match_admin' into develop
...
* gui_match_admin:
minor gui changes to admin match menus
merge conflict fix
some gui changes at admin - match - manage keywords
gui changes to admin - match - project ideas
2012-01-15 22:35:32 +01:00
Emil Siverhall
8a58a74cc3
minor gui changes to admin match menus
2012-01-15 22:34:38 +01:00
Emil Siverhall
977f123914
merge conflict fix
2012-01-15 22:32:32 +01:00
Emil Siverhall
3f0635e616
merge conflict
2012-01-15 20:50:31 +01:00
Tom Vahlman
88b449116e
Implemented the edit-button, because it didnt worked....
2012-01-13 17:47:08 +01:00
Tom Vahlman
35cd5999f7
Added null check on supervisor name.
2012-01-13 14:41:00 +01:00
Tom Vahlman
7e4ee702fb
Added version number to cargo plugin
2012-01-13 13:47:34 +01:00
Fredrik Friis
dcb0afb493
Merge branch 'release20120113'
2012-01-13 18:24:55 +09:00
Fredrik Friis
3a298fb89b
added new db update file
2012-01-13 18:05:44 +09:00
