Merge pull request #2682 from dzhw/release

Release v1.0.105
dzhw · Nov 2, 2020 · 4bfbb2a · 4bfbb2a
2 parents 1ec1703 + 537e6b6
commit 4bfbb2a
Show file tree

Hide file tree

Showing 156 changed files with 1,575 additions and 1,027 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -2,7 +2,7 @@ pull_request_rules:
   - name: automatic merge of development PRs into test
     conditions:
       - base=test
-      - status-success=continuous-integration/travis-ci/push
+      - check-success=Travis CI - Branch
     actions:
       merge:
         method: merge
diff --git a/.travis.yml b/.travis.yml
@@ -42,7 +42,7 @@ jobs:
     - pip install git+https://github.com/dzhw/javasphinx.git --user
     - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
       ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
-      && nvm install 14.1.0
+      && nvm install 14.14.0
     - npm install -g grunt-cli
     script:
     - "./deploy/build.sh unused $TRAVIS_BRANCH"

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/dzhw/metadatamanagement.svg?branch=master)](https://travis-ci.org/dzhw/metadatamanagement) [![Documentation Status](https://readthedocs.org/projects/metadatamanagement/badge/?version=latest)](https://metadatamanagement.readthedocs.io/de/latest/?badge=latest)
+[![Build Status](https:///dzhw/metadatamanagement.svg?branch=master)](https:///dzhw/metadatamanagement) [![Documentation Status](https://readthedocs.org/projects/metadatamanagement/badge/?version=latest)](https://metadatamanagement.readthedocs.io/de/latest/?badge=latest)
 [![Known Backend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=pom.xml
 )[![Known Frontend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=package.json)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=package.json
 )[![codecov](https://codecov.io/gh/dzhw/metadatamanagement/branch/development/graph/badge.svg)](https://codecov.io/gh/dzhw/metadatamanagement)[![Mergify Status](https://gh.mergify.io/badges/dzhw/metadatamanagement.png?style=cut)](https://mergify.io)
@@ -101,7 +101,7 @@ Continuous Integration Platform provided by [Travis CI][TravisCI]
 [Jasmine]: http://jasmine.github.io/2.0/introduction.html
 [NVM]: https://github.com/creationix/nvm
 [SDKMAN!]: http://sdkman.io/install.html
-[TravisCI]: https://travis-ci.org/
+[TravisCI]: https:///
 [GnuWin32]: http://gnuwin32.sourceforge.net/packages/patch.htm
 
 [![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://forthebadge.com)  [![forthebadge](https://forthebadge.com/images/badges/built-with-science.svg)](https://forthebadge.com)

diff --git a/docs/source/_static/cockpit_dp_ready.png b/docs/source/_static/cockpit_dp_ready.png
diff --git a/docs/source/_static/cockpit_studie_ready.png b/docs/source/_static/cockpit_studie_ready.png
diff --git a/docs/source/_static/dp_create_dp_via_search.png b/docs/source/_static/dp_create_dp_via_search.png
diff --git a/docs/source/_static/dp_details_overview.png b/docs/source/_static/dp_details_overview.png
diff --git a/...s_attachments_after_details_are_saved.png → ...s_attachments_after_details_are_saved.png b/...s_attachments_after_details_are_saved.png → ...s_attachments_after_details_are_saved.png
diff --git a/..._attachments_before_details_are_saved.png → ..._attachments_before_details_are_saved.png b/..._attachments_before_details_are_saved.png → ..._attachments_before_details_are_saved.png
diff --git a/docs/source/_static/dp_edit_details_attachments_details.png b/docs/source/_static/dp_edit_details_attachments_details.png
diff --git a/...ce/_static/study_edit_details_authors.png → ...ource/_static/dp_edit_details_authors.png b/...ce/_static/study_edit_details_authors.png → ...ource/_static/dp_edit_details_authors.png
diff --git a/docs/source/_static/dp_edit_details_description.png b/docs/source/_static/dp_edit_details_description.png
diff --git a/...static/study_edit_details_institution.png → ...e/_static/dp_edit_details_institution.png b/...static/study_edit_details_institution.png → ...e/_static/dp_edit_details_institution.png
diff --git a/docs/source/_static/dp_edit_details_page.png b/docs/source/_static/dp_edit_details_page.png
diff --git a/docs/source/_static/dp_edit_details_tags.png b/docs/source/_static/dp_edit_details_tags.png
diff --git a/docs/source/_static/study_edit_later.png → docs/source/_static/dp_edit_later.png b/docs/source/_static/study_edit_later.png → docs/source/_static/dp_edit_later.png
diff --git a/docs/source/_static/dp_empty.png b/docs/source/_static/dp_empty.png
diff --git a/docs/source/_static/dp_historization.png b/docs/source/_static/dp_historization.png
diff --git a/docs/source/_static/ebenen_uebersicht_de.png b/docs/source/_static/ebenen_uebersicht_de.png
diff --git a/docs/source/_static/historisation_de.png b/docs/source/_static/historisation_de.png
diff --git a/docs/source/_static/markdown_symbol.png b/docs/source/_static/markdown_symbol.png
diff --git a/docs/source/_static/project_cockpit_settings.png b/docs/source/_static/project_cockpit_settings.png
diff --git a/docs/source/_static/project_cockpit_status.png b/docs/source/_static/project_cockpit_status.png
diff --git a/docs/source/_static/projectcockpit_dataprovider_ready.png b/docs/source/_static/projectcockpit_dataprovider_ready.png
diff --git a/docs/source/_static/projectcockpit_dataprovider_status_empty.png b/docs/source/_static/projectcockpit_dataprovider_status_empty.png
diff --git a/docs/source/_static/projectcockpit_settings_dataprovider.png b/docs/source/_static/projectcockpit_settings_dataprovider.png
diff --git a/docs/source/_static/study_create_study_via_search.png b/docs/source/_static/study_create_study_via_search.png
diff --git a/docs/source/_static/study_details_overview.png b/docs/source/_static/study_details_overview.png
diff --git a/docs/source/_static/study_edit_details_attachments_details.png b/docs/source/_static/study_edit_details_attachments_details.png
diff --git a/docs/source/_static/study_edit_details_description.png b/docs/source/_static/study_edit_details_description.png
diff --git a/docs/source/_static/study_edit_details_page.png b/docs/source/_static/study_edit_details_page.png
diff --git a/docs/source/_static/study_edit_details_tags.png b/docs/source/_static/study_edit_details_tags.png
diff --git a/docs/source/_static/study_empty.png b/docs/source/_static/study_empty.png
diff --git a/docs/source/_static/study_historization.png b/docs/source/_static/study_historization.png
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -14,19 +14,21 @@
 #
 import os
 import sys
+from xml.etree.ElementTree import ElementTree
+
 # sys.path.insert(0, os.path.abspath('.'))
 numfig = True
 
 # -- Project information -----------------------------------------------------
 
 project = 'Metadatamanagement (MDM)'
-copyright = u'2019, Robert Birkelbach, Anne Gärtner, René Reitmann'
+copyright = u'2020, Robert Birkelbach, Anne Gärtner, René Reitmann'
 author = u'Robert Birkelbach, Anne Gärtner, René Reitmann'
 
 # The short X.Y version
 version = ''
-# The full version, including alpha/beta/rc tags
-release = '1.0.79'
+# The version is managed in the maven pom
+release = ElementTree(file="../../pom.xml").findtext("{http://maven.apache.org/POM/4.0.0}version")
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/source/datensatzreport_erzeugen.rst b/docs/source/datensatzreport_erzeugen.rst
@@ -3,11 +3,6 @@ Datensatzreport erzeugen
 
 Wenn ein Datensatz und die zugehörigen Variablen im MDM vorliegen, kann mit
 Hilfe des MDMs ein Datensatzreport erstellt werden.
-Hierzu wird das
-`Template
-<https://github.com/dzhw/metadatamanagement-io/tree/master/datasetreport/template/>`_
-auf den Datensatz im MDM gezogen. Nach einiger Zeit (je nach Anzahl an Variablen
-länger als eine Minute) erfolgt ein Download.
-Die resultierenden Dateien werden von FDZ-MitarbeiterInnen zu einem PDF
-kompiliert. Dokumentation zum Umgang mit dem dafür benötigten Docker-Image
-folgt.
+Hierzu wird im MDM auf der Datensatz-Seite auf den PDF-Button geklickt. Nach einiger Zeit (je nach Anzahl an Variablen
+länger als eine Minute) erhält der Publisher eine Mail, dass der Datensatzreport erzeugt wurde.
+Der Datensatzreport wird automatisch im MDM eingefügt. Es ist die jeweils aktuelle Version des Datenpakets als Version anzugeben.
diff --git a/docs/source/datentypen.rst b/docs/source/datentypen.rst
@@ -57,7 +57,7 @@ Vokabular
 
 Es ist zu beachten, dass für einige Eigenschaften nur spezielles
 Vokabular zugelassen ist! Dieses kann entweder auf der io-wiki Seite der
-jeweiligen Exportfunktion (Study, Survey, DataSet, Variable, Instrument,
+jeweiligen Exportfunktion (DataPackage, Survey, DataSet, Variable, Instrument,
 Question) oder
 `hier <https://github.com/dzhw/metadatamanagement/wiki/Domain-Model>`__
 nachgeschaut werden.

diff --git a/docs/source/id_vergabe.rst b/docs/source/id_vergabe.rst
@@ -6,10 +6,10 @@ ID-Vergabe
 Manuell vergebene ids (DAP-ids) müssen in folgender
 Tabelle_ festgehalten werden.
 
-.. _Tabelle: https://github.com/dzhw/metadatamanagement-io/wiki/unterlagen/Projektuebersicht.xlsx  
+.. _Tabelle: https://github.com/dzhw/metadatamanagement-io/wiki/unterlagen/Projektuebersicht.xlsx
 
-Das Datenaufbereitungs-Team kann sich das Kürzel selbst überlegen. Es orientiert sich in der Regel am englischsprachigen Titel der Studie: drei Buchstaben + Jahr der Erhebung. 
-Die ID muss mit dem Release Manager rückgesprochen werden und es sollten alle anderen FDZ-Aufbereitungsteams kurz informiert werden. Hintergrund ist, dass Kürzel für geplante Studien reserviert sein könnten, Beispiel SLC.
+Das Datenaufbereitungs-Team kann sich das Kürzel selbst überlegen. Es orientiert sich in der Regel am englischsprachigen Titel des Datenpakets: drei Buchstaben + Jahr der Erhebung.
+Die ID muss mit dem Release Manager rückgesprochen werden und es sollten alle anderen FDZ-Aufbereitungsteams kurz informiert werden. Hintergrund ist, dass Kürzel für geplante Datenpakete reserviert sein könnten, beispielsweise SLC.
 
 
 Logik
@@ -22,7 +22,7 @@ Logik
 |                                   | Tabelle oben Übersicht über alle       |
 |                                   | Projekte_ des DZHW                     |
 +-----------------------------------+----------------------------------------+
-| Study                             | "stu-" + DAP-id + "$"                  |
+| Data Package                      | "stu-" + DAP-id + "$"                  |
 +-----------------------------------+----------------------------------------+
 | Survey                            | "sur-" + DAP-id + "-" + "sy" +         |
 |                                   | survey.number + "$"                    |
@@ -54,7 +54,7 @@ Beispiele am Absolventenpanel 2005
 +==========================+========================+
 | DataAcquesitionProject   | gra2005                |
 +--------------------------+------------------------+
-| Study                    | stu-gra2005$           |
+| Data Package             | stu-gra2005$           |
 +--------------------------+------------------------+
 | Survey                   | sur-gra2005-sy1$       |
 +--------------------------+------------------------+

diff --git a/...dzhw/fdz/metadatamanagement/datapackagemanagement/domain/DataAvailabilities.rst b/...dzhw/fdz/metadatamanagement/datapackagemanagement/domain/DataAvailabilities.rst
diff --git a/...doc/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/DataPackage.rst b/...doc/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/DataPackage.rst
@@ -46,8 +46,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.datapackagemanagement.domain.projection DataPackageSubDocumentProjection
 
-.. java:import:: eu.dzhw.fdz.metadatamanagement.datapackagemanagement.domain.validation ValidDataAvailability
-
 .. java:import:: eu.dzhw.fdz.metadatamanagement.datapackagemanagement.domain.validation ValidDataPackageId
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.datapackagemanagement.domain.validation ValidSurveyDesign
@@ -98,14 +96,6 @@ dataAcquisitionProjectId
 
    The id of the \ :java:ref:`DataAcquisitionProject`\  to which this dataPackage belongs. The dataAcquisitionProjectId must not be empty.
 
-dataAvailability
-^^^^^^^^^^^^^^^^
-
-.. java:field:: @NotNull @ValidDataAvailability private I18nString dataAvailability
-   :outertype: DataPackage
-
-   The current state of the data's availability. Must be one of \ :java:ref:`DataAvailabilities`\  and must not be empty.
-
 dataCurators
 ^^^^^^^^^^^^
 

diff --git a/...c/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/package-index.rst b/...c/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/package-index.rst
@@ -8,7 +8,6 @@ Domain objects describing \ :java:ref:`eu.dzhw.fdz.metadatamanagement.datapackag
 .. toctree::
    :maxdepth: 1
 
-   DataAvailabilities
    DataPackage
    DataPackageAttachmentMetadata
    DataPackageAttachmentTypes

diff --git a/...rce/javadoc/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Release.rst b/...rce/javadoc/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Release.rst
@@ -52,6 +52,14 @@ lastDate
 
    The timestamp (in UTC) indicates when a publisher has released the \ :java:ref:`DataAcquisitionProject`\  with the current version the last time. Must not be empty.
 
+pinToStartPage
+^^^^^^^^^^^^^^
+
+.. java:field:: private Boolean pinToStartPage
+   :outertype: Release
+
+   Boolean which indicates whether the data package shall be displayed on the startpage or not.
+
 serialVersionUID
 ^^^^^^^^^^^^^^^^