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

ItEr30S06CUAltaMaquina: Added MACHINE criterion type; now is possible to edit resource type in Criterion Type form

Browse source
This commit is contained in:
Diego Pino Garcia 2009-10-19 09:37:06 +02:00 • committed by Javier Moran Rua
parent b272c256ba
commit e6799f46f6
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
View file

@ -170,6 +170,14 @@ public class CriterionType extends BaseEntity implements
this.resource = resource;
}
public String getResource() {
return resource.toString();
}
public void setResource(String resource) {
this.resource = ResourceEnum.valueOf(resource);
}
@Override
public Criterion createCriterion(String name) {
return Criterion.withNameAndType(name, this);

8
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java
View file

@ -21,6 +21,7 @@
package org.navalplanner.business.resources.entities;
/**
*
* @author Diego Pino Garcia<dpino@igalia.com>
@ -28,7 +29,8 @@ package org.navalplanner.business.resources.entities;
public enum ResourceEnum {
RESOURCE(Resource.class),
WORKER(Worker.class);
WORKER(Worker.class),
MACHINE(Machine.class);
Class clase;
@ -44,6 +46,10 @@ public enum ResourceEnum {
return RESOURCE;
}
public String toString() {
return clase.getSimpleName().toUpperCase();
}
public boolean isAssignableFrom(Class clase) {
return asClass().isAssignableFrom(clase);
}

8
navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
View file

@ -36,6 +36,14 @@
<label value="${i18n:_('Name')}" />
<textbox width="390px" value="@{controller.criterionType.name}"/>
</row>
<row>
<label value="${i18n:_('Type')}" />
<listbox id="lbResource" mold="select" selectedItem="@{controller.criterionType.resource}">
<listitem label="${i18n:_('Generic')}" value="RESOURCE" />
<listitem label="${i18n:_('Worker')}" value="WORKER" />
<listitem label="${i18n:_('Machine')}" value="MACHINE" />
</listbox>
</row>
<row>
<label value="${i18n:_('Multiple values per resource')}"/>
<checkbox checked="@{controller.criterionType.allowSimultaneousCriterionsPerResource}"/>