Legenda no dashboard

andrepenteado · Mar 31, 2017 · 77ba246 · 77ba246
1 parent 169d5a5
commit 77ba246
Showing 1 changed file with 46 additions and 2 deletions.
diff --git a/src/main/webapp/WEB-INF/jsp/dashboard.jsp b/src/main/webapp/WEB-INF/jsp/dashboard.jsp
@@ -1,6 +1,16 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" session="true"%>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@taglib prefix="dandelion" uri="http://github.com/dandelion" %>
+
+<dandelion:bundle includes="font-awesome"/>
+
+<c:set var="totalReceitaPendente" value="0"/>
+<c:set var="totalDespesaPendente" value="0"/>
+<c:set var="saldoPendente" value="0"/>
+<c:set var="totalReceitaLiquidado" value="0"/>
+<c:set var="totalDespesaPendente" value="0"/>
+<c:set var="saldoPendente" value="0"/>
 
 <html>
 
@@ -23,6 +33,9 @@
                     { v: ${total.value[1]}, f: '<fmt:formatNumber value="${total.value[1]}" type="currency"/>' },
                     { v: ${total.value[0] - total.value[1]}, f: '<fmt:formatNumber value="${total.value[0] - total.value[1]}" type="currency"/>' }
                  ]
+                <c:set var="totalReceitaPendente">${total.value[0]}</c:set>
+                <c:set var="totalDespesaPendente">${total.value[1]}</c:set>
+                <c:set var="saldoPendente">${total.value[0] - total.value[1]}</c:set>
             </c:forEach>
           ]);
           var options = { 
@@ -47,6 +60,9 @@
                     { v: ${total.value[1]}, f: '<fmt:formatNumber value="${total.value[1]}" type="currency"/>' },
                     { v: ${total.value[0] - total.value[1]}, f: '<fmt:formatNumber value="${total.value[0] - total.value[1]}" type="currency"/>' }  
                  ]
+                <c:set var="totalReceitaLiquidado">${total.value[0]}</c:set>
+                <c:set var="totalDespesaLiquidado">${total.value[1]}</c:set>
+                <c:set var="saldoLiquidado">${total.value[0] - total.value[1]}</c:set>
             </c:forEach>
           ]);
           var options = { 
@@ -69,14 +85,42 @@
     <h4>Saldo Próximos 30 dias</h4>
   </div>
   <div class="row">
-    <div class="col-xs-12 col-md-12" id="graficoPendentesPorDia" style="height: 300px;"></div>
+    <div class="col-xs-12 col-md-12" id="graficoPendentesPorDia" style="height: 200px;"></div>
+  </div>
+  <div class="row text-center text-primary">
+    <div class="cols-xs-6 col-md-4">
+      <i class="fa fa-2x fa-plus-circle"></i>
+      <h3><fmt:formatNumber value="${totalReceitaPendente}" type="currency"/></h3>
+    </div>
+    <div class="cols-xs-6 col-md-4 text-danger">
+      <i class="fa fa-2x fa-minus-circle"></i>
+      <h3><fmt:formatNumber value="${totalDespesaPendente}" type="currency"/></h3>
+    </div>
+    <div class="cols-xs-12 col-md-4 text-warning">
+      <i class="fa fa-2x fa-usd"></i>
+      <h3><fmt:formatNumber value="${saldoPendente}" type="currency"/></h3>
+    </div>
   </div>
 
   <div class="page-header">
     <h4>Liquidados últimos 90 dias</h4>
   </div>
   <div class="row">
-    <div class="col-xs-12 col-md-12" id="graficoLiquidadosPorDia" style="height: 300px;"></div>
+    <div class="col-xs-12 col-md-12" id="graficoLiquidadosPorDia" style="height: 200px;"></div>
+  </div>
+  <div class="row text-center text-primary">
+    <div class="cols-xs-6 col-md-4">
+      <i class="fa fa-2x fa-plus-circle"></i>
+      <h3><fmt:formatNumber value="${totalReceitaLiquidado}" type="currency"/></h3>
+    </div>
+    <div class="cols-xs-6 col-md-4 text-danger">
+      <i class="fa fa-2x fa-minus-circle"></i>
+      <h3><fmt:formatNumber value="${totalDespesaLiquidado}" type="currency"/></h3>
+    </div>
+    <div class="cols-xs-12 col-md-4 text-warning">
+      <i class="fa fa-2x fa-usd"></i>
+      <h3><fmt:formatNumber value="${saldoLiquidado}" type="currency"/></h3>
+    </div>
   </div>
 
 </body>