Renamed chart classes.

This commit is contained in:
Christian P. MOMON 2020-01-30 22:34:33 +01:00
parent 2ab42decdf
commit eafe2083b5
11 changed files with 172 additions and 238 deletions

View File

@ -1,79 +0,0 @@
/*
* Copyright (C) 2020 Christian Pierre MOMON <christian.momon@devinsy.fr>
*
* This file is part of AgirStatool, simple key value database.
*
* AgirStatool is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* AgirStatool is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
*/
package org.april.agirstatool.core.pages;
import java.io.IOException;
import org.apache.commons.codec.digest.DigestUtils;
import org.april.agirstatool.core.AgirStatool;
import org.april.agirstatool.core.AgirStatoolException;
import org.april.agirstatool.core.AgirStatoolUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.strings.StringList;
import fr.devinsy.xidyn.utils.XidynUtils;
/**
* The Class projectsRawPageBuilder.
*/
public class ChartBarView
{
private static Logger logger = LoggerFactory.getLogger(ChartBarView.class);
/**
* Builds the.
*
* @param title
* the title
* @param labelTitle
* the label title
* @param labels
* the labels
* @param values
* the values
* @return the string
* @throws AgirStatoolException
* the agir statool exception
*/
public static String build(final String title, final String labelTitle, final StringList labels, final StringList values) throws AgirStatoolException
{
String result;
try
{
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/chartBarView.xhtml"));
String code = XidynUtils.extractBodyContent(source);
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartBar"));
code = code.replace("# of Votes", labelTitle);
code = code.replaceAll("labels: \\[.*\\]", "labels: " + AgirStatoolUtils.toJSonStrings(labels));
code = code.replaceAll("data: \\[.*\\]", "data: " + AgirStatoolUtils.toJSonNumbers(values));
result = code.toString();
}
catch (IOException exception)
{
throw new AgirStatoolException("Error building ProjectsRaw view: " + exception.getMessage(), exception);
}
//
return result;
}
}

View File

@ -1,79 +0,0 @@
/*
* Copyright (C) 2020 Christian Pierre MOMON <christian.momon@devinsy.fr>
*
* This file is part of AgirStatool, simple key value database.
*
* AgirStatool is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* AgirStatool is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
*/
package org.april.agirstatool.core.pages;
import java.io.IOException;
import org.apache.commons.codec.digest.DigestUtils;
import org.april.agirstatool.core.AgirStatool;
import org.april.agirstatool.core.AgirStatoolException;
import org.april.agirstatool.core.AgirStatoolUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.strings.StringList;
import fr.devinsy.xidyn.utils.XidynUtils;
/**
* The Class projectsRawPageBuilder.
*/
public class ChartPolarView
{
private static Logger logger = LoggerFactory.getLogger(ChartPolarView.class);
/**
* Builds the.
*
* @param title
* the title
* @param labelTitle
* the label title
* @param labels
* the labels
* @param values
* the values
* @return the string
* @throws AgirStatoolException
* the agir statool exception
*/
public static String build(final String title, final String labelTitle, final StringList labels, final StringList values) throws AgirStatoolException
{
String result;
try
{
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/chartPolarView.xhtml"));
String code = XidynUtils.extractBodyContent(source);
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartPolar"));
code = code.replace("# of Votes", labelTitle);
code = code.replaceAll("labels: \\[.*\\]", "labels: " + AgirStatoolUtils.toJSonStrings(labels));
code = code.replaceAll("data: \\[.*\\]", "data: " + AgirStatoolUtils.toJSonNumbers(values));
result = code.toString();
}
catch (IOException exception)
{
throw new AgirStatoolException("Error building ProjectsRaw view: " + exception.getMessage(), exception);
}
//
return result;
}
}

View File

@ -63,7 +63,7 @@ public class CreatedClosedCountChartView
{ {
if (project.hasIssue()) if (project.hasIssue())
{ {
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/chartLineView.xhtml")); String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedCountChartView.xhtml"));
String code = XidynUtils.extractBodyContent(source); String code = XidynUtils.extractBodyContent(source);
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineChart")); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineChart"));
@ -116,7 +116,7 @@ public class CreatedClosedCountChartView
if (project.hasIssue()) if (project.hasIssue())
{ {
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/chartLineView.xhtml")); String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedCountChartView.xhtml"));
String code = XidynUtils.extractBodyContent(source); String code = XidynUtils.extractBodyContent(source);
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineBar")); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineBar"));

View File

@ -64,7 +64,7 @@ public class CreatedClosedDiffChartView
{ {
if (project.hasIssue()) if (project.hasIssue())
{ {
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/chartLineView2.xhtml")); String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedDiffChartView.xhtml"));
String code = XidynUtils.extractBodyContent(source); String code = XidynUtils.extractBodyContent(source);
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "line2Chart")); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "line2Chart"));

