adminsys/agirstatool
adminsys
/
agirstatool
9
1
Fork 0
Code Issues Pull Requests Releases Activity

Fixed bad swap of column in unassigned table. Renamed SQL methods.

This commit is contained in:
Christian P. MOMON 2020-01-23 23:04:03 +01:00
parent 3a3952048a
commit 80bdd05e76
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/april/agirstatool/core/AgirStatool.java
View File

@ -99,7 +99,7 @@ public class AgirStatool
result = new StringList(); result = new StringList();
Projects projects = listProjectsWithoutSubStats().sortByName(); Projects projects = fetchProjectsWithoutSubStats().sortByName();
String header = String.format("%3s %-30s %-30s %s %s %6s %6s %7s %7s %7s %7s %9s %7s %7s", String header = String.format("%3s %-30s %-30s %s %s %6s %6s %7s %7s %7s %7s %9s %7s %7s",
"ID", "ID",
"Identifier", "Identifier",
@ -621,10 +621,10 @@ public class AgirStatool
result = getRootProject(); result = getRootProject();
// //
Projects projects = listProjectsWithSubStats(); Projects projects = fetchProjectsWithSubStats();
// Add parent projects with alone statistics. // Add parent projects with alone statistics.
for (Project project : listProjectsWithoutSubStats()) for (Project project : fetchProjectsWithoutSubStats())
{ {
if (project.hasChild()) if (project.hasChild())
{ {
@ -694,11 +694,11 @@ public class AgirStatool
* @throws AgirStatoolException * @throws AgirStatoolException
* the agir statool exception * the agir statool exception
*/ */
public Projects listProjectsWithoutSubStats() throws AgirStatoolException public Projects fetchProjectsWithoutSubStats() throws AgirStatoolException
{ {
Projects result; Projects result;
result = listProjectsWithStats(Project.Type.ALONE); result = fetchProjectsWithStats(Project.Type.ALONE);
// //
return result; return result;
} }
@ -712,7 +712,7 @@ public class AgirStatool
* @throws AgirStatoolException * @throws AgirStatoolException
* the agir statool exception * the agir statool exception
*/ */
public Projects listProjectsWithStats(final Project.Type type) throws AgirStatoolException public Projects fetchProjectsWithStats(final Project.Type type) throws AgirStatoolException
{ {
Projects result; Projects result;
@ -846,11 +846,11 @@ public class AgirStatool
* @throws AgirStatoolException * @throws AgirStatoolException
* the agir statool exception * the agir statool exception
*/ */
public Projects listProjectsWithSubStats() throws AgirStatoolException public Projects fetchProjectsWithSubStats() throws AgirStatoolException
{ {
Projects result; Projects result;
result = listProjectsWithStats(Project.Type.CONSOLIDATED); result = fetchProjectsWithStats(Project.Type.CONSOLIDATED);
// //
return result; return result;

3
src/org/april/agirstatool/core/pages/projectsRawView.xhtml
View File

@ -29,6 +29,7 @@
<th class="tablesubtitle">Rejected</th> <th class="tablesubtitle">Rejected</th>
<th class="tablesubtitle">Closed</th> <th class="tablesubtitle">Closed</th>
<th class="tablesubtitle">Total</th> <th class="tablesubtitle">Total</th>
<th class="tablesubtitle">Maybe</th> <th class="tablesubtitle">Maybe</th>
<th class="tablesubtitle">New</th> <th class="tablesubtitle">New</th>
<th class="tablesubtitle">Confirmed</th> <th class="tablesubtitle">Confirmed</th>
@ -54,11 +55,11 @@
<td id="prl_closedIssueCount" class="td_number">n/a</td> <td id="prl_closedIssueCount" class="td_number">n/a</td>
<td id="prl_issueCount" class="td_number comment">n/a</td> <td id="prl_issueCount" class="td_number comment">n/a</td>
<td id="prl_unassignedMaybeIssueCount" class="td_number">n/a</td>
<td id="prl_unassignedNewIssueCount" class="td_number">n/a</td> <td id="prl_unassignedNewIssueCount" class="td_number">n/a</td>
<td id="prl_unassignedConfirmedIssueCount" class="td_number">n/a</td> <td id="prl_unassignedConfirmedIssueCount" class="td_number">n/a</td>
<td id="prl_unassignedOngoingIssueCount" class="td_number">n/a</td> <td id="prl_unassignedOngoingIssueCount" class="td_number">n/a</td>
<td id="prl_unassignedWaitingIssueCount" class="td_number">n/a</td> <td id="prl_unassignedWaitingIssueCount" class="td_number">n/a</td>
<td id="prl_unassignedMaybeIssueCount" class="td_number">n/a</td>
<td id="prl_unassignedResolvedIssueCount" class="td_number">n/a</td> <td id="prl_unassignedResolvedIssueCount" class="td_number">n/a</td>
<td id="prl_unassignedRejectedIssueCount" class="td_number">n/a</td> <td id="prl_unassignedRejectedIssueCount" class="td_number">n/a</td>
<td id="prl_unassignedClosedIssueCount" class="td_number">n/a</td> <td id="prl_unassignedClosedIssueCount" class="td_number">n/a</td>