Emil Siverhall
db67235a1d
minor changes for case sensitivity
2012-02-15 12:52:56 +01:00
Emil Siverhall
05c8df7ff6
Merge branch 'researchImport' into develop
...
* researchImport:
changed remote lookup in test
2012-02-15 12:39:24 +01:00
Emil Siverhall
06c6ee2355
changed remote lookup in test
2012-02-15 12:39:03 +01:00
Emil Siverhall
b6c2f38b9a
Merge branch 'researchImport' into develop
...
* researchImport:
script changes for database update, import stuff
added null check if supervisor cant be retrieved from daisy identifier and small unit test for keyword dao
removed bypass of certificate check and changed api url in applicationContext
restructure of imports to match new api. project participants is now being retrieved as well
remake of unit imports to match new api structure is done. also some changes to research area imports to make sure we have the same keywords as remote host
started on remake of unit imports after changes in external appi.
added identifier from daisy to keywords to avoid duplicates.
added research area check box to manual import panel
changes to project dto to match new api structure
added support for remote fetching of usernames based on the hierarchy of the new api. usernames are now fetched by person/id/usernames
added support for retrieving all available research areas from daisy. still needs to be tested appropriately since api-test still is down
started working on research area imports. most work is done but still needs to be overlooked after it's been tested against the api. test server down at the moment
temporary bypassing certificate validation with redirected trustStore to use apitest-server
2012-02-15 12:36:24 +01:00
Emil Siverhall
8c6ecb4d7a
script changes for database update, import stuff
2012-02-15 12:35:27 +01:00
Emil Siverhall
9cf5853a6b
added null check if supervisor cant be retrieved from daisy identifier and small unit test for keyword dao
2012-02-15 12:35:23 +01:00
Emil Siverhall
147fc92f25
removed bypass of certificate check and changed api url in applicationContext
2012-02-15 12:35:20 +01:00
Emil Siverhall
f525c37300
restructure of imports to match new api. project participants is now being retrieved as well
2012-02-15 12:35:16 +01:00
Emil Siverhall
29fd30f7bb
remake of unit imports to match new api structure is done. also some changes to research area imports to make sure we have the same keywords as remote host
2012-02-15 12:35:13 +01:00
Emil Siverhall
4ebcd2f9b5
started on remake of unit imports after changes in external appi.
2012-02-15 12:35:10 +01:00
Emil Siverhall
9b2f7c568d
added identifier from daisy to keywords to avoid duplicates.
2012-02-15 12:35:07 +01:00
Emil Siverhall
3527e2cbf9
added research area check box to manual import panel
2012-02-15 12:35:04 +01:00
Emil Siverhall
d76acea80f
changes to project dto to match new api structure
2012-02-15 12:35:00 +01:00
Emil Siverhall
2e4899a808
added support for remote fetching of usernames based on the hierarchy of the new api. usernames are now fetched by person/id/usernames
2012-02-15 12:34:56 +01:00
Emil Siverhall
0611d806ea
added support for retrieving all available research areas from daisy. still needs to be tested appropriately since api-test still is down
2012-02-15 12:34:53 +01:00
Emil Siverhall
ca741ff7a1
started working on research area imports. most work is done but still needs to be overlooked after it's been tested against the api. test server down at the moment
2012-02-15 12:34:50 +01:00
Emil Siverhall
1d4670f2c6
temporary bypassing certificate validation with redirected trustStore to use apitest-server
2012-02-15 12:34:47 +01:00
Tom Vahlman
c57972af35
Merge remote-tracking branch 'origin/develop' into develop
2012-02-15 12:23:59 +01:00
Tom Vahlman
dfd29f4174
Added tests for matching supervisor to a project idea based on which keywords has been set.
2012-02-15 12:23:12 +01:00
Fredrik Friis
a9ba1c502d
commented out bad test
2012-02-15 19:29:50 +09:00
Fredrik Friis
48299ca373
nonsense commit for git and jenkins
2012-02-15 15:11:03 +09:00
Fredrik Friis
2d33826c48
editing keywords is disabled for supervisors, but still OK for students when handing in project ideas
2012-02-15 13:04:33 +09:00
Fredrik Friis
9263fef170
algorithm no longer awards points for inactive keywords
2012-02-15 12:24:20 +09:00
Fredrik Friis
a98c214bcd
inactive keywords no longer presented to authors and supervisors
2012-02-15 12:21:11 +09:00
Fredrik Friis
3122c686a1
changed keyword dao method to recieve boolean to specify whether deleted/inactivated keywords should be included in the result or not
2012-02-15 12:13:48 +09:00
Fredrik Friis
a4bd37d837
gui fix
2012-02-15 10:35:53 +09:00
Fredrik Friis
8a7ce14f75
text changes
2012-02-15 10:19:16 +09:00
Tom Vahlman
be1e3cbb83
ProjectIdeas should be connected to an application period.
2012-02-14 17:38:43 +01:00
Tom Vahlman
51c858e548
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
2012-02-14 17:25:32 +01:00
FredrikNorberg
258661945f
Merge branch 'matchAlgoritmFix' into develop
2012-02-14 17:09:06 +01:00
FredrikNorberg
f93ba910a7
removed some print lines
2012-02-14 17:08:09 +01:00
FredrikNorberg
907ffb5079
fixed a bug in the matching algoritm and supervisorAutoCompleteTests
2012-02-14 17:06:39 +01:00
Tom Vahlman
3787763e07
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
2012-02-14 15:10:20 +01:00
FredrikNorberg
0a2ccd7d84
Merge branch 'projectIdeaSubmission' into develop
2012-02-14 14:59:33 +01:00
FredrikNorberg
29bb9c92ae
Merge branch 'supervisorAutocomplete' into develop
2012-02-14 14:58:57 +01:00
FredrikNorberg
c2fb36e0a0
added a formatter class for autocomplete
2012-02-14 14:58:23 +01:00
FredrikNorberg
3188832001
You can no longer view projectIdeas that your not involved in at the submission page
2012-02-14 14:53:30 +01:00
Tom Vahlman
bca83e5c78
Some code refresh.
2012-02-14 14:34:20 +01:00
FredrikNorberg
3681b73a59
Merge branch 'supervisorAutocomplete' into develop
2012-02-14 14:32:55 +01:00
Tom Vahlman
c533aa0226
Changed in a a text.
2012-02-14 14:21:54 +01:00
Tom Vahlman
aa8381161e
Changed in a a text.
2012-02-14 14:21:25 +01:00
FredrikNorberg
6299ce3b8e
supervisors can now be choosen independent of target values and languages and emaladresses are shown after the name in autocomplete. Also fixed 2 bugs, 1 with inactive supervisors and 1 with supervisor start page showing the wrong prject ideas
2012-02-14 14:19:18 +01:00
Rasmus Ivö
ffb3727a42
Merge branch 'rmverification' into develop
2012-02-14 13:23:35 +01:00
Rasmus Ivö
f0679696f3
Added javascript popup on deletion using the util class JavascriptEventConfirmation. Also changed existing popups to use this.
2012-02-14 13:22:13 +01:00
Fredrik Friis
2186118ff6
added no-edit warning in project idea submit panel
2012-02-14 19:29:11 +09:00
Fredrik Friis
1ca8dd2353
added no-edit warning in project idea submit panel
2012-02-14 19:24:31 +09:00
Fredrik Friis
6bafd5ce8a
Merge branch 'project' into develop
2012-02-14 16:27:19 +09:00
Fredrik Friis
2d90266782
removed help code
2012-02-14 16:27:12 +09:00
Fredrik Friis
0828948b88
Merge branch 'project' into develop
2012-02-14 16:20:18 +09:00
Fredrik Friis
7b04f29218
added project status filtering
2012-02-14 16:18:41 +09:00
