Released v1.27.0

README.md

@@ -7,7 +7,7 @@
 [![Python 3.4](https://img.shields.io/badge/python%203.4-support%20ended-red.svg)](https://dsmr-reader.readthedocs.io/en/latest/requirements.html#python)
 
 
-# DSMR Reader Datalogger/GUI
+# DSMR-reader Datalogger/GUI
 
 
 ## Documentation (`English` & `Nederlands`)
@@ -34,21 +34,7 @@
 - Scrollable graphs.
 
 
-### Dashboard
-![Dashboard](docs/static/screenshots/frontend/dashboard.png)
-
-
-### Archive
-![Archive](docs/static/screenshots/frontend/archive.png)
-
-
-### Trends
-![Archive](docs/static/screenshots/frontend/trends.png)
-
-
-### Energy contracts
-![Archive](docs/static/screenshots/frontend/energy-contracts.png)
-
-
 ## Screenshots
 More screenshots can be found in the documentation at [Read The Docs](https://dsmr-reader.readthedocs.io/en/latest/screenshots.html).
+
+![Archive](docs/static/screenshots/frontend/archive.png)

docs/admin/consumption.rst

@@ -1,9 +1,18 @@
-Admin: Consumption
-==================
+Admin: Consumption & energy supplier prices
+===========================================
 
 You can choose whether to have all readings grouped by minute (default) or by reading.
 This only affects the display of data in the Dashboard page.
 
 .. image:: ../static/screenshots/admin/consumptionsettings.png
     :target: ../static/screenshots/admin/consumptionsettings.png
     :alt: Consumption
+
+
+There is a separate page for entering your energy supplier prices.
+
+.. image:: ../static/screenshots/admin/energysupplierprice.png
+    :target: ../static/screenshots/admin/energysupplierprice.png
+    :alt: Energy supplier prices
+
+Entering your prices will allow the application to display them, when possible.

docs/changelog.rst

@@ -17,6 +17,21 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 ----
 
 
+v1.27.0 - 2018-12-23
+^^^^^^^^^^^^^^^^^^^^
+
+**Tickets resolved in this release:**
+
+- [`#557 <https://github.com/dennissiemensma/dsmr-reader/issues/557>`_] Plugin/hook voor doorsturen telegrammen
+- [`#560 <https://github.com/dennissiemensma/dsmr-reader/issues/560>`_] Added boundaryGap to improve charts - by jbrunink / Tijs van Noije
+- [`#561 <https://github.com/dennissiemensma/dsmr-reader/issues/561>`_] Arrows on status page will now be hidden on small screens where they don't make sense anymore - by jbrunink
+- [`#426 <https://github.com/dennissiemensma/dsmr-reader/issues/426>`_] Temperatuurmetingen per uur inzichtelijk als CSV
+- [`#558 <https://github.com/dennissiemensma/dsmr-reader/issues/558>`_] Custom backup storage location
+
+
+----
+
+
 v1.26.1 - 2018-10-31
 ^^^^^^^^^^^^^^^^^^^^
 

docs/credits.rst

@@ -29,6 +29,7 @@ Listed in any order, sorted by name.
 - `FutureCow <https://github.com/FutureCow>`_
 - `Gert Schaafsma <https://www.linkedin.com/in/gertschaafsma>`_
 - `gertjuhh <https://github.com/gertjuhh>`_
+- `glsf91 <https://github.com/glsf91>`_
 - `goegol <https://github.com/goegol>`_
 - `Hans-Paul Hemelaar <https://www.linkedin.com/in/hanspaulhemelaar>`_
 - `helmo <https://github.com/helmo>`_
@@ -37,6 +38,7 @@ Listed in any order, sorted by name.
 - `Jeroen Tielen <https://nl.linkedin.com/in/jeroentielen>`_
 - `joopy <https://github.com/joopy>`_
 - `Joris Vervuurt <https://github.com/jorisvervuurt>`_
+- `jbrunink <https://github.com/jbrunink>`_
 - `ju5t <https://github.com/ju5t>`_
 - `jwveldhuis <https://github.com/jwveldhuis>`_
 - Koen Volleberg
@@ -59,6 +61,7 @@ Listed in any order, sorted by name.
 - `TampertK <https://github.com/TampertK>`_
 - `ThinkPadNL <https://github.com/ThinkPadNL>`_
 - `thommy101 <https://github.com/thommy101>`_
+- Tijs van Noije
 - `TopdRob <https://github.com/TopdRob>`_
 - `tpjanssen <https://github.com/tpjanssen>`_
 - `trbs <https://github.com/trbs>`_

docs/faq.rst

@@ -6,10 +6,18 @@ Frequently Asked Questions (FAQ)
     :depth: 2
 
 
+I need help!
+------------
+If you can't find the answer in the documentation, do not hesitate in looking for help.
+You can contact me using Github tickets.
+
+* `Create a ticket at Github <https://github.com/dennissiemensma/dsmr-reader/issues/new>`_
+
+
 How can I update my application?
 --------------------------------
 The version you are running is always based on the 'latest' version of the application, called the `master` branch.
-Every once in a while there may be updates. Since ``v1.5`` you can also easily check for updates by using the application's Status page.
+Every once in a while there may be updates. You can also easily check for updates by using the application's Status page.
 
 .. warning::
 
@@ -31,6 +39,55 @@ It will make sure to check, fetch and apply any changes released. Summary of dep
 - Clear any caches.
 
 
+How can I move the database location?
+-------------------------------------
+.. warning::
+
+    Changing the database data location can cause datacorruption. Only execute the step below if you understand what you are exactly doing!
+
+Since the SD-card is quite vulnerable to wearing and corruption, you can run the database on a different disk or USB-stick.
+To do this, you will have to stop the application and database, change the database configuration, move the data and restart all processes again.
+
+Make sure the OS has direct access the new location and **create a back-up first**!
+
+In the example below we will move the data from ``/var/lib/postgresql/`` to ``/data/postgresql/`` (which could be an external mount).
+
+*Please note that "9.5" in the example below is just the version number of the database, and it may differ from your installation. The same steps however apply.*
+
+Execute the commands below:
+
+* Stop DSMR-reader: ``sudo supervisorctl stop all``
+
+* Stop database: ``sudo systemctl stop postgresql``
+
+* Confirm that the database has stopped, you should see no more ``postgresql`` processes running: ``sudo ps faux | grep postgres``
+
+* Ensure the new location exists: ``sudo mkdir /data/postgresql/``
+
+* Move the database data folder: ``sudo mv /var/lib/postgresql/9.5/ /data/postgresql/9.5/``
+
+* Make sure the ``postgres`` user has access to the new location (and any parent folders in it's path): ``sudo chown -R postgres:postgres /data/``
+
+* Edit database configuration ``sudo vi /etc/postgresql/9.5/main/postgresql.conf`` and find the line::
+
+    data_directory = '/var/lib/postgresql/9.5/main'
+
+* Change it to your new location::
+
+    data_directory = '/data/postgresql/9.5/main'
+
+* Save the file and start the database: ``sudo systemctl start postgresql``
+
+* Check whether the database is running again, you should see multiple processes: ``sudo ps faux | grep postgres``
+
+* Does the database not start? Check its logs in ``/var/log/postgresql/`` for hints.
+
+* Start DSMR-reader again: ``sudo supervisorctl start all``
+
+* Everything should work as usual now, storing the data on the new location.
+
+
+
 Recalculate prices retroactively
 --------------------------------
 *I've adjusted my energy prices but there are no changes! How can I regenerate them with my new prices?*
@@ -127,13 +184,3 @@ Fresh installations automatically include the ``dsmr_mqtt`` process. Existing in
     sudo cp /home/dsmr/dsmr-reader/dsmrreader/provisioning/supervisor/dsmr-reader.conf /etc/supervisor/conf.d/
     sudo supervisorctl reread
     sudo supervisorctl update
-
-
-
-Feature/bug report
-------------------
-*How can I propose a feature or report a bug I've found?*
-
-.. seealso::
-
-    `Just create a ticket at Github <https://github.com/dennissiemensma/dsmr-reader/issues/new>`_.

docs/locale/nl/LC_MESSAGES/admin/consumption.po

@@ -8,27 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DSMR-reader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-16 17:55+0200\n"
-"PO-Revision-Date: 2018-10-16 17:56+0200\n"
+"POT-Creation-Date: 2018-11-09 15:23+0100\n"
+"PO-Revision-Date: 2018-11-09 15:24+0100\n"
+"Last-Translator: \n"
+"Language: nl_NL\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: nl_NL\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
 #: ../../admin/consumption.rst:2
-msgid "Admin: Consumption"
-msgstr "Admin: Verbruik"
+msgid "Admin: Consumption & energy supplier prices"
+msgstr "Admin: Verbruik en energietarieven"
 
 #: ../../admin/consumption.rst:4
 msgid ""
-"You can choose whether to have all readings grouped by minute (default) or "
-"by reading. This only affects the display of data in the Dashboard page."
+"You can choose whether to have all readings grouped by minute (default) "
+"or by reading. This only affects the display of data in the Dashboard "
+"page."
+msgstr ""
+"Je kunt ervoor kiezen om alle metingen te groeperen per minuut "
+"(standaard) of per meting. Dit heeft alleen invloed op hoe de gegevens "
+"getoond worden in de Dashboard-pagina."
+
+#: ../../admin/consumption.rst:12
+msgid "There is a separate page for entering your energy supplier prices."
+msgstr "Er is een aparte pagina waar je je energietarieven kunt invullen."
+
+#: ../../admin/consumption.rst:18
+msgid ""
+"Entering your prices will allow the application to display them, when "
+"possible."
 msgstr ""
-"Je kunt ervoor kiezen om alle metingen te groeperen per minuut (standaard) "
-"of per meting. Dit heeft alleen invloed op hoe de gegevens getoond worden "
-"in de Dashboard-pagina."
+"Het invullen van de prijzen die je betaalt staat de applicatie toe om "
+"ze te tonen, wanneer mogelijk."
+
+#~ msgid "Admin: Consumption"
+#~ msgstr "Admin: Verbruik"