Merge pull request #3012 from dzhw/release

Release v1.0.115
dzhw · Oct 19, 2021 · 0d5c943 · 0d5c943
2 parents a295222 + df6e555
commit 0d5c943
Show file tree

Hide file tree

Showing 136 changed files with 7,818 additions and 20,765 deletions.
diff --git a/.github/workflows/nightly-e2e-tests.yml b/.github/workflows/nightly-e2e-tests.yml
@@ -10,10 +10,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Chrome Tests (Public User)
@@ -27,10 +27,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Firefox Tests (Public User)
@@ -44,10 +44,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Internet Explorer Tests (Public User)
@@ -61,10 +61,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Edge Tests (Public User)
@@ -78,10 +78,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Safari Tests (Public User)
@@ -101,10 +101,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Chrome Tests (Dataprovider)
@@ -124,10 +124,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Firefox Tests (Dataprovider)
@@ -147,10 +147,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Internet Explorer Tests (Dataprovider)
@@ -170,10 +170,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Edge Tests (Dataprovider)
@@ -193,10 +193,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Safari Tests (Dataprovider)
@@ -216,10 +216,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Chrome Tests (Publisher)
@@ -239,10 +239,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Firefox Tests (Publisher)
@@ -262,10 +262,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Internet Explorer Tests (Publisher)
@@ -285,10 +285,10 @@ jobs:
         - uses: actions/checkout@v1
           with:
             ref: development
-        - name: Setup Python 3.8.x
+        - name: Setup Python 3.8.0
           uses: actions/setup-python@v2
           with:
-            python-version: '3.8.x'
+            python-version: '3.8.0'
         - name: Install robotframework dependencies
           run: ./src/test/robotframework/setup.sh
         - name: Nightly Edge Tests (Publisher)
@@ -307,10 +307,10 @@ jobs:
     #    - uses: actions/checkout@v1
     #      with:
     #        ref: development
-    #    - name: Setup Python 3.8.x
+    #    - name: Setup Python 3.8.0
     #      uses: actions/setup-python@v2
     #      with:
