RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapted UnitTypeCRUDController in order to extend BaseCRUDController

Browse source 
FEA: ItEr75S14ShowInformationEditedEntity
This commit is contained in:
Cristina Alvarino 2011-07-19 13:03:34 +02:00 • committed by Manuel Rego Casasnovas
parent 2c11a51dae
commit a3841d40f4
4 changed files with 55 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/UnitType.java
View file

@ -24,6 +24,7 @@ package org.navalplanner.business.materials.entities;
import org.apache.commons.lang.StringUtils;
import org.hibernate.validator.AssertTrue;
import org.hibernate.validator.NotEmpty;
import org.navalplanner.business.common.IHumanIdentifiable;
import org.navalplanner.business.common.IntegrationEntity;
import org.navalplanner.business.common.Registry;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
@ -35,7 +36,7 @@ import org.navalplanner.business.materials.daos.IUnitTypeDAO;
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
* @author Javier Moran Rua <jmoran@ialia.com>
*/
public class UnitType extends IntegrationEntity{
public class UnitType extends IntegrationEntity implements IHumanIdentifiable {
public static UnitType create(String code, String measure) {
UnitType unitType = new UnitType(measure);
@ -116,4 +117,9 @@ public class UnitType extends IntegrationEntity{
protected IUnitTypeDAO getIntegrationEntityDAO() {
return Registry.getUnitTypeDAO();
}
@Override
public String getHumanId() {
return measure;
}
}

169
navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
View file

@ -27,12 +27,11 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.LogFactory;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.materials.entities.UnitType;
import org.navalplanner.web.common.IMessagesForUser;
import org.navalplanner.web.common.BaseCRUDController;
import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.MessagesForUser;
import org.navalplanner.web.common.OnlyOneVisible;
import org.navalplanner.web.common.Util;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
@ -40,53 +39,27 @@ import org.zkoss.zk.ui.event.CheckEvent;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Constraint;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Label;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Row;
import org.zkoss.zul.RowRenderer;
import org.zkoss.zul.Textbox;
import org.zkoss.zul.api.Window;
import org.zkoss.zul.impl.InputElement;
/**
*
* Controller for the listing and editing unit types
*
* @author Javier Moran Rua <jmoran@igalia.com>
* @author Cristina Alvarino Perez <cristina.alvarino@comtecsf.es>
*/
public class UnitTypeController extends GenericForwardComposer {
public class UnitTypeController extends BaseCRUDController<UnitType> {
private static final org.apache.commons.logging.Log LOG = LogFactory
.getLog(UnitTypeController.class);
private Component messagesContainer;
private IMessagesForUser messagesForUser;
private OnlyOneVisible visibility;
private Component listWindow;
private Window editWindow;
private IUnitTypeModel unitTypeModel;
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
messagesForUser = new MessagesForUser(messagesContainer);
comp.setVariable("controller", this, true);
getVisibility().showOnly(listWindow);
}
private OnlyOneVisible getVisibility() {
if (visibility == null) {
visibility = new OnlyOneVisible(listWindow,editWindow);
}
return visibility;
}
public List<UnitType> getUnitTypes() {
return unitTypeModel.getUnitTypes();
}
@ -103,7 +76,7 @@ public class UnitTypeController extends GenericForwardComposer {
row.addEventListener(Events.ON_CLICK, new EventListener() {
@Override
public void onEvent(Event event) {
goToEditFormInEditionMode(unitType);
goToEditForm(unitType);
}
});
}
@ -119,7 +92,7 @@ public class UnitTypeController extends GenericForwardComposer {
@Override
public void onEvent(Event event) {
goToEditFormInEditionMode(unitType);
goToEditForm(unitType);
}
}));
@ -127,7 +100,7 @@ public class UnitTypeController extends GenericForwardComposer {
@Override
public void onEvent(Event event) {
confirmRemove(unitType);
confirmDelete(unitType);
}
}));
@ -136,46 +109,6 @@ public class UnitTypeController extends GenericForwardComposer {
};
}
private void confirmRemove(UnitType unitType) {
try {
int status = Messagebox.show(_("Confirm deleting {0}. Are you sure?", unitType.getMeasure()),
"Delete", Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION);
if (Messagebox.OK == status) {
removeUnitType(unitType);
}
} catch (InterruptedException e) {
LOG.error("Error showing confirming message box",e);
throw new RuntimeException();
}
}
private void removeUnitType(UnitType unitType) {
if (unitTypeModel.isUnitTypeUsedInAnyMaterial(unitType)) {
messagesForUser.showMessage(Level.ERROR, _("Unit {0} cannot be " +
" removed because it is used in materials",
unitType.getMeasure()));
} else {
unitTypeModel.remove(unitType);
Util.reloadBindings(listWindow);
messagesForUser.showMessage(Level.INFO, _("Deleted unit type {0}",
unitType.getMeasure()));
}
}
public void goToEditFormInCreationMode() {
unitTypeModel.initCreate();
editWindow.setTitle(_("Create Unit Type"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
}
private void goToEditFormInEditionMode(UnitType unitType) {
unitTypeModel.initEdit(unitType);
editWindow.setTitle(_("Edit Unit Type"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
}
public UnitType getUnitType() {
return unitTypeModel.getCurrentUnitType();
}
@ -222,58 +155,10 @@ public class UnitTypeController extends GenericForwardComposer {
};
}
public void saveAndExit() {
if (save()) {
goToList();
}
}
public void saveAndContinue() {
if (save()) {
goToEditFormInEditionMode(getUnitType());
}
}
public void cancel() {
goToList();
}
private boolean save() {
try {
validateAll();
unitTypeModel.confirmSave();
messagesForUser.showMessage(Level.INFO, _("Unit type saved"));
return true;
} catch (ValidationException e) {
messagesForUser.showInvalidValues(e);
return false;
}
}
private void validateAll() {
Textbox codeTextBox = (Textbox) editWindow.
getFellowIfAny("codeTextBox");
validate(codeTextBox,codeTextBox.getValue());
Textbox measureTextBox = (Textbox) editWindow.
getFellowIfAny("measureTextBox");
validate(measureTextBox,measureTextBox.getValue());
}
/**
* Validates {@link Textbox} checking {@link Constraint}
* @param comp
*/
private void validate(InputElement comp, Object value) {
if (comp != null && comp.getConstraint() != null && !comp.isDisabled()) {
final Constraint constraint = comp.getConstraint();
constraint.validate(comp, value);
}
}
private void goToList() {
Util.reloadBindings(listWindow);
getVisibility().showOnly(listWindow);
@Override
protected void save() throws ValidationException {
unitTypeModel.confirmSave();
}
public void onCheckGenerateCode(Event e) {
@ -289,4 +174,38 @@ public class UnitTypeController extends GenericForwardComposer {
Util.reloadBindings(editWindow);
}
@Override
protected String getEntityType() {
return _("Unit Type");
}
@Override
protected String getPluralEntityType() {
return _("Unit Types");
}
@Override
protected void initCreate() {
unitTypeModel.initCreate();
}
@Override
protected void initEdit(UnitType unitType) {
unitTypeModel.initEdit(unitType);
}
@Override
protected UnitType getEntityBeingEdited() {
return unitTypeModel.getCurrentUnitType();
}
@Override
protected void delete(UnitType unitType) throws InstanceNotFoundException {
unitTypeModel.remove(unitType);
}
@Override
protected boolean beforeDeleting(UnitType unitType) {
return !unitTypeModel.isUnitTypeUsedInAnyMaterial(unitType);
}
}

5
navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul
View file

@ -52,7 +52,8 @@
id="measureTextBox"
value="@{controller.unitType.measure}"
constraint="@{controller.uniqueMeasureName}"
width="300px"/>
width="300px"
onBlur="controller.updateWindowTitle()" />
</row>
</rows>
</grid>
@ -65,7 +66,7 @@
<button onClick="controller.saveAndContinue();"
label="${arg.save_and_continue_button_label}"
sclass="save-button global-action"/>
<button onClick="controller.cancel();"
<button onClick="controller.cancelForm();"
label="${arg.cancel_button_label}"
sclass="cancel-button global-action"/>
</window>

2
navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul
View file

@ -29,7 +29,7 @@
<newdatasortablecolumn label="${i18n:_('Operations')}"/>
</columns>
</newdatasortablegrid>
<button id="show_create_form" onClick="controller.goToEditFormInCreationMode();" label="${i18n:_('Create')}"
<button id="show_create_form" onClick="controller.goToCreateForm();" label="${i18n:_('Create')}"
sclass="create-button global-action">
</button>
</window>