Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
1011325 - Custom form layout - don't put whitespace between html elem…
Browse files Browse the repository at this point in the history 
…ents
  • Loading branch information
@nmirasch
nmirasch committed Oct 1, 2013
1 parent 2410bd4 commit e0c13b2
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 24 deletions.
2 changes: 1 addition & 1 deletion ...ditor/src/main/java/org/jbpm/formModeler/components/editor/FormFieldEditionFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ protected void renderFieldUsingForm(Field field, Form formToEdit) throws Excepti
setAttribute("isDecorator", isDecorator);
renderFragment("outputStart");
setAttribute("namespace", getParameter("namespace"));
setAttribute("formId", formToEdit.getId());
setAttribute("form", formToEdit);
setAttribute("editClass", Field.class.getName());
setAttribute("editId", field.getId());
FieldType type = field.getFieldType();
Expand Down
36 changes: 22 additions & 14 deletions ...-form-editor/src/main/java/org/jbpm/formModeler/components/editor/FormTemplateEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,52 +16,61 @@
package org.jbpm.formModeler.components.editor;

import org.slf4j.Logger;
import org.jbpm.formModeler.core.FormCoreServices;
import org.jbpm.formModeler.service.bb.mvc.components.handling.BeanHandler;
import org.jbpm.formModeler.service.bb.mvc.controller.CommandRequest;
import org.jbpm.formModeler.api.model.Form;
import org.slf4j.LoggerFactory;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.enterprise.context.SessionScoped;
import javax.inject.Named;

