Merge pull request #2142 from dzhw/release

Release v1.0.82
dzhw · Apr 3, 2019 · 079a5fa · 079a5fa
2 parents 583d8f7 + 8c9dbe9
commit 079a5fa
Show file tree

Hide file tree

Showing 289 changed files with 25,337 additions and 14,726 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -287,6 +287,10 @@ module.exports = function(grunt) {
               'Possible misuse of “aria-label”. (If you disagree with this ' +
               'warning, file an issue report or send e-mail to ' +
               '[email protected].)',
+              'Attribute “layout-gt-md” not allowed on element “div” at this ' +
+              'point.',
+              'Attribute “layout-gt-lg” not allowed on element “div” at this ' +
+              'point.',
               'Element “a” is missing required attribute “href”'
             ],
             customattrs: [

diff --git a/bower.json b/bower.json
@@ -5,19 +5,19 @@
   "testPath": "src/test/javascript/spec",
   "dependencies": {
     "jquery": "^3.3.1",
-    "angular": "1.7.7",
-    "angular-aria": "1.7.7",
+    "angular": "1.7.8",
+    "angular-aria": "1.7.8",
     "angular-bootstrap": "2.5.0",
-    "angular-cookies": "1.7.7",
+    "angular-cookies": "1.7.8",
     "angular-dynamic-locale": "0.1.37",
-    "angular-i18n": "1.7.7",
+    "angular-i18n": "1.7.8",
     "angular-local-storage": "0.7.1",
-    "angular-resource": "1.7.7",
-    "angular-sanitize": "1.7.7",
+    "angular-resource": "1.7.8",
+    "angular-sanitize": "1.7.8",
     "angular-translate": "2.18.1",
     "angular-translate-interpolation-messageformat": "^2.18.1",
     "angular-translate-storage-cookie": "2.18.1",
-    "angular-ui-router": "1.0.20",
+    "angular-ui-router": "1.0.22",
     "bootstrap-sass": "3.4.1",
     "json3": "3.3.2",
     "ng-file-upload": "12.2.13",
@@ -32,22 +32,22 @@
     "angular-material": "master",
     "angular-block-ui": "^0.2.2",
     "lodash": "^4.17.11",
-    "plotly.js": "1.45.0",
+    "plotly.js": "1.45.3",
     "highlightjs": "^9.12.0",
     "angular-highlightjs": "^0.7.1",
-    "js-beautify": "^1.8.9",
+    "js-beautify": "^1.9.1",
     "ngclipboard": "^2.0.0",
     "angular-katex": "^0.10.0",
-    "angular-animate": "^1.7.7",
-    "angular-messages": "1.7.7",
+    "angular-animate": "^1.7.8",
+    "angular-messages": "1.7.8",
     "bowser": "1.9.4",
     "angular-file-saver": "^1.1.3",
     "clientjs": "0.1.5",
     "angular-scroll": "^1.0.2",
     "sockjs-client": "^1.3.0",
     "stomp-websocket": "^2.3.4",
     "es5-shim": "^4.5.12",
-    "es6-shim": "^0.35.4",
+    "es6-shim": "^0.35.5",
     "hyphenator": "Hyphenator#^5.3.0",
     "ng-shortcut": "^0.1.4",
     "angular-jk-carousel": "^0.5.0",
@@ -92,10 +92,10 @@
     }
   },
   "devDependencies": {
-    "angular-mocks": "1.7.7",
-    "angular-scenario": "1.7.7"
+    "angular-mocks": "1.7.8",
+    "angular-scenario": "1.7.8"
   },
   "resolutions": {
-    "angular": "1.7.7"
+    "angular": "1.7.8"
   }
 }
diff --git a/deploy/manifest-prod.yml b/deploy/manifest-prod.yml
@@ -3,9 +3,9 @@
 applications:
 - name: metadatamanagement
   path: ../target/metadatamanagement-prod.war
-  memory: 1024M
+  memory: 1536M
   disk_quota: 1024M
-  instances: 3
+  instances: 2
   buildpacks:
   - https://github.com/cloudfoundry/java-buildpack#v4.16.1
   env:

diff --git a/deploy/manifest-test.yml b/deploy/manifest-test.yml
@@ -3,9 +3,9 @@
 applications:
 - name: metadatamanagement
   path: ../target/metadatamanagement-test.war
-  memory: 1024M
+  memory: 1536M
   disk_quota: 1024M
-  instances: 3
+  instances: 2
   buildpacks:
   - https://github.com/cloudfoundry/java-buildpack#v4.16.1
   env:

diff --git a/.../eu/dzhw/fdz/metadatamanagement/instrumentmanagement/domain/CollectionModes.rst b/.../eu/dzhw/fdz/metadatamanagement/instrumentmanagement/domain/CollectionModes.rst
@@ -0,0 +1,288 @@
+CollectionModes
+===============
+
+.. java:package:: eu.dzhw.fdz.metadatamanagement.instrumentmanagement.domain
+   :noindex:
+
+.. java:type:: public class CollectionModes
+
+   The procedure, technique, or mode of inquiry used to attain the data. Used by DARA as collection mode type and harvested by the VFDB.
+
+Fields
+------
+AGGREGATION
+^^^^^^^^^^^
+
+.. java:field:: public static final String AGGREGATION
+   :outertype: CollectionModes
+
+COMPILATIONSYNTHESIS
+^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String COMPILATIONSYNTHESIS
+   :outertype: CollectionModes
+
+CONTENTCODING
+^^^^^^^^^^^^^
+
+.. java:field:: public static final String CONTENTCODING
+   :outertype: CollectionModes
+
+EXPERIMENT
+^^^^^^^^^^
+
+.. java:field:: public static final String EXPERIMENT
+   :outertype: CollectionModes
+
+EXPERIMENT_FIELDINTERVENTION
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String EXPERIMENT_FIELDINTERVENTION
+   :outertype: CollectionModes
+
+EXPERIMENT_LABORATORY
+^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String EXPERIMENT_LABORATORY
+   :outertype: CollectionModes
+
+EXPERIMENT_WEBBASED
+^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String EXPERIMENT_WEBBASED
+   :outertype: CollectionModes
+
+FOCUSGROUP
+^^^^^^^^^^
+
+.. java:field:: public static final String FOCUSGROUP
+   :outertype: CollectionModes
+
+FOCUSGROUP_FACETOFACE
+^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String FOCUSGROUP_FACETOFACE
+   :outertype: CollectionModes
+
+FOCUSGROUP_ONLINE
+^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String FOCUSGROUP_ONLINE
+   :outertype: CollectionModes
+
+FOCUSGROUP_TELEPHONE
+^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String FOCUSGROUP_TELEPHONE
+   :outertype: CollectionModes
+
+INTERVIEW
+^^^^^^^^^
+
+.. java:field:: public static final String INTERVIEW
+   :outertype: CollectionModes
+
+INTERVIEW_EMAIL
+^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String INTERVIEW_EMAIL
+   :outertype: CollectionModes
+
+INTERVIEW_FACETOFACE
+^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String INTERVIEW_FACETOFACE
+   :outertype: CollectionModes
+
+INTERVIEW_FACETOFACE_CAPICAMI
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String INTERVIEW_FACETOFACE_CAPICAMI
+   :outertype: CollectionModes
+
+INTERVIEW_FACETOFACE_PAPI
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String INTERVIEW_FACETOFACE_PAPI
+   :outertype: CollectionModes
+
+INTERVIEW_TELEPHONE
+^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String INTERVIEW_TELEPHONE
+   :outertype: CollectionModes
+
+INTERVIEW_TELEPHONE_CATI
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String INTERVIEW_TELEPHONE_CATI
+   :outertype: CollectionModes
+
+INTERVIEW_WEBBASED
+^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String INTERVIEW_WEBBASED
+   :outertype: CollectionModes
+
+MEASUREMENTSANDTESTS
+^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String MEASUREMENTSANDTESTS
+   :outertype: CollectionModes
+
+MEASUREMENTSANDTESTS_EDUCATIONAL
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String MEASUREMENTSANDTESTS_EDUCATIONAL
+   :outertype: CollectionModes
+
+MEASUREMENTSANDTESTS_PHYSICAL
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String MEASUREMENTSANDTESTS_PHYSICAL
+   :outertype: CollectionModes
+
+MEASUREMENTSANDTESTS_PSYCHOLOGICAL
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String MEASUREMENTSANDTESTS_PSYCHOLOGICAL
+   :outertype: CollectionModes
+
+OBSERVATION
+^^^^^^^^^^^
+
+.. java:field:: public static final String OBSERVATION
+   :outertype: CollectionModes
+
+OBSERVATION_COMPUTERBASED
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String OBSERVATION_COMPUTERBASED
+   :outertype: CollectionModes
+
+OBSERVATION_FIELD
+^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String OBSERVATION_FIELD
+   :outertype: CollectionModes
+
+OBSERVATION_FIELD_NONPARTICIPANT
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String OBSERVATION_FIELD_NONPARTICIPANT
+   :outertype: CollectionModes
+
+OBSERVATION_FIELD_PARTICIPANT
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String OBSERVATION_FIELD_PARTICIPANT
+   :outertype: CollectionModes
+
+OBSERVATION_LABARATORY
+^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String OBSERVATION_LABARATORY
+   :outertype: CollectionModes
+
+OBSERVATION_LABARATORY_NONPARTICIPANT
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String OBSERVATION_LABARATORY_NONPARTICIPANT
+   :outertype: CollectionModes
+
+OBSERVATION_LABARATORY_PARTICIPANT
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String OBSERVATION_LABARATORY_PARTICIPANT
+   :outertype: CollectionModes
+
+OTHER
+^^^^^
+
+.. java:field:: public static final String OTHER
+   :outertype: CollectionModes
+
+RECORDING
+^^^^^^^^^
+
+.. java:field:: public static final String RECORDING
+   :outertype: CollectionModes
+
+SELFADMINISTEREDQUESTIONNAIRE
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDQUESTIONNAIRE
+   :outertype: CollectionModes
+
+SELFADMINISTEREDQUESTIONNAIRE_COMPUTERASSISTED
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDQUESTIONNAIRE_COMPUTERASSISTED
+   :outertype: CollectionModes
+
+SELFADMINISTEREDQUESTIONNAIRE_EMAIL
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDQUESTIONNAIRE_EMAIL
+   :outertype: CollectionModes
+
+SELFADMINISTEREDQUESTIONNAIRE_PAPER
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDQUESTIONNAIRE_PAPER
+   :outertype: CollectionModes
+
+SELFADMINISTEREDQUESTIONNAIRE_SMSORMMS
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDQUESTIONNAIRE_SMSORMMS
+   :outertype: CollectionModes
+
+SELFADMINISTEREDQUESTIONNAIRE_WEBBASED
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDQUESTIONNAIRE_WEBBASED
+   :outertype: CollectionModes
+
+SELFADMINISTEREDWRITINGSANDDIARIES
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDWRITINGSANDDIARIES
+   :outertype: CollectionModes
+
+SELFADMINISTEREDWRITINGSANDDIARIES_EMAIL
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDWRITINGSANDDIARIES_EMAIL
+   :outertype: CollectionModes
+
+SELFADMINISTEREDWRITINGSANDDIARIES_PAPER
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDWRITINGSANDDIARIES_PAPER
+   :outertype: CollectionModes
+
+SELFADMINISTEREDWRITINGSANDDIARIES_WEBBASED
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final String SELFADMINISTEREDWRITINGSANDDIARIES_WEBBASED
+   :outertype: CollectionModes
+
+SIMULATION
+^^^^^^^^^^
+
+.. java:field:: public static final String SIMULATION
+   :outertype: CollectionModes
+
+SUMMARY
+^^^^^^^
+
+.. java:field:: public static final String SUMMARY
+   :outertype: CollectionModes
+
+TRANSCRIPTION
+^^^^^^^^^^^^^
+
+.. java:field:: public static final String TRANSCRIPTION
+   :outertype: CollectionModes
+