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 |
|
Emil Siverhall
|
02003a8336
|
Merge branch 'dateCount' into develop
|
2012-09-18 20:33:22 +02:00 |
|
Emil Siverhall
|
b684c74e07
|
updated current sql
|
2012-09-18 16:38:42 +02:00 |
|
Emil Siverhall
|
887c8e3438
|
added bachelorcount and master count dates to general system settings. (to have a date to count from on supervisor settings. needed a general date to use for date picker and table header instead of supervisor specific value that is still available
|
2012-09-18 16:35:52 +02:00 |
|
Emil Siverhall
|
054f066fee
|
added new components to select count from date with datepicker instead of reset button
|
2012-09-18 15:14:21 +02:00 |
|
fred-fri
|
7109ee7a28
|
name change
|
2012-09-18 15:44:20 +09:00 |
|
fred-fri
|
e7abfaf08c
|
name change
|
2012-09-18 15:42:13 +09:00 |
|
fred-fri
|
b29521b750
|
removed projectideasubtabmenupanel
|
2012-09-18 15:28:35 +09:00 |
|
fred-fri
|
a8651a4147
|
changed name
|
2012-09-18 15:13:35 +09:00 |
|
fred-fri
|
aafd50813d
|
changed name
|
2012-09-18 15:04:55 +09:00 |
|
fred-fri
|
f5a767ed26
|
changed name
|
2012-09-18 15:02:52 +09:00 |
|
fred-fri
|
5109e703a3
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-18 12:34:37 +09:00 |
|
fred-fri
|
53355e6a20
|
some cleanup
|
2012-09-18 12:34:19 +09:00 |
|
Emil Siverhall
|
da509000b4
|
Merge branch 'targetResets' into develop
|
2012-09-17 18:33:39 +02:00 |
|
Emil Siverhall
|
4cabc84532
|
added reset buttons for target numbers at supervisor settings page
|
2012-09-17 18:33:21 +02:00 |
|
Emil Siverhall
|
f4dedcff71
|
Merge branch 'settingsInfo' into develop
|
2012-09-17 17:03:08 +02:00 |
|
Emil Siverhall
|
58cf1dd0f6
|
added new info dialog to supervisor settings page to hide info in dialog
|
2012-09-17 17:02:48 +02:00 |
|
Emil Siverhall
|
1e09725f70
|
Merge branch 'researchAreaColumn' into develop
|
2012-09-17 16:29:11 +02:00 |
|
Emil Siverhall
|
db48a87000
|
added 'none' option to research area and unit filter on supervisor settings page
|
2012-09-17 16:28:39 +02:00 |
|
Emil Siverhall
|
abd727eed7
|
added research area column to supervisor settings datatable.. sorting not implemented since areas can be more than one..
|
2012-09-17 15:55:28 +02:00 |
|
Emil Siverhall
|
b831bec0c7
|
Merge branch 'supervisorSettingsInput' into develop
|
2012-09-17 15:24:22 +02:00 |
|
Emil Siverhall
|
3d990a2b7b
|
made size of input field a bit smaller
|
2012-09-17 15:24:05 +02:00 |
|
Emil Siverhall
|
b0a03f8b11
|
added new target number component that uses input field instead of dropdowns
|
2012-09-17 14:58:43 +02:00 |
|
fred-fri
|
5d5c30f178
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-17 17:40:35 +09:00 |
|
fred-fri
|
eeb31f344f
|
some cleanup
|
2012-09-17 17:39:57 +09:00 |
|
fred-fri
|
7a60a64bc9
|
removed supervisorprojectideasubtabmenupanel
|
2012-09-17 16:31:06 +09:00 |
|
Emil Siverhall
|
cfcb99a42d
|
Merge branch 'titleFix' into develop
|
2012-09-17 08:21:17 +02:00 |
|
Emil Siverhall
|
c212bbbf58
|
changed from title in admin crud dialog and removed title from dialog
|
2012-09-17 08:21:05 +02:00 |
|
Emil Siverhall
|
d96cd7b430
|
Merge branch 'createProjectLinks' into develop
|
2012-09-17 08:13:52 +02:00 |
|
Emil Siverhall
|
2cb0491576
|
hiding project creation links until we now exports are working properly
|
2012-09-17 08:13:34 +02:00 |
|
Emil Siverhall
|
afe9b5839b
|
added project creations link to supervisor ideas as well. still need some validation to throw errors if projects cant be created
|
2012-09-17 08:13:32 +02:00 |
|
Emil Siverhall
|
a7329e668e
|
added link to create project from student ideas in datatable column
|
2012-09-17 08:13:29 +02:00 |
|