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

[Bug #969] Substitute autocomplete box for select box in Cost

Browse source 
Categories. Hours type are now shown as a select box.

FEA: ItEr74S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-04-13 01:04:41 +02:00
parent a19e4f53e6
commit 9f61475f9a
6 changed files with 86 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java
View file

@ -53,4 +53,6 @@ public interface ITypeOfWorkHoursDAO extends
TypeOfWorkHours findUniqueByName(String name)
throws InstanceNotFoundException;
List<TypeOfWorkHours> hoursTypeByNameAsc();
}

7
navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
View file

@ -26,6 +26,7 @@ import java.util.List;
import org.apache.commons.lang.Validate;
import org.hibernate.Criteria;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.navalplanner.business.common.daos.IntegrationEntityDAO;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
@ -127,4 +128,10 @@ public class TypeOfWorkHoursDAO extends IntegrationEntityDAO<TypeOfWorkHours>
return found;
}
@Override
public List<TypeOfWorkHours> hoursTypeByNameAsc() {
return getSession().createCriteria(TypeOfWorkHours.class)
.addOrder(Order.asc("name")).list();
}
}

7
navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java
View file

@ -33,6 +33,7 @@ import org.navalplanner.business.costcategories.daos.ITypeOfWorkHoursDAO;
/**
* @author Jacobo Aragunde Perez <jaragunde@igalia.com>
* @author Diego Pino García <dpino@igalia.com>
*/
public class TypeOfWorkHours extends IntegrationEntity {
@ -139,4 +140,8 @@ public class TypeOfWorkHours extends IntegrationEntity {
}
}
}
public String toString() {
return name;
}
}

84
navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
View file

