Melhorias na geração de relatórios

sigi/apps/utils/templates/utils/report/report.html

@@ -26,44 +26,51 @@
 {% endblock %}
 
 {% block content %}
-  {% if form %}
+  {% block form %}
-    <form class="row">
+    {% if form %}
-      <div class="col s12">
+      <form class="row">
-        <div class="card">
+        <div class="col s12">
-          <div class="card-content">
+          <div class="card">
-            {% block filterform %}{{ form }}{% endblock filterform %}
+            <div class="card-content">
-          </div>
+              {% block filterform %}{{ form }}{% endblock filterform %}
-          <div class="card-action">
+            </div>
-            <button class="waves-effect waves-light btn" type="submit">{% translate "Submit" %}</button>
+            <div class="card-action">
-            <div class="fixed-action-btn">
+              <button class="waves-effect waves-light btn" type="submit">{% translate "Submit" %}</button>
-              <a class="btn-floating">
+              <div class="fixed-action-btn">
-                <i class="large material-icons">print</i>
+                <a class="btn-floating">
-              </a>
+                  <i class="large material-icons">print</i>
-              <ul>
+                </a>
-                <li><button class="btn-floating" type="submit" name="fmt" value="pdf" title="{% trans 'Exportar para PDF' %}" ><i class="material-icons">picture_as_pdf</i></button></li>
+                <ul>
-                <li><button class="btn-floating" type="submit" name="fmt" value="csv" title="{% trans 'Exportar para CSV' %}" ><i class="material-icons">file_download</i></button></li>
+                  <li><button class="btn-floating" type="submit" name="fmt" value="pdf" title="{% trans 'Exportar para PDF' %}" ><i class="material-icons">picture_as_pdf</i></button></li>
-              </ul>
+                  <li><button class="btn-floating" type="submit" name="fmt" value="csv" title="{% trans 'Exportar para CSV' %}" ><i class="material-icons">file_download</i></button></li>
+                </ul>
+              </div>
             </div>
           </div>
         </div>
+      </form>
+    {% else %}
+      <div class="fixed-action-btn">
+        <a class="btn-floating">
+          <i class="large material-icons">print</i>
+        </a>
+        <ul>
+          <li><a class="btn-floating" href="?fmt=pdf" title="{% trans 'Exportar para PDF' %}" ><i class="material-icons">picture_as_pdf</i></a></li>
+          <li><a class="btn-floating" href="?fmt=csv" title="{% trans 'Exportar para CSV' %}" ><i class="material-icons">file_download</i></a></li>
+        </ul>
       </div>
-    </form>
+    {% endif %}
-  {% else %}
+  {% endblock form %}
-    <div class="fixed-action-btn">
+  {% block data %}
-      <a class="btn-floating">
+    {% include "utils/report/report_items_snippet.html" with mode="html" %}
-        <i class="large material-icons">print</i>
+  {% endblock data %}
-      </a>
-      <ul>
-        <li><a class="btn-floating" href="?fmt=pdf" title="{% trans 'Exportar para PDF' %}" ><i class="material-icons">picture_as_pdf</i></a></li>
-        <li><a class="btn-floating" href="?fmt=csv" title="{% trans 'Exportar para CSV' %}" ><i class="material-icons">file_download</i></a></li>
-      </ul>
-    </div>
-  {% endif %}
-  {% include "utils/report/report_items_snippet.html" with mode="html" %}
 {% endblock %}
 
 {% block footer %}
   {{ block.super }}
+  {% if form %}
+    {{ form.media }}
+  {% endif %}
 	<script>
 		$(document).ready(function(){
 			M.FloatingActionButton.init($('.fixed-action-btn'), {hoverEnabled: false});

sigi/templates/pdf/base_report.html

@@ -43,6 +43,8 @@ th,td {
 th {
   background-color: #007433;
   color: white;
+  font-weight: 600;
+  text-transform: uppercase;
 }
 tr:nth-child(even) {
   background-color: #d2d2d2;