From 182055167833383b96d1e58deed8f38903a6d1f0 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Sat, 18 Jan 2020 10:30:21 +0100 Subject: [PATCH] Improved color indicators. --- .../core/pages/ProjectsRawView.java | 4 ++-- .../agirstatool/core/pages/agirstatool.css | 18 ++++++++++++++++++ .../core/pages/projectsGroupedView.xhtml | 12 ++++++------ .../core/pages/projectsRawView.xhtml | 14 +++++++------- 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/org/april/agirstatool/core/pages/ProjectsRawView.java b/src/org/april/agirstatool/core/pages/ProjectsRawView.java index f7c2c8c..8f79d5b 100644 --- a/src/org/april/agirstatool/core/pages/ProjectsRawView.java +++ b/src/org/april/agirstatool/core/pages/ProjectsRawView.java @@ -104,6 +104,7 @@ public class ProjectsRawView data.setContent("projectRawLine", index, "prl_projectNameLink", StringEscapeUtils.escapeXml(project.getName())); data.setContent("projectRawLine", index, "prl_childCount", project.getChildCount()); data.setContent("projectRawLine", index, "prl_issueCount", project.issueStats().getCount()); + data.setContent("projectRawLine", index, "prl_maybeIssueCount", project.issueStats().getMaybeCount()); data.setContent("projectRawLine", index, "prl_newIssueCount", project.issueStats().getNewCount()); data.setAttribute("projectRawLine", index, "prl_newIssueCount", "class", AgirStatoolUtils.selectStatIndicator(project.issueStats().getNewCount())); data.setContent("projectRawLine", index, "prl_confirmedIssueCount", project.issueStats().getConfirmedCount()); @@ -111,19 +112,18 @@ public class ProjectsRawView data.setContent("projectRawLine", index, "prl_ongoingIssueCount", project.issueStats().getOngoingCount()); data.setAttribute("projectRawLine", index, "prl_ongoingIssueCount", "class", AgirStatoolUtils.selectStatIndicator(project.issueStats().getOngoingCount())); data.setContent("projectRawLine", index, "prl_waitingIssueCount", project.issueStats().getWaitingCount()); - data.setContent("projectRawLine", index, "prl_maybeIssueCount", project.issueStats().getMaybeCount()); data.setContent("projectRawLine", index, "prl_resolvedIssueCount", project.issueStats().getResolvedCount()); data.setAttribute("projectRawLine", index, "prl_resolvedIssueCount", "class", AgirStatoolUtils.selectStatIndicator(project.issueStats().getResolvedCount())); data.setContent("projectRawLine", index, "prl_rejectedIssueCount", project.issueStats().getRejectedCount()); data.setContent("projectRawLine", index, "prl_closedIssueCount", project.issueStats().getClosedCount()); data.setContent("projectRawLine", index, "prl_unassignedIssueCount", project.issueStats().getUnassignedCount()); + data.setContent("projectRawLine", index, "prl_unassignedMaybeIssueCount", project.issueStats().getUnassignedMaybeCount()); data.setContent("projectRawLine", index, "prl_unassignedNewIssueCount", project.issueStats().getUnassignedNewCount()); data.setContent("projectRawLine", index, "prl_unassignedConfirmedIssueCount", project.issueStats().getUnassignedConfirmedCount()); data.setContent("projectRawLine", index, "prl_unassignedOngoingIssueCount", project.issueStats().getUnassignedOngoingCount()); data.setAttribute("projectRawLine", index, "prl_unassignedOngoingIssueCount", "class", AgirStatoolUtils.selectUnassignedIndicator(project.issueStats().getUnassignedOngoingCount())); data.setContent("projectRawLine", index, "prl_unassignedWaitingIssueCount", project.issueStats().getUnassignedWaitingCount()); data.setAttribute("projectRawLine", index, "prl_unassignedWaitingIssueCount", "class", AgirStatoolUtils.selectUnassignedIndicator(project.issueStats().getUnassignedWaitingCount())); - data.setContent("projectRawLine", index, "prl_unassignedMaybeIssueCount", project.issueStats().getUnassignedMaybeCount()); data.setContent("projectRawLine", index, "prl_unassignedResolvedIssueCount", project.issueStats().getUnassignedResolvedCount()); data.setAttribute("projectRawLine", index, "prl_unassignedResolvedIssueCount", "class", AgirStatoolUtils.selectUnassignedIndicator(project.issueStats().getUnassignedResolvedCount())); data.setContent("projectRawLine", index, "prl_unassignedRejectedIssueCount", project.issueStats().getUnassignedRejectedCount()); diff --git a/src/org/april/agirstatool/core/pages/agirstatool.css b/src/org/april/agirstatool/core/pages/agirstatool.css index 48b5183..04bd8d4 100644 --- a/src/org/april/agirstatool/core/pages/agirstatool.css +++ b/src/org/april/agirstatool/core/pages/agirstatool.css @@ -355,6 +355,24 @@ table > tfoot > tr > th.active background-color: #e5e5e5; } +table > thead > tr.comment > td, +table > thead > tr.comment > th, +table > thead > tr > td.comment, +table > thead > tr > th.comment, +table > tbody > tr.comment > td, +table > tbody > tr.comment > th, +table > tbody > tr > td.comment, +table > tr > td.comment, +table > tbody > tr > th.comment, +table > tr > th.comment, +table > tfoot > tr.comment > td, +table > tfoot > tr.comment > th, +table > tfoot > tr > td.comment, +table > tfoot > tr > th.comment +{ + background-color: #ececec; +} + table > thead > tr.info > td, table > thead > tr.info > th, table > thead > tr > td.info, diff --git a/src/org/april/agirstatool/core/pages/projectsGroupedView.xhtml b/src/org/april/agirstatool/core/pages/projectsGroupedView.xhtml index 68a0d8d..e77a6c8 100644 --- a/src/org/april/agirstatool/core/pages/projectsGroupedView.xhtml +++ b/src/org/april/agirstatool/core/pages/projectsGroupedView.xhtml @@ -20,9 +20,8 @@ Last
update - Total - Active Maybe + Active Resolved Concluded Total @@ -30,23 +29,24 @@ Started Resolved Concluded + Total n/a foo - n/a + n/a - n/a - n/a n/a + n/a n/a n/a + n/a - n/a n/a n/a n/a n/a + n/a n/a diff --git a/src/org/april/agirstatool/core/pages/projectsRawView.xhtml b/src/org/april/agirstatool/core/pages/projectsRawView.xhtml index 0511e30..6596ef4 100644 --- a/src/org/april/agirstatool/core/pages/projectsRawView.xhtml +++ b/src/org/april/agirstatool/core/pages/projectsRawView.xhtml @@ -20,41 +20,40 @@ Last
update - Total + Maybe New Confirmed Ongoing Waiting - Maybe Resolved Rejected Closed Total + Maybe New Confirmed Ongoing Waiting - Maybe Resolved Rejected Closed + Total n/a foo - n/a + n/a - n/a + n/a n/a n/a n/a n/a - n/a n/a n/a n/a + n/a - n/a n/a n/a n/a @@ -63,6 +62,7 @@ n/a n/a n/a + n/a n/a