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
Daniel Hasselrot
668900e636
Added possibility to query by name
2011-12-06 15:03:14 +01:00
Daniel Hasselrot
940790940b
Added possibility to query for availability of a single supervisor and project class
2011-12-06 14:57:25 +01:00
Robin Eklund
8ce36f4f83
Refactoring work, can't get further on this without more api-support.
2011-12-06 14:30:08 +01:00
Daniel Hasselrot
f98d866b54
Fixed issue with capabilities not showing up if matched to another project class
2011-12-06 13:55:33 +01:00
Daniel Hasselrot
3f7e70d2b5
Supervisors are now queryable by keywords
2011-12-06 13:16:47 +01:00
Emil Siverhall
fd102682eb
added correct menu highlighting to project idea pages
2011-12-06 12:17:52 +01:00
Emil Siverhall
68cadb0b30
refactoring to make different pages for project ideas and submission
2011-12-06 12:06:32 +01:00
Emil Siverhall
4f75381501
added links to idea submission and date field to table with project ideas
2011-12-06 12:04:45 +01:00
Emil Siverhall
9a742d5876
added support for project idea model to be submitted in keyword selection panel
2011-12-06 11:56:27 +01:00
Emil Siverhall
1b13718d7b
some changes in dataprovider to be more flexible
2011-12-06 11:54:21 +01:00
Fredrik Norberg
6ea2723da1
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 casing
2011-12-06 11:01:08 +01:00
Fredrik Friis
d7bba528e3
reload was needed by JPA
2011-12-06 18:22:37 +09:00
Robin Eklund
9129c232a8
Fixed casing
2011-12-06 10:00:03 +01:00
Fredrik Friis
372c825d97
adding filepanel for checklistpanel
2011-12-06 17:53:56 +09:00
Fredrik Norberg
80cbe0ff4a
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (38 commits)
Added automatic match page and weights
point 4 fixed
point 2&3 fixed
point 1 fixed
Added basic functionality for crud'ing application periods.
Added confirmation dialog to removal of activity plan events, pretty basic stuff.
minor bug fix when selecting project class on project idea submission
Fixed test error
Pre-aproved matches are now published directly
Added remove exemption grant
Added comment
Added project and student selector
Added possibility to create excemptions
Started working on admin exemption panel
Added a generic way to create a data provider for queryset based daos, and first draft of exemption page
Added exemption data provider
Added find methods to excemptio dao
Added possibility to get excemptions from min and max authors
Added possibility to limit authors
character encoding fixes
...
2011-12-06 09:28:37 +01:00
Daniel Hasselrot
ba6141b925
Added automatic match page and weights
2011-12-06 09:15:30 +01:00
Fredrik Friis
68d145a77c
trying to implement editing, sessionrelated bug
2011-12-06 16:58:15 +09:00
Fredrik Friis
8ce93169da
added panel for creating new
2011-12-06 15:13:29 +09:00
Fredrik Friis
c4bb2492bb
point 4 fixed
2011-12-06 12:23:44 +09:00
Fredrik Friis
bf75a80fb9
point 2&3 fixed
2011-12-06 11:34:48 +09:00
