From 5c51cb087687e5253b9803b6e7a3d0ee939c8389 Mon Sep 17 00:00:00 2001 From: Misha Date: Thu, 10 Dec 2015 15:20:38 +0200 Subject: [PATCH] Listboxes, buttons size and coloring fix in logs --- .../business/logs/entities/IssueTypeEnum.java | 2 +- .../logs/entities/LowMediumHighEnum.java | 2 +- .../web/logs/IssueLogCRUDController.java | 32 +++--- .../web/logs/RiskLogCRUDController.java | 27 +++-- .../main/webapp/common/css/libreplan_zk.css | 104 +++++++++++------- .../src/main/webapp/logs/_editIssueLog.zul | 8 +- .../src/main/webapp/logs/_editRiskLog.zul | 16 +-- 7 files changed, 111 insertions(+), 80 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueTypeEnum.java b/libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueTypeEnum.java index 93cdf37a3..0db92e05e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueTypeEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueTypeEnum.java @@ -10,7 +10,7 @@ import static org.libreplan.business.i18n.I18nHelper._; * @author Misha Gozhda */ public enum IssueTypeEnum { - PROBLEM_OR_CONCERN(_("PROBLEM OR CONCERN")), REQUEST_FOR_CHANGE(_("REQUEST FOR CHANGE")), OFF_SPECIFICATION(_("OFF SPECIFICATON")); + PROBLEM_OR_CONCERN(_("Problem or concern")), REQUEST_FOR_CHANGE(_("Request for change")), OFF_SPECIFICATION(_("Off specification")); private final String issueTypeEnum; diff --git a/libreplan-business/src/main/java/org/libreplan/business/logs/entities/LowMediumHighEnum.java b/libreplan-business/src/main/java/org/libreplan/business/logs/entities/LowMediumHighEnum.java index 883fab6a2..686b46d35 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/logs/entities/LowMediumHighEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/logs/entities/LowMediumHighEnum.java @@ -29,7 +29,7 @@ import static org.libreplan.business.i18n.I18nHelper._; */ public enum LowMediumHighEnum { - LOW(_("LOW")), MEDIUM(_("MEDIUM")), HIGH(_("HIGH")); + LOW(_("Low")), MEDIUM(_("Medium")), HIGH(_("High")); private final String lowMediumHighEnum; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java index fc3365f08..73949288e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java @@ -177,8 +177,8 @@ public class IssueLogCRUDController extends BaseCRUDController { appendObject(row, issueLog.getType()); appendObject(row, issueLog.getStatus()); appendLabel(row, issueLog.getDescription()); - appendObject(row, issueLog.getPriority()); - appendObject(row, issueLog.getSeverity()); + appendLabel(row, issueLog.getPriority().getDisplayName()); + appendLabel(row, issueLog.getSeverity().getDisplayName()); appendDate(row, issueLog.getDateRaised()); appendLabel(row, issueLog.getCreatedBy().getLoginName()); appendLabel(row, issueLog.getAssignedTo()); @@ -194,15 +194,15 @@ public class IssueLogCRUDController extends BaseCRUDController { private void setPriorityCellColor(Row row, LowMediumHighEnum priority) { Cell cell = (Cell) row.getChildren().get(5); if (priority == LowMediumHighEnum.LOW) { - cell.setClass("logs-priority-color-green"); + cell.setClass("issueLog-priority-color-green"); } if (priority == LowMediumHighEnum.MEDIUM) { - cell.setClass("logs-priority-color-yellow"); + cell.setClass("issueLog-priority-color-yellow"); } if (priority == LowMediumHighEnum.HIGH) { - cell.setClass("logs-priority-color-red"); + cell.setClass("issueLog-priority-color-red"); } } @@ -290,23 +290,23 @@ public class IssueLogCRUDController extends BaseCRUDController { public ArrayList getIssueStatusEnum() { ArrayList result = new ArrayList(); if (getIssueLog().getType() == IssueTypeEnum.REQUEST_FOR_CHANGE){ - result.add(_("ESSENTIAL")); - result.add(_("IMPORTANT")); - result.add(_("USEFUL")); - result.add(_("NOT IMPORTANT FOR NOW")); + result.add(_("Must have")); + result.add(_("Should have")); + result.add(_("Could have")); + result.add(_("Won't have")); return result; } if (getIssueLog().getType() == IssueTypeEnum.PROBLEM_OR_CONCERN) { - result.add(_("MINOR")); - result.add(_("SIGNIFICANT")); - result.add(_("MAJOR")); - result.add(_("CRITICAL")); + result.add(_("Minor")); + result.add(_("Significant")); + result.add(_("Major")); + result.add(_("Critical")); return result; } - result.add(_("LOW")); - result.add(_("MEDIUM")); - result.add(_("HIGH")); + result.add(_("Low")); + result.add(_("Medium")); + result.add(_("High")); return result; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java index 6995fd9b9..bbdf3af82 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java @@ -21,6 +21,7 @@ package org.libreplan.web.logs; import static org.libreplan.web.I18nHelper._; +import java.nio.charset.UnsupportedCharsetException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -164,18 +165,22 @@ public class RiskLogCRUDController extends BaseCRUDController { }; } - private void setScoreCellColor(Row row, int priority) { + private void setScoreCellColor(Row row, int riskScore) { Cell cell = (Cell) row.getChildren().get(4); - if (priority == 1 || priority == 2) { - cell.setClass("logs-priority-color-green"); - } - - if (priority == 3 || priority == 4) { - cell.setClass("logs-priority-color-yellow"); - } - - if (priority == 6 || priority == 9) { - cell.setClass("logs-priority-color-red"); + switch (riskScore) { + case 1: cell.setClass("riskLog-score-color-1"); + break; + case 2: cell.setClass("riskLog-score-color-2"); + break; + case 3: cell.setClass("riskLog-score-color-3"); + break; + case 4: cell.setClass("riskLog-score-color-4"); + break; + case 6: cell.setClass("riskLog-score-color-6"); + break; + case 9: cell.setClass("riskLog-score-color-9"); + break; + default: throw new UnsupportedCharsetException("Unsupported risk score"); } } diff --git a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css index 4cb3681cb..9fc6d33c7 100644 --- a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css +++ b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css @@ -6,18 +6,18 @@ * to integrate the custom appearance of the web application. */ - /* ----- Predefined Height dependent styles ----- */ - .scheduling-graphics { - height:200px; - } +/* ----- Predefined Height dependent styles ----- */ +.scheduling-graphics { + height:200px; +} - .main-layout { - height: 560px; - } +.main-layout { + height: 560px; +} - .taskheaders-border { - width: 300px; - } +.taskheaders-border { + width: 300px; +} .plannerlayout #watermark { height: 99999px !important; @@ -108,12 +108,12 @@ body .advancedallocationlayout .icono .z-button-cm { } .toolbar-box .z-button { - padding: 1px 2px 2px 2px; + padding: 1px 2px 2px 2px; } .planner-command .z-button-cm, .planner-icon .z-button-cm { - padding: 2px; + padding: 2px; } .toolbar-box .z-button .z-button-cm, @@ -400,7 +400,7 @@ div.z-row-cnt { } .z-window-embedded-tr,.z-window-highlighted-tr,.z-window-overlapped-tr,.z-window-popup-tr - { +{ background: none; } @@ -581,7 +581,7 @@ div.z-grid { } .listdetails .z-tree .z-datebox-inp { -padding-top: 3px; + padding-top: 3px; } .listdetails input { @@ -722,7 +722,7 @@ padding-top: 3px; border: 0; } .perspectives-column { -/* border-right: solid 1px; */ + /* border-right: solid 1px; */ } /* Legend colors: @@ -893,19 +893,19 @@ span.z-dottree-line { } .z-menu-body { - background-color: #d4e1ef; - border-radius: 10px 10px 0 0; + background-color: #d4e1ef; + border-radius: 10px 10px 0 0; } .z-menu-inner-m .z-menu-btn { - font-weight: normal; - color: #005782; + font-weight: normal; + color: #005782; } .z-menu-body-over .z-menu-inner-m .z-menu-btn, .z-menu-body-seld .z-menu-inner-m .z-menu-btn, .current-section .z-menu-body .z-menu-inner-m .z-menu-btn { - color: #FFFFFF; + color: #FFFFFF; } .z-menu-body-over, .z-menu-body-seld, .current-section .z-menu-body { @@ -916,7 +916,7 @@ span.z-dottree-line { .z-menu-body-over .z-menu-inner-l, .z-menu-body-over .z-menu-inner-m, .z-menu-body-over .z-menu-inner-r { - background-image:none; + background-image:none; } .z-menu-body-seld .z-menu-inner-l, @@ -1150,7 +1150,7 @@ span.perspective, span.perspective-active { } .main-area > .z-center-body:first-child { -/* height: auto !important; */ + /* height: auto !important; */ width: auto !important; } @@ -1188,18 +1188,18 @@ tr.z-treerow-seld input { tr.z-treerow-over input { background-color: #eff2f6; /* Soft blue */ - background-image: none; + background-image: none; } tr.z-treerow-over input { background-color: #eff2f6; /* Soft blue */ - background-image: none; + background-image: none; } .timeplot-canvas { position:relative; overflow:hidden; - } +} .resourcesload .timetracker-secondlevel { height: 2000px; @@ -1281,15 +1281,15 @@ tr.z-treerow-over input { } .timeTrackedTableWithLeftPane input[value="0"] { - color: #DDDDDD; + color: #DDDDDD; } /* for horizontal scrolling */ .timeTrackedTableWithLeftPane .z-grid-body table { - position:relative; + position:relative; } .timeTrackedTableWithLeftPane div.z-grid-body { -overflow: visible; + overflow: visible; } .advancedallocationlayout #timeTracker .z-vbox { @@ -1336,7 +1336,7 @@ overflow: visible; } .advancedallocationlayout .timetrackergap { - overflow: visible; + overflow: visible; } .timeTrackedTableWithLeftPane .z-grid-body .z-row-inner { @@ -1425,7 +1425,7 @@ tr.z-tree-row-seld .z-row-cnt { } .edit-task-window .z-tab-accordion { -display:none; + display:none; } .edit-task-window .z-tabpanel-accordion { @@ -1498,7 +1498,7 @@ display:none; } #ganttpanel .second_level_ #watermark .bankHoliday { -border-right: solid 1px #F2D8D8 !important; + border-right: solid 1px #F2D8D8 !important; } @@ -1597,7 +1597,7 @@ border-right: solid 1px #F2D8D8 !important; .advanced-assignment-area td .limiting.z-textbox { height: 20px; background: #61B598; // LIMITING_ASSIGNED - color: #555555; +color: #555555; border-right: solid 1px white; opacity: 1; -moz-opacity: 1; @@ -1607,7 +1607,7 @@ border-right: solid 1px #F2D8D8 !important; .advanced-assignment-area td .limiting.z-intbox[value="0"], .advanced-assignment-area td .limiting.z-textbox[value="0"] { background: #C1D9D1; // LIMITING_UNNASSIGNED - color: #555555; +color: #555555; } .advanced-assignment-area > .z-center-body { @@ -1668,7 +1668,7 @@ input.z-datebox-text-disd { display: none; } -.toolbar-box .z-button tbody, +.toolbar-box .z-button tbody, .toolbar-box .z-button tbody:hover, .toolbar-box .z-button tbody:active { background-color: transparent; @@ -1729,7 +1729,7 @@ input.z-datebox-text-disd { background-color: #A1D586; } -.z-button .z-button-tl, .z-button .z-button-tr, +.z-button .z-button-tl, .z-button .z-button-tr, .z-button .z-button-bl, .z-button .z-button-br { background-image: url(../img/btn-corner-green.gif); } @@ -1901,7 +1901,7 @@ select { } .scheduling-graphics { - width: auto !important; + width: auto !important; } .scheduling-graphics .z-tabs-ver-space { @@ -1941,14 +1941,40 @@ select { text-decoration: none !important; } -.logs-priority-color-red { +.issueLog-priority-color-red { background: #FF4000 !important; } -.logs-priority-color-yellow { +.issueLog-priority-color-yellow { background: #FFA500 !important; } -.logs-priority-color-green { +.issueLog-priority-color-green { background: #AAFFAA !important; } + +.riskLog-score-color-1 { + background: #BAF109 !important; +} + +.riskLog-score-color-2 { + background: #A3D307 !important; +} + +.riskLog-score-color-3 { + background: #FFAF04 !important; +} + +.riskLog-score-color-4 { + background: #FF9000 !important; +} + +.riskLog-score-color-6 { + background: #FF4B00 !important; +} + +.riskLog-score-color-9 { + background: #EA0024 !important; +} + + diff --git a/libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul b/libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul index f094331ea..a083f9a25 100644 --- a/libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul +++ b/libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul @@ -50,14 +50,14 @@ @@ -107,13 +107,13 @@