shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

Fixed headers replication on UDS Reports

Browse Source
This commit is contained in:
Adolfo Gómez García 2016-05-17 09:35:53 +02:00
parent ec29371b41
commit c73dae361f
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/uds/core/reports/tools/report.py
View File

@ -46,7 +46,7 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
__updated__ = '2016-01-20' __updated__ = '2016-05-17'
class UDSGeraldoReport(Report): class UDSGeraldoReport(Report):
@ -65,7 +65,7 @@ class UDSGeraldoReport(Report):
class band_page_header(ReportBand): class band_page_header(ReportBand):
height = 1.8 * cm height = 1.8 * cm
elements = [ bElements = [
SystemField(expression='%(report_title)s', top=0.5 * cm, left=0, width=BAND_WIDTH, SystemField(expression='%(report_title)s', top=0.5 * cm, left=0, width=BAND_WIDTH,
style={'fontName': 'Helvetica-Bold', 'fontSize': 14, 'alignment': TA_CENTER}), style={'fontName': 'Helvetica-Bold', 'fontSize': 14, 'alignment': TA_CENTER}),
@ -77,7 +77,7 @@ class UDSGeraldoReport(Report):
class band_page_footer(ReportBand): class band_page_footer(ReportBand):
height = 0.5 * cm height = 0.5 * cm
elements = [ bElements = [
Label(text=_('Generated by UDS'), top=0.1 * cm), Label(text=_('Generated by UDS'), top=0.1 * cm),
SystemField(expression=_('Printed in %(now:%Y, %b %d)s at %(now:%H:%M)s'), top=0.1 * cm, SystemField(expression=_('Printed in %(now:%Y, %b %d)s at %(now:%H:%M)s'), top=0.1 * cm,
width=BAND_WIDTH, style={'alignment': TA_RIGHT}), width=BAND_WIDTH, style={'alignment': TA_RIGHT}),
@ -85,7 +85,7 @@ class UDSGeraldoReport(Report):
borders = {'top': True} borders = {'top': True}
def __init__(self, queryset=None): def __init__(self, queryset=None):
self.band_page_header.elements += self.header_elements self.band_page_header.elements = self.band_page_header.bElements + self.header_elements
self.band_page_header.height = self.header_height self.band_page_header.height = self.header_height
Report.__init__(self, queryset=queryset) Report.__init__(self, queryset=queryset)

5
server/src/uds/reports/stats/login.py
View File

@ -60,7 +60,7 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
__updated__ = '2015-09-04' __updated__ = '2016-05-17'
# several constants as Width height, margins, .. # several constants as Width height, margins, ..
WIDTH, HEIGHT = 1800, 1000 WIDTH, HEIGHT = 1800, 1000
@ -69,6 +69,7 @@ GERALDO_HEIGHT = GERALDO_WIDTH * HEIGHT / WIDTH
class AccessReport(UDSGeraldoReport): class AccessReport(UDSGeraldoReport):
header_elements = []
class band_detail(ReportBand): class band_detail(ReportBand):
height = 400 * mm # Height bigger than a page, so a new page is launched height = 400 * mm # Height bigger than a page, so a new page is launched
@ -225,7 +226,7 @@ class StatsReportLogin(StatsReport):
# User access by date graph # User access by date graph
# #
surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, WIDTH, HEIGHT) surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, WIDTH, HEIGHT) # @UndefinedVariable
dataset = ((ugettext('Users access to UDS'), data),) dataset = ((ugettext('Users access to UDS'), data),)

6
server/src/uds/reports/stats/pool_performance.py
View File

@ -64,7 +64,7 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
__updated__ = '2016-05-04' __updated__ = '2016-05-17'
# several constants as Width height, margins, .. # several constants as Width height, margins, ..
WIDTH, HEIGHT = 1800, 1000 WIDTH, HEIGHT = 1800, 1000
@ -74,6 +74,8 @@ GERALDO_HEIGHT = GERALDO_WIDTH * HEIGHT / WIDTH
class AccessReport(UDSGeraldoReport): class AccessReport(UDSGeraldoReport):
header_elements = []
class band_detail(ReportBand): class band_detail(ReportBand):
height = 400 * mm # Height bigger than a page, so a new page is launched for listings height = 400 * mm # Height bigger than a page, so a new page is launched for listings
# auto_expand_height = True # auto_expand_height = True
@ -244,7 +246,7 @@ class PoolPerformanceReport(StatsReport):
xLabelFormat, poolsData, reportData = self.getRangeData() xLabelFormat, poolsData, reportData = self.getRangeData()
surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, WIDTH, HEIGHT) surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, WIDTH, HEIGHT) # @UndefinedVariable
options = { options = {
'encoding': 'utf-8', 'encoding': 'utf-8',

2
server/src/uds/reports/stats/usage_by_pool.py
View File

@ -56,7 +56,7 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
__updated__ = '2016-01-20' __updated__ = '2016-05-17'
# several constants as Width height, margins, .. # several constants as Width height, margins, ..
WIDTH, HEIGHT = 1800, 1000 WIDTH, HEIGHT = 1800, 1000

5
server/src/uds/transports/RDP/RDPFile.py
View File

@ -40,7 +40,7 @@ from uds.core.util import OsDetector
import six import six
import os import os
__updated__ = '2015-08-31' __updated__ = '2016-05-13'
class RDPFile(object): class RDPFile(object):
@ -141,7 +141,7 @@ class RDPFile(object):
Note that server is not added Note that server is not added
''' '''
params = ['-TUDS Connection', '-P', '-rclipboard:PRIMARYCLIPBOARD]'] params = ['-TUDS Connection', '-P', '-rclipboard:PRIMARYCLIPBOARD']
if self.redirectSmartcards: if self.redirectSmartcards:
params.append('-rsdcard') params.append('-rsdcard')
@ -152,7 +152,6 @@ class RDPFile(object):
params.append('-rsound:off') params.append('-rsound:off')
if self.redirectDrives is True: if self.redirectDrives is True:
params.append('-rdisk:home=' + os.environ['HOME'])
params.append('-rdisk:media=/media') params.append('-rdisk:media=/media')
if self.redirectSerials is True: if self.redirectSerials is True: