Reports require CSS for printing

adlibre · Jan 19, 2012 · fb8bc17 · fb8bc17
1 parent 502ba1f
commit fb8bc17
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 8 deletions.
diff --git a/src/adlibre_tms/templates/blue_theme/site_base.html b/src/adlibre_tms/templates/blue_theme/site_base.html
@@ -7,6 +7,7 @@
   {% compress css %}
   <link href="{{ STATIC_URL }}tms/css/site_tabs.css" rel="stylesheet" type="text/css" />
   <link href="{{ STATIC_URL }}uni_form/uni-form.css" rel="stylesheet" type="text/css" />
+  <link href="{{ STATIC_URL }}tms/css/reports_print.css" rel="stylesheet" type="text/css" media="print" />
   {% endcompress %}
   {% block extra_head %}{% endblock %}
 {% endblock %}

diff --git a/src/adlibre_tms/templates/blue_theme/tms/reports/days_consultant.html b/src/adlibre_tms/templates/blue_theme/tms/reports/days_consultant.html
@@ -64,9 +64,9 @@ <h4>{% trans "Consultant:" %} {{ key }}</h4>
                   <td>{{ obj.duration_minutes|floatformat }}</td>
                   <td>
                     {% if obj.is_billable %}
-                      <span class="checked">{% trans "Checked" %}</span>
+                      <span class="checked">{% trans "Yes" %}</span>
                     {% else %}
-                      <span class="unchecked">{% trans "Unchecked" %}</span>
+                      <span class="unchecked">{% trans "No" %}</span>
                     {% endif %}
                   </td>
                   <td>{{ obj.job.pk }}</td>

diff --git a/src/adlibre_tms/templates/blue_theme/tms/reports/expense_summary_client.html b/src/adlibre_tms/templates/blue_theme/tms/reports/expense_summary_client.html
@@ -66,9 +66,9 @@ <h5>{% trans "Consultant:" %} {{ queryset.0.employee.user.username }}</h5>
                     <td>{{ obj.payment_method }}</td>
                     <td>
                       {% if obj.is_receipted %}
-                        <span class="checked">{% trans "Checked" %}</span>
+                        <span class="checked">{% trans "Yes" %}</span>
                       {% else %}
-                        <span class="unchecked">{% trans "Unchecked" %}</span>
+                        <span class="unchecked">{% trans "No" %}</span>
                       {% endif %}
                     </td>
                     <td>{{ obj.currency }}</td>

diff --git a/src/adlibre_tms/templates/blue_theme/tms/reports/expense_summary_consultant.html b/src/adlibre_tms/templates/blue_theme/tms/reports/expense_summary_consultant.html
@@ -65,9 +65,9 @@ <h5>{% trans "Customer:" %} {{ queryset.0.customer.customer_code }}</h5>
                     <td>{{ obj.payment_method }}</td>
                     <td>
                       {% if obj.is_receipted %}
-                        <span class="checked">{% trans "Checked" %}</span>
+                        <span class="checked">{% trans "Yes" %}</span>
                       {% else %}
-                        <span class="unchecked">{% trans "Unchecked" %}</span>
+                        <span class="unchecked">{% trans "No" %}</span>
                       {% endif %}
                     </td>
                     <td>{{ obj.currency }}</td>

diff --git a/src/adlibre_tms/templates/blue_theme/tms/reports/project_details.html b/src/adlibre_tms/templates/blue_theme/tms/reports/project_details.html
@@ -67,9 +67,9 @@ <h5>{% trans "Job:" %} {{ queryset.0.service_code }}</h5>
                         <td>{{ obj.duration_minutes|floatformat }}</td>
                         <td>
                           {% if obj.is_billable %}
-                            <span class="checked">{% trans "Checked" %}</span>
+                            <span class="checked">{% trans "Yes" %}</span>
                           {% else %}
-                              <span class="unchecked">{% trans "Unchecked" %}</span>
+                              <span class="unchecked">{% trans "No" %}</span>
                           {% endif %}
                         </td>
                         <td>{{ obj.comment }}</td>

diff --git a/www/media/blue_theme/tms/css/reports_print.css b/www/media/blue_theme/tms/css/reports_print.css
@@ -0,0 +1,45 @@
+
+/* reset body styles */
+body {
+    margin: 0;
+    padding: 0;
+    line-height: 1.4em;
+    word-spacing: 1px;
+    letter-spacing: 0.2px;
+    font: 12px Arial, Helvetica,"Lucida Grande", serif;
+    color: #000;
+}
+
+/* Remove unneeded elements */
+#control-panel,
+#header,
+#footer {
+    display:none;
+}
+
+/* restyling report table */
+table {
+    border:  1px solid black;
+    width: 100%;
+}
+table tr
+{
+    border-bottom: 1px solid black;
+}
+
+/* restyling report total tables */
+table.report_job_totals,
+table.report_project_totals,
+table.report_customer_totals {
+    font: 16px Arial, Helvetica,"Lucida Grande", serif;
+    border: none;
+}
+
+/* restyling report headers */
+h3 {
+    font: 24px Arial, Helvetica,"Lucida Grande", serif;
+}
+
+h4 {
+    font: 24px Arial, Helvetica,"Lucida Grande", serif;
+}