Merge remote-tracking branch 'origin/v1.9'

server/src/uds/core/reports/tools/report.py

@@ -46,7 +46,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-__updated__ = '2015-07-07'
+__updated__ = '2016-01-20'
 
 
 class UDSGeraldoReport(Report):
@@ -60,6 +60,9 @@ class UDSGeraldoReport(Report):
     margin_right = 0.5 * cm
     margin_bottom = 0.5 * cm
 
+    header_elements = []
+    header_height = 1.8 * cm
+
     class band_page_header(ReportBand):
         height = 1.8 * cm
         elements = [
@@ -81,6 +84,12 @@ class UDSGeraldoReport(Report):
         ]
         borders = {'top': True}
 
+    def __init__(self, queryset=None):
+        self.band_page_header.elements += self.header_elements
+        self.band_page_header.height = self.header_height
+        Report.__init__(self, queryset=queryset)
+
+
     @staticmethod
     def viewSize():
         return (

server/src/uds/reports/stats/usage_by_pool.py

@@ -48,7 +48,7 @@ from .base import StatsReport
 from uds.core.util import tools
 from uds.models import ServicePool
 from geraldo.generators.pdf import PDFGenerator
-from geraldo import ReportBand, ObjectValue
+from geraldo import ReportBand, ObjectValue, Label
 from reportlab.lib.units import cm, mm
 
 import datetime
@@ -56,7 +56,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-__updated__ = '2016-01-19'
+__updated__ = '2016-01-20'
 
 # several constants as Width height, margins, ..
 WIDTH, HEIGHT = 1800, 1000
@@ -68,6 +68,15 @@ class UsersReport(UDSGeraldoReport):
     title = ''
     author = 'UDS'
 
+    header_elements = [
+        Label(text=_('Access Datetime'), top=2.0 * cm, left=0.5 * cm),
+        Label(text=_('User'), top=2.0 * cm, left=5.5 * cm),
+        Label(text=_('Duration(seconds)'), top=2.0 * cm, left=12 * cm),
+    ]
+
+    header_height = 2.5 * cm
+
+
     class band_detail(ReportBand):
         height = 0.5 * cm
         elements = (