Merge branch '95-retroactive-energy-price-changes' into development

dsmrreader · May 18, 2016 · b42dd1a · b42dd1a
2 parents 07ae39c + 99cc5d1
commit b42dd1a
Show file tree

Hide file tree

Showing 17 changed files with 495 additions and 475 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -13,6 +13,7 @@ v1.2.0 - 2016-xx-xx
 - Pie charts on trends page overlap their canvas (`#136 <https://github.com/dennissiemensma/dsmr-reader/issues/136>`_).
 - 'Slumber' consumption (`#115 <https://github.com/dennissiemensma/dsmr-reader/issues/115>`_).
 - Show lowest & highest Watt peaks (`#138 <https://github.com/dennissiemensma/dsmr-reader/issues/138>`_).
+- Reset day & hour statistics when changing energy prices (`#95 <https://github.com/dennissiemensma/dsmr-reader/issues/95>`_).
 
 
 v1.1.2 - 2016-05-01

diff --git a/docs/faq.rst b/docs/faq.rst
@@ -0,0 +1,18 @@
+Frequently Asked Questions (FAQ)
+================================
+
+Feature/bug report
+------------------
+**How can I propose a feature or report a bug I've found?**
+
+`Just create a ticket at Github <https://github.com/dennissiemensma/dsmr-reader/issues/new>`_
+
+Recalculate prices
+------------------
+**I've adjusted my energy prices but there are no changes! How can I regenerate them with my new prices?**
+
+*You can flush your statistics by executing:*
+
+``./manage.py dsmr_stats_clear_statistics --ack-to-delete-my-data``
+
+*The application will delete all statistics and (slowly) regenerate them in the background. Just make sure the source data is still there.*
diff --git a/docs/index.rst b/docs/index.rst
@@ -8,6 +8,7 @@ DSMR Reader's documentation
    screenshots
    installation
    application
+   faq
    changelog
    contributing
    credits