Support for both single and high/low tariff #130

Author: dennissiemensma

dsmr_consumption/services.py

@@ -159,6 +159,9 @@ def day_consumption(day):
     consumption['electricity2_cost'] = round_decimal(
         consumption['electricity2'] * consumption['electricity2_unit_price']
     )
+    consumption['electricity_merged'] = consumption['electricity1'] + consumption['electricity2']
+    consumption['electricity_returned_merged'] = consumption['electricity1_returned'] + consumption['electricity2_returned']
+    consumption['electricity_cost_merged'] = consumption['electricity1_cost'] + consumption['electricity2_cost']
     consumption['total_cost'] = round_decimal(
         consumption['electricity1_cost'] + consumption['electricity2_cost']
     )

dsmr_frontend/templates/dsmr_frontend/dashboard.html

@@ -88,6 +88,14 @@
                             <th class="col-md-2">{% if capabilities.electricity_returned %}{% trans "Returned" %} ({% trans "kWh" noop %}){% endif %}</th>
                             <th class="col-md-2">{% trans "Cost" %} (&euro;)</th>
                         </tr>
+                        {% if frontend_settings.merge_electricity_tariffs %}
+			            <tr>
+			                <td>{% if capabilities.electricity %}{% trans "Electricity (single tariff)" %}{% endif %}</td>
+			                <td><span class="badge bg-red">{% if capabilities.electricity %}{{ month_statistics.electricity_merged|default:'-' }} </span>{% endif %}</td>
+			                <td><span class="badge bg-green">{% if capabilities.electricity_returned %}{{ month_statistics.electricity_returned_merged|default:'-' }}{% endif %}</span></td>
+			                <td><span class="badge bg-black">{% if capabilities.electricity %}{{ month_statistics.electricity_cost_merged|default:'-' }}{% endif %}</span></td>
+			            </tr>
+			            {% else %}
                         <tr>
                             <td>{% if capabilities.electricity %}{% trans "Electricity 1 (low tariff)" %}{% endif %}</td>
                             <td><span class="badge bg-red">{% if capabilities.electricity %}{{ month_statistics.electricity1|default:'-' }} </span>{% endif %}</td>
@@ -100,6 +108,7 @@
                             <td><span class="badge bg-green">{% if capabilities.electricity_returned %}{{ month_statistics.electricity2_returned|default:'-' }}{% endif %}</span></td>
                             <td><span class="badge bg-black">{% if capabilities.electricity %}{{ month_statistics.electricity2_cost|default:'-' }}{% endif %}</span></td>
                         </tr>
+                        {% endif %}
                         {% if capabilities.gas %}
                         <tr>
                             <td>{% trans "Gas" %}</td>
@@ -141,6 +150,14 @@
                             <th class="col-md-2">{% if capabilities.electricity_returned %}{% trans "Returned" %} ({% trans "kWh" noop %}){% endif %}</th>
                             <th class="col-md-2">{% trans "Cost" %} (&euro;)</th>
                         </tr>
+                        {% if frontend_settings.merge_electricity_tariffs %}
+                        <tr>
+                            <td>{% if capabilities.electricity %}{% trans "Electricity (single tariff)" %}{% endif %}</td>
+                            <td><span class="badge bg-red">{% if capabilities.electricity %}{{ consumption.electricity_merged|default:'-' }} </span>{% endif %}</td>
+                            <td><span class="badge bg-green">{% if capabilities.electricity_returned %}{{ consumption.electricity_returned_merged|default:'-' }}{% endif %}</span></td>
+                            <td><span class="badge bg-black">{% if capabilities.electricity %}{{ consumption.electricity_cost_merged|default:'-' }}{% endif %}</span></td>
+                        </tr>
+                        {% else %}
                         <tr>
                             <td>{% if capabilities.electricity %}{% trans "Electricity 1 (low tariff)" %}{% endif %}</td>
                             <td><span class="badge bg-red">{% if capabilities.electricity %}{{ consumption.electricity1|default:'-' }} </span>{% endif %}</td>
@@ -153,6 +170,8 @@
                             <td><span class="badge bg-green">{% if capabilities.electricity_returned %}{{ consumption.electricity2_returned|default:'-' }}{% endif %}</span></td>
                             <td><span class="badge bg-black">{% if capabilities.electricity %}{{ consumption.electricity2_cost|default:'-' }}{% endif %}</span></td>
                         </tr>
+                        {% endif %}
+                        
                         {% if capabilities.gas %}
                         <tr>
                             <td> {% trans "Gas" %}</td>

dsmr_frontend/views/notification.py

@@ -10,6 +10,5 @@ class NotificationRead(RedirectView):
     url = reverse_lazy('frontend:dashboard')
 
     def post(self, request, *args, **kwargs):
-        print( "self.request.POST['id']", self.request.POST['id'])
         Notification.objects.filter(pk=self.request.POST['id']).update(read=True)
         return super(NotificationRead, self).post(request, *args, **kwargs)

dsmrreader/locales/nl/LC_MESSAGES/django.mo

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DSMR Reader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-19 18:25+0100\n"
+"POT-Creation-Date: 2016-11-20 01:43+0100\n"
 "PO-Revision-Date: 2016-11-19 15:03+0100\n"
 "Last-Translator: Dennis Siemensma <dsmr@dennissiemensma.nl>\n"
 "Language-Team: Dennis Siemensma <dsmr@dennissiemensma.nl>\n"
@@ -495,6 +495,9 @@ msgstr "Teruggeleverd"
 msgid "Cost"
 msgstr "Kosten"
 
+msgid "Electricity (single tariff)"
+msgstr "Elektriciteit (enkel tarief)"
+
 msgid "Electricity 1 (low tariff)"
 msgstr "Elektriciteit 1 (daltarief)"
 
@@ -576,9 +579,6 @@ msgstr "Voeg notitie toe voor deze datum"
 msgid "Energy price"
 msgstr "Energieprijs"
 
-msgid "Electricity (single tariff)"
-msgstr "Elektriciteit (enkel tarief)"
-
 msgid "Weather"
 msgstr "Weergegevens"