From ed4e04386a8e595fc713ec42e05d0acf074f5fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Mon, 2 Sep 2024 11:55:49 +0200 Subject: [PATCH] Update to metamodel v14, release 1.16.0 --- README.md | 4 ++++ src/index.html.j2 | 2 +- src/questions/03-resource-allocation.html.j2 | 4 ++-- src/word/index.html.j2 | 4 ++-- template.json | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9c50cf4..df2ef2d 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,10 @@ This document template for DSW is available as open-source via GitHub Repository ## Changelog +### 1.16.0 + +- Adjusted to template metamodel version 14 (released in DSW 4.10.0) + ### 1.15.1 - Fixed nested bullet points would display unwanted characters diff --git a/src/index.html.j2 b/src/index.html.j2 index 1cb646a..af95951 100644 --- a/src/index.html.j2 +++ b/src/index.html.j2 @@ -1,6 +1,6 @@ {%- set km = ctx.knowledgeModel -%} -{%- set repliesMap = ctx.questionnaireReplies -%} +{%- set repliesMap = ctx.questionnaire.replies -%} {%- set report = ctx.report -%} {%- set dc = ctx|to_context_obj -%} {% import "src/macros.html.j2" as macros with context %} diff --git a/src/questions/03-resource-allocation.html.j2 b/src/questions/03-resource-allocation.html.j2 index 22c60f6..d6db58d 100644 --- a/src/questions/03-resource-allocation.html.j2 +++ b/src/questions/03-resource-allocation.html.j2 @@ -158,8 +158,8 @@ {%- endif -%} {# People #} - {%- if ctx.createdBy %} -

{{ctx.createdBy.firstName}} {{ctx.createdBy.lastName}} is responsible for implementing the DMP, and ensuring it is reviewed and revised.

+ {%- if ctx.questionnaire.createdBy %} +

{{ctx.questionnaire.createdBy.firstName}} {{ctx.questionnaire.createdBy.lastName}} is responsible for implementing the DMP, and ensuring it is reviewed and revised.

{%- endif -%} {%- set contributorsPath = [uuids.adminDetailsCUuid, uuids.contributorsQUuid]|reply_path -%} diff --git a/src/word/index.html.j2 b/src/word/index.html.j2 index c87016c..69412db 100644 --- a/src/word/index.html.j2 +++ b/src/word/index.html.j2 @@ -1,6 +1,6 @@ {%- set km = ctx.knowledgeModel -%} -{%- set repliesMap = ctx.questionnaireReplies -%} +{%- set repliesMap = ctx.questionnaire.replies -%} {%- set report = ctx.report -%} {%- set dc = ctx|to_context_obj -%} {% import "src/macros.html.j2" as macros with context %} @@ -8,7 +8,7 @@ {% import "src/globals.j2" as globals with context %} - {{ ctx.questionnaireName }} + {{ ctx.questionnaire.name }}