Fredrik Friis
165ed30935
working on edit panel
2011-12-08 18:54:07 +09:00
Fredrik Friis
a228e4f5e8
removed the details again =) this wwhole panel must be refactored
2011-12-08 15:13:41 +09:00
Fredrik Friis
75f8cf41b7
added details to a panel
2011-12-08 15:00:20 +09:00
Fredrik Friis
b5ef603f11
fixed another bug
2011-12-08 14:28:30 +09:00
Fredrik Friis
b914773437
fixed bug
2011-12-08 14:13:07 +09:00
Fredrik Friis
d778dcc220
found a bug in the new checklisttemplatepanel, when results are filtered clicking to edit a checklisttemplate sometimes brings up the wrong template for editing. removing the panel until bug is fixed.
2011-12-08 11:34:17 +09:00
Alex Robsahm
0c2c7a7bd1
Removed comments
2011-12-07 19:46:29 +01:00
Alex Robsahm
a11badbf4f
Enable/Disable DatePicker button
2011-12-07 18:32:19 +01:00
Robin Eklund
75e5d1dda1
Minor ui-fixes, this will need the eyes of a css-guru at some point.
2011-12-07 18:19:50 +01:00
Robin Eklund
f0cdc60526
Slight refactoring to support easier extensability of new user-details.
...
Merging to develop for visibility/testing, but this will need more attention.
2011-12-07 18:10:51 +01:00
Robin Eklund
479e615deb
Merge branch 'develop' into supervisorProfile
2011-12-07 17:26:38 +01:00
Robin Eklund
100711e7fb
Added editing of user and supervisor profiles, will need some cleaning up.
2011-12-07 17:25:20 +01:00
Daniel Hasselrot
1f9569dd20
Merge branch 'rolerefactor' into develop
2011-12-07 16:58:29 +01:00
Daniel Hasselrot
e317b143c6
Removed Author and used Student instead
2011-12-07 16:44:43 +01:00
Daniel Hasselrot
870b08fe87
Remove local persistence parameters
2011-12-07 16:18:28 +01:00
Daniel Hasselrot
0b89ffeff1
Removed supervisor and changed to use employee instead
2011-12-07 16:02:44 +01:00
Daniel Hasselrot
a4f2609704
Pushed up supervisor functionality to supervisor
2011-12-07 15:30:37 +01:00
Daniel Hasselrot
d4b458b87f
Fixed compilation and test error
2011-12-07 14:52:08 +01:00
Daniel Hasselrot
a043058ec1
Fixed merge error
2011-12-07 14:43:14 +01:00
Alex Robsahm
cf4ba0b1b2
Changes for Supervisor and Admin
2011-12-07 14:26:13 +01:00
Alex Robsahm
8d83ed907b
Added matched panels
2011-12-07 14:26:13 +01:00
Alex Robsahm
7789f8ff22
Added Watson pages/panels
2011-12-07 14:24:08 +01:00
Alex Robsahm
daba5c5353
Added files for supervisor panel
2011-12-07 14:24:08 +01:00
Robin Eklund
9f8a65a217
Merge branch 'develop' into supervisorProfile
2011-12-07 10:52:45 +01:00
Daniel Hasselrot
478b6cffeb
Added run match algorithm button
2011-12-07 10:33:36 +01:00
Daniel Hasselrot
70be62c53a
Added create panel
2011-12-07 10:29:10 +01:00
Robin Eklund
494296c441
Merge branch 'hotfix-finalSeminarDates' into develop
2011-12-07 10:11:23 +01:00
Robin Eklund
0ce4d98f48
Fixed formatting bug in the final seminar panel leading to very misleading information being presented.
...
Also made it a bit more clear what time is the real one by showing both start and end dates
in the details-panel.
2011-12-07 10:09:55 +01:00
Fredrik Friis
20393e3e84
fixed small issue in conference
2011-12-07 17:10:06 +09:00
Fredrik Friis
860c673c29
added title filtering
2011-12-07 15:50:54 +09:00
Fredrik Friis
5ea7f5435c
setup for filtering on title works
2011-12-07 14:13:47 +09:00
Fredrik Friis
0ad39feeb0
made infobox more clear
2011-12-07 12:42:38 +09:00
Fredrik Friis
081688d227
multi line conference messages fixed
2011-12-07 11:59:16 +09:00
Fredrik Friis
f5caa021d5
setup for first time login notification is complete, how to figure out if someone is logging in for the first time? boolean in user that is called somehow?
2011-12-07 11:55:21 +09:00
Fredrik Friis
b6ae6cdeeb
fixed point 1
2011-12-07 11:36:41 +09:00
Fredrik Friis
d830daa95e
Merge branch 'newjanne' into develop
2011-12-07 10:53:36 +09:00
Fredrik Friis
d7fa8d3e10
added a convenience file server panel to viewchecklistpanels
2011-12-07 10:53:19 +09:00
Fredrik Friis
39346e549c
Merge branch 'newcheck' into develop
2011-12-07 09:58:43 +09:00
Fredrik Friis
27ce34baf6
editing, creating and deleting now works
2011-12-07 09:54:17 +09:00
Fredrik Norberg
7f3d9c306b
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Fixed project limit to be zero when no limit for project class
2011-12-06 18:26:34 +01:00
Fredrik Norberg
0fa2b8b476
Merge branch 'matchSupervisor' into develop
...
* matchSupervisor:
added manageSupervisorDataview, filtering still needs to be done
started with manageSupervisor dataview in match
2011-12-06 18:26:08 +01:00
Fredrik Norberg
5ea1f62f78
added manageSupervisorDataview, filtering still needs to be done
2011-12-06 18:25:28 +01:00
Daniel Hasselrot
b636a526a5
Fixed project limit to be zero when no limit for project class
2011-12-06 18:16:27 +01:00
Fredrik Norberg
2589c77d05
started with manageSupervisor dataview in match
2011-12-06 17:36:15 +01:00
Fredrik Norberg
ede0a1d2f7
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
delete files
some work to make submitted values of project ideas display correctly for editing. also some submission logic and menu highlighting.
Added possibility to query by name
Added possibility to query for availability of a single supervisor and project class
Fixed issue with capabilities not showing up if matched to another project class
Supervisors are now queryable by keywords
added correct menu highlighting to project idea pages
refactoring to make different pages for project ideas and submission
added links to idea submission and date field to table with project ideas
added support for project idea model to be submitted in keyword selection panel
some changes in dataprovider to be more flexible
started to work on panel for students project ideas
2011-12-06 17:35:32 +01:00
Emil Siverhall
4d425f5011
Merge branch 'temp' into develop
2011-12-06 16:54:54 +01:00
Emil Siverhall
9e8dbc053f
merge conflicts
2011-12-06 16:50:00 +01:00
U-emil-siv-dator\emil-siv
6a9968a6cd
delete files
2011-12-06 16:47:31 +01:00
Emil Siverhall
b8180fcc0b
some work to make submitted values of project ideas display correctly for editing. also some submission logic and menu highlighting.
2011-12-06 16:33:09 +01:00
Robin Eklund
04a3638d76
Started work on supervisor profile.
...
Will need to remodel the KeywordSelectionPanel a bit next.
2011-12-06 16:31:46 +01:00