@ -43,24 +43,28 @@ 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.navalplanner.web.common.components.Autocomplete;
import org.navalplanner.web.util.ValidationExceptionPrinter;
import org.navalplanner.web.workreports.WorkReportCRUDController;
import org.zkoss.ganttz.util.ComponentsFinder;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
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.Button;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Decimalbox;
import org.zkoss.zul.Grid;
import org.zkoss.zul.ListModel;
import org.zkoss.zul.Listbox;
import org.zkoss.zul.Listitem;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Row;
import org.zkoss.zul.RowRenderer;
import org.zkoss.zul.Rows;
import org.zkoss.zul.SimpleListModel;
import org.zkoss.zul.Textbox;
import org.zkoss.zul.api.Hbox;
import org.zkoss.zul.api.Window;
@ -93,6 +97,8 @@ public class CostCategoryCRUDController extends GenericForwardComposer
private Grid listCostCategories;
private ListModel allHoursType;
private HourCostListRenderer hourCostListRenderer = new HourCostListRenderer();
@Override
@ -124,6 +130,11 @@ public class CostCategoryCRUDController extends GenericForwardComposer
}
}
});
initializeHoursType();
}
private void initializeHoursType() {
allHoursType = new SimpleListModel(costCategoryModel.getAllHoursType());
}
@Override
@ -245,41 +256,60 @@ public class CostCategoryCRUDController extends GenericForwardComposer
}
/**
* Append a Autocomplete @{link TypeOfWorkHours} to row
* Append Selectbox of @{link TypeOfWorkHours} to row
*
* @param row
*/
private void appendAutocompleteType(final Row row) {
final Autocomplete autocomplete = new Autocomplete();
autocomplete.setAutodrop(true);
autocomplete.applyProperties();
autocomplete.setFinder("TypeOfWorkHoursFinder");
autocomplete.setConstraint("no empty:" + _("A type must be selected"));
private void appendHoursType(final Row row) {
final HourCost hourCost = (HourCost) row.getValue();
final Listbox lbHoursType = new Listbox();
lbHoursType.setMold("select");
lbHoursType.setModel(allHoursType);
lbHoursType.renderAll();
lbHoursType.applyProperties();
// Getter, show type selected
if (getTypeOfWorkHours(row) != null) {
autocomplete.setSelectedItem(getTypeOfWorkHours(row));
// First time is rendered, select first item
TypeOfWorkHours type = hourCost.getType();
if (hourCost.isNewObject() && type == null) {
Listitem item = lbHoursType.getItemAtIndex(0);
item.setSelected(true);
setHoursType(hourCost, item);
} else {
// If hoursCost has a type, select item with that type
Listitem item = ComponentsFinder.findItemByValue(lbHoursType, type);
if (item != null) {
lbHoursType.selectItem(item);
}
}
// Setter, set type selected to HourCost.type
autocomplete.addEventListener("onSelect", new EventListener() {
lbHoursType.addEventListener(Events.ON_SELECT, new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
final Comboitem comboitem = autocomplete.getSelectedItem();
if(comboitem != null) {
// Update hourCost
HourCost hourCost = (HourCost) row.getValue();
hourCost.setType((TypeOfWorkHours) comboitem.getValue());
row.setValue(hourCost);
// Update the hourPrice in the hourCost
hourCost.setPriceCost(((TypeOfWorkHours) comboitem.getValue()).getDefaultPrice());
Util.reloadBindings(listHourCosts);
Listitem item = lbHoursType.getSelectedItem();
if (item != null) {
setHoursType((HourCost) row.getValue(), item);
}
}
});
row.appendChild(autocomplete);
row.appendChild(lbHoursType);
}
private void setHoursType(HourCost hourCost, Listitem item) {
TypeOfWorkHours value = item != null ? (TypeOfWorkHours) item
.getValue() : null;
hourCost.setType(value);
if (value != null) {
// Update the hourPrice in the hourCost
hourCost.setPriceCost(value.getDefaultPrice());
Util.reloadBindings(listHourCosts);
} else {
hourCost.setPriceCost(BigDecimal.ZERO);
throw new WrongValueException(item.getParent(),
_("Please, select an item"));
}
}
/**
@ -541,7 +571,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
// Create boxes
appendTextboxCode(row);
appendAutocompleteType(row);
appendHoursType(row);
appendDecimalboxCost(row);
appendDateboxInitDate(row);
appendDateboxEndDate(row);

11
navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryModel.java
View file

@ -33,8 +33,10 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.costcategories.daos.ICostCategoryDAO;
import org.navalplanner.business.costcategories.daos.IResourcesCostCategoryAssignmentDAO;
import org.navalplanner.business.costcategories.daos.ITypeOfWorkHoursDAO;
import org.navalplanner.business.costcategories.entities.CostCategory;
import org.navalplanner.business.costcategories.entities.HourCost;
import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;
import org.navalplanner.web.common.IntegrationEntityModel;
import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification;
import org.springframework.beans.factory.annotation.Autowired;
@ -66,6 +68,9 @@ public class CostCategoryModel extends IntegrationEntityModel implements
@Autowired
private IConfigurationDAO configurationDAO;
@Autowired
private ITypeOfWorkHoursDAO typeOfWorkHoursDAO;
@Override
public List<CostCategory> getCostCategories() {
return costCategoryDAO.list(CostCategory.class);
@ -131,6 +136,12 @@ public class CostCategoryModel extends IntegrationEntityModel implements
return hourCosts;
}
@Override
@Transactional(readOnly = true)
public List<TypeOfWorkHours> getAllHoursType() {
return typeOfWorkHoursDAO.hoursTypeByNameAsc();
}
@Override
public CostCategory getCostCategory() {
return costCategory;

3
navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ICostCategoryModel.java
View file

@ -28,6 +28,7 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.costcategories.entities.CostCategory;
import org.navalplanner.business.costcategories.entities.HourCost;
import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;
import org.navalplanner.web.common.IIntegrationEntityModel;
/**
@ -66,4 +67,6 @@ public interface ICostCategoryModel extends IIntegrationEntityModel {
void validateHourCostsOverlap() throws ValidationException;
List<TypeOfWorkHours> getAllHoursType();
}