-    #        python-version: '3.8.x'
+    #        python-version: '3.8.0'
     #    - name: Install robotframework dependencies
     #      run: ./src/test/robotframework/setup.sh
     #    - name: Nightly Safari Tests (Publisher)

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -660,6 +660,8 @@ module.exports = function(grunt) {
         sources: {
           src: [
             'src/main/webapp/scripts/datapackagemanagement/**/translations*.js',
+            'src/main/webapp/scripts/analysispackagemanagement/**' +
+              '/translations*.js',
             'src/main/webapp/scripts/conceptmanagement/**/translations*.js',
             'src/main/webapp/scripts/surveymanagement/**/translations*.js',
             'src/main/webapp/scripts/instrumentmanagement/**/translations*.js',
@@ -728,6 +730,9 @@ module.exports = function(grunt) {
         if (filename.includes('datapackagemanagement')) {
           return 'DataPackage';
         }
+        if (filename.includes('analysispackagemanagement')) {
+          return 'AnalysisPackage';
+        }
         if (filename.includes('surveymanagement')) {
           return 'Survey';
         }

diff --git a/README.md b/README.md
@@ -18,9 +18,9 @@ Please checkout the development branch before starting to code and create a new
 
 Before you can build this project, you must install and configure the following dependencies on your machine:
 
-1.  Java: You need to install java 15 sdk on your system. On Ubuntu you should use [SDKMAN!][]
-2.  Maven: You need to install maven 3.6.1 or above on your system. On Ubuntu you should use [SDKMAN!][]
-3.  [Node.js][]: Node.js 14 and npm (coming with node.js) are required as well. On Ubuntu you should install node using [NVM][]
+1.  Java: You need to install java 15 sdk on your system. On Ubuntu you should use [SDKMAN!][] (`sdk install java 15.0.2.hs-adpt`)
+2.  Maven: You need to install maven 3.6.1 or above on your system. On Ubuntu you should use [SDKMAN!][] (`sdk install maven`)
+3.  [Node.js][]: Node.js 14 and npm (coming with node.js) are required as well. On Ubuntu you should install node using [NVM][] (`nvm install v14`)
 
 We use [Grunt][] as our client build system. Install the grunt command-line tool globally with:
 
@@ -44,9 +44,26 @@ Make sure that you have read-write-access on the ***data*** directory (in your p
 
 to start all services the metadatamanagement depends on. Mongodb and Elasticsearch will be listening on its default ports.
 
+You will need to setup your `~/.m2/settings.xml` so that maven can download a dependency from Github:
+
+```xml
+ <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                        http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+      <server>
+        <id>github</id>
+        <username>${GITHUB_USERNAME}</username>
+        <password>${GITHUB_TOKEN}</password>
+      </server>
+    </servers>
+  </settings>
+```
+
 In order to have all java dependencies for the server and  all nodejs dependencies for the client and in order to build everything, simply run (and lean back for a while):
 
-    mvn clean install
+    mvn -Pdev clean verify
 
 Run the following commands in two separate terminals to create a blissful development experience where your browser
 auto-refreshes when files change on your hard drive.

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
@@ -23,3 +23,4 @@ services:
       - mongodb
       - elasticsearch
       - maildev
+      - identity-provider
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,3 +32,8 @@ services:
     ports:
       - "8081:80"
       - "1025:25"
+  identity_provider:
+    image: sanduhrs/identity-provider
+    container_name: identity-provider
+    ports:
+      - "8082:80"
diff --git a/docs/source/04_Eingabemaske.rst b/docs/source/04_Eingabemaske.rst
@@ -96,7 +96,7 @@ Die Eingabemaske auf Datenpaketebene besteht aus den folgenden Abschnitten:
 - Tags (Schlagwörter) zum Datenpaket
 - Materialien zu diesem Datenpaket
 
-Im Folgenden wird auf die einzelnen Abschnitte genauer eingegangen. Allgemeine Informationen zu den Eingabemasken finden Sie :ref:`hier <Eingabemasken>`.
+Allgemeine Informationen zu den Eingabemasken finden Sie :ref:`hier <Eingabemasken>`.
 
 .. _Surveys:
 
@@ -112,9 +112,9 @@ Die Eingabemaske auf Erhebungsebene besteht aus den folgenden Abschnitten:
 - Weitere Informationen zum Rücklauf
 - Materialien zu der Erhebung
 
-Im Folgenden wird auf die einzelnen Abschnitte genauer eingegangen. Allgemeine Informationen zu den Eingabemasken finden Sie :ref:`hier <Eingabemasken>`.
+Allgemeine Informationen zu den Eingabemasken finden Sie :ref:`hier <Eingabemasken>`.
 
-Bitte beachten Sie, dass Sie die Ordnungsnummer sich auf die Reihenfolge der Erhebungs im Erhebungsdesign bezieht. So ist die Ordnungsnummer einer dritten Panelwelle 3, auch wenn sie (aus welchen Gründen auch immer) die einzige Erhebung in einem Datenpaket darstellt. Die Sortierung mehrerer Erhebungen in einem Datenpaket orientiert sich an den Ordnungsnummern.
+Bitte beachten Sie, dass Sie die Ordnungsnummer sich auf die Reihenfolge der Erhebungen im Erhebungsdesign bezieht. So ist die Ordnungsnummer einer dritten Panelwelle die 3, auch wenn sie (aus welchen Gründen auch immer) die einzige Erhebung in einem Datenpaket darstellt. Die Sortierung mehrerer Erhebungen in einem Datenpaket orientiert sich an den Ordnungsnummern.
 
 .. _Instruments:
 

diff --git a/docs/source/id_vergabe.rst b/docs/source/id_vergabe.rst
@@ -24,6 +24,8 @@ Logik
 +-----------------------------------+----------------------------------------+
 | Data Package                      | "stu-" + DAP-id + "$"                  |
 +-----------------------------------+----------------------------------------+
+| Analysis Package                  | "ana-" + DAP-id + "$"                  |
++-----------------------------------+----------------------------------------+
 | Survey                            | "sur-" + DAP-id + "-" + "sy" +         |
 |                                   | survey.number + "$"                    |
 +-----------------------------------+----------------------------------------+
@@ -41,7 +43,9 @@ Logik
 |                                   | instrumentNumber + "-" + number +      |
 |                                   | "$"                                    |
 +-----------------------------------+----------------------------------------+
-| relatedPublication                | "pub-" + citaviId + "$"                |
+| Publication                       | "pub-" + citaviId + "$"                |
++-----------------------------------+----------------------------------------+
+| Concept                           | "con-" + alphanum + "$"                |
 +-----------------------------------+----------------------------------------+
 
 .. _Projekte: https://github.com/dzhw/metadatamanagement-io/wiki/unterlagen/study_ids.xlsx