Skip to content

Commit e35d271

Browse files
API voor live gas verbruik #562
1 parent 0bd7458 commit e35d271

File tree

10 files changed

+499
-429
lines changed

10 files changed

+499
-429
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/locale/nl/LC_MESSAGES/api.mo

483 Bytes
Binary file not shown.

docs/locale/nl/LC_MESSAGES/api.po

+60-39
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: DSMR Reader v1.x\n"
1010
"Report-Msgid-Bugs-To: Dennis Siemensma <github@dennissiemensma.nl>\n"
11-
"POT-Creation-Date: 2019-04-19 11:09+0200\n"
12-
"PO-Revision-Date: 2019-04-19 11:11+0200\n"
1311
"Last-Translator: Dennis Siemensma <github@dennissiemensma.nl>\n"
1412
"Language: nl\n"
1513
"Language-Team: \n"
@@ -18,6 +16,8 @@ msgstr ""
1816
"Content-Type: text/plain; charset=utf-8\n"
1917
"Content-Transfer-Encoding: 8bit\n"
2018
"Generated-By: Babel 2.6.0\n"
19+
"POT-Creation-Date: \n"
20+
"PO-Revision-Date: \n"
2121
"X-Generator: Poedit 2.0.6\n"
2222

2323
#: ../../api.rst:2
@@ -53,8 +53,8 @@ msgstr ""
5353
"in het configuratiescherm of beheerderpaneel."
5454

5555
#: ../../api.rst:18 ../../api.rst:79 ../../api.rst:335 ../../api.rst:644
56-
#: ../../api.rst:703 ../../api.rst:746 ../../api.rst:788 ../../api.rst:832
57-
#: ../../api.rst:892 ../../api.rst:934 ../../api.rst:964
56+
#: ../../api.rst:703 ../../api.rst:746 ../../api.rst:788 ../../api.rst:827
57+
#: ../../api.rst:870 ../../api.rst:930 ../../api.rst:972 ../../api.rst:1002
5858
msgid "Example"
5959
msgstr "Voorbeeld"
6060

@@ -119,8 +119,8 @@ msgstr ""
119119
"``HTTP 200``, wanneer succesvol."
120120

121121
#: ../../api.rst:63 ../../api.rst:301 ../../api.rst:412 ../../api.rst:623
122-
#: ../../api.rst:682 ../../api.rst:731 ../../api.rst:773 ../../api.rst:811
123-
#: ../../api.rst:871 ../../api.rst:924 ../../api.rst:954
122+
#: ../../api.rst:682 ../../api.rst:731 ../../api.rst:773 ../../api.rst:812
123+
#: ../../api.rst:849 ../../api.rst:909 ../../api.rst:962 ../../api.rst:992
124124
msgid "URI"
125125
msgstr "URI"
126126

@@ -129,8 +129,8 @@ msgid "Full path: ``/api/v1/datalogger/dsmrreading``"
129129
msgstr "Volledig pad: ``/api/v1/datalogger/dsmrreading``"
130130

131131
#: ../../api.rst:68 ../../api.rst:306 ../../api.rst:417 ../../api.rst:628
132-
#: ../../api.rst:687 ../../api.rst:736 ../../api.rst:778 ../../api.rst:816
133-
#: ../../api.rst:876
132+
#: ../../api.rst:687 ../../api.rst:736 ../../api.rst:778 ../../api.rst:817
133+
#: ../../api.rst:854 ../../api.rst:914
134134
msgid "Parameters"
135135
msgstr "Parameters"
136136

@@ -143,8 +143,8 @@ msgstr ""
143143
"regeleindes ``\\n`` en 'carriage returns' ``\\r``!"
144144

145145
#: ../../api.rst:74 ../../api.rst:330 ../../api.rst:428 ../../api.rst:639
146-
#: ../../api.rst:698 ../../api.rst:741 ../../api.rst:783 ../../api.rst:827
147-
#: ../../api.rst:887 ../../api.rst:929 ../../api.rst:959
146+
#: ../../api.rst:698 ../../api.rst:741 ../../api.rst:783 ../../api.rst:822
147+
#: ../../api.rst:865 ../../api.rst:925 ../../api.rst:967 ../../api.rst:997
148148
msgid "Response"
149149
msgstr "Respons (van de server)"
150150

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

433-
#: ../../api.rst:418 ../../api.rst:629 ../../api.rst:688 ../../api.rst:817
434-
#: ../../api.rst:877
433+
#: ../../api.rst:418 ../../api.rst:629 ../../api.rst:688 ../../api.rst:855
434+
#: ../../api.rst:915
435435
msgid "All parameters are optional."
436436
msgstr "Alle parameters zijn optioneel."
437437

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

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

