Skip to content

Commit

Permalink
Release 1.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
MarekSuchanek committed Jul 4, 2023
1 parent 198552e commit 83cc577
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 139 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ This document template for DSW is available as open-source via GitHub Repository

## Changelog

### 1.12.1

- Fix extra `endif`

### 1.12.0

- Update for `dsw:root:2.5.0`
Expand Down
276 changes: 138 additions & 138 deletions src/questions/01-data-summary.html.j2
Original file line number Diff line number Diff line change
Expand Up @@ -142,154 +142,154 @@
{%- set preexistingPath = [uuids.reusingCUuid, uuids.preexistingQUuid]|reply_path -%}
{%- set preexistingAUuid = repliesMap[preexistingPath]|reply_str_value -%}
{%- if preexistingAUuid == uuids.preexistingYesAUuid -%}
{%- set refDataPath = [preexistingPath, uuids.preexistingYesAUuid, uuids.refDataQUuid]|reply_path -%}
{%- set refDataItems = repliesMap[refDataPath]|reply_items -%}
{%- set nrefDataPath = [preexistingPath, uuids.preexistingYesAUuid, uuids.nrefDataQUuid]|reply_path -%}
{%- set nrefDataItems = repliesMap[nrefDataPath]|reply_items -%}
{%- if (refDataItems|length + nrefDataItems|length) > 0 -%}
<div>
<h4>Re-used datasets</h4>
{%- if refDataItems|length > 0 -%}
<div>We have found the following reference datasets that we have considered for re-use:
<ul>
{%- for refDataItem in refDataItems -%}
{%- set refDataPrefix = [refDataPath, refDataItem]|reply_path -%}
{%- set refDataUsedPrefix = [refDataPrefix, uuids.refDataUseQUuid, uuids.refDataUseYesAUuid]|reply_path -%}
{%- set refDataNameReply = repliesMap[[refDataPrefix, uuids.refDataNameQUuid]|reply_path] -%}
{%- set refDataWhere = repliesMap[[refDataPrefix, uuids.refDataWhereQUuid]|reply_path]|reply_str_value -%}
<li>
{# identification #}
<strong>{{ macros.integrationValue(refDataNameReply, uuids.refDataNameQUuid) }}</strong>
{%- if refDataWhere -%}
{%- if refDataWhere.startswith("http://") or refDataWhere.startswith("https://") or refDataWhere.startswith("ftp://") %}
(<a href="{{ refDataWhere }}" target="_blank">{{ refDataWhere }}</a>)
{%- else %}
({{ refDataWhere }})
{%- endif -%}
{%- endif -%}
{# version #}
{%- set refDataVersionedPath = [refDataUsedPrefix, uuids.refDataVersionedQUuid]|reply_path -%}
{%- set refDataVersionedAUuid = repliesMap[refDataVersionedPath]|reply_str_value -%}
{%- if refDataVersionedAUuid == uuids.refDataVersionedYesAUuid -%}
{%- set refDataVersionedWhichPath = [refDataVersionedPath, uuids.refDataVersionedYesAUuid, uuids.refDataVersionedWhichQUuid]|reply_path -%}
{%- set refDataVersionedWhich = repliesMap[refDataVersionedWhichPath]|reply_str_value -%}
{%- set refDataVersionedChangePath = [refDataVersionedPath, uuids.refDataVersionedYesAUuid, uuids.refDataVersionedChangeQUuid]|reply_path -%}
{%- set refDataVersionedChangeAUuid = repliesMap[refDataVersionedChangePath]|reply_str_value -%}
{%- if refDataVersionedWhich or refDataVersionedChangeAUuid %}
<p>
{% if refDataVersionedWhich -%}
We will use version "{{ refDataVersionedWhich }}" of this dataset.
{%- endif -%}
{%- if refDataVersionedChangeAUuid == uuids.refDataVersionedChangeStayAUuid %}
If a new version becomes available during the project, we will stay with the old version.
{%- elif refDataVersionedChangeAUuid == uuids.refDataVersionedChangeNewAUuid %}
If a new version becomes available during the project, new analyses will be done with the new version.
{%- elif refDataVersionedChangeAUuid == uuids.refDataVersionedChangeAllAUuid %}
If a new version becomes available during the project, all analyses will be redone with the new version.
{%- endif -%}
</p>
{%- endif -%}
{%- set refDataPath = [preexistingPath, uuids.preexistingYesAUuid, uuids.refDataQUuid]|reply_path -%}
{%- set refDataItems = repliesMap[refDataPath]|reply_items -%}
{%- set nrefDataPath = [preexistingPath, uuids.preexistingYesAUuid, uuids.nrefDataQUuid]|reply_path -%}
{%- set nrefDataItems = repliesMap[nrefDataPath]|reply_items -%}
{%- if (refDataItems|length + nrefDataItems|length) > 0 -%}
<div>
<h4>Re-used datasets</h4>
{%- if refDataItems|length > 0 -%}
<div>We have found the following reference datasets that we have considered for re-use:
<ul>
{%- for refDataItem in refDataItems -%}
{%- set refDataPrefix = [refDataPath, refDataItem]|reply_path -%}
{%- set refDataUsedPrefix = [refDataPrefix, uuids.refDataUseQUuid, uuids.refDataUseYesAUuid]|reply_path -%}
{%- set refDataNameReply = repliesMap[[refDataPrefix, uuids.refDataNameQUuid]|reply_path] -%}
{%- set refDataWhere = repliesMap[[refDataPrefix, uuids.refDataWhereQUuid]|reply_path]|reply_str_value -%}
<li>
{# identification #}
<strong>{{ macros.integrationValue(refDataNameReply, uuids.refDataNameQUuid) }}</strong>
{%- if refDataWhere -%}
{%- if refDataWhere.startswith("http://") or refDataWhere.startswith("https://") or refDataWhere.startswith("ftp://") %}
(<a href="{{ refDataWhere }}" target="_blank">{{ refDataWhere }}</a>)
{%- else %}
({{ refDataWhere }})
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
{%- endif -%}
{%- if nrefDataItems|length > 0 -%}
<div>We have found the following non-reference datasets that we have considered for re-use:
<ul>
{%- for nrefDataItem in nrefDataItems -%}
{%- set nrefDataNamePath = [nrefDataPath, nrefDataItem, uuids.nrefDataNameQUuid]|reply_path -%}
{%- set nrefDataNameReply = repliesMap[nrefDataNamePath] -%}
{%- set nrefDataWhere = repliesMap[[nrefDataPrefix, uuids.nrefDataWhereQUuid]|reply_path]|reply_str_value -%}
<li>
{# identification #}
<strong>{{ macros.integrationValue(nrefDataNameReply, uuids.nrefDataNameQUuid) }}</strong>
{%- if nrefDataWhere -%}
{%- if nrefDataWhere.startswith("http://") or nrefDataWhere.startswith("https://") or nrefDataWhere.startswith("ftp://") %}
(<a href="{{ nrefDataWhere }}" target="_blank">{{ nrefDataWhere }}</a>)
{%- else %}
({{ nrefDataWhere }})
{%- endif -%}
{# version #}
{%- set refDataVersionedPath = [refDataUsedPrefix, uuids.refDataVersionedQUuid]|reply_path -%}
{%- set refDataVersionedAUuid = repliesMap[refDataVersionedPath]|reply_str_value -%}
{%- if refDataVersionedAUuid == uuids.refDataVersionedYesAUuid -%}
{%- set refDataVersionedWhichPath = [refDataVersionedPath, uuids.refDataVersionedYesAUuid, uuids.refDataVersionedWhichQUuid]|reply_path -%}
{%- set refDataVersionedWhich = repliesMap[refDataVersionedWhichPath]|reply_str_value -%}
{%- set refDataVersionedChangePath = [refDataVersionedPath, uuids.refDataVersionedYesAUuid, uuids.refDataVersionedChangeQUuid]|reply_path -%}
{%- set refDataVersionedChangeAUuid = repliesMap[refDataVersionedChangePath]|reply_str_value -%}
{%- if refDataVersionedWhich or refDataVersionedChangeAUuid %}
<p>
{% if refDataVersionedWhich -%}
We will use version "{{ refDataVersionedWhich }}" of this dataset.
{%- endif -%}
{%- endif -%}
{# version #}
{%- set refDataVersionedPath = [refDataUsedPrefix, uuids.refDataVersionedQUuid]|reply_path -%}
{%- set refDataVersionedAUuid = repliesMap[refDataVersionedPath]|reply_str_value -%}
{%- if refDataVersionedAUuid == uuids.refDataVersionedYesAUuid -%}
{%- set refDataVersionedWhichPath = [refDataVersionedPath, uuids.refDataVersionedYesAUuid, uuids.refDataVersionedWhichQUuid]|reply_path -%}
{%- set refDataVersionedWhich = repliesMap[refDataVersionedWhichPath]|reply_str_value -%}
{%- set refDataVersionedChangePath = [refDataVersionedPath, uuids.refDataVersionedYesAUuid, uuids.refDataVersionedChangeQUuid]|reply_path -%}
{%- set refDataVersionedChangeAUuid = repliesMap[refDataVersionedChangePath]|reply_str_value -%}
{%- if refDataVersionedWhich or refDataVersionedChangeAUuid %}
<p>
{% if refDataVersionedWhich -%}
We will use version "{{ refDataVersionedWhich }}" of this dataset.
{%- endif -%}
{%- if refDataVersionedChangeAUuid == uuids.refDataVersionedChangeStayAUuid %}
If a new version becomes available during the project, we will stay with the old version.
{%- elif refDataVersionedChangeAUuid == uuids.refDataVersionedChangeNewAUuid %}
If a new version becomes available during the project, new analyses will be done with the new version.
{%- elif refDataVersionedChangeAUuid == uuids.refDataVersionedChangeAllAUuid %}
If a new version becomes available during the project, all analyses will be redone with the new version.
{%- endif -%}
</p>
{%- if refDataVersionedChangeAUuid == uuids.refDataVersionedChangeStayAUuid %}
If a new version becomes available during the project, we will stay with the old version.
{%- elif refDataVersionedChangeAUuid == uuids.refDataVersionedChangeNewAUuid %}
If a new version becomes available during the project, new analyses will be done with the new version.
{%- elif refDataVersionedChangeAUuid == uuids.refDataVersionedChangeAllAUuid %}
If a new version becomes available during the project, all analyses will be redone with the new version.
{%- endif -%}
</p>
{%- endif -%}
{# data use #}
{%- set dataUse = repliesMap[[refDataUsedPrefix, uuids.refDataUsageQUuid]|reply_path]|reply_str_value -%}
{%- if dataUse -%}
<p>We will use the dataset as follows: {{ dataUse|dot }}</p>
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
{%- endif -%}
{%- if usedNRefDataItems|length > 0 -%}
<div>We will use the following already existing non-reference datasets:
<ul>
{%- for nrefDataItem in usedNRefDataItems -%}
{%- set nrefDataPrefix = [nrefDataPath, nrefDataItem]|reply_path -%}
{%- set nrefDataUsedPrefix = [nrefDataPrefix, uuids.nrefDataUseQUuid, uuids.nrefDataUseYesAUuid]|reply_path -%}
{%- set nrefDataNamePath = [nrefDataPrefix, uuids.nrefDataNameQUuid]|reply_path -%}
{%- set nrefDataNameReply = repliesMap[nrefDataNamePath] -%}
{%- set nrefDataWhere = repliesMap[[nrefDataPrefix, uuids.nrefDataWhereQUuid]|reply_path]|reply_str_value -%}
<li>
{# identification #}
<strong>{{ macros.integrationValue(nrefDataNameReply, uuids.nrefDataNameQUuid) }}</strong>
{%- if nrefDataWhere -%}
{%- if nrefDataWhere.startswith("http://") or nrefDataWhere.startswith("https://") or nrefDataWhere.startswith("ftp://") %}
(<a href="{{ nrefDataWhere }}" target="_blank">{{ nrefDataWhere }}</a>)
{%- else %}
({{ nrefDataWhere }})
{%- endif -%}
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
{%- endif -%}
{%- if nrefDataItems|length > 0 -%}
<div>We have found the following non-reference datasets that we have considered for re-use:
<ul>
{%- for nrefDataItem in nrefDataItems -%}
{%- set nrefDataNamePath = [nrefDataPath, nrefDataItem, uuids.nrefDataNameQUuid]|reply_path -%}
{%- set nrefDataNameReply = repliesMap[nrefDataNamePath] -%}
{%- set nrefDataWhere = repliesMap[[nrefDataPrefix, uuids.nrefDataWhereQUuid]|reply_path]|reply_str_value -%}
<li>
{# identification #}
<strong>{{ macros.integrationValue(nrefDataNameReply, uuids.nrefDataNameQUuid) }}</strong>
{%- if nrefDataWhere -%}
{%- if nrefDataWhere.startswith("http://") or nrefDataWhere.startswith("https://") or nrefDataWhere.startswith("ftp://") %}
(<a href="{{ nrefDataWhere }}" target="_blank">{{ nrefDataWhere }}</a>)
{%- else %}
({{ nrefDataWhere }})
{%- endif -%}
{# data access #}
{%- set nrefDataAccessPath = [nrefDataUsedPrefix, uuids.nrefDataAccessQUuid]|reply_path -%}
{%- set nrefDataAccessAUuid = repliesMap[nrefDataAccessPath]|reply_str_value -%}
{%- if nrefDataAccessAUuid %}
{%- endif -%}
{# version #}
{%- set refDataVersionedPath = [refDataUsedPrefix, uuids.refDataVersionedQUuid]|reply_path -%}
{%- set refDataVersionedAUuid = repliesMap[refDataVersionedPath]|reply_str_value -%}
{%- if refDataVersionedAUuid == uuids.refDataVersionedYesAUuid -%}
{%- set refDataVersionedWhichPath = [refDataVersionedPath, uuids.refDataVersionedYesAUuid, uuids.refDataVersionedWhichQUuid]|reply_path -%}
{%- set refDataVersionedWhich = repliesMap[refDataVersionedWhichPath]|reply_str_value -%}
{%- set refDataVersionedChangePath = [refDataVersionedPath, uuids.refDataVersionedYesAUuid, uuids.refDataVersionedChangeQUuid]|reply_path -%}
{%- set refDataVersionedChangeAUuid = repliesMap[refDataVersionedChangePath]|reply_str_value -%}
{%- if refDataVersionedWhich or refDataVersionedChangeAUuid %}
<p>
{% if nrefDataAccessAUuid == uuids.nrefDataAccessHaveCopyAUuid -%}
We already have a copy of this dataset.
{%- elif nrefDataAccessAUuid == uuids.nrefDataAccessWillDownloadAUuid -%}
We will download or get a copy.
{%- elif nrefDataAccessAUuid == uuids.nrefDataAccessWillOnlineAUuid -%}
We will use its online version without downloading it.
{% if refDataVersionedWhich -%}
We will use version "{{ refDataVersionedWhich }}" of this dataset.
{%- endif -%}
{%- if refDataVersionedChangeAUuid == uuids.refDataVersionedChangeStayAUuid %}
If a new version becomes available during the project, we will stay with the old version.
{%- elif refDataVersionedChangeAUuid == uuids.refDataVersionedChangeNewAUuid %}
If a new version becomes available during the project, new analyses will be done with the new version.
{%- elif refDataVersionedChangeAUuid == uuids.refDataVersionedChangeAllAUuid %}
If a new version becomes available during the project, all analyses will be redone with the new version.
{%- endif -%}
</p>
{%- endif -%}
{# data use #}
{%- set dataUse = repliesMap[[nrefDataUsedPrefix, uuids.nrefDataUsageQUuid]|reply_path]|reply_str_value -%}
{%- if dataUse -%}
<p>We will use the dataset as follows: {{ dataUse|dot }}</p>
{%- endif -%}
{# data use #}
{%- set dataUse = repliesMap[[refDataUsedPrefix, uuids.refDataUsageQUuid]|reply_path]|reply_str_value -%}
{%- if dataUse -%}
<p>We will use the dataset as follows: {{ dataUse|dot }}</p>
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
{%- endif -%}
{%- if usedNRefDataItems|length > 0 -%}
<div>We will use the following already existing non-reference datasets:
<ul>
{%- for nrefDataItem in usedNRefDataItems -%}
{%- set nrefDataPrefix = [nrefDataPath, nrefDataItem]|reply_path -%}
{%- set nrefDataUsedPrefix = [nrefDataPrefix, uuids.nrefDataUseQUuid, uuids.nrefDataUseYesAUuid]|reply_path -%}
{%- set nrefDataNamePath = [nrefDataPrefix, uuids.nrefDataNameQUuid]|reply_path -%}
{%- set nrefDataNameReply = repliesMap[nrefDataNamePath] -%}
{%- set nrefDataWhere = repliesMap[[nrefDataPrefix, uuids.nrefDataWhereQUuid]|reply_path]|reply_str_value -%}
<li>
{# identification #}
<strong>{{ macros.integrationValue(nrefDataNameReply, uuids.nrefDataNameQUuid) }}</strong>
{%- if nrefDataWhere -%}
{%- if nrefDataWhere.startswith("http://") or nrefDataWhere.startswith("https://") or nrefDataWhere.startswith("ftp://") %}
(<a href="{{ nrefDataWhere }}" target="_blank">{{ nrefDataWhere }}</a>)
{%- else %}
({{ nrefDataWhere }})
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
{%- endif -%}
</div>
{%- endif -%}
{%- endif -%}
{# data access #}
{%- set nrefDataAccessPath = [nrefDataUsedPrefix, uuids.nrefDataAccessQUuid]|reply_path -%}
{%- set nrefDataAccessAUuid = repliesMap[nrefDataAccessPath]|reply_str_value -%}
{%- if nrefDataAccessAUuid %}
<p>
{% if nrefDataAccessAUuid == uuids.nrefDataAccessHaveCopyAUuid -%}
We already have a copy of this dataset.
{%- elif nrefDataAccessAUuid == uuids.nrefDataAccessWillDownloadAUuid -%}
We will download or get a copy.
{%- elif nrefDataAccessAUuid == uuids.nrefDataAccessWillOnlineAUuid -%}
We will use its online version without downloading it.
{%- endif -%}
</p>
{%- endif -%}
{# data use #}
{%- set dataUse = repliesMap[[nrefDataUsedPrefix, uuids.nrefDataUsageQUuid]|reply_path]|reply_str_value -%}
{%- if dataUse -%}
<p>We will use the dataset as follows: {{ dataUse|dot }}</p>
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
{%- endif -%}
</div>
{%- endif -%}
{%- endif -%}
{# Format/Type with volume #}
{%- set formatsPath = [uuids.creatingCUuid, uuids.formatsQUuid]|reply_path -%}
Expand Down
2 changes: 1 addition & 1 deletion template.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"templateId": "h2020-dmp",
"organizationId": "dsw",
"version": "1.12.0",
"version": "1.12.1",
"name": "Horizon 2020 DMP",
"description": "Data Management Plan according to the H2020 template",
"license": "Apache-2.0",
Expand Down

0 comments on commit 83cc577

Please sign in to comment.