minor form updates (Issue #35)

Author: rsoika

src/main/java/org/imixs/application/model/ModelController.java

@@ -48,6 +48,7 @@
 import org.imixs.workflow.engine.ModelService;
 import org.imixs.workflow.engine.WorkflowService;
 import org.imixs.workflow.exceptions.AccessDeniedException;
+import org.imixs.workflow.exceptions.InvalidAccessException;
 import org.imixs.workflow.exceptions.ModelException;
 import org.imixs.workflow.exceptions.PluginException;
 import org.imixs.workflow.faces.fileupload.FileUploadController;
@@ -123,8 +124,8 @@ public List<String> getGroups(String version) {
 			Set<String> groups = modelManager.findAllGroupsByModel(model);
 			// Convert the Set to a List
 			return new ArrayList<>(groups);
-		} catch (ModelException e) {
-			logger.warning("Unable to load groups:" + e.getMessage());
+		} catch (ModelException | InvalidAccessException e) {
+			logger.severe("Unable to load groups:" + e.getMessage());
 		}
 		// return empty result
 		return new ArrayList<String>();
@@ -154,8 +155,13 @@ public List<String> getWorkflowGroups() throws ModelException {
 	 * @return
 	 * @throws ModelException
 	 */
-	public String getVersionByGroup(String group) throws ModelException {
-		return modelService.findVersionByGroup(group);
+	public String getVersionByGroup(String group) {
+		try {
+			return modelService.findVersionByGroup(group);
+		} catch (ModelException e) {
+			logger.severe(e.getMessage());
+		}
+		return null;
 	}
 
 	/**
@@ -174,7 +180,7 @@ public List<ItemCollection> findAllTasksByGroup(String group) {
 			BPMNModel model = modelManager.getModel(version);
 			result = modelManager.findTasks(model, group);
 		} catch (ModelException e) {
-			logger.warning("Failed to call findAllTasksByGroup for '" + group + "'");
+			logger.severe("Failed to call findAllTasksByGroup for '" + group + "'");
 		}
 
 		return result;
@@ -231,8 +237,14 @@ public List<String> getVersions() {
 	 * @return
 	 * @throws ModelException
 	 */
-	public ItemCollection getModelEntity(String version) throws ModelException {
-		return modelService.loadModelMetaData(version);
+	public ItemCollection getModelEntity(String version) {
+		try {
+			return modelService.loadModelMetaData(version);
+		} catch (ModelException e) {
+			logger.severe(
+					"Failed to find model version '" + version + "' : " + e.getMessage());
+		}
+		return null;
 	}
 
 	/**
@@ -272,7 +284,7 @@ public void doUploadModel(ActionEvent event)
 					model = BPMNModelFactory.read(inputStream);
 					modelService.saveModel(model);
 					continue;
-				} catch (BPMNModelException e) {
+				} catch (BPMNModelException | InvalidAccessException e) {
 					throw new ModelException(ModelException.INVALID_MODEL,
 							"Unable to read model file: " + file.getName(), e);
 				}
@@ -311,7 +323,7 @@ public ItemCollection getProcessEntity(int processid, String modelversion) {
 		try {
 			BPMNModel model = modelManager.getModel(modelversion);
 			return modelManager.findTaskByID(model, processid);
-		} catch (ModelException e) {
+		} catch (ModelException | InvalidAccessException e) {
 			logger.warning("Unable to load task " + processid + " in model version '" + modelversion + "' - "
 					+ e.getMessage());
 		}
@@ -332,7 +344,7 @@ public String getProcessDescription(int processid, String modelversion, ItemColl
 		try {
 			BPMNModel model = modelManager.getModel(modelversion);
 			pe = modelManager.findTaskByID(model, processid);
-		} catch (ModelException e1) {
+		} catch (ModelException | InvalidAccessException e1) {
 			logger.warning("Unable to load task " + processid + " in model version '" + modelversion + "' - "
 					+ e1.getMessage());
 		}

src/main/java/org/imixs/application/ui/form/CustomFormController.java

@@ -97,6 +97,7 @@ public class CustomFormController implements Serializable {
     private ModelManager modelManager = null;
     private List<CustomFormSection> sections;
     private String supportedExpressions = "";
+    private String errorMessage = "";
 
     @Inject
     WorkflowService workflowService;
@@ -121,6 +122,14 @@ public List<CustomFormSection> getSections() {
         return sections;
     }
 
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String error) {
+        this.errorMessage = error;
+    }
+
     /**
      * WorkflowEvent listener to update the current FormDefinition.
      * 
@@ -200,7 +209,10 @@ public void computeFieldDefinition(ItemCollection workitem) throws ModelExceptio
                     sections = parseSectionList(rootElement, false, workitem);
                 }
             } catch (ParserConfigurationException | SAXException | IOException e) {
-                logger.warning("Unable to parse custom form definition: " + e.getMessage());
+                errorMessage = "Invalid form definition! - Model=" + workitem.getModelVersion()
+                        + " TaskID=" + workitem.getTaskID() + " Error="
+                        + e.getMessage();
+                logger.warning(errorMessage);
                 return;
             }
 
@@ -209,8 +221,8 @@ public void computeFieldDefinition(ItemCollection workitem) throws ModelExceptio
     }
 
     /**
-     * This method overwrite the 'readOnly' status flag for all sections.
-     * Note: sections can be embedded in optional subForms.
+     * This method overwrite the 'readOnly' status flag for all sections. Note:
+     * sections can be embedded in optional subForms.
      * 
      * @param readOnly
      */
@@ -238,8 +250,8 @@ public void setReadOnly(boolean readOnly) {
     }
 
     /**
-     * This helper method pareses a parent-node for 'imixs-form-section'
-     * tags and returns a list of CustomFormSections
+     * This helper method pareses a parent-node for 'imixs-form-section' tags and
+     * returns a list of CustomFormSections
      * 
      * @param parentNode - the parent node to be parsed
      * @param readOnly   - if true, all items will become readonly independent from
@@ -272,7 +284,8 @@ private List<CustomFormSection> parseSectionList(Element parentNode, boolean rea
                         eSectionElement.getAttribute("label"),
                         eSectionElement.getAttribute("columns"),
                         eSectionElement.getAttribute("path"),
-                        defaultReadOnly);
+                        defaultReadOnly,
+                        eSectionElement.getAttribute("options"));
                 customSection.setItems(findItems(eSectionElement,
                         customSection.getColumns(), defaultReadOnly, workitem));
                 result.add(customSection);
@@ -428,7 +441,7 @@ private boolean evaluateBoolean(String expression) throws ModelException {
             } else {
                 throw new ModelException(ModelException.INVALID_MODEL_ENTRY,
                         "The custom-form expression is not allowed: "
-                                + expression);
+                                + expression + " - expression missing in 'customform.expressions' ");
             }
 
         } else {
@@ -484,8 +497,8 @@ private InputStream getFileFromResourceAsStream(String fileName) {
     /**
      * This method updates the custom Field Definition based on a given workitem.
      * The method first looks if the task associated with the workitem contains a
-     * bpmn:DataObject containing a custom definition.
-     * The result is stored into the item <code>txtWorkflowEditorCustomForm</code>.
+     * bpmn:DataObject containing a custom definition. The result is stored into the
+     * item <code>txtWorkflowEditorCustomForm</code>.
      * <p>
      * In case the model does not provide a custom Field Definition but the workitem
      * has stored one the method returns the existing one and did not update the
@@ -508,25 +521,28 @@ public String updateCustomFieldDefinition(ItemCollection workitem)
 
     /**
      * Helper method that reads a form definition from an optional
-     * <code>bpmn:DataObject</code> associated with the current task element.
-     * A <code>bpmn:DataObject</code> must contain a `form-tag` containing the form
-     * definition.
-     * If not matching <code>bpmn:DataObject</code> is defined the method returns an
-     * empty
-     * string.
+     * <code>bpmn:DataObject</code> associated with the current task element. A
+     * <code>bpmn:DataObject</code> must contain a `form-tag` containing the form
+     * definition. If not matching <code>bpmn:DataObject</code> is defined the
+     * method returns an empty string.
      * 
      * @param workitem
      * @return
      */
     @SuppressWarnings("unchecked")
     private String fetchFormDefinitionFromModel(ItemCollection workitem) {
+
+        // return if no modelversion is defined
+        if (workitem == null || workitem.getModelVersion().isBlank()) {
+            return "";
+        }
         ItemCollection task;
         try {
             BPMNModel model = modelManager.getModelByWorkitem(workitem);
             task = modelManager.loadTask(workitem, model);
 
         } catch (ModelException e) {
-            logger.warning("unable to parse data object in model: " + e.getMessage());
+            logger.fine("unable to parse data object in model: " + e.getMessage());
             return "";
         }
 

src/main/java/org/imixs/application/ui/form/CustomFormSection.java

@@ -42,14 +42,16 @@ public class CustomFormSection {
 	String label;
 	String columns;
 	String path;
+	String options;
 	boolean readonly;
 	List<CustomFormItem> items;
 
-	public CustomFormSection(String label, String columns, String path, boolean readonly) {
+	public CustomFormSection(String label, String columns, String path, boolean readonly, String options) {
 		super();
 		this.label = label;
 		this.readonly = readonly;
 		this.columns = columns;
+		this.options = options;
 		if (path != null) {
 			this.path = path.trim();
 		}
@@ -95,4 +97,12 @@ public void setReadonly(boolean readonly) {
 		this.readonly = readonly;
 	}
 
+	public String getOptions() {
+		return options;
+	}
+
+	public void setOptions(String options) {
+		this.options = options;
+	}
+
 }

src/main/java/org/imixs/application/ui/form/HTML5DateConverter.java

@@ -0,0 +1,81 @@
+package org.imixs.application.ui.form;
+
+import java.io.Serializable;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.TimeZone;
+
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
+
+/**
+ * HTML5 Date Converter
+ */
+@SuppressWarnings("rawtypes")
+@FacesConverter("imixsHTML5DateConverter")
+public class HTML5DateConverter implements Converter, Serializable {
+
+    private static final String HTML5_DATE_FORMAT_PATTERN = "yyyy-MM-dd";
+    private static final String DEFAULT_TIME_ZONE = "UTC"; // Set the timezone to CET
+
+    @Override
+    public Object getAsObject(FacesContext context, UIComponent component, String value) {
+
+        if (value == null || value.trim().isEmpty()) {
+            return ""; // Convert null to empty string
+        }
+
+        try {
+            value = value.trim();
+            String pattern = HTML5_DATE_FORMAT_PATTERN;
+
+            String timezone = (String) component.getAttributes().get("org.imixs.date.timeZone");
+            if (timezone == null || timezone.isEmpty()) {
+                timezone = getTimeZoneFromBundle(context);
+            }
+            DateFormat dateFormat = new SimpleDateFormat(pattern);
+            dateFormat.setTimeZone(TimeZone.getTimeZone(timezone));
+            return dateFormat.parse(value);
+        } catch (ParseException e) {
+            throw new RuntimeException("Error converting date", e);
+        }
+    }
+
+    @Override
+    public String getAsString(FacesContext context, UIComponent component, Object value) {
+        if (value == null || "".equals(value)) {
+            return ""; // Convert null to empty string
+        }
+
+        if (value instanceof Date) {
+            String pattern = HTML5_DATE_FORMAT_PATTERN;
+            String timezone = (String) component.getAttributes().get("org.imixs.date.timeZone");
+            if (timezone == null || timezone.isEmpty()) {
+                timezone = getTimeZoneFromBundle(context);
+            }
+
+            DateFormat dateFormat = new SimpleDateFormat(pattern);
+            dateFormat.setTimeZone(TimeZone.getTimeZone(timezone));
+            return dateFormat.format((Date) value);
+        }
+        return value.toString();
+    }
+
+    private String getTimeZoneFromBundle(FacesContext context) {
+        // Load the timezone from the message bundle
+        ResourceBundle bundle = context.getApplication()
+                .getResourceBundle(context, "message");
+
+        try {
+            return bundle.getString("timeZone");
+        } catch (MissingResourceException e) {
+            return DEFAULT_TIME_ZONE; // fallback to UTC
+        }
+    }
+}