Index: vhLibLogging.csp
===================================================================
diff -u -r42 -r50
--- vhLibLogging.csp	(.../vhLibLogging.csp)	(revision 42)
+++ vhLibLogging.csp	(.../vhLibLogging.csp)	(revision 50)
@@ -64,6 +64,68 @@
 
 
 	<SCRIPT language="javascript">
+	var IsAlreadyProcessing=false;
+	
+	function chkToonAlleNiveausClick() {
+		var ToonAlleNiveaus=GetValChk("chkToonAlleNiveaus");
+		if (ToonAlleNiveaus) {
+			// Alle chkFilterNiveau op false zetten
+			if (!IsAlreadyProcessing) {
+				IsAlreadyProcessing=true;
+				ZetAlleChkFilterNiveaus(false);
+				IsAlreadyProcessing=false;
+			}
+		}
+	}
+	function chkFilterNiveauClick(Sender) {
+		if (Sender && GetValChk("chkToonAlleNiveaus")) {
+			// De chkToonAlleNiveaus op false zetten
+			if (!IsAlreadyProcessing) {
+				IsAlreadyProcessing=true;
+				ZetChkToonAlleNiveaus(false);
+				IsAlreadyProcessing=false;
+			}
+		}
+	}
+	
+	function ZetChkToonAlleNiveaus(IsChecked) {
+		SetValChk("chkToonAlleNiveaus", IsChecked);
+	}
+	
+	function ZetAlleChkFilterNiveaus(IsChecked) {
+		var CheckBoxIDs=Array()
+		CheckBoxIDs = GeefLijstChkFilterNiveaus();
+		for (var i=0; i<CheckBoxIDs.length; i++) { 
+			SetValChk(CheckBoxIDs[i], IsChecked);
+		}
+	}
+
+	function GeefLijstChkFilterNiveaus() {
+		var CheckBoxIDs=Array();
+		for (var i=1; i<=4; i++) { 
+			CheckBoxIDs[i-1]="chkFilterNiveau_"+i;
+		}
+		return CheckBoxIDs;
+	}
+	
+	function GetValChk (FldName) {   // returns boolean (true/false)
+		var obj=document.getElementById(FldName);
+		if (!obj)  return("");
+		return obj.checked;
+	}
+	function SetValChk (FldName,blnVal) {
+		var obj=document.getElementById(FldName);
+		if (isUndef(blnVal))  blnVal=false;
+		if (obj)  obj.checked=blnVal;
+	}
+	function isUndef (jsVar) {
+		return (typeof(jsVar)=="undefined");
+	}
+	
+	</SCRIPT>
+
+
+	<SCRIPT language="javascript">
 	function ToggleDetailsSummary (objParentDiv,objInfoP)  {
 		ToggleDivExpand(objParentDiv);
 
@@ -135,6 +197,7 @@
 		}
 		return;
 	}
+	
 	</SCRIPT>
 
 </HEAD>
@@ -154,27 +217,81 @@
 					<textarea name=QUERY rows=6 cols=100>#(sqlActive)#</textarea>
 				</td>
 				<td>
-					<P class="clsSubHeader">&nbsp;</P>
-					<BR><BR>
-					<!-- <input type=checkbox name=SQED size="6" value="#(blnSQED)#" #($S(blnSQED:"checked",1:""))#>Query&nbsp;Editor&nbsp;visible -->
-					<BR>
-					<input type="submit" name="btnSubmit" style="width:60; font-weight:bold;" value="Go">
+					&nbsp;
 				</td>
 			</tr>
 		</table>
 		&nbsp;
+		<BR>
 		<BR>Aantal rijen : <INPUT type="text" name="MAXROWS" value="#(MaxRows)#">
 		<BR>
-		<BR>
-		<INPUT type="button" style="width:90;" value="RESET" onclick="window.location.href='vhLibLogging.csp';">&nbsp;
-	
+		<input type="submit" name="btnSubmit" style="width:60; font-weight:bold;" value="Go">
 	</form>
 <CSP:ELSE>
 	<BR>
 	<A href="#($G(arUrl("ToggleQED")))#">Show Query Editor</A>
