Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.imi</groupId>
<artifactId>MoPat</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<packaging>war</packaging>
<name>MoPat</name>
<!--/*
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/message/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1152,4 +1152,5 @@ configuration.label.FHIRViaHL7v2Host=Send FHIR export via HL7 communication serv
configuration.label.FHIRViaHL7v2Port=Port of the HL7 communication server for FHIR export.
configuration.label.FHIRViaHL7v2SendingFacility=
configuration.description.exportFHIRViaHL7v2=For FHIR, export can be set up using an HL7v2 communication server. In this case, the FHIR resource is embedded as a blob in the HL7 message.
encounter.error.caseNumberInvalid=The case number was invalid. Please try again!
encounter.error.caseNumberInvalid=The case number was invalid. Please try again!
survey.questionnaire.button.completeQuestionnaireInBundle=Complete the survey section
3 changes: 2 additions & 1 deletion src/main/resources/message/messages_de_DE.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1153,4 +1153,5 @@ configuration.label.exportFHIRViaHL7v2=FHIR Export via HL7 Kommunikationsserver
configuration.label.FHIRViaHL7v2Host=Host des HL7 Kommunikationsservers f\u00fcr den FHIR Export.
configuration.label.FHIRViaHL7v2Port=Port des HL7 Kommunikationsservers f\u00fcr den FHIR Export.
configuration.description.exportFHIRViaHL7v2=F\u00fcr FHIR kann der Export mittels eines HL7v2 Kommunikationsservers eingerichtet werden. In dem Fall wird die FHIR Ressource als Blob in die HL7 Nachricht eingebettet.
encounter.error.caseNumberInvalid=Die Fallnummer ist nicht g\u00FCltig. Bitte versuchen Sie es erneut!
encounter.error.caseNumberInvalid=Die Fallnummer ist nicht g\u00FCltig. Bitte versuchen Sie es erneut!
survey.questionnaire.button.completeQuestionnaireInBundle=Abschluss des Befragungsabschnittes
3 changes: 2 additions & 1 deletion src/main/resources/message/messages_en_GB.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1151,4 +1151,5 @@ configuration.label.exportFHIRViaHL7v2=Send FHIR export via HL7 communication se
configuration.label.FHIRViaHL7v2Host=Send FHIR export via HL7 communication server.
configuration.label.FHIRViaHL7v2Port=Port of the HL7 communication server for FHIR export.
configuration.description.exportFHIRViaHL7v2=For FHIR, export can be set up using an HL7v2 communication server. In this case, the FHIR resource is embedded as a blob in the HL7 message.
encounter.error.caseNumberInvalid=The case number was invalid. Please try again!
encounter.error.caseNumberInvalid=The case number was invalid. Please try again!
survey.questionnaire.button.completeQuestionnaireInBundle=Complete the survey section
92 changes: 46 additions & 46 deletions src/main/webapp/WEB-INF/fragments/resourceFragment.html
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
<th:block layout:fragment="adminJS">
<script defer th:src="@{/js/helper/dialog.js?version=3.3.0}"></script>
<script defer th:src="@{/js/helper/dragNDropList.js?version=3.3.0}"></script>
<script defer th:src="@{/js/helper/image.js?version=3.3.0}"></script>
<script defer th:src="@{/js/application.js?version=3.3.0}"></script>
<script defer th:src="@{/js/helper/localization.js?version=3.3.0}"></script>
<script defer th:src="@{/js/mobile/helper/pseudonymization.js?version=3.3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/answer.js?version=3.3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/bundle.js?version=3.3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/question.js?version=3.3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.3.0}"></script>
<script defer th:src="@{/js/mobile/survey/model/condition.js?version=3.3.0}"></script>
<script defer th:src="@{/js/helper/dialog.js?version=3.3.1}"></script>
<script defer th:src="@{/js/helper/dragNDropList.js?version=3.3.1}"></script>
<script defer th:src="@{/js/helper/image.js?version=3.3.1}"></script>
<script defer th:src="@{/js/application.js?version=3.3.1}"></script>
<script defer th:src="@{/js/helper/localization.js?version=3.3.1}"></script>
<script defer th:src="@{/js/mobile/helper/pseudonymization.js?version=3.3.1}"></script>
<script defer th:src="@{/js/mobile/survey/model/answer.js?version=3.3.1}"></script>
<script defer th:src="@{/js/mobile/survey/model/bundle.js?version=3.3.1}"></script>
<script defer th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.3.1}"></script>
<script defer th:src="@{/js/mobile/survey/model/question.js?version=3.3.1}"></script>
<script defer th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.3.1}"></script>
<script defer th:src="@{/js/mobile/survey/model/condition.js?version=3.3.1}"></script>
</th:block>

<th:block layout:fragment="adminCSS">
<link rel="stylesheet" th:href="@{/css/admin/dataTables.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/elements.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/error.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/footer.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/header.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/layout.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/mapping.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/iconpicker.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/admin/dataTables.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/admin/elements.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/admin/error.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/admin/footer.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/admin/header.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/admin/layout.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/admin/mapping.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/admin/iconpicker.css?version=3.3.1}" />
</th:block>

<th:block layout:fragment="mobileCSS">
<link rel="stylesheet" th:href="@{/css/mobile/layout.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/mobile/style.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/mobile/survey.css?version=3.3.0}" />
<link rel="stylesheet" th:href="@{/css/mobile/layout.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/mobile/style.css?version=3.3.1}" />
<link rel="stylesheet" th:href="@{/css/mobile/survey.css?version=3.3.1}" />
</th:block>

<th:block layout:fragment="mobileJS">
<script th:src="@{/js/mobile/helper/login.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/user.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/footer.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/pseudonymization.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/survey/mobileApplication.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/login.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/helper/user.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/helper/footer.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/helper/pseudonymization.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/helper/survey/mobileApplication.js?version=3.3.1}"></script>

<script th:src="@{/js/mobile/survey/selectBundle.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/selectBundle.js?version=3.3.1}"></script>

<script th:src="@{/js/mobile/survey/helpMode.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/survey/questionStyleEnhancer.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/survey.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/navigation.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/selector.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/encounter.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/bundle.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/question.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/answer.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/condition.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/configuration.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/response.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/model/pointOnImage.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/survey/stepsizeRounding.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/selector/freeTextCleaner.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/survey/helpMode.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/helper/survey/questionStyleEnhancer.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/survey.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/navigation.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/selector.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/encounter.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/bundle.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/question.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/answer.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/condition.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/configuration.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/response.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/survey/model/pointOnImage.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/helper/survey/stepsizeRounding.js?version=3.3.1}"></script>
<script th:src="@{/js/mobile/helper/selector/freeTextCleaner.js?version=3.3.1}"></script>
</th:block>
2 changes: 2 additions & 0 deletions src/main/webapp/WEB-INF/fragments/surveyMessages.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
/*[[${messages.get(#locale, 'survey.questionnaire.button.nextQuestionnaire', 'next Questionnaire')}]]*/ "next Questionnaire";
strings["survey.questionnaire.button.startSurvey"] =
/*[[${messages.get(#locale, 'survey.questionnaire.button.startSurvey', 'start Survey')}]]*/ "start Survey";
strings["survey.questionnaire.button.completeQuestionnaireInBundle"] =
/*[[${messages.get(#locale, 'survey.questionnaire.button.completeQuestionnaireInBundle', 'Complete the survey section')}]]*/ "Complete the survey section";
strings["survey.questionnaire.button.finishSurvey"] =
/*[[${messages.get(#locale, 'survey.questionnaire.button.finishSurvey', 'finish Survey')}]]*/ "finish Survey";
strings["survey.questionnaire.button.startQuestionnaire"] =
Expand Down
10 changes: 5 additions & 5 deletions src/main/webapp/WEB-INF/layout/error.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<head>
<meta charset="utf-8" />