//@SessionScoped
@ApplicationScoped
@SessionScoped
//@ApplicationScoped
@Named("FormTemplateEditor")
public class FormTemplateEditor extends BeanHandler {

private Logger log = LoggerFactory.getLogger(FormTemplateEditor.class);

private Long formId;

private String templateContent;
private boolean cancel;
private boolean persist;
private boolean loadTemplate;
private String templateToLoad;
private String genMode;

private boolean showTemplate = false;
WysiwygFormEditor wysiwygFormEditor= WysiwygFormEditor.lookup();

public boolean isOn() {
return formId != null;
return showTemplate;
}

public Long getFormId() {
return formId;
public void setShowTemplate(boolean showTemplate) {
this.showTemplate = showTemplate;
}

public Long getFormId() throws Exception{
return getForm().getId();
}

public void setFormId(Long formId) {
this.formId = formId;
if (formId != null) {
try {
setTemplateContent(getForm().getFormTemplate());
} catch (Exception e) {
log.error("Error: ", e);
}
this.showTemplate =true;
}
else{
this.showTemplate =false;
}
}

public Form getForm() throws Exception {
return FormCoreServices.lookup().getFormManager().getFormById(formId);
return wysiwygFormEditor.getCurrentForm();
}

public String getTemplateContent() {
Expand Down Expand Up @@ -121,13 +130,12 @@ public boolean containsLabel(String fieldName) {
}

public void actionSaveTemplate(CommandRequest request) throws Exception {
if (isCancel()) {
setFormId(null);
} else {
if (!isCancel()) {
if (isPersist()) {
FormCoreServices.lookup().getFormManager().saveTemplateForForm(getFormId(), getTemplateContent());
wysiwygFormEditor.getCurrentForm().setFormTemplate(getTemplateContent());
setFormId(null);
}
}
setShowTemplate(false);
}
}
1 change: 1 addition & 0 deletions ...rc/main/java/org/jbpm/formModeler/components/editor/WysiwygEditFormTemplateFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public void service(HttpServletRequest httpServletRequest, HttpServletResponse h
setAttribute("loadTemplate", Boolean.valueOf(templateEditor.isLoadTemplate()));
setAttribute("genMode", templateEditor.getGenMode());
setAttribute("formId", templateEditor.getFormId());
setAttribute("form", templateEditor.getForm());
renderFragment("output");
}catch (Exception e){
log.error("Something unexpected has happened editing Form template", e);
Expand Down
3 changes: 2 additions & 1 deletion ...r-form-editor/src/main/java/org/jbpm/formModeler/components/editor/WysiwygFormEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,8 @@ public void actionSaveTemplate(CommandRequest request) throws Exception {
if (getFormTemplateEditor().isCancel()) {
getFormTemplateEditor().setFormId(null);
} else {
FormCoreServices.lookup().getFormManager().saveTemplateForForm(getFormTemplateEditor().getFormId(), getFormTemplateEditor().getTemplateContent());
getCurrentForm().setFormTemplate(getFormTemplateEditor().getTemplateContent());
//FormCoreServices.lookup().getFormManager().saveTemplateForForm(getFormTemplateEditor().getFormId(), getFormTemplateEditor().getTemplateContent());
}
if(loadTemplate!=null && Boolean.valueOf(loadTemplate).booleanValue()){
getFormTemplateEditor().setLoadTemplate(true);
Expand Down
4 changes: 2 additions & 2 deletions ...orm-editor/src/main/webapp/formModeler/components/WysiwygFormEdit/editFieldProperties.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@
</mvc:fragment>
<%------------------------------------------------------------------------------------------------------------%>
<mvc:fragment name="fieldCustomForm">
<mvc:fragmentValue name="formId" id="formId">
<mvc:fragmentValue name="form" id="form">
<mvc:fragmentValue name="namespace" id="formNamespace">
<mvc:fragmentValue name="editClass" id="editClass">
<mvc:fragmentValue name="editId" id="editId">
<mvc:fragmentValue name="fieldType" id="fieldType">

<mvc:formatter name="FormRenderingFormatter">
<mvc:formatterParam name="formId" value="<%=formId%>"/>
<mvc:formatterParam name="form" value="<%=form%>"/>
<mvc:formatterParam name="namespace" value="<%=formNamespace%>"/>
<mvc:formatterParam name="editId" value="<%=editId%>"/>
<mvc:formatterParam name="editClass" value="<%=editClass%>"/>
Expand Down
8 changes: 5 additions & 3 deletions ...m-editor/src/main/webapp/formModeler/components/WysiwygFormEdit/menu/editFormTemplate.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<mvc:fragmentValue name="templateContent" id="templateContent">
<mvc:fragmentValue name="templateToLoad" id="templateToLoad">
<mvc:fragmentValue name="formId" id="formId">
<mvc:fragmentValue name="form" id="form">
<mvc:fragmentValue name="loadTemplate" id="loadTemplate">
<mvc:fragmentValue name="genMode" id="genMode">

Expand Down Expand Up @@ -183,7 +184,7 @@
name="templateContent"
rows="4" cols="50"><% if (Boolean.TRUE.equals(loadTemplate)) {%>
<mvc:formatter name="FormRenderingFormatter">
<mvc:formatterParam name="formId" value="<%=formId%>"/>
<mvc:formatterParam name="form" value="<%=form%>"/>
<mvc:formatterParam name="renderMode"
value="<%=Form.RENDER_MODE_TEMPLATE_EDIT%>"/>
<mvc:formatterParam name="displayMode"
Expand Down Expand Up @@ -228,7 +229,7 @@
onmouseover="if(window.formTemplateEditorHandler && this.length == 1)window.formTemplateEditorHandler.evalAvailableFields(window.formTemplateEditorHandler.fieldOptionsArray, this );"
onmouseout="if(window.formTemplateEditorHandler)window.formTemplateEditorHandler.fieldsSynchronized=false"
>
<option>-- <i18n:message key="chooseField">!!!Escoger campo</i18n:message> --
<option>-- <i18n:message key="chooseField">!!!choose field</i18n:message> --
</option>
</select>
</td>
Expand All @@ -244,7 +245,7 @@
onmouseover="if(window.formTemplateEditorHandler && this.length == 1)window.formTemplateEditorHandler.evalAvailableFields(window.formTemplateEditorHandler.labelOptionsArray, this);"
onmouseout="if(window.formTemplateEditorHandler)window.formTemplateEditorHandler.labelsSynchronized=false"
>
<option>-- <i18n:message key="chooseField">!!!Escoger campo</i18n:message> --
<option>-- <i18n:message key="chooseField">!!!choose field</i18n:message> --
</option>
</select>

Expand Down Expand Up @@ -325,6 +326,7 @@
</mvc:fragmentValue>
</mvc:fragmentValue>
</mvc:fragmentValue>
</mvc:fragmentValue>

</mvc:fragment>
</mvc:formatter>
6 changes: 3 additions & 3 deletions .../main/java/org/jbpm/formModeler/core/processing/formRendering/FormRenderingFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ public FieldHandlersManager getFieldHandlersManager() {

public void service(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws FormatterException {
Object formObject = getParameter("form");

if (formObject != null) formToPaint = (Form) formObject;
else {
Object formIdObject = getParameter("formId");
Long formId = Long.decode(String.valueOf(formIdObject));
formToPaint = getFormManager().getFormById(formId);
log.error("Form not found");
return;
}

renderMode = (String) getParameter("renderMode"); //Default is form
Expand Down

0 comments on commit e0c13b2

Please sign in to comment.