diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java index 5e4e6cf10..9b4edd464 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java @@ -20,7 +20,7 @@ package org.navalplanner.business.materials.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; /** * @@ -34,13 +34,6 @@ public enum MaterialStatusEnum { PROCESSING(_("PROCESSING")), CANCELED(_("CANCELED")); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private String description; private MaterialStatusEnum(String description) { @@ -48,7 +41,7 @@ public enum MaterialStatusEnum { } public String toString() { - return I18nHelper._(this.description); + return this.description; } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java index 56b801a7b..7abc945ac 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java @@ -20,7 +20,7 @@ package org.navalplanner.business.orders.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; /** @@ -33,13 +33,6 @@ public enum OrderStatusEnum { _("FINISHED")), CANCELLED(_("CANCELLED")), SUBCONTRACTED_PENDING_ORDER( _("SUBCONTRACTED PENDING ORDER")), STORED(_("STORED")); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private String description; private OrderStatusEnum(String description) { @@ -47,7 +40,7 @@ public enum OrderStatusEnum { } public String toString() { - return I18nHelper._(this.description); + return this.description; } public static OrderStatusEnum getDefault() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java index 51c741a16..3f59e0f8a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java @@ -20,7 +20,7 @@ package org.navalplanner.business.planner.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; /** * Possible states of a {@link SubcontractedTaskData}. @@ -31,13 +31,6 @@ public enum SubcontractState { PENDING(_("Pending"), true), FAILED_SENT(_("Failed sent"), true), SUCCESS_SENT( _("Success sent"), false); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private String name; private boolean sendable; @@ -48,7 +41,7 @@ public enum SubcontractState { @Override public String toString() { - return I18nHelper._(name); + return name; } public boolean isSendable() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java index d9d05d444..245eea8b0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java @@ -20,7 +20,7 @@ package org.navalplanner.business.planner.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; public enum TaskStatusEnum { ALL(_("All")), @@ -29,13 +29,6 @@ public enum TaskStatusEnum { PENDING(_("Pending")), BLOCKED(_("Blocked")); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private String value; private TaskStatusEnum(String value) { @@ -43,6 +36,6 @@ public enum TaskStatusEnum { } public String toString() { - return I18nHelper._(value); + return value; } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingArrangementPerOrderDTO.java b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingArrangementPerOrderDTO.java index 9ebfc86dd..5070883b1 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingArrangementPerOrderDTO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingArrangementPerOrderDTO.java @@ -235,4 +235,9 @@ public class WorkingArrangementPerOrderDTO { } return false; } + + public void setStatus(String status) { + this.status = status; + } + } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java index d6b7fbd9f..f6903a1e2 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java @@ -20,7 +20,7 @@ package org.navalplanner.business.resources.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; /** @@ -33,13 +33,6 @@ public enum ResourceEnum { WORKER(Worker.class, _("WORKER")), MACHINE(Machine.class, _("MACHINE")); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private Class klass; private final String displayName; @@ -53,7 +46,7 @@ public enum ResourceEnum { } public String getDisplayName() { - return I18nHelper._(displayName); + return displayName; } public static ResourceEnum getDefault() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java index d826e8a5b..a3c9767e1 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java @@ -20,7 +20,7 @@ package org.navalplanner.business.users.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; /** * Available types of {@link OrderAuthorization}. @@ -32,13 +32,6 @@ public enum OrderAuthorizationType { READ_AUTHORIZATION(_("Read authorization")), WRITE_AUTHORIZATION(_("Write authorization")); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private final String displayName; private OrderAuthorizationType(String displayName) { @@ -46,6 +39,6 @@ public enum OrderAuthorizationType { } public String getDisplayName() { - return I18nHelper._(displayName); + return displayName; } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java index 79db2e504..df8db4faa 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java @@ -20,7 +20,7 @@ package org.navalplanner.business.users.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; /** * Available user roles. @@ -36,13 +36,6 @@ public enum UserRole { ROLE_EDIT_ALL_ORDERS(_("All orders edition allowed")), ROLE_CREATE_ORDER(_("Order creation allowed")); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private final String displayName; private UserRole(String displayName) { @@ -50,7 +43,7 @@ public enum UserRole { } public String getDisplayName() { - return I18nHelper._(displayName); + return displayName; } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java index 4a8ae981e..6d02708ba 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java @@ -23,20 +23,13 @@ */ package org.navalplanner.business.workreports.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; public enum HoursManagementEnum { - NUMBER_OF_HOURS(_("Number of assigned hours.")), - HOURS_CALCULATED_BY_CLOCK(_("Number of hours calculated by clock.")), - NUMBER_OF_HOURS_AND_CLOCK(_("Number of assigned hours and the time.")); - - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } + NUMBER_OF_HOURS(_("Number of assigned hours")), + HOURS_CALCULATED_BY_CLOCK(_("Number of hours calculated by clock")), + NUMBER_OF_HOURS_AND_CLOCK(_("Number of assigned hours and the time")); private String description; @@ -45,7 +38,7 @@ public enum HoursManagementEnum { } public String toString() { - return I18nHelper._(this.description); + return this.description; } public static HoursManagementEnum getDefault() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java index 28259fb7c..1a749dba0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java @@ -23,7 +23,7 @@ */ package org.navalplanner.business.workreports.entities; -import org.navalplanner.business.i18n.I18nHelper; +import static org.navalplanner.business.i18n.I18nHelper._; /** * @author Susana Montes Pedreira @@ -32,13 +32,6 @@ public enum PositionInWorkReportEnum { HEADING(_("heading")), LINE(_("line")); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private String displayName; private PositionInWorkReportEnum(String displayName) { @@ -50,7 +43,7 @@ public enum PositionInWorkReportEnum { } public String toString() { - return I18nHelper._(displayName); + return displayName; } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/EnumsListitemRenderer.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/EnumsListitemRenderer.java new file mode 100644 index 000000000..6d4aa80be --- /dev/null +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/EnumsListitemRenderer.java @@ -0,0 +1,48 @@ +/* + * This file is part of NavalPlan + * + * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e + * Desenvolvemento Tecnolóxico de Galicia + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package org.navalplanner.web.common; + +import static org.navalplanner.web.I18nHelper._; + +import org.zkoss.zul.Listbox; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +/** + * {@link Enum} types needs to be translated in the webapp module, because of it + * is not possible to known the user language in the business layer. + * + * This class provides a basic renderer that just call to the translation method + * and could be useful to translate {@link Enum} that are showed into + * {@link Listbox}. + * + * @author Manuel Rego Casasnovas + */ +public class EnumsListitemRenderer implements ListitemRenderer { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + item.appendChild(new Listcell(_(data.toString()))); + } + +} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index bf61cf0b3..336653a91 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -942,7 +942,7 @@ public class OrderCRUDController extends GenericForwardComposer { appendLabel(row, order.getCustomerReference()); appendObject(row, order.getTotalBudget()); appendObject(row, order.getTotalHours()); - appendObject(row, order.getState()); + appendObject(row, _(order.getState().toString())); appendOperations(row, order); row.setTooltiptext(getTooltipText(order)); @@ -1222,4 +1222,5 @@ public class OrderCRUDController extends GenericForwardComposer { } } } + } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java index 5a29fa8c8..7e0bec303 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java @@ -283,11 +283,9 @@ public class ResourceAllocationController extends GenericForwardComposer { private static String asString(ResourceEnum resourceType) { switch (resourceType) { case RESOURCE: - return _("Resource"); case MACHINE: - return _("Machine"); case WORKER: - return _("Worker"); + return _(resourceType.getDisplayName()); default: LOG.warn("no i18n for " + resourceType.name()); return resourceType.name(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java index 13fe33e52..85c886469 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java @@ -99,7 +99,7 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon // Task status final TaskStatusEnum taskStatus = getSelectedTaskStatus(); - result.put("taskStatus", taskStatus.toString()); + result.put("taskStatus", _(taskStatus.toString())); return result; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderModel.java index e61b6efa1..d22e1e1ae 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderModel.java @@ -20,6 +20,8 @@ package org.navalplanner.web.reports; +import static org.navalplanner.web.I18nHelper._; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -181,8 +183,12 @@ public class WorkingArrangementsPerOrderModel implements // Add current task final Set dependencies = task .getDependenciesWithThisDestination(); - result.add(new WorkingArrangementPerOrderDTO(deadLineOrder, task, - taskStatus, showDependencies && !dependencies.isEmpty())); + WorkingArrangementPerOrderDTO workingArrangementPerOrderDTO = new WorkingArrangementPerOrderDTO( + deadLineOrder, task, taskStatus, showDependencies + && !dependencies.isEmpty()); + workingArrangementPerOrderDTO.setStatus(_(workingArrangementPerOrderDTO + .getStatus())); + result.add(workingArrangementPerOrderDTO); // Add dependencies if (showDependencies) { @@ -194,8 +200,10 @@ public class WorkingArrangementsPerOrderModel implements orderElement.getName(), orderElement.getCode(), each .getType().toString(), orderElement .getAdvancePercentage()); - result.add(new WorkingArrangementPerOrderDTO(task, taskStatus, - dependencyDTO)); + WorkingArrangementPerOrderDTO dto = new WorkingArrangementPerOrderDTO( + task, taskStatus, dependencyDTO); + dto.setStatus(_(dto.getStatus())); + result.add(dto); } } return result; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java index 5fa4528c8..820384592 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java @@ -309,7 +309,7 @@ public class CriterionAdminController_V2 extends GenericForwardComposer { private void setupResourceCombobox(Combobox combo) { for(ResourceEnum resource : ResourceEnum.values()) { - Comboitem item = combo.appendItem(resource.getDisplayName()); + Comboitem item = combo.appendItem(_(resource.getDisplayName())); item.setValue(resource); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java index d2851ff72..7bde0ca67 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java @@ -109,7 +109,7 @@ public class SubcontractedTasksController extends GenericForwardComposer { appendLabel(row, subcontractedTaskData.getWorkDescription()); appendLabel(row, toString(subcontractedTaskData .getSubcontractPrice())); - appendLabel(row, toString(subcontractedTaskData.getState())); + appendLabel(row, _(toString(subcontractedTaskData.getState()))); appendOperations(row, subcontractedTaskData); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java index 068ac0195..44fba543c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java @@ -32,15 +32,17 @@ import org.navalplanner.business.users.entities.Profile; import org.navalplanner.business.users.entities.ProfileOrderAuthorization; import org.navalplanner.business.users.entities.User; import org.navalplanner.business.users.entities.UserOrderAuthorization; -import org.navalplanner.business.users.entities.UserRole; import org.navalplanner.web.common.IMessagesForUser; import org.navalplanner.web.common.Level; import org.navalplanner.web.common.Util; -import org.navalplanner.web.security.SecurityUtils; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Comboitem; -import org.zkoss.zul.api.Button; +import org.zkoss.zul.Label; +import org.zkoss.zul.Row; +import org.zkoss.zul.RowRenderer; /** * Controller for CRUD actions over an {@link OrderAuthorization} @@ -136,4 +138,25 @@ public class OrderAuthorizationController extends GenericForwardComposer{ messagesForUser = component; } + public RowRenderer getOrderAuthorizationRenderer() { + return new RowRenderer() { + + @Override + public void render(Row row, Object data) throws Exception { + final ProfileOrderAuthorization profileOrderAuthorization = (ProfileOrderAuthorization) data; + + row.appendChild(new Label(profileOrderAuthorization.getProfile().getProfileName())); + row.appendChild(new Label(_(profileOrderAuthorization.getAuthorizationType().getDisplayName()))); + + row.appendChild(Util.createRemoveButton(new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + removeOrderAuthorization(profileOrderAuthorization); + } + })); + } + }; + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java index d136a4662..8c8c1f266 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java @@ -83,7 +83,7 @@ public class ProfileCRUDController extends GenericForwardComposer implements */ private void appendAllUserRoles(Combobox combo) { for(UserRole role : getAllRoles()) { - Comboitem item = combo.appendItem(role.getDisplayName()); + Comboitem item = combo.appendItem(_(role.getDisplayName())); item.setValue(role); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java index a54fcf3c3..ef6ab8241 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java @@ -92,7 +92,7 @@ public class UserCRUDController extends GenericForwardComposer implements */ private void appendAllUserRoles(Combobox combo) { for(UserRole role : UserRole.values()) { - Comboitem item = combo.appendItem(role.getDisplayName()); + Comboitem item = combo.appendItem(_(role.getDisplayName())); item.setValue(role); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java index 70fd78fb6..c94599369 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java @@ -34,6 +34,7 @@ import org.navalplanner.business.workreports.entities.PositionInWorkReportEnum; import org.navalplanner.business.workreports.entities.WorkReportLabelTypeAssigment; import org.navalplanner.business.workreports.entities.WorkReportType; import org.navalplanner.business.workreports.valueobjects.DescriptionField; +import org.navalplanner.web.common.EnumsListitemRenderer; import org.navalplanner.web.common.IMessagesForUser; import org.navalplanner.web.common.Level; import org.navalplanner.web.common.MessagesForUser; @@ -325,9 +326,10 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer if (workReportTypeModel .isHeadingDescriptionField((DescriptionField) row.getValue())) { - labelPosition.setValue(PositionInWorkReportEnum.HEADING.name()); + labelPosition.setValue(_(PositionInWorkReportEnum.HEADING + .toString())); } else { - labelPosition.setValue(PositionInWorkReportEnum.LINE.name()); + labelPosition.setValue(_(PositionInWorkReportEnum.LINE.toString())); } } @@ -414,6 +416,7 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer listPosition.setModel(new SimpleListModel( getPositionInWorkReportEnums())); + listPosition.setItemRenderer(new EnumsListitemRenderer()); return listPosition; } @@ -497,8 +500,8 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer private void appendLabelPosition(Row row) { org.zkoss.zul.Label labelPosition = new org.zkoss.zul.Label(); labelPosition.setParent(row); - labelPosition.setValue(workReportTypeModel.getLabelAssigmentPosition( - (WorkReportLabelTypeAssigment) row.getValue()).name()); + labelPosition.setValue(_(workReportTypeModel.getLabelAssigmentPosition( + (WorkReportLabelTypeAssigment) row.getValue()).toString())); } private void appendLabel(Row row) { diff --git a/navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul b/navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul index 1e6f34b8d..6ac9b4ed8 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul @@ -51,7 +51,8 @@