Merge pull request #297 from EsupPortail/test

Test
EsupPortail · May 2, 2023 · 5da65fc · 5da65fc
2 parents 173341f + 7c9e256
commit 5da65fc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,12 +7,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.10</version>
+		<version>2.7.11</version>
 		<relativePath/>
 	</parent>
 	<groupId>org.esupportail</groupId>
 	<artifactId>esup-signature</artifactId>
-	<version>1.24.6</version>
+	<version>1.24.8</version>
 	<name>esup-signature</name>
 	<properties>
 		<start-class>org.esupportail.esupsignature.EsupSignatureApplication</start-class>
@@ -172,7 +172,7 @@
 		<dependency>
 			<groupId>org.webjars.npm</groupId>
 			<artifactId>pdfjs-dist</artifactId>
-			<version>3.3.122</version>
+			<version>3.5.141</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars.npm</groupId>

diff --git a/src/main/resources/static/css/app.css b/src/main/resources/static/css/app.css
@@ -1112,15 +1112,15 @@ 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"] {
     cursor: pointer !important;
 }
 
 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 {
@@ -1561,6 +1561,22 @@ textarea:placeholder-shown.required-field {
     font-size: 14px !important;
 }
 
+.annotationLayer .buttonWidgetAnnotation.radioButton input:checked:before {
+    left: 25%;
+    top: 25%;
+    border: 1px solid black;
+}
+
+.annotationLayer .buttonWidgetAnnotation.checkBox input:checked:before, .annotationLayer .buttonWidgetAnnotation.checkBox input:checked:after {
+    left: 45%;
+    top: 10%;
+    border: 1px solid black;
+}
+
+.annotationLayer .buttonWidgetAnnotation.checkBox input, .annotationLayer .buttonWidgetAnnotation.radioButton input {
+    appearance: initial;
+}
+
 .pushButton {
     display: none;
 }

diff --git 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');