Skip to content

Commit 6037c1c

Browse files
Retrieve the current energycontract for the statistics page #485
1 parent 05edd2b commit 6037c1c

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

docs/changelog.rst

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ v1.20.0 - 2018-xx-xx
2424
**Tickets resolved in this release:**
2525

2626
- [`#484 <https://github.com/dennissiemensma/dsmr-reader/issues/484>`_] API call om huidige versie terug te geven
27+
- [`#485 <https://github.com/dennissiemensma/dsmr-reader/issues/485>`_] Retrieve the current energycontract for the statistics page - helmo
2728

2829

2930

dsmr_frontend/tests/webinterface/test_statistics.py

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def test_statistics(self, now_mock):
3838
)
3939
self.assertEqual(response.status_code, 200)
4040
self.assertIn('capabilities', response.context)
41+
self.assertIn('energy_prices', response.context)
4142

4243
if DsmrReading.objects.exists():
4344
self.assertIn('latest_reading', response.context)

dsmr_frontend/views/statistics.py

+9
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
from django.contrib.humanize.templatetags.humanize import intcomma
44
from django.views.generic.base import TemplateView, View
55
from django.http.response import HttpResponse
6+
from django.utils import timezone
67

78
from dsmr_datalogger.models.reading import DsmrReading
89
from dsmr_datalogger.models.statistics import MeterStatistics
10+
from dsmr_consumption.models.energysupplier import EnergySupplierPrice
911
from dsmr_datalogger.models.settings import DataloggerSettings
1012
import dsmr_backend.services
1113
import dsmr_consumption.services
@@ -32,6 +34,13 @@ def get_context_data(self, **kwargs):
3234
context_data['datalogger_settings'] = DataloggerSettings.get_solo()
3335
context_data['meter_statistics'] = MeterStatistics.get_solo()
3436

37+
today = timezone.localtime(timezone.now()).date()
38+
39+
try:
40+
context_data['energy_prices'] = EnergySupplierPrice.objects.by_date(today)
41+
except EnergySupplierPrice.DoesNotExist:
42+
context_data['energy_prices'] = []
43+
3544
return context_data
3645

3746

dsmrreader/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
from django.utils.version import get_version
1818

1919

20-
VERSION = (1, 20, 0, 'beta', 1)
20+
VERSION = (1, 20, 0, 'beta', 2)
2121

2222
__version__ = get_version(VERSION)

0 commit comments

Comments
 (0)