+	<BR>
+	<BR>
+	<form name="theForm" method="post" action="vhLibLogging.csp">
+		<DIV id="divGroepenCheckboxes" style="float:none; position:relative;">
+			<SCRIPT language="Cache" runat="server">
+				Set GroepenIt=##class(TECH.ListIterator).%New(LogViewerHelper.GeefGroepen())
+			</SCRIPT>
+			<CSP:WHILE CONDITION="GroepenIt.HasNext()" COUNTER=GroepIndex>  
+				<SCRIPT language="Cache" runat="server">
+					Set GroepNaam=GroepenIt.Next()
+					Set GroepControlID="chkFilterGroep"_GroepIndex
+					Set ValueChecked=$S(LogViewerHelper.IsItemInList(GroepNaam,##class(TECH.ArrayOneDimIterator).%New(.arFilterGroepen)):"checked", 1:"")
+					Set HTMLSeparator=""
+					If GroepenIt.HasNext() {
+						Set HTMLSeparator="" ; " &nbsp;&nbsp;|&nbsp;&nbsp; "
+						Set StyleFloat="left"
+						If (GroepIndex#6)=0 {
+							Set StyleFloat="right"
+							;Set HTMLSeparator=HTMLSeparator_"<BR/>"
+						}
+					}
+				</SCRIPT>
+				<DIV style="float:#(StyleFloat)#; width:300px; border:none; border-right:solid 1px black;"><LABEL input for="#(GroepControlID)#"><INPUT type="checkbox" ID="#(GroepControlID)#" name="chkFilterGroep" value="#(GroepNaam)#" #(ValueChecked)#>#(GroepNaam)#</INPUT></LABEL>#(HTMLSeparator)#</DIV>
+			</CSP:WHILE>
+			<DIV style="float:none;">&nbsp;</DIV>
+		</DIV>
+		<BR>
+		<DIV style="float:none; position:relative;">
+			<LABEL input for="chkToonAlleNiveaus"><INPUT type="checkbox" ID="chkToonAlleNiveaus" name="chkToonAlleNiveaus" onclick="chkToonAlleNiveausClick();" value="1" #($S('ToonAlleNiveaus:"", 1:"checked"))#>Toon alle niveaus</INPUT></LABEL> &nbsp;&nbsp; OF &nbsp;&nbsp;
+			<SCRIPT language="Cache" runat="server">
+				Set NiveauIt=##class(vhLib.enu.LogNiveau).ValueListIterator()
+			</SCRIPT>
+			<CSP:WHILE CONDITION="NiveauIt.HasNext()" COUNTER=NiveauIndex>  
+				<SCRIPT language="Cache" runat="server">
+					Set NiveauID=NiveauIt.Next()
+					Set NiveauNaam=##class(vhLib.enu.LogNiveau).LogicalToDisplay(NiveauID)
+					Set NiveauControlID="chkFilterNiveau_"_NiveauIndex
+					Set ValueChecked=$S(LogViewerHelper.IsItemInList(NiveauID,##class(TECH.ArrayOneDimIterator).%New(.arFilterNiveaus)):"checked", 1:"")
+					Set HTMLSeparator=""
+					If NiveauIt.HasNext() {
+						Set HTMLSeparator=" &nbsp;&nbsp;|&nbsp;&nbsp; "
+						If (NiveauIndex#10)=0 {
+							Set HTMLSeparator=HTMLSeparator_"<BR/>"
+						}
+					}
+				</SCRIPT>
+				<LABEL input for="#(NiveauControlID)#"><INPUT type="checkbox" ID="#(NiveauControlID)#" name="chkFilterNiveau" onclick="chkFilterNiveauClick(this);" value="#(NiveauID)#" #(ValueChecked)#>#(NiveauNaam)#</INPUT></LABEL>#(HTMLSeparator)#
+			</CSP:WHILE>
+		</DIV>
+		<BR>
+		<DIV style="float:none;">
+			<BR>Aantal rijen : <INPUT type="text" name="MAXROWS" value="#(MaxRows)#">
+			<BR>
+			<INPUT type="hidden" name="SQED" value="#($G(blnSQED))#">
+			<input type="submit" name="btnSubmit" style="width:60; font-weight:bold;" value="Go">
+		</DIV>
+		
+	</form>
+
+
 </CSP:IF>
-	<!-- Hier komen de groepen, of misschien ergens anders.  LOL  :-))))   ---> 
-	
+
 	<BR>
 	<BR>
 <HR>
@@ -281,27 +398,72 @@
 	;  Request Parameters
 	Kill:($G(%request.Data("QUERY",1))="") %request.Data("QUERY")
     Set name=""