<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.0}"></script>
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.1}"></script>
<script
defer
th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.0}"
th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.1}"
></script>

<link
Expand All @@ -20,15 +20,15 @@

<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.1}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.1}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.1}"
/>

<!--/* Set thymeleaf variable "deployment" to "LOCAL" to add all css files independently, so that debugging is possible
Expand Down
14 changes: 7 additions & 7 deletions src/main/webapp/WEB-INF/layout/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@

<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.1}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.1}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.1}"
/>

<th:block
Expand All @@ -59,16 +59,16 @@
<![endif]-->

<!--/* JQuery Basics */-->
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.0}"></script>
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.1}"></script>

<!--/* Modernizr to query specific device types */-->
<script th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.0}"></script>
<script th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.1}"></script>

<!--/* Bootstrap */-->
<script th:src="@{/js/bootstrap/bootstrap.min.js?version=3.3.0}"></script>
<script th:src="@{/js/bootstrap/bootstrap.min.js?version=3.3.1}"></script>

<!--/* Always import dialog from non mobile helper directory */-->
<script th:src="@{/js/helper/dialog.js?version=3.3.0}"></script>
<script th:src="@{/js/helper/dialog.js?version=3.3.1}"></script>

<th:block
layout:replace="~{fragments/resourceFragment :: mobileJS}"
Expand Down
42 changes: 21 additions & 21 deletions src/main/webapp/WEB-INF/layout/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@
<!--/* WYSIWYG Editor */-->
<link
rel="stylesheet"
th:href="@{/css/wysiwyg/summernote-bs5.min.css?version=3.3.0}"
th:href="@{/css/wysiwyg/summernote-bs5.min.css?version=3.3.1}"
/>
<!--/* dataTables */-->
<link
rel="stylesheet"
th:href="@{/css/jQuery/dataTables/datatables.min.css?version=3.3.0}"
th:href="@{/css/jQuery/dataTables/datatables.min.css?version=3.3.1}"
/>
<!--/* Bootstrap */-->
<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.1}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.1}"
/>
<link
rel="stylesheet"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.0}"
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.1}"
/>


