diff --git a/src/main/webapp/scripts/studymanagement/configuration/study.js b/src/main/webapp/scripts/studymanagement/configuration/study.js
index 571c1e6d5f..2ded5bec95 100644
--- a/src/main/webapp/scripts/studymanagement/configuration/study.js
+++ b/src/main/webapp/scripts/studymanagement/configuration/study.js
@@ -39,6 +39,9 @@ angular.module('metadatamanagementApp')
authorities: []
},
params: {
+ 'id': {
+ dynamic: true
+ },
'search-result-index': null
},
views: {
@@ -51,18 +54,21 @@ angular.module('metadatamanagementApp')
},
resolve: {
entity: ['$q', '$stateParams', 'StudySearchService', 'Principal',
- 'SimpleMessageToastService', function($q, $stateParams,
- StudySearchService, Principal, SimpleMessageToastService) {
+ 'SimpleMessageToastService', 'LocationSimplifier',
+ function($q, $stateParams,
+ StudySearchService, Principal, SimpleMessageToastService,
+ LocationSimplifier) {
var excludedAttributes = ['nested*','variables','questions',
'surveys','instruments', 'dataSets', 'relatedPublications',
'concepts'];
+ var id = LocationSimplifier.ensureDollarSign($stateParams.id);
if (Principal.loginName() && !$stateParams.version) {
- return StudySearchService.findOneById($stateParams.id, null,
+ return StudySearchService.findOneById(id, null,
excludedAttributes);
} else {
var deferred = $q.defer();
loadShadowCopy(StudySearchService,
- SimpleMessageToastService, $stateParams.id,
+ SimpleMessageToastService, id,
$stateParams.version, excludedAttributes)
.then(deferred.resolve, deferred.reject);
return deferred;
diff --git a/src/main/webapp/scripts/studymanagement/templates/attachments.html.tmpl b/src/main/webapp/scripts/studymanagement/templates/attachments.html.tmpl
index 9ebbc47e55..9160a5a264 100644
--- a/src/main/webapp/scripts/studymanagement/templates/attachments.html.tmpl
+++ b/src/main/webapp/scripts/studymanagement/templates/attachments.html.tmpl
@@ -26,7 +26,7 @@
ng-if="$ctrl.options.surveys && $ctrl.options.surveys.length > 0">
diff --git a/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.controller.js b/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.controller.js
index 38db1b309b..2ef46b9a89 100644
--- a/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.controller.js
+++ b/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.controller.js
@@ -100,6 +100,7 @@ angular.module('metadatamanagementApp')
.isUpdateAllowed(project, 'studies', true)) {
redirectToSearchView();
} else {
+ CurrentProjectService.setCurrentProject(project);
ctrl.study = study;
ctrl.currentStudySeries = study.studySeries;
ctrl.currentSponsor = study.sponsor;
diff --git a/src/main/webapp/scripts/surveymanagement/configuration/survey.js b/src/main/webapp/scripts/surveymanagement/configuration/survey.js
index da4a87e7a1..e679704c43 100644
--- a/src/main/webapp/scripts/surveymanagement/configuration/survey.js
+++ b/src/main/webapp/scripts/surveymanagement/configuration/survey.js
@@ -39,6 +39,9 @@ angular.module('metadatamanagementApp')
authorities: []
},
params: {
+ 'id': {
+ dynamic: true
+ },
'search-result-index': null
},
views: {
@@ -51,18 +54,19 @@ angular.module('metadatamanagementApp')
},
resolve: {
entity: ['$stateParams', 'SurveySearchService', 'Principal',
- 'SimpleMessageToastService', '$q',
+ 'SimpleMessageToastService', '$q', 'LocationSimplifier',
function($stateParams, SurveySearchService, Principal,
- SimpleMessageToastService, $q) {
+ SimpleMessageToastService, $q, LocationSimplifier) {
var excludedAttributes = ['nested*','variables','questions',
'instruments', 'dataSets', 'relatedPublications','concepts'];
+ var id = LocationSimplifier.ensureDollarSign($stateParams.id);
if (Principal.loginName() && !$stateParams.version) {
- return SurveySearchService.findOneById($stateParams.id, null,
+ return SurveySearchService.findOneById(id, null,
excludedAttributes);
} else {
var deferred = $q.defer();
loadShadowCopy(SurveySearchService,
- SimpleMessageToastService, $stateParams.id,
+ SimpleMessageToastService, id,
$stateParams.version, excludedAttributes)
.then(deferred.resolve, deferred.reject);
return deferred;
diff --git a/src/main/webapp/scripts/surveymanagement/views/survey-detail.controller.js b/src/main/webapp/scripts/surveymanagement/views/survey-detail.controller.js
index c1faf753f0..4250fb9f61 100644
--- a/src/main/webapp/scripts/surveymanagement/views/survey-detail.controller.js
+++ b/src/main/webapp/scripts/surveymanagement/views/survey-detail.controller.js
@@ -10,8 +10,9 @@ angular.module('metadatamanagementApp')
SurveyResponseRateImageUploadService, OutdatedVersionNotifier,
DataAcquisitionProjectResource,
ProjectUpdateAccessService, CountryCodesResource, $stateParams,
- blockUI) {
+ blockUI, LocationSimplifier) {
blockUI.start();
+ LocationSimplifier.removeDollarSign();
SearchResultNavigatorService
.setSearchIndex($stateParams['search-result-index']);
SearchResultNavigatorService.registerCurrentSearchResult();
diff --git a/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.controller.js b/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.controller.js
index 3f16914586..b28c7bd9a4 100644
--- a/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.controller.js
+++ b/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.controller.js
@@ -92,6 +92,7 @@ angular.module('metadatamanagementApp')
.isUpdateAllowed(project, 'surveys', true)) {
redirectToSearchView();
} else {
+ CurrentProjectService.setCurrentProject(project);
ctrl.survey = survey;
ctrl.currentSurveyMethod = survey.surveyMethod;
$scope.responseRateInitializing = true;
diff --git a/src/main/webapp/scripts/variablemanagement/configuration/variable.js b/src/main/webapp/scripts/variablemanagement/configuration/variable.js
index 6c74a64253..0baa45471f 100644
--- a/src/main/webapp/scripts/variablemanagement/configuration/variable.js
+++ b/src/main/webapp/scripts/variablemanagement/configuration/variable.js
@@ -36,6 +36,9 @@ angular.module('metadatamanagementApp')
authorities: []
},
params: {
+ 'id': {
+ dynamic: true
+ },
'search-result-index': null
},
views: {
@@ -48,18 +51,19 @@ angular.module('metadatamanagementApp')
},
resolve: {
entity: ['$stateParams', 'VariableSearchService', 'Principal',
- 'SimpleMessageToastService', '$q',
+ 'SimpleMessageToastService', '$q', 'LocationSimplifier',
function($stateParams, VariableSearchService, Principal,
- SimpleMessageToastService, $q) {
+ SimpleMessageToastService, $q, LocationSimplifier) {
var excludedAttributes = ['nested*','questions', 'instruments',
'relatedPublications','concepts'];
+ var id = LocationSimplifier.ensureDollarSign($stateParams.id);
if (Principal.loginName() && !$stateParams.version) {
- return VariableSearchService.findOneById($stateParams.id, null,
+ return VariableSearchService.findOneById(id, null,
excludedAttributes);
} else {
var deferred = $q.defer();
loadShadowCopy(VariableSearchService,
- SimpleMessageToastService, $stateParams.id,
+ SimpleMessageToastService, id,
$stateParams.version, excludedAttributes)
.then(deferred.resolve, deferred.reject);
return deferred;
diff --git a/src/main/webapp/scripts/variablemanagement/views/variable-detail.controller.js b/src/main/webapp/scripts/variablemanagement/views/variable-detail.controller.js
index 621b8b578d..7018174544 100644
--- a/src/main/webapp/scripts/variablemanagement/views/variable-detail.controller.js
+++ b/src/main/webapp/scripts/variablemanagement/views/variable-detail.controller.js
@@ -12,8 +12,9 @@ angular.module('metadatamanagementApp')
$state, BreadcrumbService,
SearchResultNavigatorService,
OutdatedVersionNotifier,
- $stateParams, blockUI) {
+ $stateParams, blockUI, LocationSimplifier) {
blockUI.start();
+ LocationSimplifier.removeDollarSign();
SearchResultNavigatorService
.setSearchIndex($stateParams['search-result-index']);
diff --git a/src/test/robotframework/common_variables.yaml b/src/test/robotframework/common_variables.yaml
index 42e7305e2d..3da6eb619f 100644
--- a/src/test/robotframework/common_variables.yaml
+++ b/src/test/robotframework/common_variables.yaml
@@ -1,4 +1,4 @@
-website: https://dev.metadata.fdz.dzhw.eu#!/de/start
+website: https://dev.metadata.fdz.dzhw.eu/#!/de/start
capabilities:
chrome:
name: Win10/Chrome
diff --git a/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot b/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
index 84885c0bad..ef0dbedf22 100644
--- a/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
+++ b/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
@@ -16,8 +16,8 @@ Create Dataset by Dataprovider
Fill up the Subdatasets
Select Access Way for the Datasets from The List download-suf
Enter Number of Observations or Episodes
+ Select Data Format
Fill up the description of Subdatasets
- Fill up the Citation Hint of Subdatasets
Save Changes
Get back to german home page
Click on data set tab
@@ -42,6 +42,10 @@ Select Access Way for the Datasets from The List
Click Element Through Tooltips xpath=//md-select[@name='subDataSetsAccessWay_0']
Click Element Through Tooltips xpath=//md-select-menu//md-option[contains(., '${accesswayname}')]
+Select Data Format
+ Click Element Through Tooltips xpath=//md-select[@name='subDataSetsDataFormats_0']
+ Click Element Through Tooltips xpath=//md-select-menu//md-option[contains(., 'Stata')]
+
Enter Number of Observations or Episodes
Input Text xpath=//input[@name='subDataSetsNumberOfObservations_0'] 5
@@ -49,10 +53,6 @@ Fill up the description of Subdatasets
Input Text xpath=//input[@name='subDataSetsDescriptionDe_0'] Subdataset Description De
Input Text xpath=//input[@name='subDataSetsDescriptionEn_0'] subdataset Description En
-Fill up the Citation Hint of Subdatasets
- Input Text xpath=//textarea[@name='subDataSetsCitationHintDe_0'] Subdataset Citation Hint in De
- Input Text xpath=//textarea[@name='subDataSetsCitationHintEn_0'] Subdataset Citation Hint in En
-
Choose Format
Click Element xpath=//md-select[@name="format"]
Click Element xpath=//md-select-menu//md-content//md-option//div[contains(., 'lang')]
diff --git a/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot b/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
index cb559831e5..75dc03a58a 100644
--- a/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
+++ b/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
@@ -11,8 +11,6 @@ Check Shopping Cart as a Public User
Put all access ways in shopping cart
Go to Shopping Cart
Delete an Item # we have 4 items in the cart and we delete one item
- Confirm Order
- Close The Toast Message
Check The Links
Empty The Shopping Cart
Get back to german home page # to sync with next test flow
@@ -47,14 +45,6 @@ Go to Shopping Cart
Click Element Through Tooltips xpath=//a//md-icon[contains(., 'shopping_cart')]
Xpath Should Match X Times //md-card[contains(@class, 'fdz-search-result')] 4
-Confirm Order
- Click Element Through Tooltips xpath=//span[contains(., 'Beantragen')]
-
-Close The Toast Message
- Click Element Through Tooltips xpath=//md-toast//span[contains(., 'Sie haben noch nicht alle benötigten')]
- Element Should Contain xpath=//md-toast//span[contains(.,'Sie haben noch nicht alle benötigten')] Sie haben noch nicht alle benötigten
- Click Element Through Tooltips xpath=//button//following::md-icon[contains(.,"close")]
-
Check The Links
@{MD_DATALINKS} Create List Variablen Datensätze
:FOR ${MD_LK} IN @{MD_DATALINKS}
@@ -62,4 +52,4 @@ Check The Links
\ Go Back
Empty The Shopping Cart
- Click Element Through Tooltips xpath=//span[contains(., 'Einkaufswagen leeren')]
+ Click Element Through Tooltips xpath=//span[contains(., 'Warenkorb leeren')]
diff --git a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot
index d29f38b056..5d8ca8128b 100644
--- a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot
+++ b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot
@@ -39,6 +39,10 @@ Publisher Create But Can Not Delete Study When Publisher is Ready
Input Text name=authorsFirstName_0 Anne
Input Text name=authorsMiddleName_0 noMiddleName
Input Text name=authorsLastName_0 Droid
+ Focus xpath=//input[@name = 'curatorsFirstName_0']
+ Input Text name=curatorsFirstName_0 Anne
+ Input Text name=curatorsMiddleName_0 noMiddleName
+ Input Text name=curatorsLastName_0 Droid
Input Text xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input Deutsche Tags Schlüsselwörter
Run Keyword And Ignore Error Click Element Through Tooltips xpath=//md-virtual-repeat-container//span[text()='Deutsche Tags Schlüsselwörter']
Input Text xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input English Days Keyword
@@ -51,7 +55,7 @@ Publisher Create But Can Not Delete Study When Publisher is Ready
Publisher Create and Can Delete Study When Both are Ready
Click Dataprovider Ready Checkbox for Studies
- Run Keyword If '${BROWSER}' == 'safari' Sleep 10s
+ Run Keyword If '${BROWSER}' == 'safari' Sleep 10s
Click on Delete Button for Metadata
Close The Toast Message ${TOAST_MSSG}
diff --git a/src/test/robotframework/publisher/Studymanagement/Create_Study.robot b/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
index f2c3c22302..e686198a96 100644
--- a/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
+++ b/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
@@ -37,6 +37,10 @@ Create Study by Publisher
Input Text name=authorsMiddleName_1 D2
Input Text name=authorsLastName_1 noLastName
Move Second Author To Place One
+ Focus xpath=//input[@name = 'curatorsFirstName_0']
+ Input Text name=curatorsFirstName_0 Anne
+ Input Text name=curatorsMiddleName_0 noMiddleName
+ Input Text name=curatorsLastName_0 Droid
Input Text xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input Deutsche Tags Schlüsselwörter
Run Keyword And Ignore Error Click Element Through Tooltips xpath=//md-virtual-repeat-container//span[text()='Deutsche Tags Schlüsselwörter']
Input Text xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input English Days Keyword