Skip to content

Commit efbde62

Browse files
ywarneckeywarnecke
authored
Merge pull request #277 from imi-ms/v3.3.1
V3.3.1
2 parents 844bfc9 + f6a4b93 commit efbde62

File tree

15 files changed

+138
-112
lines changed

15 files changed

+138
-112
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>de.imi</groupId>
55
<artifactId>MoPat</artifactId>
6-
<version>3.3.0</version>
6+
<version>3.3.1</version>
77
<packaging>war</packaging>
88
<name>MoPat</name>
99
<!--/*

‎src/main/resources/message/messages.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,4 +1152,5 @@ configuration.label.FHIRViaHL7v2Host=Send FHIR export via HL7 communication serv
11521152
configuration.label.FHIRViaHL7v2Port=Port of the HL7 communication server for FHIR export.
11531153
configuration.label.FHIRViaHL7v2SendingFacility=
11541154
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.
1155-
encounter.error.caseNumberInvalid=The case number was invalid. Please try again!
1155+
encounter.error.caseNumberInvalid=The case number was invalid. Please try again!
1156+
survey.questionnaire.button.completeQuestionnaireInBundle=Complete the survey section

‎src/main/resources/message/messages_de_DE.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,4 +1153,5 @@ configuration.label.exportFHIRViaHL7v2=FHIR Export via HL7 Kommunikationsserver
11531153
configuration.label.FHIRViaHL7v2Host=Host des HL7 Kommunikationsservers f\u00fcr den FHIR Export.
11541154
configuration.label.FHIRViaHL7v2Port=Port des HL7 Kommunikationsservers f\u00fcr den FHIR Export.
11551155
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.
1156-
encounter.error.caseNumberInvalid=Die Fallnummer ist nicht g\u00FCltig. Bitte versuchen Sie es erneut!
1156+
encounter.error.caseNumberInvalid=Die Fallnummer ist nicht g\u00FCltig. Bitte versuchen Sie es erneut!
1157+
survey.questionnaire.button.completeQuestionnaireInBundle=Abschluss des Befragungsabschnittes

‎src/main/resources/message/messages_en_GB.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,4 +1151,5 @@ configuration.label.exportFHIRViaHL7v2=Send FHIR export via HL7 communication se
11511151
configuration.label.FHIRViaHL7v2Host=Send FHIR export via HL7 communication server.
11521152
configuration.label.FHIRViaHL7v2Port=Port of the HL7 communication server for FHIR export.
11531153
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.
1154-
encounter.error.caseNumberInvalid=The case number was invalid. Please try again!
1154+
encounter.error.caseNumberInvalid=The case number was invalid. Please try again!
1155+
survey.questionnaire.button.completeQuestionnaireInBundle=Complete the survey section

‎src/main/webapp/WEB-INF/fragments/resourceFragment.html‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
<th:block layout:fragment="adminJS">
2-
<script defer th:src="@{/js/helper/dialog.js?version=3.3.0}"></script>
3-
<script defer th:src="@{/js/helper/dragNDropList.js?version=3.3.0}"></script>
4-
<script defer th:src="@{/js/helper/image.js?version=3.3.0}"></script>
5-
<script defer th:src="@{/js/application.js?version=3.3.0}"></script>
6-
<script defer th:src="@{/js/helper/localization.js?version=3.3.0}"></script>
7-
<script defer th:src="@{/js/mobile/helper/pseudonymization.js?version=3.3.0}"></script>
8-
<script defer th:src="@{/js/mobile/survey/model/answer.js?version=3.3.0}"></script>
9-
<script defer th:src="@{/js/mobile/survey/model/bundle.js?version=3.3.0}"></script>
10-
<script defer th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.3.0}"></script>
11-
<script defer th:src="@{/js/mobile/survey/model/question.js?version=3.3.0}"></script>
12-
<script defer th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.3.0}"></script>
13-
<script defer th:src="@{/js/mobile/survey/model/condition.js?version=3.3.0}"></script>
2+
<script defer th:src="@{/js/helper/dialog.js?version=3.3.1}"></script>
3+
<script defer th:src="@{/js/helper/dragNDropList.js?version=3.3.1}"></script>
4+
<script defer th:src="@{/js/helper/image.js?version=3.3.1}"></script>
5+
<script defer th:src="@{/js/application.js?version=3.3.1}"></script>
6+
<script defer th:src="@{/js/helper/localization.js?version=3.3.1}"></script>
7+
<script defer th:src="@{/js/mobile/helper/pseudonymization.js?version=3.3.1}"></script>
8+
<script defer th:src="@{/js/mobile/survey/model/answer.js?version=3.3.1}"></script>
9+
<script defer th:src="@{/js/mobile/survey/model/bundle.js?version=3.3.1}"></script>
10+
<script defer th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.3.1}"></script>
11+
<script defer th:src="@{/js/mobile/survey/model/question.js?version=3.3.1}"></script>
12+
<script defer th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.3.1}"></script>
13+
<script defer th:src="@{/js/mobile/survey/model/condition.js?version=3.3.1}"></script>
1414
</th:block>
1515

1616
<th:block layout:fragment="adminCSS">
17-
<link rel="stylesheet" th:href="@{/css/admin/dataTables.css?version=3.3.0}" />
18-
<link rel="stylesheet" th:href="@{/css/admin/elements.css?version=3.3.0}" />
19-
<link rel="stylesheet" th:href="@{/css/admin/error.css?version=3.3.0}" />
20-
<link rel="stylesheet" th:href="@{/css/admin/footer.css?version=3.3.0}" />
21-
<link rel="stylesheet" th:href="@{/css/admin/header.css?version=3.3.0}" />
22-
<link rel="stylesheet" th:href="@{/css/admin/layout.css?version=3.3.0}" />
23-
<link rel="stylesheet" th:href="@{/css/admin/mapping.css?version=3.3.0}" />
24-
<link rel="stylesheet" th:href="@{/css/admin/iconpicker.css?version=3.3.0}" />
17+
<link rel="stylesheet" th:href="@{/css/admin/dataTables.css?version=3.3.1}" />
18+
<link rel="stylesheet" th:href="@{/css/admin/elements.css?version=3.3.1}" />
19+
<link rel="stylesheet" th:href="@{/css/admin/error.css?version=3.3.1}" />
20+
<link rel="stylesheet" th:href="@{/css/admin/footer.css?version=3.3.1}" />
21+
<link rel="stylesheet" th:href="@{/css/admin/header.css?version=3.3.1}" />
22+
<link rel="stylesheet" th:href="@{/css/admin/layout.css?version=3.3.1}" />
23+
<link rel="stylesheet" th:href="@{/css/admin/mapping.css?version=3.3.1}" />
24+
<link rel="stylesheet" th:href="@{/css/admin/iconpicker.css?version=3.3.1}" />
2525
</th:block>
2626

2727
<th:block layout:fragment="mobileCSS">
28-
<link rel="stylesheet" th:href="@{/css/mobile/layout.css?version=3.3.0}" />
29-
<link rel="stylesheet" th:href="@{/css/mobile/style.css?version=3.3.0}" />
30-
<link rel="stylesheet" th:href="@{/css/mobile/survey.css?version=3.3.0}" />
28+
<link rel="stylesheet" th:href="@{/css/mobile/layout.css?version=3.3.1}" />
29+
<link rel="stylesheet" th:href="@{/css/mobile/style.css?version=3.3.1}" />
30+
<link rel="stylesheet" th:href="@{/css/mobile/survey.css?version=3.3.1}" />
3131
</th:block>
3232

3333
<th:block layout:fragment="mobileJS">
34-
<script th:src="@{/js/mobile/helper/login.js?version=3.3.0}"></script>
35-
<script th:src="@{/js/mobile/helper/user.js?version=3.3.0}"></script>
36-
<script th:src="@{/js/mobile/helper/footer.js?version=3.3.0}"></script>
37-
<script th:src="@{/js/mobile/helper/pseudonymization.js?version=3.3.0}"></script>
38-
<script th:src="@{/js/mobile/helper/survey/mobileApplication.js?version=3.3.0}"></script>
34+
<script th:src="@{/js/mobile/helper/login.js?version=3.3.1}"></script>
35+
<script th:src="@{/js/mobile/helper/user.js?version=3.3.1}"></script>
36+
<script th:src="@{/js/mobile/helper/footer.js?version=3.3.1}"></script>
37+
<script th:src="@{/js/mobile/helper/pseudonymization.js?version=3.3.1}"></script>
38+
<script th:src="@{/js/mobile/helper/survey/mobileApplication.js?version=3.3.1}"></script>
3939

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

42-
<script th:src="@{/js/mobile/survey/helpMode.js?version=3.3.0}"></script>
43-
<script th:src="@{/js/mobile/helper/survey/questionStyleEnhancer.js?version=3.3.0}"></script>
44-
<script th:src="@{/js/mobile/survey/survey.js?version=3.3.0}"></script>
45-
<script th:src="@{/js/mobile/survey/navigation.js?version=3.3.0}"></script>
46-
<script th:src="@{/js/mobile/survey/selector.js?version=3.3.0}"></script>
47-
<script th:src="@{/js/mobile/survey/model/encounter.js?version=3.3.0}"></script>
48-
<script th:src="@{/js/mobile/survey/model/bundle.js?version=3.3.0}"></script>
49-
<script th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.3.0}"></script>
50-
<script th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.3.0}"></script>
51-
<script th:src="@{/js/mobile/survey/model/question.js?version=3.3.0}"></script>
52-
<script th:src="@{/js/mobile/survey/model/answer.js?version=3.3.0}"></script>
53-
<script th:src="@{/js/mobile/survey/model/condition.js?version=3.3.0}"></script>
54-
<script th:src="@{/js/mobile/survey/model/configuration.js?version=3.3.0}"></script>
55-
<script th:src="@{/js/mobile/survey/model/response.js?version=3.3.0}"></script>
56-
<script th:src="@{/js/mobile/survey/model/pointOnImage.js?version=3.3.0}"></script>
57-
<script th:src="@{/js/mobile/helper/survey/stepsizeRounding.js?version=3.3.0}"></script>
58-
<script th:src="@{/js/mobile/helper/selector/freeTextCleaner.js?version=3.3.0}"></script>
42+
<script th:src="@{/js/mobile/survey/helpMode.js?version=3.3.1}"></script>
43+
<script th:src="@{/js/mobile/helper/survey/questionStyleEnhancer.js?version=3.3.1}"></script>
44+
<script th:src="@{/js/mobile/survey/survey.js?version=3.3.1}"></script>
45+
<script th:src="@{/js/mobile/survey/navigation.js?version=3.3.1}"></script>
46+
<script th:src="@{/js/mobile/survey/selector.js?version=3.3.1}"></script>
47+
<script th:src="@{/js/mobile/survey/model/encounter.js?version=3.3.1}"></script>
48+
<script th:src="@{/js/mobile/survey/model/bundle.js?version=3.3.1}"></script>
49+
<script th:src="@{/js/mobile/survey/model/questionnaire.js?version=3.3.1}"></script>
50+
<script th:src="@{/js/mobile/survey/model/bundleQuestionnaire.js?version=3.3.1}"></script>
51+
<script th:src="@{/js/mobile/survey/model/question.js?version=3.3.1}"></script>
52+
<script th:src="@{/js/mobile/survey/model/answer.js?version=3.3.1}"></script>
53+
<script th:src="@{/js/mobile/survey/model/condition.js?version=3.3.1}"></script>
54+
<script th:src="@{/js/mobile/survey/model/configuration.js?version=3.3.1}"></script>
55+
<script th:src="@{/js/mobile/survey/model/response.js?version=3.3.1}"></script>
56+
<script th:src="@{/js/mobile/survey/model/pointOnImage.js?version=3.3.1}"></script>
57+
<script th:src="@{/js/mobile/helper/survey/stepsizeRounding.js?version=3.3.1}"></script>
58+
<script th:src="@{/js/mobile/helper/selector/freeTextCleaner.js?version=3.3.1}"></script>
5959
</th:block>

‎src/main/webapp/WEB-INF/fragments/surveyMessages.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
/*[[${messages.get(#locale, 'survey.questionnaire.button.nextQuestionnaire', 'next Questionnaire')}]]*/ "next Questionnaire";
2424
strings["survey.questionnaire.button.startSurvey"] =
2525
/*[[${messages.get(#locale, 'survey.questionnaire.button.startSurvey', 'start Survey')}]]*/ "start Survey";
26+
strings["survey.questionnaire.button.completeQuestionnaireInBundle"] =
27+
/*[[${messages.get(#locale, 'survey.questionnaire.button.completeQuestionnaireInBundle', 'Complete the survey section')}]]*/ "Complete the survey section";
2628
strings["survey.questionnaire.button.finishSurvey"] =
2729
/*[[${messages.get(#locale, 'survey.questionnaire.button.finishSurvey', 'finish Survey')}]]*/ "finish Survey";
2830
strings["survey.questionnaire.button.startQuestionnaire"] =

