Emil Siverhall
|
445f3d99e1
|
changes to reloading of page when new count date is set. page is now reloading to display correct date in datatable
|
2012-09-24 12:49:44 +02:00 |
|
fred-fri
|
a5a88dad1e
|
removed hidden logic and code
|
2012-09-24 16:38:12 +09:00 |
|
fred-fri
|
12ab19555f
|
cleanup
|
2012-09-24 16:35:15 +09:00 |
|
fred-fri
|
f449a5e6b3
|
removed hidden stuff
|
2012-09-24 16:32:38 +09:00 |
|
fred-fri
|
8fa358d175
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-24 16:28:08 +09:00 |
|
fred-fri
|
799d5b52ed
|
added research areas and keywords to view all available supervisor project ideas in student view
|
2012-09-24 16:26:56 +09:00 |
|
Emil Siverhall
|
24a429ee8c
|
Merge branch 'exceptionFix' into develop
|
2012-09-24 08:44:43 +02:00 |
|
Emil Siverhall
|
9840ea8ea9
|
changed order of validation when checking to see if idea is exportable or not.
|
2012-09-24 08:43:54 +02:00 |
|
fred-fri
|
84e4b41bf2
|
fixed markup bug
|
2012-09-24 15:33:33 +09:00 |
|
fred-fri
|
fd1fcc0e1b
|
added columns to all available project ideas
|
2012-09-24 15:09:04 +09:00 |
|
fred-fri
|
3b21427f4f
|
added info links for unlcear supervisor idea form stuff
|
2012-09-24 13:54:26 +09:00 |
|
fred-fri
|
c6e15adc5f
|
added help link to prerequisites
|
2012-09-24 13:38:26 +09:00 |
|
fred-fri
|
333945f4f8
|
restructured dialog
|
2012-09-24 13:26:18 +09:00 |
|
fred-fri
|
b6feaf206e
|
added dialog
|
2012-09-24 13:14:42 +09:00 |
|
fred-fri
|
a0a9a97f3c
|
restructured the form a bit
|
2012-09-24 12:49:06 +09:00 |
|
fred-fri
|
ab2dd3bb18
|
removed duplicate sql file
|
2012-09-24 11:46:03 +09:00 |
|
ranil
|
62772f69c6
|
TEXT change in IdeainfoPanel by ranil
|
2012-09-22 22:47:01 +02:00 |
|
ranil
|
7fafb6f6e2
|
Text change in IdeaInfopanel
|
2012-09-21 18:34:31 +02:00 |
|
Ranil Peiris
|
0618bbcf52
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-21 18:26:29 +02:00 |
|
Emil Siverhall
|
7d7ed120b5
|
Merge branch 'createProjects' into develop
|
2012-09-21 14:15:13 +02:00 |
|
Emil Siverhall
|
7f9de75bec
|
added more feedback messages telling if a project couldnt be exported and that its needed to be added manually in daisy
|
2012-09-21 14:10:50 +02:00 |
|
Emil Siverhall
|
a4b7e3d614
|
enabled exports in project creation methods
|
2012-09-21 13:25:46 +02:00 |
|
Ranil Peiris
|
c2739ecb01
|
Text change in IdeaInfo panel by Ranil
|
2012-09-20 23:16:52 +02:00 |
|
Emil Siverhall
|
edadb75c6d
|
made create project from student idea-link visible for admins as well
|
2012-09-20 22:09:33 +02:00 |
|
Emil Siverhall
|
b761709cb4
|
added export button to supervisor-student ideas details dialog. and some new display logic methods to student idea service
|
2012-09-20 22:03:34 +02:00 |
|
Emil Siverhall
|
2f125edd15
|
refactoring and some logging added when creating projects from student ideas as well
|
2012-09-20 21:26:44 +02:00 |
|
Emil Siverhall
|
5959712899
|
instead of hiding export buttons, just disable them when ideas is not ready for export
|
2012-09-20 20:48:12 +02:00 |
|
Emil Siverhall
|
34b7cecbad
|
added export button in admin - supervisor idea - crud panel and some more logging when project cant be created from ideas.
|
2012-09-20 19:48:59 +02:00 |
|
Emil Siverhall
|
a49c1e5443
|
added export button to supervisor idea details panel
|
2012-09-20 16:14:26 +02:00 |
|
Emil Siverhall
|
5300e11beb
|
some refactoring in project creation methods and added logging when project creation fails/succeed. also service method for supervisor idea that returns if a project is exportable or not
|
2012-09-20 16:13:31 +02:00 |
|
Emil Siverhall
|
de0be7c885
|
removed first meeting info text
|
2012-09-20 11:05:11 +02:00 |
|
Emil Siverhall
|
ee9a246e9f
|
added some new constructors to label and link column (makes it easier to choose if links should be visible and confirmation dialog should exist)
|
2012-09-20 10:45:32 +02:00 |
|
Emil Siverhall
|
e46d2ecdc7
|
Merge branch 'nameColumnFix' into develop
|
2012-09-20 09:17:06 +02:00 |
|
Emil Siverhall
|
1929b92add
|
changed to only use one column for supervisor name
|
2012-09-20 09:16:38 +02:00 |
|
fred-fri
|
6edcb2410e
|
some markup and ajax changes in supervisorsettings
|
2012-09-20 15:41:57 +09:00 |
|
fred-fri
|
b58b0af695
|
moved help link to the right of filter by name
|
2012-09-20 14:28:32 +09:00 |
|
fred-fri
|
34bdeade26
|
some renaming and cleanup of supervisor settings info panel
|
2012-09-20 14:23:09 +09:00 |
|
Emil Siverhall
|
2f292edbbe
|
Merge branch 'AdminIdeaRefactor' into develop
|
2012-09-19 15:52:06 +02:00 |
|
Emil Siverhall
|
8181343e44
|
moved supervisor idea page with crud functionality to the old admin - match - project idea page. radio choice added to switch between student and supervisor idea panels
|
2012-09-19 15:49:45 +02:00 |
|
Emil Siverhall
|
698586ea9f
|
added filtering based on the supervisors unit to admin supervisor idea crud panel
|
2012-09-19 14:44:06 +02:00 |
|
Emil Siverhall
|
ffabf95c4c
|
added filtering on research areas to admin supervisor idea crud panel
|
2012-09-19 14:07:01 +02:00 |
|
Emil Siverhall
|
0502a41aca
|
added visibility column to show if idea is visible/hidden
|
2012-09-19 13:24:32 +02:00 |
|
Emil Siverhall
|
5ccd389e43
|
added sortable columns on supervisor first and last name to crud datatable. also sorting on idea status
|
2012-09-19 12:28:01 +02:00 |
|
fred-fri
|
314da11bbe
|
small markup bug fixed
|
2012-09-19 14:10:43 +09:00 |
|
fred-fri
|
53f26f45e6
|
removed redundant page
|
2012-09-19 13:57:55 +09:00 |
|
fred-fri
|
f368ff7186
|
added new db file
2012-09-19
|
2012-09-19 11:48:16 +09:00 |
|
fred-fri
|
99a68f46d4
|
test commit
|
2012-09-19 11:20:28 +09:00 |
|
fred-fri
|
f25a4a6036
|
test commit
|
2012-09-19 11:06:28 +09:00 |
|
fred-fri
|
cc84e56714
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-19 10:50:29 +09:00 |
|
fred-fri
|
d33121ade3
|
fixed research area lazydelete bug
|
2012-09-19 10:49:56 +09:00 |
|