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 Work Reports. Hours type

Browse source 
are now shown as a select box.

FEA: ItEr74S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-04-13 11:03:48 +02:00
parent 966844638d
commit e77fc7117a
3 changed files with 67 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java
View file

@ -26,6 +26,7 @@ import java.util.Map;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;
import org.navalplanner.business.labels.entities.Label;
import org.navalplanner.business.labels.entities.LabelType;
import org.navalplanner.business.orders.entities.OrderElement;
@ -242,4 +243,6 @@ public interface IWorkReportModel extends IIntegrationEntityModel {
List<OrderElement> getOrderElements();
void generateWorkReportLinesIfIsNecessary();
List<TypeOfWorkHours> getAllHoursType();
}

71
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
View file

@ -23,6 +23,7 @@ package org.navalplanner.web.workreports;
import static org.navalplanner.web.I18nHelper._;
import java.math.BigDecimal;
import java.util.ConcurrentModificationException;
import java.util.Date;
import java.util.List;
@ -32,6 +33,7 @@ import org.apache.commons.logging.LogFactory;
import org.hibernate.validator.InvalidValue;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.costcategories.entities.HourCost;
import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;
import org.navalplanner.business.labels.entities.Label;
import org.navalplanner.business.labels.entities.LabelType;
@ -56,6 +58,7 @@ import org.navalplanner.web.common.components.bandboxsearch.BandboxSearch;
import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry;
import org.navalplanner.web.common.entrypoints.URLHandler;
import org.zkoss.ganttz.IPredicate;
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;
@ -70,8 +73,10 @@ import org.zkoss.zul.Columns;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Constraint;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Decimalbox;
import org.zkoss.zul.Grid;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.ListModel;
import org.zkoss.zul.Listbox;
import org.zkoss.zul.Listitem;
import org.zkoss.zul.Messagebox;
@ -124,6 +129,8 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
private BandboxSearch bandboxSelectOrderElementInHead;
private ListModel allHoursType;
private final static String MOLD = "paging";
private final static int PAGING = 10;
@ -175,6 +182,11 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
//listType is null in reports -> work report lines
listType.setSelectedIndex(0);
}
initializeHoursType();
}
private void initializeHoursType() {
allHoursType = new SimpleListModel(workReportModel.getAllHoursType());
}
private void initCurrentList() {
@ -1143,36 +1155,55 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
row.appendChild(intNumHours);
}
/**
* Append Selectbox of @{link TypeOfWorkHours} to row
*
* @param row
*/
private void appendHoursType(final Row row) {
final WorkReportLine line = (WorkReportLine) row.getValue();
final Autocomplete hoursType = new Autocomplete();
hoursType.setAutodrop(true);
hoursType.applyProperties();
hoursType.setFinder("TypeOfWorkHoursFinder");
final WorkReportLine workReportLine = (WorkReportLine) row.getValue();
final Listbox lbHoursType = new Listbox();
lbHoursType.setMold("select");
lbHoursType.setModel(allHoursType);
lbHoursType.renderAll();
lbHoursType.applyProperties();
if (line.getTypeOfWorkHours() != null) {
hoursType.setSelectedItem(line.getTypeOfWorkHours());
}
// First time is rendered, select first item
TypeOfWorkHours type = workReportLine.getTypeOfWorkHours();
if (workReportLine.isNewObject() && type == null) {
Listitem item = lbHoursType.getItemAtIndex(0);
item.setSelected(true);
setHoursType(workReportLine, item);
} else {
// If workReportLine has a type, select item with that type
Listitem item = ComponentsFinder.findItemByValue(lbHoursType, type);
if (item != null) {
lbHoursType.selectItem(item);
}
}
lbHoursType.addEventListener(Events.ON_SELECT, new EventListener() {
hoursType.addEventListener("onChange", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
changeHoursType(hoursType, row);
Listitem item = lbHoursType.getSelectedItem();
if (item != null) {
setHoursType((WorkReportLine) row.getValue(), item);
}
}
});
row.appendChild(hoursType);
row.appendChild(lbHoursType);
}
private void changeHoursType(final Autocomplete hoursType, final Row row) {
final WorkReportLine line = (WorkReportLine) row.getValue();
final Comboitem comboitem = hoursType.getSelectedItem();
if ((comboitem == null)
|| ((TypeOfWorkHours) comboitem.getValue() == null)) {
line.setTypeOfWorkHours(null);
throw new WrongValueException(hoursType,
private void setHoursType(WorkReportLine workReportLine, Listitem item) {
TypeOfWorkHours value = item != null ? (TypeOfWorkHours) item
.getValue() : null;
workReportLine.setTypeOfWorkHours(value);
if (value == null) {
throw new WrongValueException(item.getParent(),
_("Please, select an item"));
} else {
line.setTypeOfWorkHours((TypeOfWorkHours) comboitem.getValue());
}
}

13
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java
View file

@ -38,11 +38,14 @@ import org.navalplanner.business.common.daos.IConfigurationDAO;
import org.navalplanner.business.common.entities.EntityNameEnum;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.costcategories.daos.ITypeOfWorkHoursDAO;
import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;
import org.navalplanner.business.labels.daos.ILabelDAO;
import org.navalplanner.business.labels.entities.Label;
import org.navalplanner.business.labels.entities.LabelType;
import org.navalplanner.business.orders.daos.IOrderDAO;
import org.navalplanner.business.orders.daos.IOrderElementDAO;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.orders.entities.OrderLineGroup;
import org.navalplanner.business.resources.daos.IWorkerDAO;
@ -101,6 +104,9 @@ public class WorkReportModel extends IntegrationEntityModel implements
@Autowired
private IConfigurationDAO configurationDAO;
@Autowired
private ITypeOfWorkHoursDAO typeOfWorkHoursDAO;
private WorkReportType workReportType;
private WorkReport workReport;
@ -612,4 +618,11 @@ public class WorkReportModel extends IntegrationEntityModel implements
public IntegrationEntity getCurrentEntity() {
return this.workReport;
}
@Override
@Transactional(readOnly = true)
public List<TypeOfWorkHours> getAllHoursType() {
return typeOfWorkHoursDAO.hoursTypeByNameAsc();
}
}