Index: Tools/Test/Report.cls.xml
===================================================================
diff -u -r2153 -r2157
--- Tools/Test/Report.cls.xml	(.../Report.cls.xml)	(revision 2153)
+++ Tools/Test/Report.cls.xml	(.../Report.cls.xml)	(revision 2157)
@@ -160,23 +160,34 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	 #dim GlobalForLogging As %String = ..#GlobalForLogging
-	 #dim IsRunning As %String = $G(^SYS("SourceControl","SVN","UnitTestInProcess",..GetManager().%ClassName(1)))>0
+	 #dim IsRunning As %String = ##class(svn.Setting).IsUnitTestBezig(..GetManager().%ClassName(1))
 	 
-	 &html<<table>>
-	 &html<<tr><td><a href="#(..#PackagePrefix)#.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#:</a></td>>
-	 &html<<td><b>#(..GetDuration(index))#</b></td>> 
+	 #dim LeftMargin As %String = ($select(IsRunning:"100px",1:"5px"))
 	 
-	 If IsRunning {
-	 	&html<<td rowspan="3"><b><img src="http://fop/CacheMonitoring/busy.gif" width="65px" hspace="15"/></b></td>>
+	 &html<<table style="height:80px">>
+	 if IsRunning { 
+	 	&html<<tr><td><img src="http://fop/CacheMonitoring/busy.gif" width="65px" hspace="15"/></td></tr>> 
+	 	&html<<tr><td style="text-align:center;font-weight:bold;">#(..GeefLeesbaarTijd(##class(svn.Setting).GetTestStartTime(..GetManager().%ClassName(1))))#</td></tr>> 
+	 }  else { 
+	 	&html<<tr><td>&nbsp;</td></tr>> 
 	 }
-	 &html<</tr>>  
+	 &html<</table>>  
 	 
-	 &html<<tr><td align=left><b>Triggered:</b></td><td><b>#(..GetLastTriggerTime())#</b></td></tr>>
-	 &html<<tr><td align=left #(..TestenOpZelfdeDatumAlsTriggered(index))#><b>Finished:</b></td><td #(..TestenOpZelfdeDatumAlsTriggered(index))#><b>#(..GetEndTime(index))#</b></td></tr>>
-	
+
+	 &html<<table style="position:absolute;top:40px;left:#(LeftMargin)#">>
+	 &html<<tr>>
+	 &html<<td><a href="#(..#PackagePrefix)#.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#:</a></td>>
+	 &html<<td><b>#(..GetDuration(index))#</b></td></tr>>
+	 &html<<tr><td align=left><b>Started :</b></td><td><b>#(..GeefLeesbaarTijdstip(..GetStartTime(index)))#</b></td></tr>>
+	 &html<<tr><td align=left><b>Finished:</b></td><td><b>#(..GeefLeesbaarTijdstip(..GetEndTime(index)))#</b></td></tr>>
 	 if $length(suite) && ( suite'=..#PackagePrefix ) &html<<tr><td rowspan="3"><div style="font-size:25px;"><b>BEPERKTE RUN</b></div></td></tr>>	
+	 &html<</table>>
 	 
+ 	 &html<<table style="position:absolute;left:75%;top:40px;font-size:12px;font-weight:bold;">>
+ 	 &html<<tr #(..OpZelfdeDatum(..GetLastTriggerTime()))#><td align=left>Triggered:</td><td>#(..GeefLeesbaarTijdstip(..GetLastTriggerTime()))#</td></tr>>
+	 &html<<tr #(..OpZelfdeDatum(..GetDataVersion()))#><td align=left>Data :</td><td>#(..GeefLeesbaarDatum(..GetDataVersion()))#</td></tr>>
 	 &html<</table>>
+
 	 
 	 Do ..ToonConflicten()
 ]]></Implementation>
@@ -197,7 +208,7 @@
 
 <Method name="BeginReport">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>index:%String,suite:%String,case</FormalSpec>
+<FormalSpec>index:%String,suite:%String,case:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim GlobalForLogging As %String = ..#GlobalForLogging
@@ -262,7 +273,7 @@
  }Else{
 	 &html<<table>>
 	 &html<<tr><td align=right><b>NameSpace: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#</a></b></td></tr>>
-	 &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #(..GetEndTime(index))# )</a></b></td></tr>>
+	 &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #(..GeefLeesbaarTijdstip(..GetEndTime(index)))# )</a></b></td></tr>>
 	 &html<<tr><td align=right><b>TestSuite: </b></td><td><b>#(suite)#</b></td></tr>>
 	 &html<</table>>
  }
@@ -319,7 +330,7 @@
  
  &html<<table>>
  &html<<tr><td align=right><b>NameSpace: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#</a></b></td></tr>>
- &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #(..GetEndTime(index))# )</a></b></td></tr>>
+ &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #(..GeefLeesbaarTijdstip(..GetEndTime(index)))# )</a></b></td></tr>>
  &html<<tr><td align=right><b>TestSuite: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#&SUITE=#(..EscapeURL(suite))#">#(suite)#</a></b></td></tr>>
  &html<<tr><td align=right><b>TestCase: </b></td><td><b>#(case)#</b></td></tr>>
  &html<</table>>
@@ -360,7 +371,7 @@
  Do ..BeginReport(index,suite,case)
  &html<<table>>
  &html<<tr><td align=right><b>NameSpace: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#</a></b></td></tr>>
