0001-dataviz-format-durations-in-graphs-36874.patch

Frédéric Péters, 13 octobre 2019 15:41

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

Subject: [PATCH] dataviz: format durations in graphs (#36874)

 combo/apps/dataviz/models.py | 27 ++++++++++++++++++++++-
 tests/test_dataviz.py        | 42 +++++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 2 deletions(-)

     from django.core.urlresolvers import reverse
     from django.db import models
     from django.utils.translation import ugettext_lazy as _
     from django.utils.encoding import force_text
     from django.utils.translation import ugettext_lazy as _, ungettext
     from django.conf import settings
     from jsonfield import JSONField
-...
                     chart.add(label, value)
                 chart.show_legend = True
             if response.get('unit') == 'seconds':
                 def format_duration(value):
                     if value is None:
                         return '-'
                     days = value // 86400
                     hours = (value % 86400) // 3600
                     if days:
                         days_string = ungettext('%d day', '%d days', days) % days
                     if hours:
                         hours_string = ungettext('%d hour', '%d hours', hours) % hours
                     if days and hours:
                         value = _('%(days_string)s and %(hours_string)s') % {
                                 'days_string': days_string,
                                 'hours_string': hours_string,
+                        }
                     elif days:
                         value = days_string
                     elif hours:
                         value = hours_string
                     else:
                         value = _('Less than an hour')
                     return force_text(value)
                 chart.config.value_formatter = format_duration
             return chart

             'name': 'seventh visualization (loop/X/Y)',
             'slug': 'seventh',
         },
+        {
             'data-url': 'https://bijoe.example.com/visualization/8/json/',
             'path': 'https://bijoe.example.com/visualization/8/iframe/?signature=123',
             'name': 'eighth visualization (duration)',
             'slug': 'eighth',
         },
+    ]
-...
+                }
+            }
             return {'content': json.dumps(response), 'request': request, 'status_code': 200}
         if url.path == '/visualization/8/json/':
             response = {
                 'format': '1',
                 'data': [1000, 123000, 8600, 86400],
                 'axis': {
                     'y_labels': ['web', 'mail', 'email', 'fax']
                 },
                 'unit': 'seconds',
+            }
             return {'content': json.dumps(response), 'request': request, 'status_code': 200}
     def test_chartng_cell(app):
-...
                 with pytest.raises(UnsupportedDataSet):
                     chart = cell.get_chart()
                 # duration
                 cell.data_reference = 'plop:eighth'
                 cell.save()
                 chart = cell.get_chart()
     def test_chartng_cell_view(app, normal_user):
         page = Page(title='One', slug='index')
-...
                 resp = app.get('/api/dataviz/graph/1/?width=400', status=200)
                 assert 'Unsupported dataset' in resp.text
                 # durations
                 cell.data_reference = 'plop:eighth'
                 cell.chart_type = 'table'
                 cell.save()
                 resp = app.get('/api/dataviz/graph/1/')  # get data in cache
                 resp = app.get('/')
                 assert '<td>Less than an hour</td>' in resp.text
                 assert '<td>1 day and 10 hours</td>' in resp.text
                 assert '<td>2 hours</td>' in resp.text
                 assert '<td>1 day</td>' in resp.text
                 cell.chart_type = 'bar'
                 cell.save()
                 resp = app.get('/api/dataviz/graph/1/?width=400', status=200)
                 assert '>Less than an hour<' in resp.text
                 assert '>1 day and 10 hours<' in resp.text
                 assert '>2 hours<' in resp.text
                 assert '>1 day<' in resp.text
     def test_chartng_cell_manager(app, admin_user):
         page = Page(title='One', slug='index')
-...
                 cell.save()
                 resp = app.get('/manage/pages/%s/' % page.id)
                 assert resp.form['cdataviz_chartngcell-%s-data_reference' % cell.id].options == [
                     (u'plop:eighth', False, u'eighth visualization (duration)'),
                     (u'plop:example', True, u'example visualization (X)'),
                     (u'plop:fifth', False, u'fifth visualization (loop/X)'),
                     (u'plop:fourth', False, u'fourth visualization (no axis)'),
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-dataviz-format-durations-in-graphs-36874.patch