diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java index 70df51e6e..07b4e748b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java @@ -75,11 +75,14 @@ public class Machine extends Resource { this.name = name; } - @Override public String getDescription() { return description; } + public String getShortDescription() { + return code + " :: " + name; + } + public void setDescription(String description) { this.description = description; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java index 0e51b4f02..91efa3848 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java @@ -97,7 +97,7 @@ public abstract class Resource extends BaseEntity{ return satisfactionActives; } - public abstract String getDescription(); + public abstract String getShortDescription(); private interface IPredicate { public boolean accepts(CriterionSatisfaction satisfaction); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java index 7856644e3..9a99b819c 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java @@ -66,11 +66,15 @@ public class Worker extends Resource { this.nif = nif; } - @Override - public String getDescription(){ + public String getDescription() { return getFirstName()+" "+getSurname(); } + @Override + public String getShortDescription() { + return getNif() + " :: " + getDescription(); + } + public String getFirstName() { return firstName; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java index e7c4d0ec9..4b9136c93 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java @@ -47,6 +47,6 @@ public class ResourceFinder extends Finder implements IFinder { @Override public String _toString(Object value) { final Resource resource = (Resource) value; - return (resource != null) ? resource.getDescription() : ""; + return (resource != null) ? resource.getShortDescription() : ""; } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java index 1290ab1e4..abe161c85 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java @@ -76,7 +76,7 @@ public class AsignedHoursToOrderElementModel implements Iterator iterador = listWRL.iterator(); while (iterador.hasNext()) { WorkReportLine w = iterador.next(); - w.getResource().getDescription(); + w.getResource().getShortDescription(); w.getOrderElement().getWorkHours(); w.getWorkReport().getDate(); this.asignedDirectHours = this.asignedDirectHours + w.getNumHours(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java index 0921fe1b5..ceacbd5fb 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java @@ -506,7 +506,7 @@ public class AdvancedAllocationController extends GenericForwardComposer { Restriction restriction) { return Row.createRow(messages, restriction, specificResourceAllocation.getResource() - .getDescription(), 1, Arrays + .getShortDescription(), 1, Arrays .asList(specificResourceAllocation)); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java index 894ab4c68..ec763f30f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java @@ -426,7 +426,7 @@ class FormBinder { private List getResourcesDescriptions(List resources) { List resourcesDescriptions = new ArrayList(); for (Resource each : resources) { - resourcesDescriptions.add(each.getDescription()); + resourcesDescriptions.add(each.getShortDescription()); } return resourcesDescriptions; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java index 895fc9295..b6a884b08 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java @@ -92,7 +92,7 @@ public class SpecificAllocationRow extends AllocationRow { public static SpecificAllocationRow forResource(Resource resource) { SpecificAllocationRow result = new SpecificAllocationRow(); - result.setName(resource.getDescription()); + result.setName(resource.getShortDescription()); result.setResource(resource); result.setResourcesPerDay(ResourcesPerDay.amount(1)); return result; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java index 2fc5eb0cb..a6429e0ab 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java @@ -202,7 +202,7 @@ public class ResourceLoadModel implements IResourceLoadModel { .sortedByStartDate(resourceAllocationDAO .findAllocationsRelatedTo(resource)); return new LoadTimelinesGroup(buildTimeLine(resource, resource - .getDescription(), sortedByStartDate), buildSecondLevel( + .getShortDescription(), sortedByStartDate), buildSecondLevel( resource, sortedByStartDate)); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index acc269601..68ea47510 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -967,7 +967,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements if (resource == null || orderElement == null) { return ITEM; } - return resource.getDescription() + " - " + orderElement.getCode(); + return resource.getShortDescription() + " - " + orderElement.getCode(); } /** diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java index 5350d67ef..18adcb82d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java @@ -139,7 +139,7 @@ public class WorkReportModel implements IWorkReportModel { // Load WorkReportType workReport.getWorkReportType().getName(); if (workReport.getResource() != null) { - workReport.getResource().getDescription(); + workReport.getResource().getShortDescription(); } if (workReport.getOrderElement() != null) { workReport.getOrderElement().getCode(); @@ -160,7 +160,7 @@ public class WorkReportModel implements IWorkReportModel { // Load WorkReportLines for (WorkReportLine workReportLine : workReport.getWorkReportLines()) { workReportLine.getNumHours(); - workReportLine.getResource().getDescription(); + workReportLine.getResource().getShortDescription(); workReportLine.getOrderElement().getName(); workReportLine.getTypeOfWorkHours().getName(); @@ -252,7 +252,7 @@ public class WorkReportModel implements IWorkReportModel { for (WorkReport each : workReportDAO.list(WorkReport.class)) { each.getWorkReportType().getName(); if (each.getResource() != null) { - each.getResource().getDescription(); + each.getResource().getShortDescription(); } if (each.getOrderElement() != null) { each.getOrderElement().getName();