Fredrik Friis
d8fb6c5dec
Merge branch 'release20120123'
2012-01-23 12:36:09 +09:00
Fredrik Friis
f67a0ede55
new sql update file
2012-01-23 12:15:27 +09:00
Emil Siverhall
0ff5072841
Merge branch 'gui_improvements_match' into develop
...
* gui_improvements_match:
small menu fix
made dialog bigger on manage supervisor popup as well, to avoid horizontal scroll
code cleanup
more dialog size changes and other gui fixes to match administration
changes to dialog size in top waiting and rejected project ideas edit button
gui changes to edit dialog when managing project ideas from admin page. also some minor code cleanup
gui improvements on manage supervisor page
info box added to manage keyword page
gui changes to make tables look better and also some improvements on checkbox area on manage project ideas page
minor gui changes to manage supervisor panel
added info box to student exemption panel
added info box to automatic match panel
2012-01-22 20:48:02 +01:00
Emil Siverhall
dbda4ed9e9
small menu fix
2012-01-22 20:47:06 +01:00
Emil Siverhall
82eea65411
made dialog bigger on manage supervisor popup as well, to avoid horizontal scroll
2012-01-22 20:47:02 +01:00
Emil Siverhall
8a2d49369c
code cleanup
2012-01-22 20:46:58 +01:00
Emil Siverhall
1f5ceaf5a2
more dialog size changes and other gui fixes to match administration
2012-01-22 20:46:55 +01:00
Emil Siverhall
03c221f2ef
changes to dialog size in top waiting and rejected project ideas edit button
2012-01-22 20:46:51 +01:00
Emil Siverhall
3a0d42d924
gui changes to edit dialog when managing project ideas from admin page. also some minor code cleanup
2012-01-22 20:46:47 +01:00
Emil Siverhall
4e9da74ba3
gui improvements on manage supervisor page
2012-01-22 20:46:43 +01:00
Emil Siverhall
47d105408c
info box added to manage keyword page
2012-01-22 20:46:40 +01:00
Emil Siverhall
5d1225c5e8
gui changes to make tables look better and also some improvements on checkbox area on manage project ideas page
2012-01-22 20:46:36 +01:00
Emil Siverhall
eae1595ed9
minor gui changes to manage supervisor panel
2012-01-22 20:46:32 +01:00
Emil Siverhall
1f15fe0888
added info box to student exemption panel
2012-01-22 20:46:28 +01:00
Emil Siverhall
2a4451838b
added info box to automatic match panel
2012-01-22 20:46:25 +01:00
Tom Vahlman
8d2d8e6f3a
Fixed failed test changeStatus has been changed but the test was probably fault.
2012-01-20 10:42:29 +01:00
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
