From 14eef2d7a2820bde79472897713c926098d0d19c Mon Sep 17 00:00:00 2001 From: Vova Perebykivskyi Date: Fri, 28 Oct 2016 09:59:56 +0300 Subject: [PATCH] Visual improvements for workReport page. Code refactoring. --- .../business/planner/entities/CalculatedValue.java | 5 +++-- .../libreplan/web/workreports/WorkReportCRUDController.java | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/CalculatedValue.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/CalculatedValue.java index 7e9594113..9315a3575 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/CalculatedValue.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/CalculatedValue.java @@ -22,10 +22,11 @@ package org.libreplan.business.planner.entities; /** - * It represents the value that is calculated + * It represents the value that is calculated. + * * @author Óscar González Fernández */ public enum CalculatedValue { - NUMBER_OF_HOURS, END_DATE, RESOURCES_PER_DAY; + NUMBER_OF_HOURS, END_DATE, RESOURCES_PER_DAY } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java index a20256084..8d3dc49b0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java @@ -987,6 +987,10 @@ public class WorkReportCRUDController // Create the fields and labels appendFieldsAndLabelsInLines(row); + NewDataSortableGrid grid = (NewDataSortableGrid) row.getParent().getParent(); + NewDataSortableColumn priorityColumn = (NewDataSortableColumn) grid.getChildren().get(1).getChildren().get(2); + priorityColumn.setWidth("110px"); + if (!getWorkReport().getWorkReportType().getHoursManagement().equals(HoursManagementEnum.NUMBER_OF_HOURS)) { appendHoursStartAndFinish(row); } @@ -1374,7 +1378,7 @@ public class WorkReportCRUDController descriptionValue::setValue); } - private Autocomplete createAutocompleteLabels(LabelType labelType,Label selectedLabel) { + private Autocomplete createAutocompleteLabels(LabelType labelType, Label selectedLabel) { Autocomplete comboLabels = new Autocomplete(); comboLabels.setButtonVisible(true); comboLabels.setWidth("100px");