View File

@ -18,19 +18,53 @@
*/ */
package org.april.agirstatool.core.pages; package org.april.agirstatool.core.pages;
import java.io.IOException;
import org.apache.commons.codec.digest.DigestUtils;
import org.april.agirstatool.core.AgirStatool;
import org.april.agirstatool.core.AgirStatoolException; import org.april.agirstatool.core.AgirStatoolException;
import org.april.agirstatool.core.AgirStatoolUtils;
import org.april.agirstatool.core.Project; import org.april.agirstatool.core.Project;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fr.devinsy.strings.StringList; import fr.devinsy.strings.StringList;
import fr.devinsy.xidyn.utils.XidynUtils;
/** /**
* The Class projectsRawPageBuilder. * The Class projectsRawPageBuilder.
*/ */
public class IssueStatChartView public class IssueStatusChartView
{ {
private static Logger logger = LoggerFactory.getLogger(IssueStatChartView.class); private static Logger logger = LoggerFactory.getLogger(IssueStatusChartView.class);
/**
* Builds the grouped.
*
* @param title
* the title
* @param project
* the project
* @return the string
* @throws AgirStatoolException
* the agir statool exception
*/
public static String buildGrouped(final String title, final Project project) throws AgirStatoolException
{
String result;
StringList labels = new StringList("Maybe", "Active", "Resolved");
StringList values = new StringList();
values.append(project.issueStats().getMaybeCount());
values.append(project.issueStats().getActiveCount());
values.append(project.issueStats().getResolvedCount());
String targetTitle = title + " " + project.getName();
result = build(targetTitle, targetTitle, labels, values);
//
return result;
}
/** /**
* Builds the. * Builds the.
@ -57,35 +91,47 @@ public class IssueStatChartView
values.append(project.issueStats().getResolvedCount()); values.append(project.issueStats().getResolvedCount());
String targetTitle = title + " " + project.getName(); String targetTitle = title + " " + project.getName();
result = ChartBarView.build(targetTitle, targetTitle, labels, values); result = build(targetTitle, targetTitle, labels, values);
// //
return result; return result;
} }
/** /**
* Builds the grouped. * Builds the.
* *
* @param title * @param title
* the title * the title
* @param project * @param labelTitle
* the project * the label title
* @param labels
* the labels
* @param values
* the values
* @return the string * @return the string
* @throws AgirStatoolException * @throws AgirStatoolException
* the agir statool exception * the agir statool exception
*/ */
public static String buildGrouped(final String title, final Project project) throws AgirStatoolException public static String build(final String title, final String labelTitle, final StringList labels, final StringList values) throws AgirStatoolException
{ {
String result; String result;
StringList labels = new StringList("Maybe", "Active", "Resolved"); try
StringList values = new StringList(); {
values.append(project.issueStats().getMaybeCount()); String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/issueStatusChartView.xhtml"));
values.append(project.issueStats().getActiveCount()); String code = XidynUtils.extractBodyContent(source);
values.append(project.issueStats().getResolvedCount());
String targetTitle = title + " " + project.getName(); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartBar"));
result = ChartBarView.build(targetTitle, targetTitle, labels, values); code = code.replace("# of Votes", labelTitle);
code = code.replaceAll("labels: \\[.*\\]", "labels: " + AgirStatoolUtils.toJSonStrings(labels));
code = code.replaceAll("data: \\[.*\\]", "data: " + AgirStatoolUtils.toJSonNumbers(values));
result = code.toString();
}
catch (IOException exception)
{
throw new AgirStatoolException("Error building ProjectsRaw view: " + exception.getMessage(), exception);
}
// //
return result; return result;

View File

@ -79,10 +79,10 @@ public class ProjectPage
data.setContent("created-ClosedFullChart", CreatedClosedDiffChartView.buildFull("Created-closed Count", project)); data.setContent("created-ClosedFullChart", CreatedClosedDiffChartView.buildFull("Created-closed Count", project));
data.setContent("ageFullChart", IssueAgeChartView.buildFull("Issue Age Full Chart", project)); data.setContent("ageFullChart", IssueAgeChartView.buildFull("Issue Age Full Chart", project));
data.setContent("issueRawChart", IssueStatChartView.build("Issue Raw Count", project)); data.setContent("issueRawChart", IssueStatusChartView.build("Issue Raw Count", project));
data.setContent("issueGroupedChart", IssueStatChartView.buildGrouped("Issue Grouped Count", project)); data.setContent("issueGroupedChart", IssueStatusChartView.buildGrouped("Issue Grouped Count", project));
data.setContent("unassignedRawChart", UnassignedPolarChartView.build("Unassigned Raw Count", project)); data.setContent("unassignedRawChart", UnassignedIssueChartView.build("Unassigned Raw Count", project));
data.setContent("unassignedGroupedChart", UnassignedPolarChartView.buildGrouped("Unassigned Grouped Count", project)); data.setContent("unassignedGroupedChart", UnassignedIssueChartView.buildGrouped("Unassigned Grouped Count", project));
data.setContent("createdClosedChartMini", CreatedClosedCountChartView.buildLastMonths("Created/closed 6 months CountA", project, 6)); data.setContent("createdClosedChartMini", CreatedClosedCountChartView.buildLastMonths("Created/closed 6 months CountA", project, 6));
data.setContent("created-ClosedChartMini", CreatedClosedDiffChartView.buildLastMonths("Created-closed Count Mini", project, 6)); data.setContent("created-ClosedChartMini", CreatedClosedDiffChartView.buildLastMonths("Created-closed Count Mini", project, 6));
data.setContent("ageChartMini", IssueAgeChartView.buildLastMonths("Issue Age Chart Mini", project, 6)); data.setContent("ageChartMini", IssueAgeChartView.buildLastMonths("Issue Age Chart Mini", project, 6));

View File

@ -18,20 +18,55 @@
*/ */
package org.april.agirstatool.core.pages; package org.april.agirstatool.core.pages;
import java.io.IOException;
import org.apache.commons.codec.digest.DigestUtils;
import org.april.agirstatool.core.AgirStatool;
import org.april.agirstatool.core.AgirStatoolException; import org.april.agirstatool.core.AgirStatoolException;
import org.april.agirstatool.core.AgirStatoolUtils;
import org.april.agirstatool.core.IssueStats; import org.april.agirstatool.core.IssueStats;
import org.april.agirstatool.core.Project; import org.april.agirstatool.core.Project;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fr.devinsy.strings.StringList; import fr.devinsy.strings.StringList;
import fr.devinsy.xidyn.utils.XidynUtils;
/** /**
* The Class projectsRawPageBuilder. * The Class projectsRawPageBuilder.
*/ */
public class UnassignedPolarChartView public class UnassignedIssueChartView
{ {
private static Logger logger = LoggerFactory.getLogger(UnassignedPolarChartView.class); private static Logger logger = LoggerFactory.getLogger(UnassignedIssueChartView.class);
/**
* Builds the grouped.
*
* @param title
* the title
* @param project
* the project
* @return the string
* @throws AgirStatoolException
* the agir statool exception
*/
public static String buildGrouped(final String title, final Project project) throws AgirStatoolException
{
String result;
StringList labels = new StringList("Started", "Resolved", "Concluded");
StringList values = new StringList();
IssueStats stats = project.issueStats();
values.append(stats.getUnassignedStartedCount());
values.append(stats.getUnassignedResolvedCount());
values.append(stats.getUnassignedConcludedCount());
String targetTitle = title + " " + project.getName();
result = build(targetTitle, targetTitle, labels, values);
//
return result;
}
/** /**
* Builds the. * Builds the.
@ -59,36 +94,47 @@ public class UnassignedPolarChartView
values.append(stats.getUnassignedClosedCount()); values.append(stats.getUnassignedClosedCount());
String targetTitle = title + " " + project.getName(); String targetTitle = title + " " + project.getName();
result = ChartPolarView.build(targetTitle, targetTitle, labels, values); result = build(targetTitle, targetTitle, labels, values);
// //
return result; return result;
} }
/** /**
* Builds the grouped. * Builds the.
* *
* @param title * @param title
* the title * the title
* @param project * @param labelTitle
* the project * the label title
* @param labels
* the labels
* @param values
* the values
* @return the string * @return the string
* @throws AgirStatoolException * @throws AgirStatoolException
* the agir statool exception * the agir statool exception
*/ */
public static String buildGrouped(final String title, final Project project) throws AgirStatoolException public static String build(final String title, final String labelTitle, final StringList labels, final StringList values) throws AgirStatoolException
{ {
String result; String result;
StringList labels = new StringList("Started", "Resolved", "Concluded"); try
StringList values = new StringList(); {
IssueStats stats = project.issueStats(); String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/unassignedIssueChart.xhtml"));
values.append(stats.getUnassignedStartedCount()); String code = XidynUtils.extractBodyContent(source);
values.append(stats.getUnassignedResolvedCount());
values.append(stats.getUnassignedConcludedCount());
String targetTitle = title + " " + project.getName(); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartPolar"));
result = ChartPolarView.build(targetTitle, targetTitle, labels, values); code = code.replace("# of Votes", labelTitle);
code = code.replaceAll("labels: \\[.*\\]", "labels: " + AgirStatoolUtils.toJSonStrings(labels));
code = code.replaceAll("data: \\[.*\\]", "data: " + AgirStatoolUtils.toJSonNumbers(values));
result = code.toString();
}
catch (IOException exception)
{
throw new AgirStatoolException("Error building ProjectsRaw view: " + exception.getMessage(), exception);
}
// //
return result; return result;