From 3947c71ed93adbaf7965a2204f94470e17412e8d Mon Sep 17 00:00:00 2001
From: Peter Hedenskog <peter@soulgalore.com>
Date: Thu, 9 Aug 2012 16:02:43 +0200
Subject: [PATCH] getting all summary numbers together

---
 report/velocity/summary.logic.vm |  7 +++++++
 report/velocity/summary.vm       | 35 ++++++++++++++++++++++----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/report/velocity/summary.logic.vm b/report/velocity/summary.logic.vm
index 4972c8f6e..27995ffa9 100644
--- a/report/velocity/summary.logic.vm
+++ b/report/velocity/summary.logic.vm
@@ -13,6 +13,7 @@
 #set($nrOfTotalRequests = 0)
 #set($nrOfTotalRequestsPrimedCache = 0)
 #set($totalPageWeight = 0)
+#set($totalDocumentWeight = 0)
 #set($totalLoadTime = 0)
 #set($totalScore = 0)	 
 
@@ -53,6 +54,11 @@
 	#if($!{results.getChild("o")})
      	#set ($totalScore = $math.add($totalScore, $results.getChild("o").getValue()))
 	#end
+
+	#if($!{results.getChild("stats").getChild("doc").getChild("w")})
+        #set ($totalDocumentWeight = $math.add($totalDocumentWeight, $results.getChild("stats").getChild("doc").getChild("w").getValue()))
+    	#end
+
 #end
 	  
 ##	Create averages	  
@@ -64,6 +70,7 @@
 #set ($imageAverage = $math.roundTo($nrOfDecimals,$math.div($nrOfImages,$nrOfPages)))
 #set ($requestPrimedAverage = $math.roundTo($nrOfDecimals,$math.div($nrOfTotalRequestsPrimedCache,$nrOfPages)))
 #set ($pageWeightAverage = $math.roundTo($nrOfDecimals,$math.div($totalPageWeight,$nrOfPages)))
+#set ($totalDocumentWeightAverage = $math.roundTo($nrOfDecimals,$math.div($totalDocumentWeight,$nrOfPages)))
 #set ($loadTimeAverage = $math.roundTo($nrOfDecimals,$math.div($totalLoadTime,$nrOfPages)))
 
 
diff --git a/report/velocity/summary.vm b/report/velocity/summary.vm
index b62aea8e6..a789a3d15 100644
--- a/report/velocity/summary.vm
+++ b/report/velocity/summary.vm
@@ -5,18 +5,33 @@
 
  <div class="row">
  <div class="span12">
- 
-	<h2>$nrOfPages pages analyzed for $document.getRootElement().getAttribute("url").getValue() </h2>
+
+	<h2>$nrOfPages pages analyzed for $document.getRootElement().getAttribute("url").getValue()</h2>
+	<p>Test performed: $document.getRootElement().getAttribute("date").getValue()</p>
+
+	<div class="row">
+        <div class="span6">
+	     <div class="alert alert-#scoreType($scoreAverage)">
+             Average Yslow score <div class='large'>$scoreAverage</div>
+             </div> 
+
+        </div>
+        <div class="span6">
+             <div class="alert alert-#requestType($requestAverage)">
+             Average number of requests <div class='large'>$requestAverage</div>
+             </div>
+        </div>
+        </div>
 
 	<div class="row">
       	<div class="span3">
-	     <div class="alert alert-#scoreType($scoreAverage)">
-	     Average Yslow score is <div class='large'>$scoreAverage</div>
-	     </div>
+            <div class="alert alert-#weightType($pageWeightAverage)">
+             Total page weight (b) <div class='large'>$pageWeightAverage</div>
+             </div>
 	</div>
       	<div class="span3">
-	     <div class="alert alert-#requestType($requestAverage)">
-             Average number of requests <div class='large'>$requestAverage</div>
+	     <div class="alert alert-#weightMobileType($totalDocumentWeightAverage)">
+             Document page weight (b) <div class='large'>$totalDocumentWeightAverage</div>
              </div>
 	</div>
 	<div class="span3">
@@ -44,20 +59,18 @@
              </div>
         </div>
         <div class="span3">
-             <div class="alert alert-#requestPrimedType($requestPrimedAverage)">
+             <div class="alert alert-#requestPrimedType($requestAverage $requestPrimedAverage)">
               Requests primed cache  <div class='large'>$requestPrimedAverage</div>
              </div>
         </div>
         <div class="span3">
              <div class="alert alert-#loadTimeType($loadTimeAverage)">
-              Average load time <div class='large'>$loadTimeAverage</div>
+              Average load time (ms) <div class='large'>$loadTimeAverage</div>
              </div>
         </div>
 
         </div>
 
-
-
 	<table class="table table-condensed table-striped table-bordered" id="pagesTable" >
 	<thead>
 	<tr>