cpm/agirstatool
1
0
Fork 0
Code Issues Pull requests Releases Activity

Improved issue bar chart.

Browse source
This commit is contained in:
Christian P. MOMON 2020-01-20 08:00:41 +01:00
parent 1aa8ee8637
commit 489e845484
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/april/agirstatool/core/pages/ChartBarView.java
View file

@ -57,7 +57,7 @@ public class ChartBarView
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/chartBarView.xhtml")); String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/chartBarView.xhtml"));
String code = XidynUtils.extractBodyContent(source); String code = XidynUtils.extractBodyContent(source);
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title)); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartBar"));
code = code.replace("# of Votes", labelTitle); code = code.replace("# of Votes", labelTitle);
code = code.replaceAll("labels: \\[.*\\]", "labels: " + AgirStatoolUtils.toJSonStrings(labels)); code = code.replaceAll("labels: \\[.*\\]", "labels: " + AgirStatoolUtils.toJSonStrings(labels));
code = code.replaceAll("data: \\[.*\\]", "data: " + AgirStatoolUtils.toJSonNumbers(values)); code = code.replaceAll("data: \\[.*\\]", "data: " + AgirStatoolUtils.toJSonNumbers(values));

30
src/org/april/agirstatool/core/pages/IssueStatChartView.java
View file

@ -19,7 +19,7 @@
package org.april.agirstatool.core.pages; package org.april.agirstatool.core.pages;
import org.april.agirstatool.core.AgirStatoolException; import org.april.agirstatool.core.AgirStatoolException;
import org.april.agirstatool.core.IssueStats; import org.april.agirstatool.core.Project;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -41,7 +41,7 @@ public class IssueStatChartView
* @throws AgirStatoolException * @throws AgirStatoolException
* the agir statool exception * the agir statool exception
*/ */
public static String build(final String title, final IssueStats stats) throws AgirStatoolException public static String build(final String title, final Project project) throws AgirStatoolException
{ {
String result; String result;
@ -49,14 +49,15 @@ public class IssueStatChartView
StringList labels = new StringList("Maybe", "New", "Confirmed", "Ongoing", "Waiting", "Resolved"); StringList labels = new StringList("Maybe", "New", "Confirmed", "Ongoing", "Waiting", "Resolved");
StringList values = new StringList(); StringList values = new StringList();
values.append(stats.getMaybeCount()); values.append(project.issueStats().getMaybeCount());
values.append(stats.getNewCount()); values.append(project.issueStats().getNewCount());
values.append(stats.getConfirmedCount()); values.append(project.issueStats().getConfirmedCount());
values.append(stats.getOngoingCount()); values.append(project.issueStats().getOngoingCount());
values.append(stats.getWaitingCount()); values.append(project.issueStats().getWaitingCount());
values.append(stats.getResolvedCount()); values.append(project.issueStats().getResolvedCount());
result = ChartBarView.build(title, title, labels, values); String targetTitle = title + " – " + project.getName();
result = ChartBarView.build(targetTitle, targetTitle, labels, values);
// //
return result; return result;
@ -71,7 +72,7 @@ public class IssueStatChartView
* @throws AgirStatoolException * @throws AgirStatoolException
* the agir statool exception * the agir statool exception
*/ */
public static String buildGrouped(final String title, final IssueStats stats) throws AgirStatoolException public static String buildGrouped(final String title, final Project project) throws AgirStatoolException
{ {
String result; String result;
@ -79,11 +80,12 @@ public class IssueStatChartView
StringList labels = new StringList("Maybe", "Active", "Resolved"); StringList labels = new StringList("Maybe", "Active", "Resolved");
StringList values = new StringList(); StringList values = new StringList();
values.append(stats.getMaybeCount()); values.append(project.issueStats().getMaybeCount());
values.append(stats.getActiveCount()); values.append(project.issueStats().getActiveCount());
values.append(stats.getResolvedCount()); values.append(project.issueStats().getResolvedCount());
result = ChartBarView.build(title, title, labels, values); String targetTitle = title + " – " + project.getName();
result = ChartBarView.build(targetTitle, targetTitle, labels, values);
// //
return result; return result;

8
src/org/april/agirstatool/core/pages/ProjectPage.java
View file

@ -57,13 +57,13 @@ public class ProjectPage
data.setContent("projectName", project.getName()); data.setContent("projectName", project.getName());
data.setContent("issueRawChart", IssueStatChartView.build("Issue Raw Count", project.issueStats())); data.setContent("issueRawChart", IssueStatChartView.build("Issue Raw Count", project));
data.setContent("issueGroupedChart", IssueStatChartView.buildGrouped("Issue Grouped Count", project.issueStats())); data.setContent("issueGroupedChart", IssueStatChartView.buildGrouped("Issue Grouped Count", project));
if (project.hasChild()) if (project.hasChild())
{ {
data.setContent("issueRawChartAlone", IssueStatChartView.build("Issue Raw Count (#)", project.subProjects().get(0).issueStats())); data.setContent("issueRawChartAlone", IssueStatChartView.build("Issue Raw Count", project.subProjects().get(0)));
data.setContent("issueGroupedChartAlone", IssueStatChartView.buildGrouped("Issue Grouped Count (#)", project.subProjects().get(0).issueStats())); data.setContent("issueGroupedChartAlone", IssueStatChartView.buildGrouped("Issue Grouped Count", project.subProjects().get(0)));
} }
String projectsRawView = ProjectsRawView.build(project); String projectsRawView = ProjectsRawView.build(project);