From 3fc10a8aea0e84616f45474e1c41b7fbbd31b0be Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 21 Apr 2023 08:58:04 +0200 Subject: [PATCH 1/8] Spring Boot > 2.7.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae3864079..d431409df 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.10 + 2.7.11 org.esupportail From ffd783c9a58e0f90384894ef55f4cb518efa2064 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 21 Apr 2023 10:02:57 +0200 Subject: [PATCH 2/8] fix restore radio on zoom --- src/main/resources/static/js/modules/utils/PdfViewer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/modules/utils/PdfViewer.js b/src/main/resources/static/js/modules/utils/PdfViewer.js index 0b163f016..90d7f0176 100644 --- a/src/main/resources/static/js/modules/utils/PdfViewer.js +++ b/src/main/resources/static/js/modules/utils/PdfViewer.js @@ -368,12 +368,12 @@ export class PdfViewer extends EventFactory { } restoreValues(items) { - console.log("set fields " + items.length); + console.log("set fields " + items.length); for (let i = 0; i < items.length; i++) { if(items[i].fieldName != null) { let inputName = items[i].fieldName.split(/\$|#|!/)[0]; let savedValue = this.savedFields.get(items[i].fieldName); - let inputField = $('#' + $.escapeSelector(inputName)); + let inputField = $('[name="' + inputName + '"]'); if (inputField.val() != null) { if(savedValue != null) { if (inputField.is(':checkbox')) { From f6d739abbbef89ba77b6985a0e3fcbdc8abeaedb Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 21 Apr 2023 10:07:23 +0200 Subject: [PATCH 3/8] pdfjs > 3.4.120 + 1.24.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0820fb98e..519bab272 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.esupportail esup-signature - 1.24.6 + 1.24.7 esup-signature org.esupportail.esupsignature.EsupSignatureApplication @@ -172,7 +172,7 @@ org.webjars.npm pdfjs-dist - 3.3.122 + 3.4.120 org.webjars.npm From ff4d864707e38fffed24feaa35f8433d5d21f9d6 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 21 Apr 2023 11:01:39 +0200 Subject: [PATCH 4/8] pdfjs > 3.5.141 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 519bab272..6f68a18c7 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ org.webjars.npm pdfjs-dist - 3.4.120 + 3.5.141 org.webjars.npm From ba041a7bf11f344ec8d4fb815da66b1e7c7965c3 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 21 Apr 2023 13:36:44 +0200 Subject: [PATCH 5/8] pdfjs center radio & checkbox --- src/main/resources/static/css/app.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/resources/static/css/app.css b/src/main/resources/static/css/app.css index 3a8d5081c..8b0a4e660 100644 --- a/src/main/resources/static/css/app.css +++ b/src/main/resources/static/css/app.css @@ -1561,6 +1561,15 @@ textarea:placeholder-shown.required-field { font-size: 14px !important; } +.annotationLayer .buttonWidgetAnnotation.radioButton input:checked:before { + left: 27%; + top: 24%; +} + +.annotationLayer .buttonWidgetAnnotation.checkBox input:checked:before, .annotationLayer .buttonWidgetAnnotation.checkBox input:checked:after { + left: 50%; +} + .pushButton { display: none; } From 500ecbadb691a8d944ce689f9b68c5e5f7f3b918 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 21 Apr 2023 14:32:04 +0200 Subject: [PATCH 6/8] form css --- src/main/resources/static/css/app.css | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/resources/static/css/app.css b/src/main/resources/static/css/app.css index 8b0a4e660..617d43bb6 100644 --- a/src/main/resources/static/css/app.css +++ b/src/main/resources/static/css/app.css @@ -1112,7 +1112,7 @@ height: 100%; } input:placeholder-shown.required-field { - background-color: rgba(255, 0, 21, 0.13) !important; + background-color: rgba(255, 0, 0, 0.2) !important; } input[type="checkbox"] { @@ -1120,7 +1120,7 @@ input[type="checkbox"] { } input[type="checkbox"]:not(:checked).required-field { - background-color: rgba(255, 0, 21, 0.13) !important; + background-color: rgba(255, 0, 0, 0.2) !important; border: 1px solid black; } @@ -1129,12 +1129,12 @@ input[type="radio"] { } input[type="radio"]:not(:checked).required-field { - background-color: rgba(255, 0, 21, 0.13) !important; + background-color: rgba(255, 0, 0, 0.2) !important; border: 1px solid black; } textarea:placeholder-shown.required-field { - background-color: rgba(255, 0, 21, 0.13) !important; + background-color: rgba(255, 0, 0, 0.2) !important; } .disabled-field { @@ -1562,12 +1562,19 @@ textarea:placeholder-shown.required-field { } .annotationLayer .buttonWidgetAnnotation.radioButton input:checked:before { - left: 27%; - top: 24%; + left: 25%; + top: 25%; + border: 1px solid black; } .annotationLayer .buttonWidgetAnnotation.checkBox input:checked:before, .annotationLayer .buttonWidgetAnnotation.checkBox input:checked:after { - left: 50%; + left: 45%; + top: 10%; + border: 1px solid black; +} + +.annotationLayer .buttonWidgetAnnotation.checkBox input, .annotationLayer .buttonWidgetAnnotation.radioButton input { + appearance: initial; } .pushButton { From 8296fa4480a9891292ac3d642ef50377b71a875b Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Tue, 2 May 2023 08:51:28 +0200 Subject: [PATCH 7/8] fix always required fields --- src/main/resources/static/js/modules/utils/PdfViewer.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/static/js/modules/utils/PdfViewer.js b/src/main/resources/static/js/modules/utils/PdfViewer.js index 90d7f0176..4fc02aa5b 100644 --- a/src/main/resources/static/js/modules/utils/PdfViewer.js +++ b/src/main/resources/static/js/modules/utils/PdfViewer.js @@ -627,6 +627,8 @@ export class PdfViewer extends EventFactory { enableInputField(inputField, dataField) { inputField.prop('disabled', false); inputField.removeClass('disabled-field disable-selection'); + inputField.prop('required', false); + inputField.removeClass('required-field'); if (dataField.required) { inputField.prop('required', true); inputField.addClass('required-field'); From 2f9699cc4e28beb4fa0e2e206f17d37cb887eb98 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Tue, 2 May 2023 11:10:18 +0200 Subject: [PATCH 8/8] 1.27.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f68a18c7..71d8e4bed 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.esupportail esup-signature - 1.24.7 + 1.24.8 esup-signature org.esupportail.esupsignature.EsupSignatureApplication