adicao de grafico

erbernardino · Apr 22, 2012 · f6ab8e6 · f6ab8e6
1 parent 6684bea
commit f6ab8e6
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 8 deletions.
diff --git a/SaldoUnico.dart b/SaldoUnico.dart
@@ -19,9 +19,10 @@ class SaldoUnico {
     Date proximaRecarga = bu.proximaRecarga();
 
     document.query('#resultado').value = Utils.formatDate(proximaRecarga);
-    document.query('#resultado').insertAdjacentHTML("afterEnd", getUrlToCallendar(proximaRecarga,"Recarregar Bilhete Único", "Se esquecer de carragar vai parar na catraca!!!") ) ;
+    document.query('#callendarButton').innerHTML = getUrlToCallendar(proximaRecarga,"Recarregar Bilhete Único", "Se esquecer de carragar vai parar na catraca!!!")  ;
 
-    document.query("#saldoPorDia").innerHTML = bu.valorPorDia.toString();
+    //document.query("#saldoPorDia").innerHTML = bu.valorPorDia.toString();
+    window.postMessage(Utils.geraDados(bu.valorPorDia), '*');
   }
 
 

diff --git a/SaldoUnico.html b/SaldoUnico.html
@@ -5,6 +5,28 @@
   	<meta charset="utf-8">
     <title>Saldo Unico</title>
     <link href="css/bootstrap.min.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+    <script type="text/javascript">
+
+
+    window.onmessage=function(messageEvent){
+
+    	drawChart(messageEvent.data);
+
+    }
+
+      google.load("visualization", "1", {packages:["corechart"]});
+      google.setOnLoadCallback(drawChart);
+      function drawChart(data) {
+        var data = google.visualization.arrayToDataTable(data);
+        var options = {
+          title: 'Gastos'
+        };
+
+        var chart = new google.visualization.LineChart(document.getElementById('chart_div'));
+        chart.draw(data, options);
+      }
+    </script>
   </head>
   <body>    
     <div id="container">
@@ -35,22 +57,22 @@
 					</div>
 				</div>
 
-				<div class="control-group">
+				<div class="control-group" style="width:600px;">
 					<label class="control-label" for="input01">Proxima recarga:</label>
 					<div class="controls">
-						<input type="text" class="input-xlarge" id="resultado">
+					<input type="text" class="input-xlarge" id="resultado" />
+					<div id="callendarButton" style="float:right;" /></div>
 						<p class="help-block">Estimativa de data que voce precisara carrega o seu Bilhete Unico.</p>
 					</div>
 				</div>		
 
 				<div class="form-actions">
 					<input type="button" value="Calcular" id="calcular" class="btn btn-large btn-primary">
+
 		        </div>
 	        </fieldset>
         </form>
-        <div id="saldoPorDia">
-
-        </div> 
+        <div id="chart_div" style="width: 900px; height: 500px;"></div> 
 	</div>
 
     <script type="application/dart" src="SaldoUnico.dart"></script>

diff --git a/Utils.dart b/Utils.dart
@@ -21,6 +21,25 @@ class Utils {
 
   }
 
+  static Object geraDados(Map dados){
+    List result = new List();
+
+    List resultIn = new List();
+    resultIn.add("Dia");
+    resultIn.add("Valor");
+    result.add(resultIn);
+
+
+    for(String key in dados.getKeys()){
+      List resultIn = new List();
+      resultIn.add(key);
+      resultIn.add(dados[key]);
+      result.add(resultIn);
+    }
+    return result;
+  }
+
+
   static String twoDigits(String str){
     if(str.length == 1){
       str = "0$str";  

diff --git a/UtilsTest.dart b/UtilsTest.dart
@@ -3,7 +3,8 @@
 class UtilsTest {
   static void run() {
     [testFormataDDMMYYYYComZero,
-     testFormataDDMMYYYYSemZero].forEach(beforeEach);
+     testFormataDDMMYYYYSemZero,
+     testGeraDados].forEach(beforeEach);
   }
 
   static void beforeEach(var test){
@@ -19,6 +20,18 @@ class UtilsTest {
     Date now = new Date(2012, 10, 12, 0, 0, 0, 0);
     Expect.equals("12/10/2012", Utils.formatDate(now));
   }
+
+  static void testGeraDados(){
+    LinkedHashMap map = new LinkedHashMap();
+    map["01/01/2012"] = 2.0;
+    map["02/01/2012"] = 1.0;
+    var result = Utils.geraDados(map);
+    // [["01/01/2012",1],["02/01/2012",1]]
+    Expect.equals("01/01/2012", result[1][0]);
+    Expect.equals(2.0, result[1][1]);
+    Expect.equals("02/01/2012", result[2][0]);
+    Expect.equals(1.0, result[2][1]);
+  }
 }
 
 void main() {