-    For  Set name=$O(%request.Data(name)) Quit:(name="")  Merge tmpRq(name)=%request.Data(name,1)
+    For  Set name=$O(%request.Data(name)) Quit:(name="")  Merge tmpRq(name)=%request.Data(name)
 
-	Set blnSQED=$G(%request.Data("SQED",1),0)
+	  ;d WLIP^vhDBG(97,"request : ")
+	  ;d WLIP^vhDBG(97,$$$ArrayTT("Data",%request,"Data"))
+
+	Set blnSQED=$G(%request.Data("SQED",1),1)
+	Merge arFilterGroepen=%request.Data("chkFilterGroep")
+	Merge arFilterNiveaus=%request.Data("chkFilterNiveau")
+	
+	Set ToonAlleNiveaus=($G(%request.Data("chkToonAlleNiveaus",1))=1)
+	
+	If ToonAlleNiveaus {
+		Kill arFilterNiveaus
+	}
+	ElseIf '$D(arFilterNiveaus) {
+		Set arFilterNiveaus(1)=##class(vhLib.enu.LogNiveau).Error()
+		Set arFilterNiveaus(2)=##class(vhLib.enu.LogNiveau).Warning()
+	}
+	Set LogViewerHelper=##class(vhLib.LogViewer).%New()
+
 	Set sqlAll=""
 	
 	set MaxRows = $get(%request.Data("MAXROWS",1),1000)
 	Set AantalDagen = 15
+
+	Set WhereClause=""   ; "Datum > '"_$zd($Horolog-AantalDagen,1)_"'"
 	
+	Set FilterNiveauIt=##class(TECH.ArrayOneDimIterator).%New(.arFilterNiveaus)
+	If FilterNiveauIt.HasNext() {
+		Set WhereClause=WhereClause_$S(WhereClause="":"", 1:" AND ")_"("_LogViewerHelper.GeefWhereClauseVoorNiveaus(FilterNiveauIt)_")"
+	}
+	
+	Set FilterGroepenIt=##class(TECH.ArrayOneDimIterator).%New(.arFilterGroepen)
+	If FilterGroepenIt.HasNext() {
+		Set WhereClause=WhereClause_$S(WhereClause="":"", 1:" AND ")_"("_LogViewerHelper.GeefWhereClauseVoorGroepen(FilterGroepenIt)_")"
+	}
+	
+	;d WLIP^vhDBG(97,"WhereClause : "_WhereClause)
+	
+
+	
 	/***   SQL STATEMENTS   ***/
 	/***   ==============   ***/
 	Set sqlLOGAllFields="SELECT Datum, Tijd, Groep, Niveau, Actie, JobID, DetailTrunc As Detail,  ID , LessDetail, MainIndex , Namespace , RemoteIP , Server , ProgLabel , SubID  " 
 	Set sqlLOG         ="SELECT Datum, Tijd, Groep, Niveau, Actie, JobID, DetailTrunc As Detail"
 	
-	Set sqlLOG=sqlLOG_$C(13,10)_"  FROM vhLib.Logging WHERE Datum > '"_$zd($Horolog-AantalDagen,1)_"' AND (Niveau = 'E' OR Niveau='W')"
+	Set sqlLOG=sqlLOG_$C(13,10)_"  FROM vhLib.Logging WHERE "_WhereClause
 	Set sqlLOG=sqlLOG_$C(13,10)_"  ORDER BY Datum DESC, Tijd DESC, SubID DESC"
 	
 	; SQLs to be displayed
 	Set sqlDFL=$S(1:sqlLOG)
 	Set sqlActive=$G(%request.Data("QUERY",1),sqlDFL)
     ; URL for ToggleQueryEditor
 	Merge tmpAr=tmpRq
+	Kill tmpAr("chkFilterGroep")
+	Kill tmpAr("chkFilterNiveau")
+	Kill tmpAr("chkToonAlleNiveaus")
+
+	Merge tmpAr("chkFilterGroep")=%request.Data("chkFilterGroep")
+	If ToonAlleNiveaus {
+		Set tmpAr("chkToonAlleNiveaus")=1
+	} 
+	Else {
+		Merge tmpAr("chkFilterNiveau")=%request.Data("chkFilterNiveau")
+	}
+	
 	Kill tmpAr("SQED")
 	Set tmpAr("SQED")=('blnSQED)
 	Set arUrl("ToggleQED")="?"_##class(vhLib.cspBasis).CQueryString(.tmpAr)