0001-backoffice-display-applied-filters-in-PDF-output-891.patch

Frédéric Péters, 08 novembre 2015 17:01

Voir les différences: en ligne côte à côte

Subject: [PATCH] backoffice: display applied filters in PDF output (#8916)

 data/print-html-as-pdf.js           |  4 ++++
 tests/test_backoffice_pages.py      | 15 +++++++++++++++
 wcs/backoffice/management.py        | 23 +++++++++++++++++++++++
 wcs/qommon/static/css/dc2/admin.css |  4 ++++
 wcs/qommon/storage.py               |  4 ++--
 wcs/sql.py                          |  4 ++--
 6 files changed, 50 insertions(+), 4 deletions(-)

         $('html').css('background', 'white').css('font-size', '8pt');
         $('div#main').css('width', '95%');
         $('div#main-content').css('width', '95%').css('border', 'none');
         $('#statistics .criterias').css('display', 'block');
         $('div#main-content > h2').css({
                 'border-bottom': '1px solid #666',
                 'font-weight': 'bold'});
       });
       page.render(system.args[1] + '.pdf');
       phantom.exit();

         assert 'Resolution time' in resp.body
         assert 'To Status &quot;New&quot;' in resp.body
         assert 'To Status &quot;Finished&quot;' in resp.body
         assert not '<h2>Filters</h2>' in resp.body
         resp.forms[0]['filter-end-value'] = '2013-01-01'
         resp = resp.forms[0].submit()
         assert 'Total number of records: 0' in resp.body
         assert '<h2>Filters</h2>' in resp.body
         assert 'End: 2013-01-01' in resp.body
     def test_backoffice_statistics_status_filter(pub):
         create_superuser(pub)
-...
         resp = app.get('/backoffice/management/form-title/')
         resp = resp.click('Statistics')
         assert 'filter' not in resp.forms[0].fields # status is not displayed by default
         assert not '<h2>Filters</h2>' in resp.body
         # add 'status' as a filter
         resp.forms[0]['filter-status'].checked = True
         resp = resp.forms[0].submit()
         assert 'filter' in resp.forms[0].fields
         assert not '<h2>Filters</h2>' in resp.body
         assert resp.forms[0]['filter'].value == 'all'
         resp.forms[0]['filter'].value = 'pending'
         resp = resp.forms[0].submit()
         assert 'Total number of records: 17' in resp.body
         assert '<h2>Filters</h2>' in resp.body
         assert 'Status: Pending' in resp.body
         resp.forms[0]['filter'].value = 'done'
         resp = resp.forms[0].submit()
         assert 'Total number of records: 33' in resp.body
         assert '<h2>Filters</h2>' in resp.body
         assert 'Status: Done' in resp.body
         resp.forms[0]['filter'].value = 'rejected'
         resp = resp.forms[0].submit()
         assert 'Total number of records: 0' in resp.body
         assert '<h2>Filters</h2>' in resp.body
         assert 'Status: Rejected' in resp.body
         resp.forms[0]['filter'].value = 'all'
         resp = resp.forms[0].submit()
-...
         resp.forms[0]['filter-2-value'].value = 'foo'
         resp = resp.forms[0].submit()
         assert 'Total number of records: 13' in resp.body
         assert '<h2>Filters</h2>' in resp.body
         assert '2nd field: foo' in resp.body
         # check it's also possible to get back to the complete list
         resp.forms[0]['filter-2-value'].value = ''
-...
         resp.forms[0]['filter-3-value'].value = 'A'
         resp = resp.forms[0].submit()
         assert 'Total number of records: 13' in resp.body
         assert '<h2>Filters</h2>' in resp.body
         assert '3rd field: aa' in resp.body
         # set field to be displayed by default in filters
         formdef = FormDef.get_by_urlname('form-title')

                 if filter_field.id == 'start':
                     period_start = time.strptime(filter_field_value, format_string)
                     criterias.append(GreaterOrEqual('receipt_time', period_start))
                     criterias[-1]._label = '%s: %s' % (_('Start'), filter_field_value)
                 elif filter_field.id == 'end':
                     period_end = time.strptime(filter_field_value, format_string)
                     criterias.append(LessOrEqual('receipt_time', period_end))
                     criterias[-1]._label = '%s: %s' % (_('End'), filter_field_value)
                 elif filter_field.type == 'item' and filter_field_value not in (None, 'None'):
                     criterias.append(Equal('f%s' % filter_field.id, filter_field_value))
                     field_options = filter_field.get_options()
                     if field_options and type(field_options[0]) in (list, tuple):
                         for option in field_options:
                             if option[0] == filter_field_value or option[-1] == filter_field_value:
                                 filter_field_value = option[1]
                                 break
                     criterias[-1]._label = '%s: %s' % (filter_field.label, filter_field_value)
             return criterias
-...
                 if selected_filter == 'pending':
                     applied_filters = ['wf-%s' % x.id for x in
                                   self.formdef.workflow.get_not_endpoint_status()]
                     criteria_label = _('Status: %s') % _('Pending')
                 elif selected_filter == 'done':
                     applied_filters = ['wf-%s' % x.id for x in
                                   self.formdef.workflow.get_endpoint_status()]
                     criteria_label = _('Status: %s') % _('Done')
                 else:
                     criteria_label = _('Status: %s') % self.formdef.workflow.get_status(
                             selected_filter).name
                     applied_filters = ['wf-%s' % selected_filter]
                 criterias.append(Or([Equal('status', x) for x in applied_filters]))
                 criterias[-1]._label = criteria_label
             values = self.formdef.data_class().select(criterias)
             if get_publisher().is_using_postgresql():
-...
                 self.formdef.data_class().load_all_evolutions(values)
             r += htmltext('<div id="statistics">')
             if criterias:
                 r += htmltext('<div class="criterias bo-block">')
                 r += htmltext('<h2>%s</h2>') % _('Filters')
                 r += htmltext('<ul>')
                 for criteria in criterias:
                     criteria_label = getattr(criteria, '_label', None)
                     if criteria_label:
                         r += htmltext('<li>%s</li>') % criteria_label
                 r += htmltext('</ul></div>')
             if do_graphs:
                 r += htmltext('<div class="splitcontent-left">')

wcs/qommon/static/css/dc2/admin.css
1133	1133	div.user-pending-forms span.status {
1134	1134	font-size: 80%;
1135	1135	}
	1136
	1137	#statistics .criterias {
	1138	display: none;
	1139	}

             return lambda x: value.intersection(set(getattr(x, self.attribute, []) or []))
     class Or(Criteria):
         def __init__(self, criterias):
         def __init__(self, criterias, **kwargs):
             self.criterias = criterias
         def build_lambda(self):
-...
             return func
     class And(Criteria):
         def __init__(self, criterias):
         def __init__(self, criterias, **kwargs):
             self.criterias = criterias
         def build_lambda(self):

             return {}
     class Or(Criteria):
         def __init__(self, criterias):
         def __init__(self, criterias, **kwargs):
             self.criterias = []
             for element in criterias:
                 sql_class = globals().get(element.__class__.__name__)
-...
             return d
     class And(Criteria):
         def __init__(self, criterias):
         def __init__(self, criterias, **kwargs):
             self.criterias = []
             for element in criterias:
                 sql_class = globals().get(element.__class__.__name__)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-backoffice-display-applied-filters-in-PDF-output-891.patch