Merge pull request #259 from m4dm4rtig4n/0.8.13

0.8.13

Makefile

@@ -1,4 +1,5 @@
 COMPOSE=docker compose -f dev/docker-compose.dev.yaml
+COMPOSE_TEST=docker compose -f dev/docker-compose.test.yaml
 
 .DEFAULT_GOAL := wizard
 ## Run wizard
@@ -17,6 +18,12 @@ run:
 	$(COMPOSE) rm -f myelectricaldata_import
 	python3 main.py action=run
 
+## Connect to EnedisGateway container : DEV
+run-test:
+	$(COMPOSE_TEST) stop myelectricaldata_import
+	$(COMPOSE_TEST) rm -f myelectricaldata_import
+	python3 main.py action=run env=test
+
 ## Connect to EnedisGateway container : DEV
 run-production:
 	$(COMPOSE) stop myelectricaldata_import

README.md

@@ -8,14 +8,6 @@ Si vous souhaitez participer au projet :
 
 [![Donate][donation-paypal]](https://www.paypal.me/m4dm4rtig4n)
 
-<form action="https://www.paypal.com/donate" method="post" target="_top" style="height: 55px;" id="paypal_form">
-  <input type="hidden" name="business" value="FY25JLXDYLXAJ">
-  <input type="hidden" name="no_recurring" value="0">
-  <input type="hidden" name="currency_code" value="EUR">
-  <input type="image" id="paypal_img" src="https://companieslogo.com/img/orig/PYPL-3570673e.png?t=1633695449" border="0" name="submit" title="PayPal - The safer, easier way to pay online!" alt="Bouton Faites un don avec PayPal">
-  <img alt="" border="0" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1">
-</form>
-
 [donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white
 [donation-paypal]: https://www.appvizer.fr/media/application/1591/logo/logo-paypal.png
 

app/VERSION

@@ -1 +1 @@
-0.8.12-beta2
+0.8.13-release

app/main.py

@@ -165,6 +165,11 @@ def lock():
     def gateway_status():
         return Ajax().gateway_status()
 
+    @APP.route("/datatable/<usage_point_id>/<measurement_direction>", methods=['GET'])
+    @APP.route("/datatable/<usage_point_id>/<measurement_direction>/", methods=['GET'])
+    def datatable(usage_point_id, measurement_direction):
+        return Ajax(usage_point_id).datatable(measurement_direction, request.args)
+
 
     @APP.route("/configuration/<usage_point_id>", methods=['POST'])
     @APP.route("/configuration/<usage_point_id>/", methods=['POST'])
@@ -201,6 +206,11 @@ def import_data(usage_point_id, target):
     def reset_all_data(usage_point_id):
         return Ajax(usage_point_id).reset_all_data()
 
+    @APP.route("/delete/<usage_point_id>", methods=['GET'])
+    @APP.route("/delete/<usage_point_id>/", methods=['GET'])
+    def delete_all_data(usage_point_id):
+        return Ajax(usage_point_id).delete_all_data()
+
 
     @APP.route("/reset_gateway/<usage_point_id>", methods=['GET'])
     @APP.route("/reset_gateway/<usage_point_id>/", methods=['GET'])