improve reporting CSS, person work statement report

This commit is contained in:
Helmut Merz 2016-01-10 18:23:04 +01:00
parent e272675498
commit cd65a3f7b5
5 changed files with 40 additions and 1 deletions

View file

@ -262,10 +262,20 @@ table.records th, table.records td {
border: 1px solid lightgrey; border: 1px solid lightgrey;
} }
table.report th {
border-bottom: 1px solid #bbbbbb;
font-weight: bold;
}
table.report td { table.report td {
border-bottom: 1px dotted #dddddd;
vertical-align: top; vertical-align: top;
} }
.report-meta table {
width: auto;
}
dl.docutils dt { dl.docutils dt {
font-weight: bold; font-weight: bold;
margin-top: 0.3em; margin-top: 0.3em;

View file

@ -91,6 +91,14 @@
factory="loops.expert.browser.report.ResultsConceptView" factory="loops.expert.browser.report.ResultsConceptView"
permission="zope.View" /> permission="zope.View" />
<zope:adapter
name="concept_report_embedded.html"
for="loops.interfaces.IConcept
zope.publisher.interfaces.browser.IBrowserRequest"
provides="zope.interface.Interface"
factory="loops.expert.browser.report.EmbeddedReportConceptView"
permission="zope.View" />
<zope:adapter <zope:adapter
name="concept_results_embedded.html" name="concept_results_embedded.html"
for="loops.interfaces.IConcept for="loops.interfaces.IConcept

View file

@ -24,6 +24,16 @@
</div> </div>
<div metal:define-macro="embedded_report">
<div tal:define="report item/reportInstance;
reportView nocall:item"
tal:attributes="class string:content-$level;">
<div metal:use-macro="item/report_macros/header" />
<div metal:use-macro="item/resultsRenderer" />
</div>
</div>
<div metal:define-macro="header"> <div metal:define-macro="header">
<metal:block use-macro="view/concept_macros/concepttitle" /> <metal:block use-macro="view/concept_macros/concepttitle" />
<form method="get" name="report_data" class="report-meta"> <form method="get" name="report_data" class="report-meta">

View file

@ -279,6 +279,17 @@ class ReportConceptView(ResultsConceptView, ReportView):
return qf return qf
class EmbeddedReportConceptView(ReportConceptView):
@Lazy
def macro(self):
return self.report_macros['embedded_report']
@Lazy
def title(self):
return self.report.title
class ReportParamsView(ReportConceptView): class ReportParamsView(ReportConceptView):
""" Report view allowing to enter parameters before executing the report. """ Report view allowing to enter parameters before executing the report.
""" """

View file

@ -151,7 +151,7 @@ task = TargetField('taskId', u'Task',
party = TargetField('userName', u'Party', party = TargetField('userName', u'Party',
description=u'The party (usually a person) who did the work.', description=u'The party (usually a person) who did the work.',
fieldType='selection', fieldType='selection',
executionSteps=['query', 'sort', 'output']) executionSteps=['sort', 'output'])
workTitle = StringField('title', u'Title', workTitle = StringField('title', u'Title',
description=u'The short description of the work.', description=u'The short description of the work.',
executionSteps=['sort', 'output']) executionSteps=['sort', 'output'])