Merge pull request #39 from IUT-Blagnac/DevPierre

MAJ clientMQTT

Code/Python/clientMQTT.py

@@ -1,3 +1,4 @@
+import glob
 import paho.mqtt.client as mqtt
 import configparser
 import json
@@ -29,18 +30,25 @@ def on_connect(client, userdata, flags, rc):
         print(f"Échec de connexion, code de retour : {rc}")
 
 def on_message(client, userdata, msg):
+    date=datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
     topic = msg.topic
     payload = msg.payload.decode("utf-8")
+    parties = topic.split("/")
+    flux_mqtt = parties[0]
 
     try:
         data = json.loads(payload)
     except json.JSONDecodeError:
         data = payload
 
-    parties = topic.split("/")
-    flux_mqtt = parties[0]
-
     if flux_mqtt=="solaredge":
+        liste_fichier=glob.glob(os.path+'\\*')
+        last_file=liste_fichier[-1]
+        tab1=last_file.split('_').split('-')
+        ##Gérer les périodes ici
+        if liste_fichier:
+            return
+
         if SOLAREDGE_INFO_TYPES[0] == "all" :
             message = f"{data}"
         else:

Code/java/src/main/resources/application/view/menu.fxml

@@ -26,7 +26,7 @@
                   <Insets top="40.0" />
                </VBox.margin>
             </Button>
-            <Button mnemonicParsing="false" onAction="#fermer" prefHeight="30.0" prefWidth="176.0" text="Fermer l'application">
+            <Button alignment="CENTER" mnemonicParsing="false" onAction="#fermer" prefHeight="30.0" prefWidth="176.0" text="Fermer l'application">
                <VBox.margin>
                   <Insets top="40.0" />
                </VBox.margin>