From 3dd50d12a588282ac6783fe3d169ff787f1270f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Mon, 14 May 2012 15:06:32 +0200 Subject: [PATCH] Added qualitative indicators to deadline ratios FEA: ItEr76S15OrganizingPerProjectDashboard --- .../web/dashboard/DashboardController.java | 7 ++++++ .../main/webapp/dashboard/css/dashboard.css | 20 +++++++++++++++++- .../dashboard/img/value-meaning-negative.png | Bin 0 -> 401 bytes .../dashboard/img/value-meaning-positive.png | Bin 0 -> 363 bytes 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 libreplan-webapp/src/main/webapp/dashboard/img/value-meaning-negative.png create mode 100644 libreplan-webapp/src/main/webapp/dashboard/img/value-meaning-positive.png diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java index af68cd34d..f66c4abd6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java @@ -101,11 +101,18 @@ public class DashboardController extends GenericForwardComposer { private void renderOvertimeRatio() { lblOvertimeRatio.setValue(String.format("%.2f", dashboardModel .getOvertimeRatio().doubleValue())); + String valueMeaning = (dashboardModel.getOvertimeRatio().doubleValue() > 1) ? "negative" + : "positive"; + lblOvertimeRatio.setSclass("dashboard-label-remarked " + valueMeaning); } private void renderAvailabilityRatio() { lblAvailabilityRatio.setValue(String.format("%.2f", dashboardModel .getAvailabilityRatio().doubleValue())); + String valueMeaning = (dashboardModel.getAvailabilityRatio() + .doubleValue() > 1) ? "negative" : "positive"; + lblAvailabilityRatio.setSclass("dashboard-label-remarked " + + valueMeaning); } private void renderCostStatus(Order order) { diff --git a/libreplan-webapp/src/main/webapp/dashboard/css/dashboard.css b/libreplan-webapp/src/main/webapp/dashboard/css/dashboard.css index 18c83fd45..52339f08d 100644 --- a/libreplan-webapp/src/main/webapp/dashboard/css/dashboard.css +++ b/libreplan-webapp/src/main/webapp/dashboard/css/dashboard.css @@ -13,10 +13,28 @@ } .dashboard-label-remarked { - font-size: 1em; + color: #666; + font-family: Trebuchet MS,Arial,Helvetica,sans-serif; + font-size: 16px; font-weight: bold; } +.dashboard-label-remarked.positive, +.dashboard-label-remarked.negative { + background-position: 100%; + background-repeat: no-repeat; + padding-right: 25px; + background-size: 25px; +} + +.dashboard-label-remarked.negative { + background-image: url('../img/value-meaning-negative.png'); +} + +.dashboard-label-remarked.positive { + background-image: url('../img/value-meaning-positive.png'); +} + .dashboard-box { border: solid 2px #9B9B9B; background: #fffdf6; diff --git a/libreplan-webapp/src/main/webapp/dashboard/img/value-meaning-negative.png b/libreplan-webapp/src/main/webapp/dashboard/img/value-meaning-negative.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb55a7c7f141c33afb8a0c120f7d4a876e0880c GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfwc6x=<11Hv2m#DR+5c)B=-cpSfaZ7*N5f&lvm`x#}0-$LhD zm3^Ii;AHuwi`z3VU33k$ikQ4C{*Elm8`Wd1HuV)Ut4_b{ky$uVbCYTq!-T4xs|!!) z_^n)bERp@b#nh_HK}Uoc)OV;|E32wo>|Wv&^WEE9aQmSny1N@|0;JP|oGa8;uF^F& z%-r)WR6f}EQqi}Ky*BTvlNx8Od0M6?y;;m;>*b0oI%}7N-}adL-rpx+^VUn3Pqt;9 z?2KpSJD0Kjo@&&`$~6n#e6?_P?A((7e4~ENbJNh>^X(@Hn7aRtf8<-cV{LHy+Z(qO p3U`WVOjr6F^wqa_-^!z(-)rs-by-*STnOlI22WQ%mvv4FO#oM_p_c#v literal 0 HcmV?d00001 diff --git a/libreplan-webapp/src/main/webapp/dashboard/img/value-meaning-positive.png b/libreplan-webapp/src/main/webapp/dashboard/img/value-meaning-positive.png new file mode 100644 index 0000000000000000000000000000000000000000..581071ba83ffad16686553c9ca9a19ca28509ce4 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf1PEimyorj;_(=}cZq_Ju3rk- znIGi6d|FsG5PLUF3(5v!?+Mq|UQ<{bt=kwiJ&Jj&-d2|E*;k`9V^8KEh+@7PHg;|1>`7jm}+R(XT0|CKvXHA!xVuKWBGq5ulG4JYD@<);T3K0RSBGhLZpQ literal 0 HcmV?d00001