--- dao/DaoAdresseService/src/main/webapp/admin.jsp	2015/03/20 13:57:47	2457
+++ dao/DaoAdresseService/src/main/webapp/admin.jsp	2015/11/27 13:53:39	2786
@@ -14,6 +14,13 @@
     
 <script>
 
+function resizeIframe(obj){
+   {obj.style.height = 0;};
+   {obj.style.height = obj.contentWindow.document.body.scrollHeight + 'px';}
+}
+
+
+
 function refreshLoaderStatus() {
 	$.get("admin?isrunning=1", function(data) {
 		if (data == "true") {
@@ -31,8 +38,13 @@
 }
 
 $(document).ready( function() {
+	
+	$('iframe').load(function() { //dynamically resize all iframes on load
+		resizeIframe( this );
+	});
+	
 	$("#reloadData").click(function() {
-		$.get("admin?reload=1");
+		$.get("admin?reload=1&trigger=Manual");
 		
 		$(this).text("Running")
 			.removeClass("btn-success")
@@ -44,12 +56,76 @@
 		$("#dbProbeContent").load("DbConnectionProbe");		
 	});
 	
+	var options = {
+		    //Boolean - Whether we should show a stroke on each segment
+		    segmentShowStroke : true,
+
+		    //String - The colour of each segment stroke
+		    segmentStrokeColor : "#fff",
+
+		    //Number - The width of each segment stroke
+		    segmentStrokeWidth : 2,
+
+		    //Number - The percentage of the chart that we cut out of the middle
+		    percentageInnerCutout : 50, // This is 0 for Pie charts
+
+		    //Number - Amount of animation steps
+		    animationSteps : 10,
+
+		    //String - Animation easing effect
+		    animationEasing : "easeOutBounce",
+
+		    //Boolean - Whether we animate the rotation of the Doughnut
+		    animateRotate : true,
+
+		    //Boolean - Whether we animate scaling the Doughnut from the centre
+		    animateScale : false,
+
+		};
+	
+	
+	if ( "<c:out value="${stats.direkteCount}"></c:out>" != "") {	
+		var data = [
+		            {
+		                value: <c:out value="${stats.direkteCount}"></c:out>,
+		                color: "#46BFBD", //grøn
+		                highlight: "#5AD3D1",
+		                
+		                label: "Direkte"
+		            },
+		            {
+		                value: <c:out value="${stats.extendedCount}"></c:out>,
+		                color: "#FDB45C", //gul
+		                highlight: "#FFC870",
+		                label: "Udvidet"
+		            },
+		            {
+		                value: <c:out value="${stats.hundredePctCount}"></c:out>,
+		                color: "#949FB1", //grey
+		                highlight: "#A8B3C5",
+		                label: "100%"
+		            }
+		            ,
+		            {
+		                value: <c:out value="${stats.ikkeDaekketCount}"></c:out>,
+		                color:"#F7464A", //rød
+		                highlight: "#FF5A5E",
+		                label: "Ikke dækket"
+		            }
+		        ]
+		
+		// Get context with jQuery - using jQuery's .get() method.
+		var ctx = $("#myChart").get(0).getContext("2d");
+		// This will get the first returned node in the jQuery collection.
+		var myNewChart = new Chart(ctx).Pie(data,options);
+		
+	}
 	
 	
 	
 	
 	refreshLoaderStatus();
-	setInterval(refreshLoaderStatus, 3000 );
+	setInterval(refreshLoaderStatus, 5000 );
 	
 });
 
@@ -75,15 +151,23 @@
 	   			</tr>
 				<tr>
 	   				<td>100%: </td>
-	   				<td align="right"><c:out value="${stats.hundredePctCount}"></c:out></td>
+					<td align="right">
+	   					<a href='CsvUdtraek?type=100pct' target='_blank'><c:out value="${stats.hundredePctCount}"></c:out></a>
+	   				</td>
 	   			</tr>
 				<tr>
 	   				<td>Ikke dækket: </td>
-	   				<td align="right" target='_blank'>
-	   					<a href='CsvUdtraek?type=ikkedaekket'><c:out value="${stats.ikkeDaekketCount}"></c:out></a>
+	   				<td align="right">
+	   					<a href='CsvUdtraek?type=ikkedaekket' target='_blank'><c:out value="${stats.ikkeDaekketCount}"></c:out></a>
 	   				</td>
 	   			</tr>
+	   			<tr>
+	   				<td>Total: </td>
+	   				<td align="right"><c:out value="${stats.totalCount}"></c:out></td>
+	   			</tr>
 	   		</table>
+	   		
+	   		<canvas id="myChart" width="150" height="150"></canvas>
    		
 	    </c:when>
 	    <c:otherwise>
@@ -119,6 +203,25 @@
 	<button type="button" class="btn" id="dbConnectionProbe">Test Connection</button><br>
 	<span id="dbProbeContent"></span>
 	
+	<h3>Pages</h3>
+	<ul>
+		<li><a href='CsvUdtraek'>CSV Udtr&aelig;k</a></li>
+		<li><a href='inspectData.jsp'>Inspect Data</a></li>
+	</ul>
+
+	<h3>Software</h3>
+	<table>
+				<tr>
+	   				<td>SVN version: </td>
+	   				<td align="right"><c:out value="${scmrevision}"></c:out></td>
+	   			</tr>
+				<tr>
+	   				<td>Build Time: </td>
+	   				<td align="right"><c:out value="${buildtime}"></c:out></td>
+	   			</tr>
+	</table>
+	
+	
 	
 	
     
@@ -127,11 +230,11 @@
     
     <div class="col-sm-8">
       <h3>Runtime options</h3>
-      <iframe src="ConfigServlet" width="100%" frameborder="0" height="250">
+      <iframe src="ConfigServlet" width="100%" height="250" style="border-width: 0px; margin-bottom: 20px;" >
       </iframe>
       
       
-      <iframe src="CircuitBreakerServlet" width="100%" frameborder="0" height="450">
+      <iframe src="CircuitBreakerServlet" width="100%" height="450" style="border-width: 0px;">
       </iframe>
 
     </div>
@@ -140,4 +243,4 @@
 
 
     </jsp:body>
-</t:genericpage>
\ No newline at end of file
+</t:genericpage>