‎src/main/webapp/WEB-INF/layout/error.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<head>
88
<meta charset="utf-8" />
99

10-
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.0}"></script>
10+
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.1}"></script>
1111
<script
1212
defer
13-
th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.0}"
13+
th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.1}"
1414
></script>
1515

1616
<link
@@ -20,15 +20,15 @@
2020

2121
<link
2222
rel="stylesheet"
23-
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.0}"
23+
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.1}"
2424
/>
2525
<link
2626
rel="stylesheet"
27-
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.0}"
27+
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.1}"
2828
/>
2929
<link
3030
rel="stylesheet"
31-
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.0}"
31+
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.1}"
3232
/>
3333

3434
<!--/* Set thymeleaf variable "deployment" to "LOCAL" to add all css files independently, so that debugging is possible

‎src/main/webapp/WEB-INF/layout/login.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333

3434
<link
3535
rel="stylesheet"
36-
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.0}"
36+
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.1}"
3737
/>
3838
<link
3939
rel="stylesheet"
40-
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.0}"
40+
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.1}"
4141
/>
4242
<link
4343
rel="stylesheet"
44-
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.0}"
44+
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.1}"
4545
/>
4646

4747
<th:block
@@ -59,16 +59,16 @@
5959
<![endif]-->
6060

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

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

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

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

7373
<th:block
7474
layout:replace="~{fragments/resourceFragment :: mobileJS}"

‎src/main/webapp/WEB-INF/layout/main.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@
2727
<!--/* WYSIWYG Editor */-->
2828
<link
2929
rel="stylesheet"
30-
th:href="@{/css/wysiwyg/summernote-bs5.min.css?version=3.3.0}"
30+
th:href="@{/css/wysiwyg/summernote-bs5.min.css?version=3.3.1}"
3131
/>
3232
<!--/* dataTables */-->
3333
<link
3434
rel="stylesheet"
35-
th:href="@{/css/jQuery/dataTables/datatables.min.css?version=3.3.0}"
35+
th:href="@{/css/jQuery/dataTables/datatables.min.css?version=3.3.1}"
3636
/>
3737
<!--/* Bootstrap */-->
3838
<link
3939
rel="stylesheet"
40-
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.0}"
40+
th:href="@{/css/bootstrap/bootstrap.min.css?version=3.3.1}"
4141
/>
4242
<link
4343
rel="stylesheet"
44-
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.0}"
44+
th:href="@{/css/bootstrap/bootstrap-icons.min.css?version=3.3.1}"
4545
/>
4646
<link
4747
rel="stylesheet"
48-
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.0}"
48+
th:href="@{/css/bootstrap/fileinput.min.css?version=3.3.1}"
4949
/>
5050

