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

ItEr53S12CUCreacionRecursosLimitantesItEr52S13: Rename limitedResource as limitingResource

Browse source
This commit is contained in:
Diego Pino Garcia 2010-04-07 16:35:51 +02:00 • committed by Javier Moran Rua
parent 485c5f8b81
commit a35a1d60b4
11 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
View file

@ -94,7 +94,7 @@ public abstract class Resource extends IntegrationEntity {
private Set<ResourcesCostCategoryAssignment> resourcesCostCategoryAssignments =
new HashSet<ResourcesCostCategoryAssignment>();
private Boolean limitedResource = Boolean.FALSE;
private Boolean limitingResource = Boolean.FALSE;
private void clearCachedData() {
assignmentsByDayCached = null;
@ -1046,16 +1046,16 @@ public abstract class Resource extends IntegrationEntity {
return Registry.getResourceDAO();
}
public Boolean isLimitedResource() {
return limitedResource;
public Boolean isLimitingResource() {
return limitingResource;
}
public void setLimitedResource(Boolean limitedResource) {
this.limitedResource = limitedResource;
public void setLimitingResource(Boolean limitingResource) {
this.limitingResource = limitingResource;
}
public String getLimitedResourceAsString() {
return (Boolean.TRUE.equals(isLimitedResource())) ? _("yes") : _("no");
public String getLimitingResourceAsString() {
return (Boolean.TRUE.equals(isLimitingResource())) ? _("yes") : _("no");
}
}

2
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java
View file

@ -94,7 +94,7 @@ public class VirtualWorker extends Worker {
}
@Override
public Boolean isLimitedResource() {
public Boolean isLimitingResource() {
return false;
}

2
navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
View file

@ -15,7 +15,7 @@
<property name="code" access="property" not-null="true" unique="true"/>
<property name="limitedResource" column="LIMITED_RESOURCE" not-null="true"/>
<property name="limitingResource" column="LIMITED_RESOURCE" not-null="true"/>
<set access="field" cascade="all-delete-orphan" inverse="true" name="criterionSatisfactions">
<key column="resource" not-null="true"/>

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

@ -49,7 +49,7 @@ import org.navalplanner.web.costcategories.ResourcesCostCategoryAssignmentContro
import org.navalplanner.web.resources.search.ResourcePredicate;
import org.navalplanner.web.resources.worker.CriterionsController;
import org.navalplanner.web.resources.worker.CriterionsMachineController;
import org.navalplanner.web.resources.worker.WorkerCRUDController.LimitedResourceEnum;
import org.navalplanner.web.resources.worker.WorkerCRUDController.LimitingResourceEnum;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.util.GenericForwardComposer;
@ -101,7 +101,7 @@ public class MachineCRUDController extends GenericForwardComposer {
private Datebox filterFinishDate;
private Listbox filterLimitedResource;
private Listbox filterLimitingResource;
private Textbox txtfilter;
@ -145,8 +145,8 @@ public class MachineCRUDController extends GenericForwardComposer {
.getFellowIfAny("filterFinishDate");
this.filterStartDate = (Datebox) listWindow
.getFellowIfAny("filterStartDate");
this.filterLimitedResource = (Listbox) listWindow
.getFellowIfAny("filterLimitedResource");
this.filterLimitingResource = (Listbox) listWindow
.getFellowIfAny("filterLimitingResource");
this.bdFilters = (BandboxMultipleSearch) listWindow
.getFellowIfAny("bdFilters");
this.txtfilter = (Textbox) listWindow.getFellowIfAny("txtfilter");
@ -520,18 +520,18 @@ public class MachineCRUDController extends GenericForwardComposer {
.getValue());
}
final Listitem item = filterLimitedResource.getSelectedItem();
Boolean isLimitedResource = (item != null) ? LimitedResourceEnum
.valueOf((LimitedResourceEnum) item.getValue()) : null;
final Listitem item = filterLimitingResource.getSelectedItem();
Boolean isLimitingResource = (item != null) ? LimitingResourceEnum
.valueOf((LimitingResourceEnum) item.getValue()) : null;
if (listFilters.isEmpty()
&& (personalFilter == null || personalFilter.isEmpty())
&& startDate == null && finishDate == null
&& isLimitedResource == null) {
&& isLimitingResource == null) {
return null;
}
return new ResourcePredicate(listFilters, personalFilter, startDate,
finishDate, isLimitedResource);
finishDate, isLimitingResource);
}
private void filterByPredicate(ResourcePredicate predicate) {
@ -552,25 +552,25 @@ public class MachineCRUDController extends GenericForwardComposer {
listing.invalidate();
}
public Set<LimitedResourceEnum> getLimitedResourceFilterOptionList() {
return LimitedResourceEnum.getLimitedResourceFilterOptionList();
public Set<LimitingResourceEnum> getLimitingResourceFilterOptionList() {
return LimitingResourceEnum.getLimitingResourceFilterOptionList();
}
public Set<LimitedResourceEnum> getLimitedResourceOptionList() {
return LimitedResourceEnum.getLimitedResourceOptionList();
public Set<LimitingResourceEnum> getLimitingResourceOptionList() {
return LimitingResourceEnum.getLimitingResourceOptionList();
}
public Object getLimitedResource() {
public Object getLimitingResource() {
final Machine machine = getMachine();
return (machine != null) ? LimitedResourceEnum.valueOf(machine
.isLimitedResource())
: LimitedResourceEnum.NON_LIMITED_RESOURCE; // Default option
return (machine != null) ? LimitingResourceEnum.valueOf(machine
.isLimitingResource())
: LimitingResourceEnum.NON_LIMITING_RESOURCE; // Default option
}
public void setLimitedResource(LimitedResourceEnum option) {
public void setLimitingResource(LimitingResourceEnum option) {
Machine machine = getMachine();
if (machine != null) {
machine.setLimitedResource(LimitedResourceEnum.LIMITED_RESOURCE.equals(option));
machine.setLimitingResource(LimitingResourceEnum.LIMITING_RESOURCE.equals(option));
}
}

12
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java
View file

@ -52,18 +52,18 @@ public class ResourcePredicate implements IPredicate {
private String[] personalFilters;
private Boolean isLimitedResource;
private Boolean isLimitingResource;
private List<Resource> assignedResourcesInIntervalDates;
public ResourcePredicate(List<FilterPair> filters, String personalFilters,
LocalDate startDate,
LocalDate finishDate,
Boolean isLimitedResource) {
Boolean isLimitingResource) {
this.filters = filters;
this.startDate = startDate;
this.finishDate = finishDate;
this.isLimitedResource = isLimitedResource;
this.isLimitingResource = isLimitingResource;
this.personalFilters = personalFilters.split(" ");
}
@ -78,14 +78,14 @@ public class ResourcePredicate implements IPredicate {
return false;
}
if (acceptFilters(resource) && acceptPersonalFilters(resource)
&& acceptFiltersDates(resource) && acceptFilterIsLimitedResource(resource)) {
&& acceptFiltersDates(resource) && acceptFilterIsLimitingResource(resource)) {
return true;
}
return false;
}
private boolean acceptFilterIsLimitedResource(Resource resource) {
return (isLimitedResource != null) ? isLimitedResource.equals(resource.isLimitedResource()) : true;
private boolean acceptFilterIsLimitingResource(Resource resource) {
return (isLimitingResource != null) ? isLimitingResource.equals(resource.isLimitingResource()) : true;
}
private boolean acceptFilters(Resource resource) {

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

@ -111,7 +111,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
private Datebox filterFinishDate;
private Listbox filterLimitedResource;
private Listbox filterLimitingResource;
private BandboxMultipleSearch bdFilters;
@ -297,8 +297,8 @@ public class WorkerCRUDController extends GenericForwardComposer implements
.getFellowIfAny("filterFinishDate");
this.filterStartDate = (Datebox) listWindow
.getFellowIfAny("filterStartDate");
this.filterLimitedResource = (Listbox) listWindow
.getFellowIfAny("filterLimitedResource");
this.filterLimitingResource = (Listbox) listWindow
.getFellowIfAny("filterLimitingResource");
this.bdFilters = (BandboxMultipleSearch) listWindow
.getFellowIfAny("bdFilters");
this.txtfilter = (Textbox) listWindow.getFellowIfAny("txtfilter");
@ -607,18 +607,18 @@ public class WorkerCRUDController extends GenericForwardComposer implements
finishDate = LocalDate.fromDateFields(filterFinishDate.getValue());
}
final Listitem item = filterLimitedResource.getSelectedItem();
Boolean isLimitedResource = (item != null) ? LimitedResourceEnum
.valueOf((LimitedResourceEnum) item.getValue()) : null;
final Listitem item = filterLimitingResource.getSelectedItem();
Boolean isLimitingResource = (item != null) ? LimitingResourceEnum
.valueOf((LimitingResourceEnum) item.getValue()) : null;
if (listFilters.isEmpty()
&& (personalFilter == null || personalFilter.isEmpty())
&& startDate == null && finishDate == null
&& isLimitedResource == null) {
&& isLimitingResource == null) {
return null;
}
return new ResourcePredicate(listFilters, personalFilter, startDate,
finishDate, isLimitedResource);
finishDate, isLimitingResource);
}
private void filterByPredicate(ResourcePredicate predicate) {
@ -639,14 +639,14 @@ public class WorkerCRUDController extends GenericForwardComposer implements
listing.invalidate();
}
public enum LimitedResourceEnum {
public enum LimitingResourceEnum {
ALL(_("ALL")),
LIMITED_RESOURCE(_("LIMITED RESOURCE")),
NON_LIMITED_RESOURCE(_("NON LIMITED RESOURCE"));
LIMITING_RESOURCE(_("LIMITING RESOURCE")),
NON_LIMITING_RESOURCE(_("NON LIMITING RESOURCE"));
private String option;
private LimitedResourceEnum(String option) {
private LimitingResourceEnum(String option) {
this.option = option;
}
@ -654,53 +654,53 @@ public class WorkerCRUDController extends GenericForwardComposer implements
return option;
}
public static LimitedResourceEnum valueOf(Boolean isLimitedResource) {
return (Boolean.TRUE.equals(isLimitedResource)) ? LIMITED_RESOURCE : NON_LIMITED_RESOURCE;
public static LimitingResourceEnum valueOf(Boolean isLimitingResource) {
return (Boolean.TRUE.equals(isLimitingResource)) ? LIMITING_RESOURCE : NON_LIMITING_RESOURCE;
}
public static Boolean valueOf(LimitedResourceEnum option) {
if (LIMITED_RESOURCE.equals(option)) {
public static Boolean valueOf(LimitingResourceEnum option) {
if (LIMITING_RESOURCE.equals(option)) {
return true;
} else if (NON_LIMITED_RESOURCE.equals(option)) {
} else if (NON_LIMITING_RESOURCE.equals(option)) {
return false;
} else {
return null;
}
}
public static Set<LimitedResourceEnum> getLimitedResourceOptionList() {
public static Set<LimitingResourceEnum> getLimitingResourceOptionList() {
return EnumSet.of(
LimitedResourceEnum.LIMITED_RESOURCE,
LimitedResourceEnum.NON_LIMITED_RESOURCE);
LimitingResourceEnum.LIMITING_RESOURCE,
LimitingResourceEnum.NON_LIMITING_RESOURCE);
}
public static Set<LimitedResourceEnum> getLimitedResourceFilterOptionList() {
return EnumSet.of(LimitedResourceEnum.ALL,
LimitedResourceEnum.LIMITED_RESOURCE,
LimitedResourceEnum.NON_LIMITED_RESOURCE);
public static Set<LimitingResourceEnum> getLimitingResourceFilterOptionList() {
return EnumSet.of(LimitingResourceEnum.ALL,
LimitingResourceEnum.LIMITING_RESOURCE,
LimitingResourceEnum.NON_LIMITING_RESOURCE);
}
}
public Set<LimitedResourceEnum> getLimitedResourceFilterOptionList() {
return LimitedResourceEnum.getLimitedResourceFilterOptionList();
public Set<LimitingResourceEnum> getLimitingResourceFilterOptionList() {
return LimitingResourceEnum.getLimitingResourceFilterOptionList();
}
public Set<LimitedResourceEnum> getLimitedResourceOptionList() {
return LimitedResourceEnum.getLimitedResourceOptionList();
public Set<LimitingResourceEnum> getLimitingResourceOptionList() {
return LimitingResourceEnum.getLimitingResourceOptionList();
}
public Object getLimitedResource() {
public Object getLimitingResource() {
final Worker worker = getWorker();
return (worker != null) ? LimitedResourceEnum.valueOf(worker
.isLimitedResource())
: LimitedResourceEnum.NON_LIMITED_RESOURCE; // Default option
return (worker != null) ? LimitingResourceEnum.valueOf(worker
.isLimitingResource())
: LimitingResourceEnum.NON_LIMITING_RESOURCE; // Default option
}
public void setLimitedResource(LimitedResourceEnum option) {
public void setLimitingResource(LimitingResourceEnum option) {
Worker worker = getWorker();
if (worker != null) {
worker.setLimitedResource(LimitedResourceEnum.LIMITED_RESOURCE.equals(option));
worker.setLimitingResource(LimitingResourceEnum.LIMITING_RESOURCE.equals(option));
}
}

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

@ -56,10 +56,10 @@
</row>
<row>
<label value="${i18n:_('Limted resource')}" />
<combobox id="cbLimitedResource" width="200px"
model="@{controller.limitedResourceOptionList}"
selectedItem="@{controller.limitedResource}"
onSelect="controller.setLimitedResource(self.selectedItem.value);"
<combobox id="cbLimitingResource" width="200px"
model="@{controller.limitingResourceOptionList}"
selectedItem="@{controller.limitingResource}"
onSelect="controller.setLimitingResource(self.selectedItem.value);"
disabled="@{controller.isEditing}" />
</row>
</rows>

4
navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
View file

@ -33,7 +33,7 @@
<column label="${i18n:_('Code')}" sort="auto(code)" />
<column label="${i18n:_('Name')}" sort="auto(name)" />
<column label="${i18n:_('Description')}" sort="auto(description)" />
<column label="${i18n:_('Limited resource')}" sort="auto(limitedResource)" />
<column label="${i18n:_('Limiting resource')}" sort="auto(limitingResource)" />
<column label="${i18n:_('Operations')}" />
</columns>
<rows>
@ -41,7 +41,7 @@
<label value="@{machine.code}" />
<label value="@{machine.name}" />
<label value="@{machine.description}" />
<label value="@{machine.limitedResourceAsString}" />
<label value="@{machine.limitingResourceAsString}" />
<hbox>
<button sclass="icono" image="/common/img/ico_editar1.png"
hoverImage="/common/img/ico_editar.png"

8
navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
View file

@ -10,11 +10,11 @@
<label value="${i18n:_('Personal details')}"/>
<textbox id="txtfilter" width="200px"/>
<!-- Limited resource -->
<label value="${i18n:_('Limited resource')}"/>
<listbox id="filterLimitedResource"
<!-- Limiting resource -->
<label value="${i18n:_('Limiting resource')}"/>
<listbox id="filterLimitingResource"
mold="select"
model="@{controller.limitedResourceFilterOptionList}" />
model="@{controller.limitingResourceFilterOptionList}" />
<!-- Filter by date -->
<label value="${i18n:_('Active period from')}"/>

10
navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
View file

@ -65,11 +65,11 @@
<textbox value="@{controller.worker.nif}" constraint="no empty"/>
</row>
<row visible="@{controller.isRealWorker}">
<label value="${i18n:_('Limited resource')}" />
<combobox id="cbLimitedResource" width="200px"
model="@{controller.limitedResourceOptionList}"
selectedItem="@{controller.limitedResource}"
onSelect="controller.setLimitedResource(self.selectedItem.value);"
<label value="${i18n:_('Limiting resource')}" />
<combobox id="cbLimitingResource" width="200px"
model="@{controller.limitingResourceOptionList}"
selectedItem="@{controller.limitingResource}"
onSelect="controller.setLimitingResource(self.selectedItem.value);"
disabled="@{controller.isEditing}" />
</row>
<row visible="@{controller.isVirtualWorker}">

4
navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
View file

@ -33,7 +33,7 @@
<newdatasortablecolumn label="${i18n:_('Surname')}" sort="auto(surname)" />
<newdatasortablecolumn label="${i18n:_('NIF')}" sort="auto(nif)" />
<newdatasortablecolumn label="${i18n:_('Code')}"/>
<newdatasortablecolumn label="${i18n:_('Limited resource')}" sort="auto(limitedResource)" />
<newdatasortablecolumn label="${i18n:_('Limiting resource')}" sort="auto(limitingResource)" />
<newdatasortablecolumn label="${i18n:_('Operations')}" />
</columns>
<rows>
@ -42,7 +42,7 @@
<label value="@{worker.surname}" />
<label value="@{worker.nif}" />
<label value="@{worker.code}" />
<label value="@{worker.limitedResourceAsString}" />
<label value="@{worker.limitingResourceAsString}" />
<hbox>
<button sclass="icono" image="/common/img/ico_editar1.png"
hoverImage="/common/img/ico_editar.png"