472-
#: ../../api.rst:424 ../../api.rst:635 ../../api.rst:694 ../../api.rst:823
473-
#: ../../api.rst:883
472+
#: ../../api.rst:424 ../../api.rst:635 ../../api.rst:694 ../../api.rst:861
473+
#: ../../api.rst:921
474474
msgid ""
475475
"``limit`` (*integer*) - Limits the resultset size returned. Omit for "
476476
"maintaining the default limit (**25**)."
@@ -479,8 +479,8 @@ msgstr ""
479479
"Laat deze parameter weg voor de standaardwaarde (**25**)."
480480

481481
#: ../../api.rst:429 ../../api.rst:640 ../../api.rst:699 ../../api.rst:742
482-
#: ../../api.rst:784 ../../api.rst:828 ../../api.rst:888 ../../api.rst:930
483-
#: ../../api.rst:960
482+
#: ../../api.rst:784 ../../api.rst:823 ../../api.rst:866 ../../api.rst:926
483+
#: ../../api.rst:968 ../../api.rst:998
484484
msgid ""
485485
"``HTTP 200`` on success. Body contains the result(s) in JSON format. Any other "
486486
"status code on failure."
@@ -578,7 +578,8 @@ msgstr ""
578578
"(standaard)."
579579

580580
#: ../../api.rst:645 ../../api.rst:704 ../../api.rst:748 ../../api.rst:792
581-
#: ../../api.rst:835 ../../api.rst:895 ../../api.rst:936 ../../api.rst:966
581+
#: ../../api.rst:831 ../../api.rst:873 ../../api.rst:933 ../../api.rst:974
582+
#: ../../api.rst:1004
582583
msgid "**Data structure returned**::"
583584
msgstr "**Datastructuur**::"
584585

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

613-
#: ../../api.rst:737 ../../api.rst:779
614+
#: ../../api.rst:737 ../../api.rst:779 ../../api.rst:818
614615
msgid "None."
615616
msgstr "Geen."
616617

@@ -637,87 +638,107 @@ msgstr ""
637638
"**N.B.**: ``cost_per_hour`` is alleen beschikbaar wanneer je energieprijzen "
638639
"hebt ingesteld."
639640

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

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

652-
#: ../../api.rst:812
673+
#: ../../api.rst:850
653674
msgid "Full path: ``/api/v2/statistics/day``"
654675
msgstr "Volledig pad: ``/api/v2/statistics/day``"
655676

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

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

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

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

688-
#: ../../api.rst:866
709+
#: ../../api.rst:904
689710
msgid "``GET`` - ``statistics/hour``"
690711
msgstr "``GET`` - ``statistics/hour``"
691712

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

700-
#: ../../api.rst:872
721+
#: ../../api.rst:910
701722
msgid "Full path: ``/api/v2/statistics/hour``"
702723
msgstr "Volledig pad: ``/api/v2/statistics/hour``"
703724

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

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

720-
#: ../../api.rst:881
741+
#: ../../api.rst:919
721742
msgid ""
722743
"``ordering`` (*string*) - Use ``-hour_start`` to sort **descending**. Omit or "
723744
"use ``hour_start`` to sort **ascending** (default)."
@@ -726,30 +747,30 @@ msgstr ""
726747
"Laat de parameter weg of gebruik ``hour_start`` om **oplopend** te sorteren "
727748
"(standaard)."
728749

729-
#: ../../api.rst:919
750+
#: ../../api.rst:957
730751
msgid "``GET`` - ``application/version``"
731752
msgstr "``GET`` - ``application/version``"
732753

733-
#: ../../api.rst:920
754+
#: ../../api.rst:958
734755
msgid "Returns the version of DSMR-reader you are running."
735756
msgstr "Geeft terug welke versie van DSMR-reader je momenteel draait."
736757

737-
#: ../../api.rst:925
758+
#: ../../api.rst:963
738759
msgid "Full path: ``/api/v2/application/version``"
739760
msgstr "Volledig pad: ``/api/v2/application/version``"
740761

741-
#: ../../api.rst:949
762+
#: ../../api.rst:987
742763
msgid "``GET`` - ``application/status``"
743764
msgstr "``GET`` - ``application/status``"
744765

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

753-
#: ../../api.rst:955
774+
#: ../../api.rst:993
754775
msgid "Full path: ``/api/v2/application/status``"
755776
msgstr "Volledig pad: ``/api/v2/application/status``"
245 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)