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

ItEr52S13CUCreacionRecursosLimitantes: Added combobox for selecting whether a machine is a limitedResource

Browse source
This commit is contained in:
Diego Pino Garcia 2010-04-05 02:18:12 +02:00 • committed by Javier Moran Rua
parent 6be13f03f8
commit fb7a89a892
3 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
View file

@ -24,6 +24,7 @@ import static org.navalplanner.web.I18nHelper._;
import java.util.Date;
import java.util.List;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -61,6 +62,7 @@ import org.zkoss.zul.SimpleListModel;
import org.zkoss.zul.Tab;
import org.zkoss.zul.Textbox;
import org.zkoss.zul.api.Window;
import org.navalplanner.web.resources.worker.WorkerCRUDController.LimitedResourceEnum;
/**
* Controller for {@link Machine} resource <br />
@ -538,4 +540,23 @@ public class MachineCRUDController extends GenericForwardComposer {
.toArray()));
listing.invalidate();
}
}
public Set<LimitedResourceEnum> getLimitedResourceOptionList() {
return LimitedResourceEnum.getLimitedResourceOptionList();
}
public Object getLimitedResource() {
final Machine machine = getMachine();
return (machine != null) ? LimitedResourceEnum.valueOf(machine
.isLimitedResource())
: LimitedResourceEnum.NON_LIMITED_RESOURCE; // Default option
}
public void setLimitedResource(LimitedResourceEnum option) {
Machine machine = getMachine();
if (machine != null) {
machine.setLimitedResource(LimitedResourceEnum.LIMITED_RESOURCE.equals(option));
}
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
View file

@ -628,7 +628,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
listing.invalidate();
}
private enum LimitedResourceEnum {
public enum LimitedResourceEnum {
ALL(""),
LIMITED_RESOURCE(_("LIMITED RESOURCE")),
NON_LIMITED_RESOURCE(_("NON LIMITED RESOURCE"));

7
navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
View file

@ -54,6 +54,13 @@
<textbox value="@{controller.machine.description}" width="500px"
constraint="no empty:${i18n:_('Description cannot be null or empty')}" />
</row>
<row>
<label value="${i18n:_('Limted resource')}" />
<combobox id="cbLimitedResource" width="200px"
model="@{controller.limitedResourceOptionList}"
selectedItem="@{controller.limitedResource}"
onSelect="controller.setLimitedResource(self.selectedItem.value);" />
</row>
</rows>
</grid>
</tabpanel>