Emil Siverhall
|
b7ab6808af
|
Merge branch 'emailFix' into develop
|
2012-10-26 13:48:45 +02:00 |
|
Emil Siverhall
|
71a9329a4a
|
added supervisor email address to final seminar panel
|
2012-10-26 13:48:31 +02:00 |
|
Emil Siverhall
|
1e87ee3ebf
|
Merge branch 'currentFix' into develop
|
2012-10-26 09:32:01 +02:00 |
|
Emil Siverhall
|
9c516ac2ee
|
added exemption info to current sql
|
2012-10-26 09:31:48 +02:00 |
|
Emil Siverhall
|
daf05a8b74
|
Merge branch 'exemptionDates' into develop
|
2012-10-26 09:14:57 +02:00 |
|
Emil Siverhall
|
6eb75d745f
|
added manual updates of expirationDates to exemptions already existing in db
|
2012-10-26 09:12:58 +02:00 |
|
Emil Siverhall
|
3cf6695b44
|
changed to old unit tests involving student exemptions. added expiration date
|
2012-10-26 09:12:21 +02:00 |
|
Emil Siverhall
|
1f4fe9ef8a
|
removed old exemption panel and some clean up in service method
|
2012-10-26 09:12:19 +02:00 |
|
Emil Siverhall
|
fe13879dfc
|
made sure we check for active exemptions when submitting student ideas
|
2012-10-26 09:12:17 +02:00 |
|
Emil Siverhall
|
43dfab93f9
|
added unit tests for exemption service methods
|
2012-10-26 09:12:14 +02:00 |
|
Emil Siverhall
|
f347c81cf1
|
changes to isExemptionGranted boolean to check if expiration date has passed or not
|
2012-10-26 09:12:12 +02:00 |
|
Emil Siverhall
|
91e7443ae0
|
updated current.sql with ned column to exemptions
|
2012-10-26 09:12:10 +02:00 |
|
Emil Siverhall
|
91c62c5d89
|
refactoring of exemption page is done. also added filtering on level and student (auto complete). changes to data object as well and added expiration date for the exemptions. default is 6 months from today
|
2012-10-26 09:11:32 +02:00 |
|
Emil Siverhall
|
8cf80ca902
|
started refactoring of exemption page. we not use service and datatable as on other pages
|
2012-10-26 09:11:30 +02:00 |
|
fred-fri
|
a1a487014c
|
Merge branch 'release20121026'
20121026
|
2012-10-26 10:15:30 +09:00 |
|
fred-fri
|
dbf50f6730
|
addedd new sql file
|
2012-10-26 10:14:04 +09:00 |
|
Emil Siverhall
|
1c2d39eef5
|
Merge branch 'deactiveAreaImport' into develop
|
2012-10-25 10:30:39 +02:00 |
|
Emil Siverhall
|
9b8f0d48f4
|
removed possibility to manually import all research areas from daisy, since we then get areas without supervisors attached as well
|
2012-10-25 10:30:15 +02:00 |
|
fred-fri
|
34b5d6b234
|
added first meetin column to popup page
|
2012-10-25 14:44:02 +09:00 |
|
fred-fri
|
8b91fd9aa4
|
added first meeting column to ordinary crud page
|
2012-10-25 14:37:23 +09:00 |
|
fred-fri
|
eb1e2a34dc
|
added info
|
2012-10-25 13:43:22 +09:00 |
|
fred-fri
|
e701ce4aad
|
removed nullpointerbug
|
2012-10-25 13:40:07 +09:00 |
|
fred-fri
|
02b22cc35d
|
hooked up the page to use the new methods
|
2012-10-25 12:36:14 +09:00 |
|
fred-fri
|
f88a17f38f
|
added boolean builder and implemented the methods to point to it
|
2012-10-25 12:29:27 +09:00 |
|
fred-fri
|
4db4637ae4
|
added cout and findall methods
|
2012-10-25 12:24:55 +09:00 |
|
fred-fri
|
e633c48bfb
|
added some comments
|
2012-10-25 08:44:42 +09:00 |
|
Jona Ekenberg
|
872c346f05
|
Nu fungerar filtreringen.
|
2012-10-25 01:17:22 +02:00 |
|
Emil Siverhall
|
d542c6ee1a
|
Merge branch 'templateBug' into develop
|
2012-10-24 21:25:48 +02:00 |
|
Emil Siverhall
|
003ec229ea
|
fixed bug that tried to redirect the supervisor to the wrong page after submitting changes to activity plan templates
|
2012-10-24 21:24:50 +02:00 |
|
Emil Siverhall
|
3b6850bfd8
|
Merge branch 'researchAreaPage' into develop
|
2012-10-24 20:39:09 +02:00 |
|
Emil Siverhall
|
06ce620772
|
added focus method to trick auto complete component and work properly
|
2012-10-24 20:37:52 +02:00 |
|
Emil Siverhall
|
ee678823e7
|
addition of keyword relationships now works as well with research areas
|
2012-10-24 20:37:50 +02:00 |
|
Emil Siverhall
|
0fd74ae841
|
deletion of area - keyword relationships now works properly
|
2012-10-24 20:37:48 +02:00 |
|
Emil Siverhall
|
86a690a0ed
|
added unit tests for new keyword auto complete component
|
2012-10-24 20:37:46 +02:00 |
|
Emil Siverhall
|
3da3fbfe78
|
started working on edit relationship-dialog for research areas
|
2012-10-24 20:37:43 +02:00 |
|
Emil Siverhall
|
5227fa5838
|
added new auto complete component to use with keywords
|
2012-10-24 20:37:41 +02:00 |
|
Emil Siverhall
|
e458027f80
|
added details dialog for which keywords that relates to a certain research area
|
2012-10-24 20:37:39 +02:00 |
|
Emil Siverhall
|
cecbc31f32
|
removed column for active in scipro attribute since we dont know if this is going to be implemented yet. also added correct logics for checking to see if area is active in daisy
|
2012-10-24 20:37:37 +02:00 |
|
Emil Siverhall
|
2630e1ea88
|
added correct column for counting supervisor relationships for each research area and info dialog containing the supervisors
|
2012-10-24 20:37:35 +02:00 |
|
Emil Siverhall
|
2250e94c85
|
added admin page for research area crud panel with some restructuring of the keyword tab. started working on the columns in research area datatable. still a lot to do
|
2012-10-24 20:37:32 +02:00 |
|
Emil Siverhall
|
e7aaad14be
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-10-24 20:12:46 +02:00 |
|
Emil Siverhall
|
83dd807026
|
fixed merge conflict from hotfix branch
|
2012-10-24 20:12:24 +02:00 |
|
Emil Siverhall
|
a0440efa3d
|
Merge branch 'hotfix-20121024'
20121024
|
2012-10-24 19:59:19 +02:00 |
|
Emil Siverhall
|
6a03f96199
|
hotfix to make sure a student role is added to users trying to log in without authorization role
|
2012-10-24 19:56:13 +02:00 |
|
fred-fri
|
ce7f67e64a
|
clarification
|
2012-10-24 13:24:53 +09:00 |
|
fred-fri
|
e65b05e446
|
added partner days to accept info
|
2012-10-24 13:22:38 +09:00 |
|
fred-fri
|
73786e8b19
|
fixed so that you dont get javascript are you sure confirmation if link is not enabled
|
2012-10-24 12:37:24 +09:00 |
|
fred-fri
|
7c15b1ad8a
|
fixed so that you dont get javascript are you sure confirmation if link is not enabled
|
2012-10-24 12:34:20 +09:00 |
|
fred-fri
|
ad572e7ce8
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-10-24 12:26:31 +09:00 |
|
fred-fri
|
c07e74eef9
|
removed the jquery css rule that made links inside dialogs black
|
2012-10-24 12:26:03 +09:00 |
|