Expand All @@ -57,70 +57,70 @@
<th:block layout:fragment="links"></th:block>

<!--/* JQuery Basics */-->
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.0}"></script>
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.1}"></script>
<script
defer
th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.0}"
th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.1}"
></script>
<!--/* Sortable + jquery bindings */-->
<script th:src="@{/js/sortable/Sortable.min.js?version=3.3.0}"></script>
<script th:src="@{/js/sortable/jquery-sortable.js?version=3.3.0}"></script>
<script th:src="@{/js/sortable/Sortable.min.js?version=3.3.1}"></script>
<script th:src="@{/js/sortable/jquery-sortable.js?version=3.3.1}"></script>

<!--/* WYSIWYG Editor */-->
<script
defer
th:src="@{/js/wysiwyg/summernote-bs5.min.js?version=3.3.0}"
th:src="@{/js/wysiwyg/summernote-bs5.min.js?version=3.3.1}"
></script>
<script
defer
th:src="@{/js/wysiwyg/summernote-de-DE.min.js?version=3.3.0}"
th:src="@{/js/wysiwyg/summernote-de-DE.min.js?version=3.3.1}"
></script>
<script
defer
th:src="@{/js/wysiwyg/summernote-es-ES.min.js?version=3.3.0}"
th:src="@{/js/wysiwyg/summernote-es-ES.min.js?version=3.3.1}"
></script>


<!--/* dataTables */-->
<script
defer
th:src="@{/js/jQuery/dataTables/jquery.dataTables.min.js?version=3.3.0}"
th:src="@{/js/jQuery/dataTables/jquery.dataTables.min.js?version=3.3.1}"
></script>
<script
defer
th:src="@{/js/jQuery/dataTables/datatables.min.js?version=3.3.0}"
th:src="@{/js/jQuery/dataTables/datatables.min.js?version=3.3.1}"
></script>
<!--/* Bootstrap */-->
<script
defer
th:src="@{/js/bootstrap/bootstrap.min.js?version=3.3.0}"
th:src="@{/js/bootstrap/bootstrap.min.js?version=3.3.1}"
></script>
<!--/* file upload */-->
<script
defer
th:src="@{/js/bootstrap/fileinput.min.js?version=3.3.0}"
th:src="@{/js/bootstrap/fileinput.min.js?version=3.3.1}"
></script>
<script
defer
th:src="@{/js/bootstrap/locales/de.js?version=3.3.0}"
th:src="@{/js/bootstrap/locales/de.js?version=3.3.1}"
></script>
<script
defer
th:src="@{/js/bootstrap/locales/es.js?version=3.3.0}"
th:src="@{/js/bootstrap/locales/es.js?version=3.3.1}"
></script>
<script
defer
th:src="@{/js/helper/dialog.js?version=3.3.0}"
th:src="@{/js/helper/dialog.js?version=3.3.1}"
></script>
<script
defer
th:src="@{/js/helper/image.js?version=3.3.0}"
th:src="@{/js/helper/image.js?version=3.3.1}"
></script>
<!--/* Iconpicker for slider questions */-->
<script
type="module"
defer
th:src="@{/js/iconpicker.js?version=3.3.0}"
th:src="@{/js/iconpicker.js?version=3.3.1}"
></script>

<th:block
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/layout/mobile.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
*/-->
<th:block layout:decorate="~{layout/login}">
<th:block layout:fragment="addScripts">
<script th:src="@{/js/zxing/zxing.min.js?version=3.3.0}"></script>
<script th:src="@{/js/zxing/zxing.min.js?version=3.3.1}"></script>
</th:block>
</th:block>
6 changes: 3 additions & 3 deletions src/main/webapp/WEB-INF/layout/mobileQuestionnaire.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<th:block layout:fragment="header"></th:block>

<th:block layout:fragment="addScripts">
<script th:src="@{/js/svg/svg.min.js?version=3.3.0}"></script>
<script th:src="@{/js/zxing/zxing.min.js?version=3.3.0}"></script>
<script th:src="@{/js/jQuery/jquery-barcode.min.js?version=3.3.0}"></script>
<script th:src="@{/js/svg/svg.min.js?version=3.3.1}"></script>
<script th:src="@{/js/zxing/zxing.min.js?version=3.3.1}"></script>
<script th:src="@{/js/jQuery/jquery-barcode.min.js?version=3.3.1}"></script>
</th:block>

<th:block layout:fragment="content"></th:block>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/layout/mobileUser.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
th:with="onLoad='initUser();'"
>
<th:block layout:fragment="addScripts">
<script th:src="@{/js/mobile/helper/user.js?version=3.3.0}"></script>
<script th:src="@{/js/mobile/helper/user.js?version=3.3.1}"></script>
</th:block>
</th:block>
Loading