From 035304bce999bd616de3abddab13a5600e24e666 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 7 Jan 2021 17:49:57 +0100
Subject: [PATCH] Added alert filter in check page.

---
 .../statoolinfos/checker/PropertyChecks.java  | 25 +++++++-
 .../htmlize/PropertyFileCheckPage.java        | 15 ++++-
 .../htmlize/propertyFileCheck.xhtml           | 63 ++++++++++++-------
 3 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/checker/PropertyChecks.java b/src/fr/devinsy/statoolinfos/checker/PropertyChecks.java
index 28a8d7d..dc97158 100644
--- a/src/fr/devinsy/statoolinfos/checker/PropertyChecks.java
+++ b/src/fr/devinsy/statoolinfos/checker/PropertyChecks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2020-2021 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of StatoolInfos, simple service statistics tool.
  * 
@@ -63,6 +63,29 @@ public class PropertyChecks extends ArrayList<PropertyCheck>
         return result;
     }
 
+    /**
+     * Extract alert lines.
+     *
+     * @return the property checks
+     */
+    public PropertyChecks extractAlertLines()
+    {
+        PropertyChecks result;
+
+        result = new PropertyChecks();
+
+        for (PropertyCheck check : this)
+        {
+            if (check.getStatus() != Status.OK)
+            {
+                result.add(check);
+            }
+        }
+
+        //
+        return result;
+    }
+
     /**
      * Gets the alert count.
      *
diff --git a/src/fr/devinsy/statoolinfos/htmlize/PropertyFileCheckPage.java b/src/fr/devinsy/statoolinfos/htmlize/PropertyFileCheckPage.java
index c3a87b1..f4803ed 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/PropertyFileCheckPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/PropertyFileCheckPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2020-2021 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of StatoolInfos, simple service statistics tool.
  * 
@@ -99,6 +99,7 @@ public class PropertyFileCheckPage
 
             TagDataManager data = new TagDataManager();
 
+            data.setContent("lineCount", checks.size());
             data.setContent("warningCount", checks.getWarningCount());
             data.setContent("errorCount", checks.getErrorCount());
             data.setContent("voidCount", checks.getVoidCount());
@@ -130,6 +131,18 @@ public class PropertyFileCheckPage
                 index += 1;
             }
 
+            index = 0;
+            for (PropertyCheck check : checks.extractAlertLines())
+            {
+                //
+                data.setContent("alertLine", index, "alertLineIndex", check.getIndex());
+                data.setEscapedContent("alertLine", index, "alertLineContent", check.getLine());
+                data.setEscapedContent("alertLine", index, "alertLineComment", check.getComment());
+                data.setAttribute("alertLine", index, "alertLineContent", "class", statusToCSS(check.getStatus()));
+
+                index += 1;
+            }
+
             //
             String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml", data).toString();
 
diff --git a/src/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml b/src/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml
index 76d1a01..ba5536a 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml
@@ -15,13 +15,13 @@
 		<div class="center">
 			<h2 id="statsTitle">n/a</h2>
 		</div>
-		<div id="rawgroupedswitch" style="margin: 4px;">
-			<span style="display: inline-block; padding-top: 6px; vertical-align: text-top;"><a href="#part2">Réduit</a></span>
-			<label class="switch">
-			    <input type="checkbox" onclick="javascript:viewFlip();" />
-			    <span class="slider round"></span>
-			</label>
-			<span style="margin-left: 50px;">Statistiques : </span>
+		<div style="margin-left: 0px; margin-bottom: 10px;">
+			<a id="" href="#all" class="button" onclick="javascript:setView('ALL');">Tout</a>
+			<a id="" href="#shrinked" class="button" onclick="javascript:setView('SHRINKED');">Réduit</a>
+			<a id="" href="#alerts" class="button" onclick="javascript:setView('ALERTS');">Alertes</a>
+			
+			<span style="margin-left: 150px;">Statistiques : </span>
+			<span id="lineCount" style="padding: 0 10px; background-color: #d5d5d5" title="Nombre de lignes">n/a</span>
 			<span id="warningCount" class="bg_warning" style="padding: 0 10px;" title="Attendus">n/a</span>
 			<span id="errorCount" class="bg_error" style="padding: 0 10px;" title="Erreurs">n/a</span>
 			<span id="voidCount" class="bg_void" style="padding: 0 10px;" title="Inconnus">n/a</span>
@@ -30,9 +30,9 @@
 			<table class="table_simple">
 				<tbody>
 					<tr id="line">
-						<td id="lineIndex" style="width: 30px; text-align: right;">000</td>
+						<td id="lineIndex" style="width: 30px; text-align: right; padding-right: 5px;">000</td>
 						<td id="lineContent" style="padding-left: 10px;">n/a</td>
-						<td id="lineComment" style="width: 200px; padding-left: 10px;">n/a</td>
+						<td id="lineComment" style="width: 200px; padding-left: 5px;">n/a</td>
 					</tr>
 				</tbody>
 			</table>
@@ -41,9 +41,20 @@
 			<table class="table_simple">
 				<tbody>
 					<tr id="shrunkLine">
-						<td id="shrunkLineIndex" style="width: 30px; text-align: right;">000</td>
+						<td id="shrunkLineIndex" style="width: 30px; text-align: right; right; padding-right: 5px;">000</td>
 						<td id="shrunkLineContent" style="padding-left: 10px;">n/a</td>
-						<td id="shrunkLineComment" style="width: 200px; padding-left: 10px;">n/a</td>
+						<td id="shrunkLineComment" style="width: 200px; padding-left: 5px;">n/a</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+		<div id="alertBlock" style="width: 100%; display: none;">
+			<table class="table_simple">
+				<tbody>
+					<tr id="alertLine">
+						<td id="alertLineIndex" style="width: 30px; text-align: right; right; padding-right: 5px;">000</td>
+						<td id="alertLineContent" style="padding-left: 10px;">n/a</td>
+						<td id="alertLineComment" style="width: 200px; padding-left: 5px;">n/a</td>
 					</tr>
 				</tbody>
 			</table>
@@ -51,21 +62,29 @@
 	</div>
 
 	<script type="text/javascript">
-	var showView = 'FULL';
-	
-	function viewFlip ()
+	function setView (selection)
 	{
-	    if (showView == 'FULL')
-	    {
-	    	document.getElementById ('fullBlock').style.display = 'none';
-	    	document.getElementById ('shrunkBlock').style.display = 'block';
-	        showView = 'SHRUNK';
-	    }
-	    else
+    	document.getElementById ('fullBlock').style.display = 'none';
+    	document.getElementById ('shrunkBlock').style.display = 'none';
+    	document.getElementById ('alertBlock').style.display = 'none';
+
+        if (selection == 'ALL')
 	    {
 	    	document.getElementById ('fullBlock').style.display = 'block';
 	    	document.getElementById ('shrunkBlock').style.display = 'none';
-	        showView = 'FULL';
+	    	document.getElementById ('alertBlock').style.display = 'none';
+	    }
+	    else if (selection == 'SHRINKED')
+	    {
+	    	document.getElementById ('fullBlock').style.display = 'none';
+	    	document.getElementById ('shrunkBlock').style.display = 'block';
+	    	document.getElementById ('alertBlock').style.display = 'none';
+	    }
+	    else if (selection == 'ALERTS')
+	    {
+	    	document.getElementById ('fullBlock').style.display = 'none';
+	    	document.getElementById ('shrunkBlock').style.display = 'none';
+	    	document.getElementById ('alertBlock').style.display = 'block';
 	    }
 	}
 	</script>