0001-dataviz-add-formatting-for-series-in-seconds-72131.patch

Valentin Deniaud, 07 décembre 2022 13:37

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

Subject: [PATCH] dataviz: add formatting for series in seconds (#72131)

 .../migrations/0025_statistic_data_type.py    | 19 ++++++++++
 combo/apps/dataviz/models.py                  |  7 +++-
 combo/apps/dataviz/utils.py                   |  3 +-
 tests/test_dataviz.py                         | 38 +++++++++++++++++++
 4 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 combo/apps/dataviz/migrations/0025_statistic_data_type.py

     # Generated by Django 2.2.26 on 2022-12-06 17:03
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('dataviz', '0024_display_condition'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='statistic',
                 name='data_type',
                 field=models.CharField(default='', max_length=32),
                 preserve_default=False,
             ),
+        ]

         url = models.URLField(_('Data URL'))
         filters = JSONField(default=list)
         has_future_data = models.BooleanField(default=False)
         data_type = models.CharField(max_length=32)
         available = models.BooleanField(_('Available data'), default=True)
         last_update = models.DateTimeField(_('Last update'), null=True, auto_now=True)
-...
                 chart.axis_count = min(len(data['series']), 2)
                 self.prepare_chart(chart, width, height)
                 if self.statistic.data_type:
                     chart.config.value_formatter = self.get_value_formatter(self.statistic.data_type)
                     chart.compute_sum = False
                 if chart.axis_count == 1:
                     data['series'][0]['data'] = self.process_one_dimensional_data(
                         chart, data['series'][0]['data']
-...
                     chart.add(label, value)
         @staticmethod
         def get_value_formatter(unit, measure):
         def get_value_formatter(unit, measure='duration'):
             if unit == 'seconds' or measure == 'duration':
                 def format_duration(value):

                             site_title=site_dict.get('title', ''),
                             filters=stat.get('filters', []),
                             has_future_data=stat.get('future_data', False),
                             data_type=stat.get('data_type', ''),
                             available=True,
+                        )
+                    )
         update_fields = ('label', 'url', 'site_title', 'filters', 'available', 'has_future_data')
         update_fields = ('label', 'url', 'site_title', 'filters', 'available', 'has_future_data', 'data_type')
         all_statistics = {stat.natural_key(): stat for stat in Statistic.objects.all()}
         statistics_to_create = []
         statistics_to_update = {}

                     },
                 ],
             },
+            {
                 'url': 'https://authentic.example.com/api/statistics/duration-in-seconds/',
                 'name': 'Duration in seconds',
                 'id': 'duration-in-seconds',
                 'data_type': 'seconds',
             },
+        ]
+    }
-...
                 },
+            }
             return {'content': json.dumps(response), 'request': request, 'status_code': 200}
         if url.path == '/api/statistics/duration-in-seconds/':
             response = {
                 'data': {
                     'series': [{'data': [140, 3600 * 3, 86400 * 4, 86400 * 100], 'label': 'Serie 1'}],
                     'x_labels': ['Minutes', 'Hours', 'Days', 'Months'],
                 },
+            }
             return {'content': json.dumps(response), 'request': request, 'status_code': 200}
     @pytest.fixture
-...
         resp = app.get(location, status=404)
     @with_httmock(new_api_mock)
     def test_chartng_cell_view_new_api_duration(app, normal_user, new_api_statistics):
         page = Page.objects.create(title='One', slug='index')
         cell = ChartNgCell(page=page, order=1, placeholder='content')
         cell.statistic = Statistic.objects.get(slug='duration-in-seconds')
         cell.save()
         resp = app.get('/')
         location = '/api/dataviz/graph/%s/' % cell.id
         resp = app.get(location + '?width=400', status=200)
         assert '>Less than an hour<' in resp.text
         assert '>3 hours<' in resp.text
         assert '>4 days<' in resp.text
         assert '>100 days<' in resp.text
         cell.chart_type = 'table'
         cell.save()
         resp = app.get(location, status=200)
         assert '<td>Less than an hour</td>' in resp.text
         assert '<td>3 hours</td>' in resp.text
         assert '<td>4 days</td>' in resp.text
         assert '<td>100 days</td>' in resp.text
     @with_httmock(bijoe_mock)
     def test_chartng_cell_manager(app, admin_user, statistics):
         page = Page(title='One', slug='index')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-dataviz-add-formatting-for-series-in-seconds-72131.patch