From 80bdd05e76cf815146a10c6ac21dd17d39d0f8e5 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 23 Jan 2020 23:04:03 +0100
Subject: [PATCH] Fixed bad swap of column in unassigned table. Renamed SQL
 methods.

---
 src/org/april/agirstatool/core/AgirStatool.java  | 16 ++++++++--------
 .../agirstatool/core/pages/projectsRawView.xhtml |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/org/april/agirstatool/core/AgirStatool.java b/src/org/april/agirstatool/core/AgirStatool.java
index 0815d0f..e924529 100644
--- a/src/org/april/agirstatool/core/AgirStatool.java
+++ b/src/org/april/agirstatool/core/AgirStatool.java
@@ -99,7 +99,7 @@ public class AgirStatool
 
 		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",
 				"ID",
 				"Identifier",
@@ -621,10 +621,10 @@ public class AgirStatool
 		result = getRootProject();
 
 		//
-		Projects projects = listProjectsWithSubStats();
+		Projects projects = fetchProjectsWithSubStats();
 
 		// Add parent projects with alone statistics.
-		for (Project project : listProjectsWithoutSubStats())
+		for (Project project : fetchProjectsWithoutSubStats())
 		{
 			if (project.hasChild())
 			{
@@ -694,11 +694,11 @@ public class AgirStatool
 	 * @throws AgirStatoolException
 	 *             the agir statool exception
 	 */
-	public Projects listProjectsWithoutSubStats() throws AgirStatoolException
+	public Projects fetchProjectsWithoutSubStats() throws AgirStatoolException
 	{
 		Projects result;
 
-		result = listProjectsWithStats(Project.Type.ALONE);
+		result = fetchProjectsWithStats(Project.Type.ALONE);
 		//
 		return result;
 	}
@@ -712,7 +712,7 @@ public class AgirStatool
 	 * @throws AgirStatoolException
 	 *             the agir statool exception
 	 */
-	public Projects listProjectsWithStats(final Project.Type type) throws AgirStatoolException
+	public Projects fetchProjectsWithStats(final Project.Type type) throws AgirStatoolException
 	{
 		Projects result;
 
@@ -846,11 +846,11 @@ public class AgirStatool
 	 * @throws AgirStatoolException
 	 *             the agir statool exception
 	 */
-	public Projects listProjectsWithSubStats() throws AgirStatoolException
+	public Projects fetchProjectsWithSubStats() throws AgirStatoolException
 	{
 		Projects result;
 
-		result = listProjectsWithStats(Project.Type.CONSOLIDATED);
+		result = fetchProjectsWithStats(Project.Type.CONSOLIDATED);
 
 		//
 		return result;
diff --git a/src/org/april/agirstatool/core/pages/projectsRawView.xhtml b/src/org/april/agirstatool/core/pages/projectsRawView.xhtml
index 6596ef4..4feddac 100644
--- a/src/org/april/agirstatool/core/pages/projectsRawView.xhtml
+++ b/src/org/april/agirstatool/core/pages/projectsRawView.xhtml
@@ -29,6 +29,7 @@
 				<th class="tablesubtitle">Rejected</th>
 				<th class="tablesubtitle">Closed</th>
 				<th class="tablesubtitle">Total</th>
+				
 				<th class="tablesubtitle">Maybe</th>
 				<th class="tablesubtitle">New</th>
 				<th class="tablesubtitle">Confirmed</th>
@@ -54,11 +55,11 @@
 				<td id="prl_closedIssueCount" class="td_number">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_unassignedConfirmedIssueCount" 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_unassignedMaybeIssueCount" 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_unassignedClosedIssueCount" class="td_number">n/a</td>