0001-dataviz-display-total-in-tables-37903.patch

Valentin Deniaud, 08 janvier 2020 12:51

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

Subject: [PATCH] dataviz: display total in tables (#37903)

 combo/apps/dataviz/models.py |  9 ++++++
 tests/test_dataviz.py        | 57 +++++++++++++++++++++++++++++++++---
 2 files changed, 62 insertions(+), 4 deletions(-)

                 else:
                     ctx['table'] = chart.render_table(
                         transpose=bool(chart.axis_count == 2),
                         total=chart.compute_sum,
+                    )
                     ctx['table'] = ctx['table'].replace('<table>', '<table class="main">')
             return ctx
-...
                 # use a single colour for dots
                 chart.config.style.colors = ('#1f77b4',) * len(x_labels)
             chart.compute_sum = bool(response.get('measure') == 'integer')
             if chart.compute_sum and self.chart_type == 'table':
                 if chart.axis_count < 2:  # workaround pygal
                     chart.compute_sum = False
                     if chart.axis_count == 1:
                         data.append(sum(data))
                         x_labels.append('Total')
             if self.chart_type != 'pie':
                 for i, serie_label in enumerate(y_labels):
                     if chart.axis_count < 2:

                 'data': [222, 134, 53],
                 'axis': {
                     'x_labels': ['web', 'mail', 'email']
+                }
                 },
                 'measure': 'integer',
+            }
             return {'content': json.dumps(response), 'request': request, 'status_code': 200}
         if url.path == '/visualization/2/json/':
-...
                 'data': [222, 134, 53],
                 'axis': {
                     'y_labels': ['web', 'mail', 'email']
+                }
                 },
                 'measure': 'integer',
+            }
             return {'content': json.dumps(response), 'request': request, 'status_code': 200}
         if url.path == '/visualization/3/json/':
-...
                 'axis': {
                     'x_labels': ['web', 'mail', 'email'],
                     'y_labels': ['foo', 'bar'],
+                }
                 },
                 'measure': 'integer',
+            }
             return {'content': json.dumps(response), 'request': request, 'status_code': 200}
         if url.path == '/visualization/4/json/':
             response = {
                 'format': '1',
                 'data': 222,
                 'axis': {}
                 'axis': {},
                 'measure': 'integer',
+            }
             return {'content': json.dumps(response), 'request': request, 'status_code': 200}
         if url.path == '/visualization/5/json/':
-...
                     (u'plop:tenth', False, u'tenth visualization (percents)'),
                     (u'plop:third', False, u'third visualization (X/Y)'),
+                ]
     def test_table_cell(app, admin_user):
         page = Page(title='One', slug='index')
         page.save()
         app = login(app)
         with override_settings(KNOWN_SERVICES={
                 'bijoe': {'plop': {'title': 'test', 'url': 'https://bijoe.example.com',
                           'secret': 'combo', 'orig': 'combo'}}}):
             with HTTMock(bijoe_mock):
                 cell = ChartNgCell(page=page, order=1, placeholder='content')
                 cell.data_reference = 'plop:example'
                 cell.chart_type = 'table'
                 cell.save()
                 resp = app.get('/api/dataviz/graph/1/')
                 resp = app.get('/')
                 assert resp.text.count('Total') == 1
                 cell.data_reference = 'plop:second'
                 cell.save()
                 resp = app.get('/api/dataviz/graph/1/')
                 resp = app.get('/')
                 assert resp.text.count('Total') == 1
                 cell.data_reference = 'plop:third'
                 cell.save()
                 resp = app.get('/api/dataviz/graph/1/')
                 resp = app.get('/')
                 assert '114' in resp.text
                 assert resp.text.count('Total') == 2
                 cell.data_reference = 'plop:fourth'
                 cell.save()
                 resp = app.get('/api/dataviz/graph/1/')
                 resp = app.get('/')
                 assert resp.text.count('Total') == 0
                 # total of durations is not computed
                 cell.data_reference = 'plop:eigth'
                 cell.save()
                 resp = app.get('/api/dataviz/graph/1/')
                 resp = app.get('/')
                 assert resp.text.count('Total') == 0
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-dataviz-display-total-in-tables-37903.patch