JBPM-10077 Field with LocalDateTime is forcing to enter value even th…

…ough its not marked mandatory
kiegroup · May 13, 2022 · 2df8972 · 2df8972
1 parent 0110963
commit 2df8972
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/...pm-ui/src/main/java/org/kie/server/services/jbpm/ui/form/render/AbstractFormRenderer.java b/...pm-ui/src/main/java/org/kie/server/services/jbpm/ui/form/render/AbstractFormRenderer.java
@@ -183,7 +183,6 @@ public String renderCase(String containerId, CaseDefinition caseDefinition, Form
         return finalOutput;
     }
 
-
     public String renderProcess(String containerId, ProcessDefinition processDesc, FormInstance form) {
 
         List<String> scriptDataList = new ArrayList<>();        
@@ -784,11 +783,9 @@ protected String appendExtractionExpression(String type, String name, String id,
                         .append("')")
                         .append(getExtractionValue(jsType));
             } else {
-                jsonTemplate.append("document.getElementById('")
+                jsonTemplate.append("getLocalDateWithoutTime('")
                         .append(id)
-                        .append("') ")
-                        .append(getExtractionValue(jsType))
-                        .append(" + 'T00:00'");
+                        .append("') ");
             }
         } else {
             jsonTemplate.append("document.getElementById('")

diff --git a/...m-ui/src/main/resources/form-templates-providers/bootstrap/input-form-group-template.html b/...m-ui/src/main/resources/form-templates-providers/bootstrap/input-form-group-template.html
@@ -69,9 +69,9 @@
 	<strong style="color: red">*</strong>
 	</#if>
 	<#if item.showTime >
-		<input id="${item.id}" name="${item.name}" type="datetime-local" class="form-control" value="${item.value}" ${(item.required)?string('required', '')} pattern="${item.pattern}"/>
+		<input id="${item.id}" name="${item.name}" type="datetime-local" class="form-control" value="${item.value}"  ${(item.required)?string('required', '')} ${(item.readOnly)?string('disabled', '')} />
 	<#elseif  !item.showTime >
-		<input id="${item.id}" name="${item.name}" type="date" class="form-control" value="${item.value}" ${(item.required)?string('required', '')} pattern="${item.pattern}"/>
+		<input id="${item.id}" name="${item.name}" type="date" class="form-control" value="${item.value}" ${(item.required)?string('required', '')} ${(item.readOnly)?string('disabled', '')} />
 	</#if>
 </div>
 <#elseif item.type == "slider">

diff --git a/...ie-server-services-jbpm-ui/src/main/resources/form-templates-providers/js/kieserver-ui.js b/...ie-server-services-jbpm-ui/src/main/resources/form-templates-providers/js/kieserver-ui.js
@@ -556,3 +556,11 @@ function closeCreationForm(fieldId) {
 	currentRow = null;
 }
 
+function getLocalDateWithoutTime(elementId) {
+	console.log('LocalDateWithoutTime Element =' + document.getElementById(elementId).value);
+	if (document.getElementById(elementId).value === '') {
+		return document.getElementById(elementId).value;
+	} else {
+		return document.getElementById(elementId).value + 'T00:00';
+	}
+}
diff --git a/...-ui/src/main/resources/form-templates-providers/patternfly/input-form-group-template.html b/...-ui/src/main/resources/form-templates-providers/patternfly/input-form-group-template.html
@@ -68,9 +68,9 @@
 		<strong style="color: red">*</strong>
 	</#if>
 	<#if item.showTime >
-		<input id="${item.id}" name="${item.name}" type="datetime-local" class="form-control" value="${item.value}" ${(item.required)?string('required', '')} pattern="${item.pattern}"/>
+		<input id="${item.id}" name="${item.name}" type="datetime-local" class="form-control" value="${item.value}" ${(item.required)?string('required', '')} ${(item.readOnly)?string('disabled', '')}/>
 	<#elseif  !item.showTime >
-	<input id="${item.id}" name="${item.name}" type="date" class="form-control" value="${item.value}" ${(item.required)?string('required', '')} pattern="${item.pattern}"/>
+	<input id="${item.id}" name="${item.name}" type="date" class="form-control" value="${item.value}" ${(item.required)?string('required', '')} ${(item.readOnly)?string('disabled', '')}/>
 	</#if>
 </div>
 <#elseif item.type == "documentCollection">

diff --git a/.../src/test/java/org/kie/server/services/jbpm/ui/form/render/BootstrapFormRendererTest.java b/.../src/test/java/org/kie/server/services/jbpm/ui/form/render/BootstrapFormRendererTest.java
@@ -34,8 +34,8 @@ public void testProcessFormRendererWithDate() {
 
         BootstrapFormRenderer bootstrapFormRenderer = new BootstrapFormRenderer();
         String outString = bootstrapFormRenderer.renderProcess("test-containerId", processAssetDesc, form);
-        assertThat(outString).contains("'dateBirth' : String(document.getElementById('field_1703386699666296E12') .value + 'T00:00')");
-        assertThat(outString).contains("<input id=\"field_1703386699666296E12\" name=\"dateBirth\" type=\"date\" class=\"form-control\" value=\"\"  pattern=\"(\\d+)(-|\\/)(\\d+)(?:-|\\/)(?:(\\d+)\\s+(\\d+):(\\d+)(?::(\\d+))?(?:\\.(\\d+))?)?\"/>");
+        assertThat(outString).contains("'dateBirth' : String(getLocalDateWithoutTime('field_1703386699666296E12') )");
+        assertThat(outString).contains("<input id=\"field_1703386699666296E12\" name=\"dateBirth\" type=\"date\" class=\"form-control\" value=");
     }
 
     @Test
@@ -49,7 +49,7 @@ public void testProcessFormRendererWithDateTime() {
         BootstrapFormRenderer bootstrapFormRenderer = new BootstrapFormRenderer();
         String outString = bootstrapFormRenderer.renderProcess("test-containerId", processAssetDesc, form);
 
-        assertThat(outString).contains("'dateBirth' : String(document.getElementById('field_1703386699666296E12').value");
-        assertThat(outString).contains("<input id=\"field_1703386699666296E12\" name=\"dateBirth\" type=\"datetime-local\" class=\"form-control\" value=\"\"  pattern=\"(\\d+)(-|\\/)(\\d+)(?:-|\\/)(?:(\\d+)\\s+(\\d+):(\\d+)(?::(\\d+))?(?:\\.(\\d+))?)?\"/>");
+        assertThat(outString).contains("'dateBirth' : String(document.getElementById('field_1703386699666296E12').value)");
+        assertThat(outString).contains("<input id=\"field_1703386699666296E12\" name=\"dateBirth\" type=\"datetime-local\" class=\"form-control\" value=");
     }
 }