5151

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

5959
<!--/* JQuery Basics */-->
60-
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.0}"></script>
60+
<script th:src="@{/js/jQuery/jquery.min.js?version=3.3.1}"></script>
6161
<script
6262
defer
63-
th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.0}"
63+
th:src="@{/js/modernizr/modernizr-custom.js?version=3.3.1}"
6464
></script>
6565
<!--/* Sortable + jquery bindings */-->
66-
<script th:src="@{/js/sortable/Sortable.min.js?version=3.3.0}"></script>
67-
<script th:src="@{/js/sortable/jquery-sortable.js?version=3.3.0}"></script>
66+
<script th:src="@{/js/sortable/Sortable.min.js?version=3.3.1}"></script>
67+
<script th:src="@{/js/sortable/jquery-sortable.js?version=3.3.1}"></script>
6868

6969
<!--/* WYSIWYG Editor */-->
7070
<script
7171
defer
72-
th:src="@{/js/wysiwyg/summernote-bs5.min.js?version=3.3.0}"
72+
th:src="@{/js/wysiwyg/summernote-bs5.min.js?version=3.3.1}"
7373
></script>
7474
<script
7575
defer
76-
th:src="@{/js/wysiwyg/summernote-de-DE.min.js?version=3.3.0}"
76+
th:src="@{/js/wysiwyg/summernote-de-DE.min.js?version=3.3.1}"
7777
></script>
7878
<script
7979
defer
80-
th:src="@{/js/wysiwyg/summernote-es-ES.min.js?version=3.3.0}"
80+
th:src="@{/js/wysiwyg/summernote-es-ES.min.js?version=3.3.1}"
8181
></script>
8282

