Skip to content
Snippets Groups Projects
Commit 81817f53 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3369 set static formName, cleanup remove unused fields

parent 1bd4ac42
No related branches found
No related tags found
No related merge requests found
run.sh 0 → 100755
mvn package fc-server:run-ms-war
package de.ozgcloud.formcycle.logic; package de.ozgcloud.formcycle.logic;
import java.time.ZonedDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.joda.time.LocalDateTime;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData; import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormHeader; import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormHeader;
import de.itvsh.ozg.pluto.vorgang.GrpcFormData; import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
...@@ -53,7 +52,8 @@ public class OzgCloudFormDataConverter { ...@@ -53,7 +52,8 @@ public class OzgCloudFormDataConverter {
private FormCycleFormHeader buildHeader(Map<String, List<String[]>> formData) { private FormCycleFormHeader buildHeader(Map<String, List<String[]>> formData) {
return FormCycleFormHeader.newBuilder() return FormCycleFormHeader.newBuilder()
.setReceivedAt(LocalDateTime.now().toString()) .setReceivedAt(ZonedDateTime.now().toString())
.setFormName("FormCycle Formular")
.build(); .build();
} }
} }
\ No newline at end of file
package de.ozgcloud.formcycle.model; package de.ozgcloud.formcycle.model;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import de.xima.fc.annotations.Placeholder; import de.xima.fc.annotations.Placeholder;
import de.xima.fc.workflow.model.nodes.MultiFile;
import de.xima.fc.workflow.taglib.model.BaseActionProps; import de.xima.fc.workflow.taglib.model.BaseActionProps;
import de.xima.fc.workflow.validation.constraints.MultiFileSize;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -36,10 +33,4 @@ public final class WorkflowElementNodeProps extends BaseActionProps { ...@@ -36,10 +33,4 @@ public final class WorkflowElementNodeProps extends BaseActionProps {
@NotEmpty @NotEmpty
@Size(max = 100) @Size(max = 100)
private String eingangsAdapterUrl = "https://fc-kommune.by.kop-cloud.de"; private String eingangsAdapterUrl = "https://fc-kommune.by.kop-cloud.de";
// A reference to one or more files the user can select.
@Valid
@MultiFileSize(min = 1, payload = MultiFile.resources.class, message = MultiFileSize.MESSAGE_MIN_ONLY)
private MultiFile files = new MultiFile();
} }
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
</p:fieldset> </p:fieldset>
<xi:multiFile id="files" required="true" value="#{model.files}"
legend="#{msg['WorkflowElementNode.files']}" />
</xi:namingContainer> </xi:namingContainer>
</ui:composition> </ui:composition>
...@@ -16,19 +16,5 @@ ...@@ -16,19 +16,5 @@
<xi:newWorkflowActionBase id="base" value="#{model}" <xi:newWorkflowActionBase id="base" value="#{model}"
legend="#{msg['WorkflowElementTrigger.name']}" /> legend="#{msg['WorkflowElementTrigger.name']}" />
<p:fieldset
legend="#{msg['WorkflowElementTriggerProps.section_settings']}"
styleClass="fc-fieldset">
<xi:inputText id="type" value="#{model.type}"
forceIndicateRequired="true" maxlength="100"
label="#{msg['WorkflowElementTriggerProps.type']}">
<p:ajax event="change" partialSubmit="true"
listener="#{elementPropertiesBean.storeCurrent}" process="@this"
update=":flowchartForm:flowchart" global="false" />
</xi:inputText>
</p:fieldset>
</xi:namingContainer> </xi:namingContainer>
</ui:composition> </ui:composition>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment