Skip to content

Commit cf73d12

Browse files
API voor live gas verbruik #562
1 parent ab0bd0a commit cf73d12

File tree

13 files changed

+1125
-985
lines changed

13 files changed

+1125
-985
lines changed

docs/api.rst

+39-1
Original file line numberDiff line numberDiff line change
@@ -794,11 +794,49 @@ Example
794794
{
795795
"timestamp": "2016-07-01T20:00:00Z",
796796
"currently_returned": 0,
797-
"currently_delivered":1123,
797+
"currently_delivered": 1123,
798798
"cost_per_hour": 0.02,
799799
}
800800

801801

802+
803+
----
804+
805+
806+
``GET`` - ``consumption/gas-live``
807+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
808+
Returns the latest gas consumption.
809+
810+
811+
URI
812+
~~~
813+
Full path: ``/api/v2/consumption/gas-live``
814+
815+
816+
Parameters
817+
~~~~~~~~~~
818+
None.
819+
820+
821+
Response
822+
~~~~~~~~
823+
``HTTP 200`` on success. Body contains the result(s) in JSON format. Any other status code on failure.
824+
825+
826+
Example
827+
~~~~~~~
828+
829+
**Note**: ``cost_per_interval`` is only available when you've set energy prices.
830+
831+
**Data structure returned**::
832+
833+
{
834+
"timestamp": "2019-04-19T00:00:00Z",
835+
"currently_delivered": 0.456,
836+
"cost_per_interval": 0.34,
837+
}
838+
839+
802840
----
803841

804842

docs/changelog.rst

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ v2.1.0 - 2019-04-xx
2121
**Tickets resolved in this release:**
2222

2323
- [`#574 <https://github.com/dennissiemensma/dsmr-reader/issues/574>`_] Add Telegram notification support - by thommy101
24+
- [`#562 <https://github.com/dennissiemensma/dsmr-reader/issues/562>`_] API voor live gas verbruik
2425

2526

2627
----

docs/locale/nl/LC_MESSAGES/api.mo

464 Bytes
Binary file not shown.

docs/locale/nl/LC_MESSAGES/api.po

+58-37
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ msgstr ""
5151
"in het configuratiescherm of beheerderpaneel."
5252

5353
#: ../../api.rst:18 ../../api.rst:79 ../../api.rst:335 ../../api.rst:644
54-
#: ../../api.rst:703 ../../api.rst:746 ../../api.rst:788 ../../api.rst:832
55-
#: ../../api.rst:892 ../../api.rst:934 ../../api.rst:964
54+
#: ../../api.rst:703 ../../api.rst:746 ../../api.rst:788 ../../api.rst:827
55+
#: ../../api.rst:870 ../../api.rst:930 ../../api.rst:972 ../../api.rst:1002
5656
msgid "Example"
5757
msgstr "Voorbeeld"
5858

@@ -117,8 +117,8 @@ msgstr ""
117117
"``HTTP 200``, wanneer succesvol."
118118

119119
#: ../../api.rst:63 ../../api.rst:301 ../../api.rst:412 ../../api.rst:623
120-
#: ../../api.rst:682 ../../api.rst:731 ../../api.rst:773 ../../api.rst:811
121-
#: ../../api.rst:871 ../../api.rst:924 ../../api.rst:954
120+
#: ../../api.rst:682 ../../api.rst:731 ../../api.rst:773 ../../api.rst:812
121+
#: ../../api.rst:849 ../../api.rst:909 ../../api.rst:962 ../../api.rst:992
122122
msgid "URI"
123123
msgstr "URI"
124124

@@ -127,8 +127,8 @@ msgid "Full path: ``/api/v1/datalogger/dsmrreading``"
127127
msgstr "Volledig pad: ``/api/v1/datalogger/dsmrreading``"
128128

129129
#: ../../api.rst:68 ../../api.rst:306 ../../api.rst:417 ../../api.rst:628
130-
#: ../../api.rst:687 ../../api.rst:736 ../../api.rst:778 ../../api.rst:816
131-
#: ../../api.rst:876
130+
#: ../../api.rst:687 ../../api.rst:736 ../../api.rst:778 ../../api.rst:817
131+
#: ../../api.rst:854 ../../api.rst:914
132132
msgid "Parameters"
133133
msgstr "Parameters"
134134

@@ -141,8 +141,8 @@ msgstr ""
141141
"regeleindes ``\\n`` en 'carriage returns' ``\\r``!"
142142

143143
#: ../../api.rst:74 ../../api.rst:330 ../../api.rst:428 ../../api.rst:639
144-
#: ../../api.rst:698 ../../api.rst:741 ../../api.rst:783 ../../api.rst:827
145-
#: ../../api.rst:887 ../../api.rst:929 ../../api.rst:959
144+
#: ../../api.rst:698 ../../api.rst:741 ../../api.rst:783 ../../api.rst:822
145+
#: ../../api.rst:865 ../../api.rst:925 ../../api.rst:967 ../../api.rst:997
146146
msgid "Response"
147147
msgstr "Respons (van de server)"
148148

@@ -428,8 +428,8 @@ msgstr ""
428428
"Haalt opgeslagen metingen op. De metingen komen ofwel voort uit telegrammen of "
429429
"zijn handmatig aangemaakt via deze API."
430430

431-
#: ../../api.rst:418 ../../api.rst:629 ../../api.rst:688 ../../api.rst:817
432-
#: ../../api.rst:877
431+
#: ../../api.rst:418 ../../api.rst:629 ../../api.rst:688 ../../api.rst:855
432+
#: ../../api.rst:915
433433
msgid "All parameters are optional."
434434
msgstr "Alle parameters zijn optioneel."
435435

@@ -458,17 +458,17 @@ msgstr ""
458458
"Laat de parameter weg of gebruik ``timestamp`` om **oplopend** te sorteren "
459459
"(standaard)."
460460

461-
#: ../../api.rst:423 ../../api.rst:634 ../../api.rst:693 ../../api.rst:822
462-
#: ../../api.rst:882
461+
#: ../../api.rst:423 ../../api.rst:634 ../../api.rst:693 ../../api.rst:860
462+
#: ../../api.rst:920
463463
msgid ""
464464
"``offset`` (*integer*) - When iterating large resultsets, the offset "
465465
"determines the starting point."
466466
msgstr ""
467467
"``offset`` (*integer*) - Bij het doorlopen van vele resultaten kun je hiermee "
468468
"het startpunt bepalen."
469469

470-
#: ../../api.rst:424 ../../api.rst:635 ../../api.rst:694 ../../api.rst:823
471-
#: ../../api.rst:883
470+
#: ../../api.rst:424 ../../api.rst:635 ../../api.rst:694 ../../api.rst:861
471+
#: ../../api.rst:921
472472
msgid ""
473473
"``limit`` (*integer*) - Limits the resultset size returned. Omit for "
474474
"maintaining the default limit (**25**)."
@@ -477,8 +477,8 @@ msgstr ""
477477
"Laat deze parameter weg voor de standaardwaarde (**25**)."
478478

479479
#: ../../api.rst:429 ../../api.rst:640 ../../api.rst:699 ../../api.rst:742
480-
#: ../../api.rst:784 ../../api.rst:828 ../../api.rst:888 ../../api.rst:930
481-
#: ../../api.rst:960
480+
#: ../../api.rst:784 ../../api.rst:823 ../../api.rst:866 ../../api.rst:926
481+
#: ../../api.rst:968 ../../api.rst:998
482482
msgid ""
483483
"``HTTP 200`` on success. Body contains the result(s) in JSON format. Any other "
484484
"status code on failure."
@@ -576,7 +576,8 @@ msgstr ""
576576
"(standaard)."
577577

578578
#: ../../api.rst:645 ../../api.rst:704 ../../api.rst:748 ../../api.rst:792
579-
#: ../../api.rst:835 ../../api.rst:895 ../../api.rst:936 ../../api.rst:966
579+
#: ../../api.rst:831 ../../api.rst:873 ../../api.rst:933 ../../api.rst:974
580+
#: ../../api.rst:1004
580581
msgid "**Data structure returned**::"
581582
msgstr "**Datastructuur**::"
582583

@@ -608,7 +609,7 @@ msgstr "Geeft het verbruik (tot nu toe) van de huidige dag terug."
608609
msgid "Full path: ``/api/v2/consumption/today``"
609610
msgstr "Volledig pad: ``/api/v2/consumption/today``"
610611

611-
#: ../../api.rst:737 ../../api.rst:779
612+
#: ../../api.rst:737 ../../api.rst:779 ../../api.rst:818
612613
msgid "None."
613614
msgstr "Geen."
614615

@@ -635,87 +636,107 @@ msgstr ""
635636
"**N.B.**: ``cost_per_hour`` is alleen beschikbaar wanneer je energieprijzen "
636637
"hebt ingesteld."
637638

638-
#: ../../api.rst:806
639+
#: ../../api.rst:807
640+
msgid "``GET`` - ``consumption/gas-live``"
641+
msgstr "``GET`` - ``consumption/gas-live``"
642+
643+
#: ../../api.rst:808
644+
msgid "Returns the latest gas consumption."
645+
msgstr "Geeft het meest recente gasverbruik weer."
646+
647+
#: ../../api.rst:813
648+
msgid "Full path: ``/api/v2/consumption/gas-live``"
649+
msgstr "Volledig pad: ``/api/v2/consumption/gas-live``"
650+
651+
#: ../../api.rst:829
652+
msgid ""
653+
"**Note**: ``cost_per_interval`` is only available when you've set energy "
654+
"prices."
655+
msgstr ""
656+
"**N.B.**: ``cost_per_interval`` is alleen beschikbaar wanneer je "
657+
"energieprijzen hebt ingesteld."
658+
659+
#: ../../api.rst:844
639660
msgid "``GET`` - ``statistics/day``"
640661
msgstr "``GET`` - ``statistics/day``"
641662

642-
#: ../../api.rst:807
663+
#: ../../api.rst:845
643664
msgid ""
644665
"Retrieves any **aggregated day statistics**. Please note that these are "
645666
"generated a few hours **after midnight**."
646667
msgstr ""
647668
"Haalt **geaggregeerde dagstatistieken** op. Deze worden elke dag een paar uur "
648669
"**ná middernacht** gegenereerd."
649670

650-
#: ../../api.rst:812
671+
#: ../../api.rst:850
651672
msgid "Full path: ``/api/v2/statistics/day``"
652673
msgstr "Volledig pad: ``/api/v2/statistics/day``"
653674

654-
#: ../../api.rst:819
675+
#: ../../api.rst:857
655676
msgid ""
656677
"``day__gte`` (*date*) - Limits the result to any statistics having their date "
657678
"**higher or equal** to this parameter."
658679
msgstr ""
659680
"``day__gte`` (*date*) - Beperkt het resultaat tot alle datums die **hoger of "
660681
"gelijk zijn aan** deze parameter."
661682

662-
#: ../../api.rst:820
683+
#: ../../api.rst:858
663684
msgid ""
664685
"``day__lte`` (*date*) - Limits the result to any statistics having their date "
665686
"**lower or equal** to this parameter."
666687
msgstr ""
667688
"``day__lte`` (*date*) - Beperkt het resultaat tot alle datums die **lager of "
668689
"gelijk zijn aan** deze parameter."
669690

670-
#: ../../api.rst:821
691+
#: ../../api.rst:859
671692
msgid ""
672693
"``ordering`` (*string*) - Use ``-day`` to sort **descending**. Omit or use "
673694
"``day`` to sort **ascending** (default)."
674695
msgstr ""
675696
"``ordering`` (*string*) - Gebruik ``-day`` om **aflopend** te sorteren. Laat "
676697
"de parameter weg of gebruik ``day`` om **oplopend** te sorteren (standaard)."
677698

678-
#: ../../api.rst:833 ../../api.rst:893
699+
#: ../../api.rst:871 ../../api.rst:931
679700
msgid ""
680701
"All the :ref:`generic DSMRREADING examples <generic-examples-anchor>` apply "
681702
"here as well, since only the ``timestamp`` field differs."
682703
msgstr ""
683704
"Alle :ref:`generieke DSMRREADING voorbeelden <generic-examples-anchor>` zijn "
684705
"hier tevens van toepassing, gezien alleen het ``timestamp`` field afwijkt."
685706

686-
#: ../../api.rst:866
707+
#: ../../api.rst:904
687708
msgid "``GET`` - ``statistics/hour``"
688709
msgstr "``GET`` - ``statistics/hour``"
689710

690-
#: ../../api.rst:867
711+
#: ../../api.rst:905
691712
msgid ""
692713
"Retrieves any **aggregated hourly statistics**. Please note that these are "
693714
"generated a few hours **after midnight**."
694715
msgstr ""
695716
"Haalt **geaggregeerde uurstatistieken** op. Deze worden elke dag een paar uur "
696717
"**ná middernacht** gegenereerd."
697718

698-
#: ../../api.rst:872
719+
#: ../../api.rst:910
699720
msgid "Full path: ``/api/v2/statistics/hour``"
700721
msgstr "Volledig pad: ``/api/v2/statistics/hour``"
701722

702-
#: ../../api.rst:879
723+
#: ../../api.rst:917
703724
msgid ""
704725
"``hour_start__gte`` (*datetime*) - Limits the result to any statistics having "
705726
"their datetime (hour start) **higher or equal** to this parameter."
706727
msgstr ""
707728
"``hour_start__gte`` (*datetime*) - Beperkt het resultaat tot alle "
708729
"(datum)tijdstippen die **hoger of gelijk zijn aan** deze parameter."
709730

710-
#: ../../api.rst:880
731+
#: ../../api.rst:918
711732
msgid ""
712733
"``hour_start__lte`` (*datetime*) - Limits the result to any statistics having "
713734
"their datetime (hour start) **lower or equal** to this parameter."
714735
msgstr ""
715736
"``hour_start__lte`` (*datetime*) - Beperkt het resultaat tot alle "
716737
"(datum)tijdstippen die **lager of gelijk zijn aan** deze parameter."
717738

718-
#: ../../api.rst:881
739+
#: ../../api.rst:919
719740
msgid ""
720741
"``ordering`` (*string*) - Use ``-hour_start`` to sort **descending**. Omit or "
721742
"use ``hour_start`` to sort **ascending** (default)."
@@ -724,30 +745,30 @@ msgstr ""
724745
"Laat de parameter weg of gebruik ``hour_start`` om **oplopend** te sorteren "
725746
"(standaard)."
726747

727-
#: ../../api.rst:919
748+
#: ../../api.rst:957
728749
msgid "``GET`` - ``application/version``"
729750
msgstr "``GET`` - ``application/version``"
730751

731-
#: ../../api.rst:920
752+
#: ../../api.rst:958
732753
msgid "Returns the version of DSMR-reader you are running."
733754
msgstr "Geeft terug welke versie van DSMR-reader je momenteel draait."
734755

735-
#: ../../api.rst:925
756+
#: ../../api.rst:963
736757
msgid "Full path: ``/api/v2/application/version``"
737758
msgstr "Volledig pad: ``/api/v2/application/version``"
738759

739-
#: ../../api.rst:949
760+
#: ../../api.rst:987
740761
msgid "``GET`` - ``application/status``"
741762
msgstr "``GET`` - ``application/status``"
742763

743-
#: ../../api.rst:950
764+
#: ../../api.rst:988
744765
msgid ""
745766
"Returns the status of DSMR-reader, containing the same data as displayed on "
746767
"the Status page."
747768
msgstr ""
748769
"Geeft de status van DSMR-reader terug, vergelijkbaar aan de gegevens die "
749770
"getoond worden op de Status-pagina."
750771

751-
#: ../../api.rst:955
772+
#: ../../api.rst:993
752773
msgid "Full path: ``/api/v2/application/status``"
753774
msgstr "Volledig pad: ``/api/v2/application/status``"
-6 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)