8383

8484
<!--/* dataTables */-->
8585
<script
8686
defer
87-
th:src="@{/js/jQuery/dataTables/jquery.dataTables.min.js?version=3.3.0}"
87+
th:src="@{/js/jQuery/dataTables/jquery.dataTables.min.js?version=3.3.1}"
8888
></script>
8989
<script
9090
defer
91-
th:src="@{/js/jQuery/dataTables/datatables.min.js?version=3.3.0}"
91+
th:src="@{/js/jQuery/dataTables/datatables.min.js?version=3.3.1}"
9292
></script>
9393
<!--/* Bootstrap */-->
9494
<script
9595
defer
96-
th:src="@{/js/bootstrap/bootstrap.min.js?version=3.3.0}"
96+
th:src="@{/js/bootstrap/bootstrap.min.js?version=3.3.1}"
9797
></script>
9898
<!--/* file upload */-->
9999
<script
100100
defer
101-
th:src="@{/js/bootstrap/fileinput.min.js?version=3.3.0}"
101+
th:src="@{/js/bootstrap/fileinput.min.js?version=3.3.1}"
102102
></script>
103103
<script
104104
defer
105-
th:src="@{/js/bootstrap/locales/de.js?version=3.3.0}"
105+
th:src="@{/js/bootstrap/locales/de.js?version=3.3.1}"
106106
></script>
107107
<script
108108
defer
109-
th:src="@{/js/bootstrap/locales/es.js?version=3.3.0}"
109+
th:src="@{/js/bootstrap/locales/es.js?version=3.3.1}"
110110
></script>
111111
<script
112112
defer
113-
th:src="@{/js/helper/dialog.js?version=3.3.0}"
113+
th:src="@{/js/helper/dialog.js?version=3.3.1}"
114114
></script>
115115
<script
116116
defer
117-
th:src="@{/js/helper/image.js?version=3.3.0}"
117+
th:src="@{/js/helper/image.js?version=3.3.1}"
118118
></script>
119119
<!--/* Iconpicker for slider questions */-->
120120
<script
121121
type="module"
122122
defer
123-
th:src="@{/js/iconpicker.js?version=3.3.0}"
123+
th:src="@{/js/iconpicker.js?version=3.3.1}"
124124
></script>
125125

126126
<th:block

‎src/main/webapp/WEB-INF/layout/mobile.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
*/-->
66
<th:block layout:decorate="~{layout/login}">
77
<th:block layout:fragment="addScripts">
8-
<script th:src="@{/js/zxing/zxing.min.js?version=3.3.0}"></script>
8+
<script th:src="@{/js/zxing/zxing.min.js?version=3.3.1}"></script>
99
</th:block>
1010
</th:block>

0 commit comments

Comments
 (0)