- &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #(..GetEndTime(index))# )</a></b></td></tr>>
+ &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #(..GeefLeesbaarTijdstip(..GetEndTime(index)))# )</a></b></td></tr>>
  &html<<tr><td align=right><b>TestSuite: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#&SUITE=#(..EscapeURL(suite))#">#(suite)#</a></b></td></tr>>
  &html<<tr><td align=right><b>TestCase: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#&SUITE=#(..EscapeURL(suite))#&CASE=#(..EscapeURL(case))#">#(case)#</a></b></td></tr>>
  &html<<tr><td align=right><b>Method: </b></td><td><b>#(method)#()</b></td></tr>>
@@ -431,53 +442,69 @@
 <Method name="GetReportTitle">
 <ClassMethod>1</ClassMethod>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "<table width=""100%"" bgcolor=""#BBBBBB""><tr><td><font size=4 color=""#FFFFFF""><b>"_..#PackagePrefix_" | "_ $zu(110)_" | DATA "_..GetDataVersion()_" </b></font></td></tr></table>"
+<Implementation><![CDATA[	quit "<table width=""100%"" bgcolor=""#BBBBBB""><tr><td><font size=4 color=""#FFFFFF""><b>"_..#PackagePrefix_" | "_ $$$UCase($zu(110))_" </b></font></td></tr></table>"
 ]]></Implementation>
 </Method>
 
+<Method name="GetCurrentRunStarted">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim GlobalForLogging As %String = ..#GlobalForLogging
+	quit ..GetStartTime($order(@GlobalForLogging@(""),-1))
+]]></Implementation>
+</Method>
+
 <Method name="GetStartTime">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>index:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim GlobalForLogging As %String = ..#GlobalForLogging
-	Quit ..GeefLeesbaarTijdstip($listget(@GlobalForLogging@(index),1))
+	Quit ($listget(@GlobalForLogging@(index),1))
 ]]></Implementation>
 </Method>
 
 <Method name="GetEndTime">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>index:%String</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
     #dim GlobalForLogging As %String = ..#GlobalForLogging
-    Quit ..GeefLeesbaarTijdstip($listget(@GlobalForLogging@(index),2))
+    Quit ($listget(@GlobalForLogging@(index),2))
 ]]></Implementation>
 </Method>
 
-<Method name="GetDataVersion">
+<Method name="GeefLeesbaarTijdstip">
 <ClassMethod>1</ClassMethod>
+<FormalSpec>Tijdstip:%String</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$FormatDateTime^vhLib("ddd dd-mm",##class(TECH.DateTime).TimestampToDate($G(^svn.Deploy("StartCacheBackup"))))
+<Implementation><![CDATA[    quit ..GeefLeesbaarDatum(Tijdstip)_" om "_..GeefLeesbaarTijd(Tijdstip)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLeesbaarTijdstip">
+<Method name="GeefLeesbaarTijd">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Tijdstip:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim LeesbaarTijdstipDag As %String = $$FormatDateTime^vhLib("ddd dd-mm",Tijdstip)
-	
-	#dim Timestamp As %TimeStamp = ##class(TECH.DateTime).HorologToTimeStamp(Tijdstip)
-    #dim LeesbaarTijdstipTijd As %String = $Piece(Timestamp," ",2,$Length(Timestamp,"-"))
-    
-    Set LeesbaarTijdstip = LeesbaarTijdstipDag_" om "_LeesbaarTijdstipTijd
-    Quit LeesbaarTijdstip
+	set:$$$Not(Tijdstip["-") Tijdstip = ##class(TECH.DateTime).HorologToTimeStamp(Tijdstip)
+    #dim LeesbaarTijdstipTijd As %String = $Piece(Tijdstip," ",2,$Length(Tijdstip,"-"))
+    quit LeesbaarTijdstipTijd
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLeesbaarDatum">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Tijdstip:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit $$FormatDateTime^vhLib("ddd dd-mm",Tijdstip)
+]]></Implementation>
+</Method>
+
 <Method name="GetDuration">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>index:%String</FormalSpec>
@@ -503,22 +530,28 @@
 
 <Method name="GetLastTriggerTime">
 <ClassMethod>1</ClassMethod>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefLeesbaarTijdstip($G(^SYS("SourceControl","SVN","LastTriggeredTimeStamp")))
+<ReturnType>%TimeStamp</ReturnType>
+<Implementation><![CDATA[	Quit $G(^SYS("SourceControl","SVN","LastTriggeredTimeStamp"))
 ]]></Implementation>
 </Method>
 
-<Method name="TestenOpZelfdeDatumAlsTriggered">
+<Method name="GetDataVersion">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>index:%String</FormalSpec>
+<ReturnType>%TimeStamp</ReturnType>
+<Implementation><![CDATA[	quit ^svn.Deploy("StartCacheBackup")
+]]></Implementation>
+</Method>
+
+<Method name="OpZelfdeDatum">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Tijdstip:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim String As %String = ""
-	#dim LastTriggerTime As %String = $Piece(..GetLastTriggerTime(),"om",1)
-	#dim LastEndTime As %String = $Piece(..GetEndTime(index),"om",1)
+	#dim DatumTijdstip As %String = $$FormatDateTime^vhLib("ddd dd-mm",Tijdstip)
+	#dim DatumHuidig As %String = $$FormatDateTime^vhLib("ddd dd-mm",+$H)
 	
-	If (LastTriggerTime '= LastEndTime) 
-	{
+	If (DatumTijdstip '= DatumTijdstip)	{
 		Set String = "class=""blink"""
 	}
 	Quit String