Release 1.18.0 with new Science Europe template (#11)

README.md

@@ -24,10 +24,19 @@ This document template for DSW is available as open-source via GitHub Repository
 * **Rob Hooft** <[rob.hooft@health-ri.nl](mailto:rob.hooft@health-ri.nl)>
   * ORCID: [0000-0001-6825-9439](https://orcid.org/0000-0001-6825-9439)
   * GitHub: [@rwwh](https://github.com/rwwh)
+* **Jana Martínková** <[jana.martinkova@ds-wizard.org]>(mailto:jana.martinkova@ds-wizard.org)>
+  * ORCID: [0000-0001-8575-6533](https://orcid.org/0000-0001-8575-6533/)
+  * GitHub: [@jmartinkova](https://github.com/jmartinkova)
 
 
 ## Changelog
 
+### 1.18.0
+
+- Update according to the Science Europe DMP template, including the project number, access to private data, and project costs
+- Fix the question regarding data versions to allow for multiple choices
+- Correct the version table and front page
+
 ### 1.17.0
 
 - Adjusted to template metamodel version 13 (released in DSW 4.3.0)

src/content.html.j2

@@ -1,49 +1,40 @@
 <div id="dmp-content">
   <section id="sec-data-collection" class="dmp-section">
-    <h2>Section A: Data Collection</h2>
-
-    {% include "src/questions/01-what-data.html.j2" with context %}
-    {% include "src/questions/02-how-data.html.j2" with context %}
+    <h2>Section 1: Data description and collection or re-use of existing data</h2>
+    {% include "src/questions/01-how-data.html.j2" with context %}
+    {% include "src/questions/02-what-data.html.j2" with context %}
   </section>
 
   <section id="sec-docs-metadata" class="dmp-section">
-    <h2>Section B: Documentation and Meta-data</h2>
-
+    <h2>Section 2: Documentation and data quality</h2>
     {% include "src/questions/03-docs-metadata.html.j2" with context %}
-  </section>
-
-  <section id="sec-ethics-legal" class="dmp-section">
-    <h2>Section C: Ethics and Legal Compliance</h2>
-
-    {% include "src/questions/04-ethical-issues.html.j2" with context %}
-    {% include "src/questions/05-copyright-ipr.html.j2" with context %}
+    {% include "src/questions/04-quality-control.html.j2" with context %}
   </section>
 
   <section id="sec-storage-backup" class="dmp-section">
-    <h2>Section D: Storage and Backup</h2>
-
-    {% include "src/questions/06-store-backup.html.j2" with context %}
-    {% include "src/questions/07-access-security.html.j2" with context %}
+    <h2>Section 3: Storage and backup during research process</h2>
+    {% include "src/questions/05-store-backup.html.j2" with context %}
+    {% include "src/questions/06-access-security.html.j2" with context %}
   </section>
 
-  <section id="sec-selection-preservation" class="dmp-section">
-    <h2>Section E: Selection and Preservation</h2>
-
-    {% include "src/questions/08-which-longterm.html.j2" with context %}
-    {% include "src/questions/09-longterm-plan.html.j2" with context %}
+  <section id="sec-ethics-legal" class="dmp-section">
+    <h2>Section 4: Legal and ethical requirements, codes of conduct</h2>
+    {% include "src/questions/07-personal-data.html.j2" with context %}
+    {% include "src/questions/08-copyright-ipr.html.j2" with context %}
+    {% include "src/questions/09-ethical-issues.html.j2" with context %}
   </section>
-
-  <section id="sec-data-sharing" class="dmp-section">
-    <h2>Section F: Data Sharing</h2>
 
-    {% include "src/questions/10-how-share.html.j2" with context %}
-    {% include "src/questions/11-restrictions.html.j2" with context %}
+  <section id="sec-sharing-preservation" class="dmp-section">
+    <h2>Section 5: Data sharing and long-term preservation</h2>
+    {% include "src/questions/10-share-restrictions.html.j2" with context %}
+    {% include "src/questions/11-data-preservation.html.j2" with context %}
+    {% include "src/questions/12-access-data.html.j2" with context %}
+    {% include "src/questions/13-persistent-identifier.html.j2" with context %}
   </section>
 
   <section id="sec-responsibilities-resources" class="dmp-section">
-    <h2>Section G: Responsibilities and Resources</h2>
-
-    {% include "src/questions/12-dm-responsible.html.j2" with context %}
-    {% include "src/questions/13-required-resources.html.j2" with context %}
+    <h2>Section 6: Data management responsibilities and resources</h2>
+    {% include "src/questions/14-dm-responsible.html.j2" with context %}
+    {% include "src/questions/15-required-resources.html.j2" with context %}
   </section>
 </div>

src/macros.html.j2

@@ -10,7 +10,7 @@
 {%- macro integrationValue(reply) -%}
   {%- if reply and reply.value.value.type == "IntegrationType" -%}
     {{ reply.value.value.value.rsplit(" ![]")[0]|markdown }}
-  {%- elif reply %}
+  {%- elif reply -%}
     {{ reply.value.value.value }}
   {%- endif -%}
 {%- endmacro -%}

src/projects.html.j2

@@ -15,13 +15,17 @@
       <h3 class="empty-value">(project name not given)</h3>
     {%- endif -%}
 
+    {%- set projectNumberPath = [projectsPath, projectsItem, uuids.projectNumberQUuid]|reply_path -%}
+    {%- set projectNumber = repliesMap[projectNumberPath]|reply_str_value -%}
     {%- set projectStartPath = [projectsPath, projectsItem, uuids.projectStartQUuid]|reply_path -%}
     {%- set projectStart = repliesMap[projectStartPath]|reply_str_value -%}
     {%- set projectEndPath = [projectsPath, projectsItem, uuids.projectEndQUuid]|reply_path -%}
     {%- set projectEnd = repliesMap[projectEndPath]|reply_str_value -%}
     {%- set fundersPath = [projectsPath, projectsItem, uuids.fundersQUuid]|reply_path -%}
     {%- set fundersItems = repliesMap[fundersPath]|reply_items -%}
       <dl>
+        <dt>Project Number</dt>
+        <dd>{{ projectNumber if projectNumber else "N/A" }}</dd>
         <dt>Start date</dt>
         <dd>{{ projectStart if projectStart else "N/A" }}</dd>
         <dt>End date</dt>