Added full active issue chart.
This commit is contained in:
parent
357276dcc0
commit
80818318ab
4 changed files with 11 additions and 29 deletions
|
@ -21,5 +21,6 @@
|
|||
<classpathentry kind="lib" path="lib/devinsy-strings-0.8.2.jar" sourcepath="lib/devinsy-strings-0.8.2-sources.zip"/>
|
||||
<classpathentry kind="lib" path="lib/devinsy-xml-0.8.2.jar" sourcepath="lib/devinsy-xml-0.8.2-sources.zip"/>
|
||||
<classpathentry kind="lib" path="lib/xidyn-1.8.2.jar" sourcepath="lib/xidyn-1.8.2-sources.zip"/>
|
||||
<classpathentry kind="lib" path="lib/commons-cli-1.4.jar" sourcepath="lib/commons-cli-1.4-sources.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
|
|
@ -117,37 +117,16 @@ public class CreatedClosedDiffChartView
|
|||
{
|
||||
String result;
|
||||
|
||||
try
|
||||
{
|
||||
logger.debug("Building created/concluded chart view…");
|
||||
|
||||
if (project.hasIssue())
|
||||
{
|
||||
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/chartLineView.xhtml"));
|
||||
String code = XidynUtils.extractBodyContent(source);
|
||||
|
||||
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineBar"));
|
||||
|
||||
StringList labels = buildWeekLabels(project.issueStats().getFirstCreate().toLocalDate());
|
||||
code = code.replaceAll("labels: \\[.*\\]", "labels: " + AgirStatoolUtils.toJSonStrings(labels));
|
||||
|
||||
StringList values = project.issueStats().getWeekCreatedIssueCounts().toValueList();
|
||||
code = code.replaceAll("data: \\[.*\\]", "data: " + AgirStatoolUtils.toJSonNumbers(values));
|
||||
|
||||
values = project.issueStats().getWeekConcludedIssueCounts().toValueList();
|
||||
code = code.replaceAll("data: \\[.*\\] ", "data: " + AgirStatoolUtils.toJSonNumbers(values));
|
||||
|
||||
result = code.toString();
|
||||
result = build(title, project, project.issueStats().getFirstCreate().toLocalDate(), LocalDate.now());
|
||||
}
|
||||
else
|
||||
{
|
||||
result = "No issue.";
|
||||
}
|
||||
}
|
||||
catch (IOException exception)
|
||||
{
|
||||
throw new AgirStatoolException("Error building ProjectsRaw view: " + exception.getMessage(), exception);
|
||||
}
|
||||
|
||||
//
|
||||
return result;
|
||||
|
|
|
@ -67,6 +67,7 @@ public class ProjectPage
|
|||
data.setContent("createdClosedPreviousYearChart", CreatedClosedCountChartView.buildPreviousYear("Created/closed last year Count", project));
|
||||
data.setContent("created-ClosedPreviousYearChart", CreatedClosedDiffChartView.buildPreviousYear("Created-closed last year Count", project));
|
||||
data.setContent("createdClosedFullChart", CreatedClosedCountChartView.buildFull("Created/closed Count", project));
|
||||
data.setContent("created-ClosedFullChart", CreatedClosedDiffChartView.buildFull("Created-closed Count", project));
|
||||
|
||||
data.setContent("issueRawChart", IssueStatChartView.build("Issue Raw Count", project));
|
||||
data.setContent("issueGroupedChart", IssueStatChartView.buildGrouped("Issue Grouped Count", project));
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<script src="Chart.bundle.min.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div style="margin: 10px;">
|
||||
<div style="margin: 5px 10px 10px 10px;">
|
||||
<h1><a href="index.xhtml">Agir Statool</a><sup id="versionsup" style="font-size: 9px;">v0.0.14</sup> – Project <a id="agirLink" href="#">n/a</a></h1>
|
||||
<div>
|
||||
<div style="margin: 5px;">
|
||||
|
@ -39,7 +39,8 @@
|
|||
<div id="created-ClosedPreviousYearChart" style="display: inline-block; width: 49%; height: 400px;">CREATED-CLOSED PREVIOUS YEAR CHART</div>
|
||||
</div>
|
||||
<div id="fullBox">
|
||||
<div id="createdClosedFullChart" style="height: 400px;">CREATED/CLOSED FULL CHART</div>
|
||||
<div id="createdClosedFullChart" style="height: 400px; padding-bottom: 4px;">CREATED/CLOSED FULL CHART</div>
|
||||
<div id="created-ClosedFullChart" style="height: 400px;">CREATED-CLOSED FULL CHART</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in a new issue