From 8828ee3f84816b5e7b758248727940ea21fd8a06 Mon Sep 17 00:00:00 2001 From: NariaReynhard Date: Thu, 21 Nov 2024 16:13:20 +0100 Subject: [PATCH 1/5] =?UTF-8?q?ajout=20d'une=20interface=20beaucoup=20plus?= =?UTF-8?q?=20lisible=20au=20niveau=20du=20sch=C3=A9ma=20mais=20n=C3=A9ces?= =?UTF-8?q?sitant=20une=20modification=20du=20code=20pour=20=C3=AAtre=20fo?= =?UTF-8?q?nctionnel=20=C3=A0=20nouveau?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/DonneesActuellesController.java | 47 +- .../resources/application/svg/demoSVG.html | 588 ++++++++++++++++++ .../application/view/affichageTpsReel.fxml | 159 +---- 3 files changed, 623 insertions(+), 171 deletions(-) create mode 100644 Code/java/src/main/resources/application/svg/demoSVG.html diff --git a/Code/java/src/main/java/application/view/DonneesActuellesController.java b/Code/java/src/main/java/application/view/DonneesActuellesController.java index f5b6c164c..34d0b2078 100644 --- a/Code/java/src/main/java/application/view/DonneesActuellesController.java +++ b/Code/java/src/main/java/application/view/DonneesActuellesController.java @@ -10,9 +10,12 @@ import javafx.scene.layout.GridPane; import javafx.scene.layout.VBox; import javafx.scene.text.Text; +import javafx.scene.web.WebView; import javafx.stage.Stage; import javafx.scene.input.MouseEvent; +import java.nio.file.Paths; + public class DonneesActuellesController { private enum TEXTVALUES{ @@ -37,8 +40,8 @@ private String getDisplayText(){ } } private Stage containingStage; - @FXML - private VBox buttonsHolder; + //@FXML + //private VBox buttonsHolder; @FXML private VBox displayedDatas; @FXML @@ -48,13 +51,23 @@ private String getDisplayText(){ @FXML private CheckBox humidity; + @FXML + private WebView iutschematics; + private IoTMainFrame main = new IoTMainFrame(); public void initContext(Stage _containingStage) { this.containingStage = _containingStage; - this.buttons_setup(); + //this.buttons_setup(); + this.initWeb(); } + private void initWeb(){ + String pathSvg = Paths.get("src/main/resources/application/svg/demoSVG.html").toUri().toString(); + System.out.println(pathSvg); + iutschematics.getEngine().load(pathSvg); + } + public void displayDialog(){ this.containingStage.show(); } @@ -170,18 +183,18 @@ public void displayedListUpdate(String room){ }else displayedDatas.getChildren().remove(toDelete); } - public void buttons_setup(){ - for (Node titledPaneNode : buttonsHolder.getChildren()) { - if(titledPaneNode instanceof TitledPane titledPane) { - GridPane gridPane = (GridPane) titledPane.getContent(); - for(Node buttonNode : gridPane.getChildren()){ - if (buttonNode instanceof ToggleButton button){ - button.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> { - displayedListUpdate(button.getText()); - }); - } - } - } - } - } +// public void buttons_setup() { +// for (Node titledPaneNode : buttonsHolder.getChildren()) { +// if (titledPaneNode instanceof TitledPane titledPane) { +// GridPane gridPane = (GridPane) titledPane.getContent(); +// for (Node buttonNode : gridPane.getChildren()) { +// if (buttonNode instanceof ToggleButton button) { +// button.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> { +// displayedListUpdate(button.getText()); +// }); +// } +// } +// } +// } +// } } diff --git a/Code/java/src/main/resources/application/svg/demoSVG.html b/Code/java/src/main/resources/application/svg/demoSVG.html new file mode 100644 index 000000000..017ca8d70 --- /dev/null +++ b/Code/java/src/main/resources/application/svg/demoSVG.html @@ -0,0 +1,588 @@ + + + + + + test + + + + +

Full IUT

+ + + Maison intelligente + + + + + + + Batiment E (R&T) + + + + + + + + + + + + + Batiment C (Recherche) + Amphi1 + Local Technique + + + + + + + + + + + + + Batiment B (G.I.M. & Info) + + + + + + + + + + + + + + + + Batiment A (administration) + + + + + + + + + + Batiment A (bibliothèque) + + + + + + + + +

Batiment B

+ + + Rez de chaussé + + + + + + + Premier étage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Deuxième étage + + + + + + + + + + + +
+

Rez de chaussé

+ + + RGT + + + + Magasin + + + + Cafeteria + + + + + + + + + SAN. + + + + + B_001 + + + + B_002 + + + + B_003 + + + + B_004 + + + + B_005 + + + + B_006 + + + + B_007 + + + + B_008 + + + + B_009 + + + + B_010 + + + +
+ +

Premier étage

+ + + SAN. + + + + + + + + + + + + + Sous-station + + + + + + rengement + + + + Couloir + + + + B_101 + + + + B_102 + + + + B_103 + + + + B_104 + + + + B_105 + + + + B_106 + + + + B_107 + + + + B_108 + + + + B_109 + + + + B_109b + + + + B_110 + + + + B_111 + + + + B112 + + + + B_112b + + + + B_113 + + + + B_115 + + + + B_116a + + + + B_116b + + + + + + +

Deuxième étage

+ + + Couloir + + + + SAN. + + + + + + + + + + + + + + + + + + + + + + + + + Rengement + + + + + Balcon + + + + + B_201 + + + + B_202 + + + + B_203 + + + + B_204 + + + + B_205 + + + + B_206 + + + + B_207 + + + + B_208 + + + + B_209 + + + + B_210 + + + + B_211 + + + + B_212b + + + + B_212a + + + + B_213 + + + + B_214 + + + + B_215 + + + + B_216 + + + + B_219 + + + + B_220 + + + + B_221 + + + + B_222 + + + + B_223 + + + + B_224 + + + + B_225 + + + + B_226 + + + + B_227 + + + + B_228a + + + + B_228b + + + + B_228c + + + + B_229 + + + + B_230 + + + + B_231 + + + + B_232 + + + + B_233 + + + + B_234 + + + + B_235a + + + + B_235b + + + + + + + \ No newline at end of file diff --git a/Code/java/src/main/resources/application/view/affichageTpsReel.fxml b/Code/java/src/main/resources/application/view/affichageTpsReel.fxml index 836423b87..f6ac51ed0 100644 --- a/Code/java/src/main/resources/application/view/affichageTpsReel.fxml +++ b/Code/java/src/main/resources/application/view/affichageTpsReel.fxml @@ -44,14 +44,12 @@ - - - + @@ -90,7 +88,7 @@
- + @@ -135,159 +133,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + From 51a7a141a97eb1afae4f90224b16daa143686770 Mon Sep 17 00:00:00 2001 From: NariaReynhard Date: Mon, 25 Nov 2024 09:44:55 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Commit=20pour=20=C3=AAtre=20s=C3=BBr=20que?= =?UTF-8?q?=20la=20branche=20est=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Code/PHP/includes/DBProdsAccess.php | 55 +++++++++++++++++++ .../view/DonneesActuellesController.java | 36 +++++++++++- 2 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 Code/PHP/includes/DBProdsAccess.php diff --git a/Code/PHP/includes/DBProdsAccess.php b/Code/PHP/includes/DBProdsAccess.php new file mode 100644 index 000000000..26ee0e6bd --- /dev/null +++ b/Code/PHP/includes/DBProdsAccess.php @@ -0,0 +1,55 @@ + + + prepare('SELECT * FROM PRODUIT'); + $PDOReq -> execute(); + return $PDOReq -> fetchAll(); +} + +function accessProduitPrix($idProduit){ + $PDOReq = -> $connect -> prepare('SELECT * FROM DISPOFORMAT WHERE idProduit = ?'); + $PDOReq -> execute([$idProduit]); + return $PDOReq -> fetchAll(); +} + +function accessProduitsId($ID){ + $PDOReq = $connect -> prepare('SELECT * FROM PRODUIT WHERE idProduit = ?'); + $PDOReq -> execute([$ID]); + return $PDOReq -> fetchAll(); +} + + + +function accessImagesLinks($prodId){ + $PDOReq = $connect -> prepare('SELECT nomFichier FROM IMAGE WHERE idProduit = ?'); + $PDOReq -> execute ([$ID]); + return $PDOReq -> fetchAll(); +} + +function accessCategories(){ + $PDOReq = $connect -> prepare('SELECT * FROM CATEGORIE'); + $PDOReq -> execute(); + return $PDOReq -> fetchAll(); +} + +function accessFormats(){ + $PDOReq = $connect -> prepare('SELECT * FROM FORMAT'); + $PDOReq -> execute(); + return $PDOReq -> fetchAll(); +} + +function accessCouleurs(){ + $PDOReq = $connect -> prepare('SELECT * FROM COULEUR'); + $PDOReq -> execute(); + return $PDOReq -> fetchAll(); +} + +function accessConditionnements(){ + $PDOReq = $connect -> prepare('SELECT * FROM CONDITIONNEMENT'); + $PDOReq -> execute(); + return $PDOReq -> fetchAll(); +} +?> \ No newline at end of file diff --git a/Code/java/src/main/java/application/view/DonneesActuellesController.java b/Code/java/src/main/java/application/view/DonneesActuellesController.java index 34d0b2078..6967fe63b 100644 --- a/Code/java/src/main/java/application/view/DonneesActuellesController.java +++ b/Code/java/src/main/java/application/view/DonneesActuellesController.java @@ -10,12 +10,14 @@ import javafx.scene.layout.GridPane; import javafx.scene.layout.VBox; import javafx.scene.text.Text; +import javafx.scene.web.WebEngine; import javafx.scene.web.WebView; import javafx.stage.Stage; import javafx.scene.input.MouseEvent; import java.nio.file.Paths; +import netscape.javascript.JSObject; public class DonneesActuellesController { private enum TEXTVALUES{ @@ -39,6 +41,15 @@ private String getDisplayText(){ return displayText; } } + + public class JSBridge { + public void handleClick(String room) { + // Log the click and call your method to update the displayed data + System.out.println("Room clicked: " + room); + displayedListUpdate(room); // Assuming this updates your UI + } + } + private Stage containingStage; //@FXML //private VBox buttonsHolder; @@ -53,7 +64,8 @@ private String getDisplayText(){ @FXML private WebView iutschematics; - + private WebEngine webEngine; + private JSBridge jsBridge = new JSBridge(); private IoTMainFrame main = new IoTMainFrame(); public void initContext(Stage _containingStage) { @@ -64,8 +76,26 @@ public void initContext(Stage _containingStage) { private void initWeb(){ String pathSvg = Paths.get("src/main/resources/application/svg/demoSVG.html").toUri().toString(); - System.out.println(pathSvg); - iutschematics.getEngine().load(pathSvg); + webEngine = iutschematics.getEngine(); + webEngine.load(pathSvg); + + webEngine.documentProperty().addListener((observable, oldValue, newValue) -> { + if(newValue != null){ + JSObject window = (JSObject) webEngine.executeScript("window"); + window.setMember("javaBridge", jsBridge); + + webEngine.executeScript(""" + document.querySelectorAll('g').forEach(function(element) { + element.addEventListener('click', function(event) { + // Get the id of the element itself + var id = element.getAttribute('id'); + // Pass the id to the Java method + javaBridge.handleClick(id); + }); + }); + """); + } + }); } public void displayDialog(){ From eca89c943da406324e4f9c610480123aef75483e Mon Sep 17 00:00:00 2001 From: NariaReynhard Date: Mon, 25 Nov 2024 10:29:32 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20la=20syst=C3=A8?= =?UTF-8?q?me=20de=20recherche=20de=20fichier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/DonneesActuellesController.java | 35 ++--- .../resources/application/svg/demoSVG.html | 128 +++++++++--------- 2 files changed, 83 insertions(+), 80 deletions(-) diff --git a/Code/java/src/main/java/application/view/DonneesActuellesController.java b/Code/java/src/main/java/application/view/DonneesActuellesController.java index 6967fe63b..ee13f0e9f 100644 --- a/Code/java/src/main/java/application/view/DonneesActuellesController.java +++ b/Code/java/src/main/java/application/view/DonneesActuellesController.java @@ -15,7 +15,9 @@ import javafx.stage.Stage; import javafx.scene.input.MouseEvent; +import java.io.File; import java.nio.file.Paths; +import java.util.Objects; import netscape.javascript.JSObject; @@ -75,7 +77,8 @@ public void initContext(Stage _containingStage) { } private void initWeb(){ - String pathSvg = Paths.get("src/main/resources/application/svg/demoSVG.html").toUri().toString(); + String pathSvg = Objects.requireNonNull(DonneesActuellesController.class.getClassLoader().getResource("application/svg/demoSVG.html")).toString(); + webEngine = iutschematics.getEngine(); webEngine.load(pathSvg); @@ -157,7 +160,7 @@ private void updateDisplayedDatas(){ public void displayedListUpdate(String room){ - Boolean deleted = false; + boolean deleted = false; Node toDelete = null; for(Node n : displayedDatas.getChildren()){ if(n instanceof TitledPane checking){ @@ -213,18 +216,18 @@ public void displayedListUpdate(String room){ }else displayedDatas.getChildren().remove(toDelete); } -// public void buttons_setup() { -// for (Node titledPaneNode : buttonsHolder.getChildren()) { -// if (titledPaneNode instanceof TitledPane titledPane) { -// GridPane gridPane = (GridPane) titledPane.getContent(); -// for (Node buttonNode : gridPane.getChildren()) { -// if (buttonNode instanceof ToggleButton button) { -// button.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> { -// displayedListUpdate(button.getText()); -// }); -// } -// } -// } -// } -// } + private void getCorrespondingData(String room){ + File folder = new File(Paths.get("../../Python/AM107/"+room).toString()); + if(folder.exists()) { + File[] allDatas = folder.listFiles(); + assert allDatas != null; + File captorData = allDatas[0]; + for(File current : allDatas){ + if(current.lastModified() > captorData.lastModified()){ + captorData = current; + } + } + System.out.println(captorData); + } + } } diff --git a/Code/java/src/main/resources/application/svg/demoSVG.html b/Code/java/src/main/resources/application/svg/demoSVG.html index 017ca8d70..2ce41038f 100644 --- a/Code/java/src/main/resources/application/svg/demoSVG.html +++ b/Code/java/src/main/resources/application/svg/demoSVG.html @@ -239,43 +239,43 @@

Rez de chaussé

 - B_001 + B001 - B_002 + B002 - B_003 + B003 - B_004 + B004 - B_005 + B005 - B_006 + B006 - B_007 + B007 - B_008 + B008 - B_009 + B009 - B_010 + B010 @@ -311,51 +311,51 @@

Premier étage

- B_101 + B101 - B_102 + B102 - B_103 + B103 - B_104 + B104 - B_105 + B105 - B_106 + B106 - B_107 + B107 - B_108 + B108 - B_109 + B109 - B_109b + B109b - B_110 + B110 - B_111 + B111 @@ -363,23 +363,23 @@

Premier étage

 - B_112b + B112b - B_113 + B113 - B_115 + B115 - B_116a + B116a - B_116b + B116b @@ -428,151 +428,151 @@

Deuxième étage

 - B_201 + B201 - B_202 + B202 - B_203 + B203 - B_204 + B204 - B_205 + B205 - B_206 + B206 - B_207 + B207 - B_208 + B208 - B_209 + B209 - B_210 + B210 - B_211 + B211 - B_212b + B212b - B_212a + B212a - B_213 + B213 - B_214 + B214 - B_215 + B215 - B_216 + B216 - B_219 + B219 - B_220 + B220 - B_221 + B221 - B_222 + B222 - B_223 + B223 - B_224 + B224 - B_225 + B225 - B_226 + B226 - B_227 + B227 - B_228a + B228a - B_228b + B228b - B_228c + B228c - B_229 + B229 - B_230 + B230 - B_231 + B231 - B_232 + B232 - B_233 + B233 - B_234 + B234 - B_235a + B235a - B_235b + B235b From a2eb6b6ef0cadd51a3ad414cf0efbe5d1d6d9df9 Mon Sep 17 00:00:00 2001 From: NariaReynhard Date: Mon, 25 Nov 2024 12:06:10 +0100 Subject: [PATCH 4/5] Ajout de l'outil data reader --- .../java/application/tools/DataReader.java | 54 +++++++++++++++++++ .../view/DonneesActuellesController.java | 22 +++++--- .../AM107/AM107-12/2024-11-22_14-58-32 | 1 + .../AM107/AM107-13/2024-11-22_14-52-48 | 1 + .../AM107/AM107-14/2024-11-22_14-50-11 | 1 + .../AM107/AM107-15/2024-11-22_14-46-39 | 1 + .../AM107/AM107-16/2024-11-22_14-51-50 | 1 + .../AM107/AM107-17/2024-11-22_14-45-39 | 1 + .../AM107/AM107-18/2024-11-22_14-53-48 | 1 + .../AM107/AM107-2/2024-11-22_14-49-48 | 1 + .../AM107/AM107-20/2024-11-22_14-45-39 | 1 + .../AM107/AM107-22/2024-11-22_14-53-17 | 1 + .../AM107/AM107-23/2024-11-22_14-51-17 | 1 + .../AM107/AM107-24/2024-11-22_14-49-18 | 1 + .../AM107/AM107-26/2024-11-22_14-44-50 | 1 + .../AM107/AM107-27/2024-11-22_14-50-47 | 1 + .../AM107/AM107-28/2024-11-22_14-56-18 | 1 + .../AM107/AM107-29/2024-11-22_14-53-48 | 1 + .../AM107/AM107-3/2024-11-22_14-53-08 | 1 + .../AM107/AM107-30/2024-11-22_14-47-20 | 1 + .../AM107/AM107-31/2024-11-22_14-48-47 | 1 + .../AM107/AM107-31/2024-11-22_15-08-49 | 1 + .../AM107/AM107-32/2024-11-22_14-49-46 | 1 + .../AM107/AM107-36/2024-11-22_14-50-47 | 1 + .../AM107/AM107-37/2024-11-22_14-49-16 | 1 + .../AM107/AM107-38/2024-11-22_14-47-48 | 1 + .../AM107/AM107-39/2024-11-22_14-54-12 | 1 + .../AM107/AM107-4/2024-11-22_14-51-37 | 1 + .../AM107/AM107-41/2024-11-22_14-48-47 | 1 + .../AM107/AM107-41/2024-11-22_15-08-50 | 1 + .../AM107/AM107-42/2024-11-22_11-18-06 | 1 + .../AM107/AM107-42/2024-11-22_14-58-07 | 1 + .../AM107/AM107-43/2024-11-22_14-52-15 | 1 + .../AM107/AM107-45/2024-11-22_14-51-21 | 1 + .../AM107/AM107-46/2024-11-22_14-51-19 | 1 + .../AM107/AM107-47/2024-11-22_14-52-49 | 1 + .../AM107/AM107-49/2024-11-22_14-49-49 | 1 + .../AM107/AM107-5/2024-11-22_14-51-08 | 1 + .../AM107/AM107-50/2024-11-22_14-49-19 | 1 + .../AM107/AM107-51/2024-11-22_14-47-49 | 1 + .../AM107/AM107-53/2024-11-22_14-47-16 | 1 + .../AM107/AM107-54/2024-11-22_14-45-48 | 1 + .../AM107/AM107-55/2024-11-22_14-51-49 | 1 + .../AM107/AM107-6/2024-11-22_14-47-49 | 1 + .../AM107/AM107-7/2024-11-22_14-50-49 | 1 + .../AM107/AM107-8/2024-11-22_14-52-08 | 1 + .../AM107/B001/2024-11-22_14-50-49 | 1 + .../AM107/B002/2024-11-22_14-52-08 | 1 + .../AM107/B103/2024-11-22_14-58-32 | 1 + .../AM107/B105/2024-11-22_14-52-48 | 1 + .../AM107/B106/2024-11-22_14-50-11 | 1 + .../AM107/B108/2024-11-22_14-46-39 | 1 + .../AM107/B109/2024-11-22_14-51-50 | 1 + .../AM107/B110/2024-11-22_14-49-48 | 1 + .../AM107/B111/2024-11-22_14-53-08 | 1 + .../AM107/B112/2024-11-22_14-45-39 | 1 + .../AM107/B113/2024-11-22_14-53-48 | 1 + .../AM107/B201/2024-11-22_14-51-37 | 1 + .../AM107/B202/2024-11-22_14-51-08 | 1 + .../AM107/B203/2024-11-22_14-47-49 | 1 + .../AM107/B217/2024-11-22_14-45-39 | 1 + .../AM107/B234/2024-11-22_14-53-17 | 1 + .../AM107/C001/2024-11-22_14-51-49 | 1 + .../AM107/C002/2024-11-22_14-45-48 | 1 + .../AM107/C004/2024-11-22_14-51-17 | 1 + .../AM107/C006/2024-11-22_14-49-18 | 1 + .../AM107/C102/2024-11-22_14-47-16 | 1 + .../AM107/E001/2024-11-22_14-56-18 | 1 + .../AM107/E003/2024-11-22_14-44-50 | 1 + .../AM107/E004/2024-11-22_14-50-47 | 1 + .../AM107/E006/2024-11-22_14-53-48 | 1 + .../AM107/E007/2024-11-22_14-47-20 | 1 + .../AM107/E100/2024-11-22_14-49-16 | 1 + .../AM107/E101/2024-11-22_14-48-47 | 1 + .../AM107/E101/2024-11-22_15-08-49 | 1 + .../AM107/E102/2024-11-22_14-49-46 | 1 + .../AM107/E106/2024-11-22_14-50-47 | 1 + .../AM107/E207/2024-11-22_14-48-47 | 1 + .../AM107/E207/2024-11-22_15-08-50 | 1 + .../AM107/E208/2024-11-22_14-47-48 | 1 + .../AM107/E209/2024-11-22_14-54-12 | 1 + .../AM107/E210/2024-11-22_11-18-06 | 1 + .../AM107/E210/2024-11-22_14-58-07 | 1 + .../2024-11-22_14-52-49" | 1 + .../Foyer-personnels/2024-11-22_14-51-19 | 1 + .../AM107/Local-velo/2024-11-22_14-51-21 | 1 + .../AM107/Salle-conseil/2024-11-22_14-52-15 | 1 + .../AM107/amphi1/2024-11-22_14-47-49 | 1 + .../AM107/hall-amphi/2024-11-22_14-49-19 | 1 + .../2024-11-22_14-49-49" | 1 + 90 files changed, 156 insertions(+), 8 deletions(-) create mode 100644 Code/java/src/main/java/application/tools/DataReader.java create mode 100644 Code/java/src/main/resources/application/AM107/AM107-12/2024-11-22_14-58-32 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-13/2024-11-22_14-52-48 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-14/2024-11-22_14-50-11 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-15/2024-11-22_14-46-39 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-16/2024-11-22_14-51-50 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-17/2024-11-22_14-45-39 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-18/2024-11-22_14-53-48 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-2/2024-11-22_14-49-48 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-20/2024-11-22_14-45-39 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-22/2024-11-22_14-53-17 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-23/2024-11-22_14-51-17 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-24/2024-11-22_14-49-18 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-26/2024-11-22_14-44-50 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-27/2024-11-22_14-50-47 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-28/2024-11-22_14-56-18 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-29/2024-11-22_14-53-48 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-3/2024-11-22_14-53-08 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-30/2024-11-22_14-47-20 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-31/2024-11-22_14-48-47 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-31/2024-11-22_15-08-49 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-32/2024-11-22_14-49-46 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-36/2024-11-22_14-50-47 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-37/2024-11-22_14-49-16 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-38/2024-11-22_14-47-48 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-39/2024-11-22_14-54-12 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-4/2024-11-22_14-51-37 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-41/2024-11-22_14-48-47 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-41/2024-11-22_15-08-50 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-42/2024-11-22_11-18-06 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-42/2024-11-22_14-58-07 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-43/2024-11-22_14-52-15 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-45/2024-11-22_14-51-21 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-46/2024-11-22_14-51-19 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-47/2024-11-22_14-52-49 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-49/2024-11-22_14-49-49 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-5/2024-11-22_14-51-08 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-50/2024-11-22_14-49-19 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-51/2024-11-22_14-47-49 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-53/2024-11-22_14-47-16 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-54/2024-11-22_14-45-48 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-55/2024-11-22_14-51-49 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-6/2024-11-22_14-47-49 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-7/2024-11-22_14-50-49 create mode 100644 Code/java/src/main/resources/application/AM107/AM107-8/2024-11-22_14-52-08 create mode 100644 Code/java/src/main/resources/application/AM107/B001/2024-11-22_14-50-49 create mode 100644 Code/java/src/main/resources/application/AM107/B002/2024-11-22_14-52-08 create mode 100644 Code/java/src/main/resources/application/AM107/B103/2024-11-22_14-58-32 create mode 100644 Code/java/src/main/resources/application/AM107/B105/2024-11-22_14-52-48 create mode 100644 Code/java/src/main/resources/application/AM107/B106/2024-11-22_14-50-11 create mode 100644 Code/java/src/main/resources/application/AM107/B108/2024-11-22_14-46-39 create mode 100644 Code/java/src/main/resources/application/AM107/B109/2024-11-22_14-51-50 create mode 100644 Code/java/src/main/resources/application/AM107/B110/2024-11-22_14-49-48 create mode 100644 Code/java/src/main/resources/application/AM107/B111/2024-11-22_14-53-08 create mode 100644 Code/java/src/main/resources/application/AM107/B112/2024-11-22_14-45-39 create mode 100644 Code/java/src/main/resources/application/AM107/B113/2024-11-22_14-53-48 create mode 100644 Code/java/src/main/resources/application/AM107/B201/2024-11-22_14-51-37 create mode 100644 Code/java/src/main/resources/application/AM107/B202/2024-11-22_14-51-08 create mode 100644 Code/java/src/main/resources/application/AM107/B203/2024-11-22_14-47-49 create mode 100644 Code/java/src/main/resources/application/AM107/B217/2024-11-22_14-45-39 create mode 100644 Code/java/src/main/resources/application/AM107/B234/2024-11-22_14-53-17 create mode 100644 Code/java/src/main/resources/application/AM107/C001/2024-11-22_14-51-49 create mode 100644 Code/java/src/main/resources/application/AM107/C002/2024-11-22_14-45-48 create mode 100644 Code/java/src/main/resources/application/AM107/C004/2024-11-22_14-51-17 create mode 100644 Code/java/src/main/resources/application/AM107/C006/2024-11-22_14-49-18 create mode 100644 Code/java/src/main/resources/application/AM107/C102/2024-11-22_14-47-16 create mode 100644 Code/java/src/main/resources/application/AM107/E001/2024-11-22_14-56-18 create mode 100644 Code/java/src/main/resources/application/AM107/E003/2024-11-22_14-44-50 create mode 100644 Code/java/src/main/resources/application/AM107/E004/2024-11-22_14-50-47 create mode 100644 Code/java/src/main/resources/application/AM107/E006/2024-11-22_14-53-48 create mode 100644 Code/java/src/main/resources/application/AM107/E007/2024-11-22_14-47-20 create mode 100644 Code/java/src/main/resources/application/AM107/E100/2024-11-22_14-49-16 create mode 100644 Code/java/src/main/resources/application/AM107/E101/2024-11-22_14-48-47 create mode 100644 Code/java/src/main/resources/application/AM107/E101/2024-11-22_15-08-49 create mode 100644 Code/java/src/main/resources/application/AM107/E102/2024-11-22_14-49-46 create mode 100644 Code/java/src/main/resources/application/AM107/E106/2024-11-22_14-50-47 create mode 100644 Code/java/src/main/resources/application/AM107/E207/2024-11-22_14-48-47 create mode 100644 Code/java/src/main/resources/application/AM107/E207/2024-11-22_15-08-50 create mode 100644 Code/java/src/main/resources/application/AM107/E208/2024-11-22_14-47-48 create mode 100644 Code/java/src/main/resources/application/AM107/E209/2024-11-22_14-54-12 create mode 100644 Code/java/src/main/resources/application/AM107/E210/2024-11-22_11-18-06 create mode 100644 Code/java/src/main/resources/application/AM107/E210/2024-11-22_14-58-07 create mode 100644 "Code/java/src/main/resources/application/AM107/Foyer-etudiants-entr\303\251e/2024-11-22_14-52-49" create mode 100644 Code/java/src/main/resources/application/AM107/Foyer-personnels/2024-11-22_14-51-19 create mode 100644 Code/java/src/main/resources/application/AM107/Local-velo/2024-11-22_14-51-21 create mode 100644 Code/java/src/main/resources/application/AM107/Salle-conseil/2024-11-22_14-52-15 create mode 100644 Code/java/src/main/resources/application/AM107/amphi1/2024-11-22_14-47-49 create mode 100644 Code/java/src/main/resources/application/AM107/hall-amphi/2024-11-22_14-49-19 create mode 100644 "Code/java/src/main/resources/application/AM107/hall-entr\303\251e-principale/2024-11-22_14-49-49" diff --git a/Code/java/src/main/java/application/tools/DataReader.java b/Code/java/src/main/java/application/tools/DataReader.java new file mode 100644 index 000000000..ed5a34dbf --- /dev/null +++ b/Code/java/src/main/java/application/tools/DataReader.java @@ -0,0 +1,54 @@ +package application.tools; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.List; + +public class DataReader { + public static List getTemps(List datasToFetch){ + List tempsToReturn = new ArrayList<>(); + for(File currentFile : datasToFetch){ + try { + String data = Files.readString(currentFile.toPath()); + data = data.replace("{","").replace("}",""); + String[] splittedValues = data.split(", "); + tempsToReturn.add(Float.parseFloat(splittedValues[0])); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + return tempsToReturn; + } + + public static List getHumidities(List datasToFetch){ + List humiditiesToReturn = new ArrayList<>(); + for(File currentFile : datasToFetch){ + try{ + String data = Files.readString(currentFile.toPath()); + data = data.replace("{","").replace("}",""); + String[] splittedValues = data.split(", "); + humiditiesToReturn.add(Float.parseFloat(splittedValues[1])); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + return humiditiesToReturn; + } + + public static List getCo2(List datasToFetch){ + List co2ToReturn = new ArrayList<>(); + for(File currentFile : datasToFetch){ + try{ + String data = Files.readString(currentFile.toPath()); + data = data.replace("{","").replace("}",""); + String[] splittedValues = data.split(", "); + co2ToReturn.add(Float.parseFloat(splittedValues[2])); + } catch(IOException e){ + throw new RuntimeException(e); + } + } + return co2ToReturn; + } +} diff --git a/Code/java/src/main/java/application/view/DonneesActuellesController.java b/Code/java/src/main/java/application/view/DonneesActuellesController.java index ee13f0e9f..e4e03d4a0 100644 --- a/Code/java/src/main/java/application/view/DonneesActuellesController.java +++ b/Code/java/src/main/java/application/view/DonneesActuellesController.java @@ -16,6 +16,9 @@ import javafx.scene.input.MouseEvent; import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.nio.file.Files; import java.nio.file.Paths; import java.util.Objects; @@ -46,15 +49,17 @@ private String getDisplayText(){ public class JSBridge { public void handleClick(String room) { - // Log the click and call your method to update the displayed data System.out.println("Room clicked: " + room); - displayedListUpdate(room); // Assuming this updates your UI + displayedListUpdate(room); + try { + getCorrespondingData(room); + } catch (URISyntaxException | IOException e) { + throw new RuntimeException(e); + } } } private Stage containingStage; - //@FXML - //private VBox buttonsHolder; @FXML private VBox displayedDatas; @FXML @@ -72,7 +77,6 @@ public void handleClick(String room) { public void initContext(Stage _containingStage) { this.containingStage = _containingStage; - //this.buttons_setup(); this.initWeb(); } @@ -216,10 +220,12 @@ public void displayedListUpdate(String room){ }else displayedDatas.getChildren().remove(toDelete); } - private void getCorrespondingData(String room){ - File folder = new File(Paths.get("../../Python/AM107/"+room).toString()); + private void getCorrespondingData(String room) throws URISyntaxException, IOException { + room=room.toUpperCase(); + File folder = new File(Objects.requireNonNull(DonneesActuellesController.class.getClassLoader().getResource("application/AM107/"+room)).toURI()); if(folder.exists()) { File[] allDatas = folder.listFiles(); + System.out.println(allDatas.length); assert allDatas != null; File captorData = allDatas[0]; for(File current : allDatas){ @@ -227,7 +233,7 @@ private void getCorrespondingData(String room){ captorData = current; } } - System.out.println(captorData); + System.out.println(Files.readString(captorData.toPath())); } } } diff --git a/Code/java/src/main/resources/application/AM107/AM107-12/2024-11-22_14-58-32 b/Code/java/src/main/resources/application/AM107/AM107-12/2024-11-22_14-58-32 new file mode 100644 index 000000000..132254b6b --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-12/2024-11-22_14-58-32 @@ -0,0 +1 @@ +{22.1, 37.5, 2199} diff --git a/Code/java/src/main/resources/application/AM107/AM107-13/2024-11-22_14-52-48 b/Code/java/src/main/resources/application/AM107/AM107-13/2024-11-22_14-52-48 new file mode 100644 index 000000000..f129602b2 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-13/2024-11-22_14-52-48 @@ -0,0 +1 @@ +{20, 47.5, 1678} diff --git a/Code/java/src/main/resources/application/AM107/AM107-14/2024-11-22_14-50-11 b/Code/java/src/main/resources/application/AM107/AM107-14/2024-11-22_14-50-11 new file mode 100644 index 000000000..a9a5170f5 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-14/2024-11-22_14-50-11 @@ -0,0 +1 @@ +{19.4, 51.5, 1407} diff --git a/Code/java/src/main/resources/application/AM107/AM107-15/2024-11-22_14-46-39 b/Code/java/src/main/resources/application/AM107/AM107-15/2024-11-22_14-46-39 new file mode 100644 index 000000000..7d59b073f --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-15/2024-11-22_14-46-39 @@ -0,0 +1 @@ +{17.9, 50.5, 876} diff --git a/Code/java/src/main/resources/application/AM107/AM107-16/2024-11-22_14-51-50 b/Code/java/src/main/resources/application/AM107/AM107-16/2024-11-22_14-51-50 new file mode 100644 index 000000000..767181bbb --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-16/2024-11-22_14-51-50 @@ -0,0 +1 @@ +{20.2, 48, 866} diff --git a/Code/java/src/main/resources/application/AM107/AM107-17/2024-11-22_14-45-39 b/Code/java/src/main/resources/application/AM107/AM107-17/2024-11-22_14-45-39 new file mode 100644 index 000000000..5604875bd --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-17/2024-11-22_14-45-39 @@ -0,0 +1 @@ +{21.7, 52.5, 2070} diff --git a/Code/java/src/main/resources/application/AM107/AM107-18/2024-11-22_14-53-48 b/Code/java/src/main/resources/application/AM107/AM107-18/2024-11-22_14-53-48 new file mode 100644 index 000000000..f850b08e0 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-18/2024-11-22_14-53-48 @@ -0,0 +1 @@ +{18.3, 56, 1406} diff --git a/Code/java/src/main/resources/application/AM107/AM107-2/2024-11-22_14-49-48 b/Code/java/src/main/resources/application/AM107/AM107-2/2024-11-22_14-49-48 new file mode 100644 index 000000000..0673cb3ec --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-2/2024-11-22_14-49-48 @@ -0,0 +1 @@ +{21.9, 48, 1252} diff --git a/Code/java/src/main/resources/application/AM107/AM107-20/2024-11-22_14-45-39 b/Code/java/src/main/resources/application/AM107/AM107-20/2024-11-22_14-45-39 new file mode 100644 index 000000000..d6015dce9 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-20/2024-11-22_14-45-39 @@ -0,0 +1 @@ +{20.1, 47, 936} diff --git a/Code/java/src/main/resources/application/AM107/AM107-22/2024-11-22_14-53-17 b/Code/java/src/main/resources/application/AM107/AM107-22/2024-11-22_14-53-17 new file mode 100644 index 000000000..17aab3a59 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-22/2024-11-22_14-53-17 @@ -0,0 +1 @@ +{21.6, 41, 1097} diff --git a/Code/java/src/main/resources/application/AM107/AM107-23/2024-11-22_14-51-17 b/Code/java/src/main/resources/application/AM107/AM107-23/2024-11-22_14-51-17 new file mode 100644 index 000000000..4f03e4f03 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-23/2024-11-22_14-51-17 @@ -0,0 +1 @@ +{19.9, 51.5, 1424} diff --git a/Code/java/src/main/resources/application/AM107/AM107-24/2024-11-22_14-49-18 b/Code/java/src/main/resources/application/AM107/AM107-24/2024-11-22_14-49-18 new file mode 100644 index 000000000..9d997ad6e --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-24/2024-11-22_14-49-18 @@ -0,0 +1 @@ +{20.1, 48, 877} diff --git a/Code/java/src/main/resources/application/AM107/AM107-26/2024-11-22_14-44-50 b/Code/java/src/main/resources/application/AM107/AM107-26/2024-11-22_14-44-50 new file mode 100644 index 000000000..df8acefbd --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-26/2024-11-22_14-44-50 @@ -0,0 +1 @@ +{21.6, 39.5, 889} diff --git a/Code/java/src/main/resources/application/AM107/AM107-27/2024-11-22_14-50-47 b/Code/java/src/main/resources/application/AM107/AM107-27/2024-11-22_14-50-47 new file mode 100644 index 000000000..88247ced9 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-27/2024-11-22_14-50-47 @@ -0,0 +1 @@ +{22.5, 43, 1228} diff --git a/Code/java/src/main/resources/application/AM107/AM107-28/2024-11-22_14-56-18 b/Code/java/src/main/resources/application/AM107/AM107-28/2024-11-22_14-56-18 new file mode 100644 index 000000000..6db052e17 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-28/2024-11-22_14-56-18 @@ -0,0 +1 @@ +{19.5, 39, 469} diff --git a/Code/java/src/main/resources/application/AM107/AM107-29/2024-11-22_14-53-48 b/Code/java/src/main/resources/application/AM107/AM107-29/2024-11-22_14-53-48 new file mode 100644 index 000000000..aac9ad9d9 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-29/2024-11-22_14-53-48 @@ -0,0 +1 @@ +{21.1, 42, 1192} diff --git a/Code/java/src/main/resources/application/AM107/AM107-3/2024-11-22_14-53-08 b/Code/java/src/main/resources/application/AM107/AM107-3/2024-11-22_14-53-08 new file mode 100644 index 000000000..b6f793ea4 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-3/2024-11-22_14-53-08 @@ -0,0 +1 @@ +{22.1, 47, 1361} diff --git a/Code/java/src/main/resources/application/AM107/AM107-30/2024-11-22_14-47-20 b/Code/java/src/main/resources/application/AM107/AM107-30/2024-11-22_14-47-20 new file mode 100644 index 000000000..e2b1f8a38 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-30/2024-11-22_14-47-20 @@ -0,0 +1 @@ +{20.7, 39.5, 924} diff --git a/Code/java/src/main/resources/application/AM107/AM107-31/2024-11-22_14-48-47 b/Code/java/src/main/resources/application/AM107/AM107-31/2024-11-22_14-48-47 new file mode 100644 index 000000000..2384dff57 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-31/2024-11-22_14-48-47 @@ -0,0 +1 @@ +{19.1, 39, 518} diff --git a/Code/java/src/main/resources/application/AM107/AM107-31/2024-11-22_15-08-49 b/Code/java/src/main/resources/application/AM107/AM107-31/2024-11-22_15-08-49 new file mode 100644 index 000000000..355c34c1c --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-31/2024-11-22_15-08-49 @@ -0,0 +1 @@ +{19.7, 39, 564} diff --git a/Code/java/src/main/resources/application/AM107/AM107-32/2024-11-22_14-49-46 b/Code/java/src/main/resources/application/AM107/AM107-32/2024-11-22_14-49-46 new file mode 100644 index 000000000..4c5be42bd --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-32/2024-11-22_14-49-46 @@ -0,0 +1 @@ +{20.7, 40, 639} diff --git a/Code/java/src/main/resources/application/AM107/AM107-36/2024-11-22_14-50-47 b/Code/java/src/main/resources/application/AM107/AM107-36/2024-11-22_14-50-47 new file mode 100644 index 000000000..7d0088b74 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-36/2024-11-22_14-50-47 @@ -0,0 +1 @@ +{20.7, 42, 1047} diff --git a/Code/java/src/main/resources/application/AM107/AM107-37/2024-11-22_14-49-16 b/Code/java/src/main/resources/application/AM107/AM107-37/2024-11-22_14-49-16 new file mode 100644 index 000000000..35b97d731 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-37/2024-11-22_14-49-16 @@ -0,0 +1 @@ +{23.2, 33.5, 579} diff --git a/Code/java/src/main/resources/application/AM107/AM107-38/2024-11-22_14-47-48 b/Code/java/src/main/resources/application/AM107/AM107-38/2024-11-22_14-47-48 new file mode 100644 index 000000000..8ff1cad13 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-38/2024-11-22_14-47-48 @@ -0,0 +1 @@ +{19.8, 43.5, 1016} diff --git a/Code/java/src/main/resources/application/AM107/AM107-39/2024-11-22_14-54-12 b/Code/java/src/main/resources/application/AM107/AM107-39/2024-11-22_14-54-12 new file mode 100644 index 000000000..fec64399c --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-39/2024-11-22_14-54-12 @@ -0,0 +1 @@ +{21.3, 39.5, 1108} diff --git a/Code/java/src/main/resources/application/AM107/AM107-4/2024-11-22_14-51-37 b/Code/java/src/main/resources/application/AM107/AM107-4/2024-11-22_14-51-37 new file mode 100644 index 000000000..34f03df62 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-4/2024-11-22_14-51-37 @@ -0,0 +1 @@ +{22.5, 47, 1924} diff --git a/Code/java/src/main/resources/application/AM107/AM107-41/2024-11-22_14-48-47 b/Code/java/src/main/resources/application/AM107/AM107-41/2024-11-22_14-48-47 new file mode 100644 index 000000000..90b953505 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-41/2024-11-22_14-48-47 @@ -0,0 +1 @@ +{20.3, 38, 547} diff --git a/Code/java/src/main/resources/application/AM107/AM107-41/2024-11-22_15-08-50 b/Code/java/src/main/resources/application/AM107/AM107-41/2024-11-22_15-08-50 new file mode 100644 index 000000000..444cfac1f --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-41/2024-11-22_15-08-50 @@ -0,0 +1 @@ +{20.3, 37.5, 538} diff --git a/Code/java/src/main/resources/application/AM107/AM107-42/2024-11-22_11-18-06 b/Code/java/src/main/resources/application/AM107/AM107-42/2024-11-22_11-18-06 new file mode 100644 index 000000000..c9d38b8db --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-42/2024-11-22_11-18-06 @@ -0,0 +1 @@ +{19.7, 42, 441} diff --git a/Code/java/src/main/resources/application/AM107/AM107-42/2024-11-22_14-58-07 b/Code/java/src/main/resources/application/AM107/AM107-42/2024-11-22_14-58-07 new file mode 100644 index 000000000..cbba95551 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-42/2024-11-22_14-58-07 @@ -0,0 +1 @@ +{21.2, 36.5, 456} diff --git a/Code/java/src/main/resources/application/AM107/AM107-43/2024-11-22_14-52-15 b/Code/java/src/main/resources/application/AM107/AM107-43/2024-11-22_14-52-15 new file mode 100644 index 000000000..62a4d20a9 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-43/2024-11-22_14-52-15 @@ -0,0 +1 @@ +{22.2, 39.5, 514} diff --git a/Code/java/src/main/resources/application/AM107/AM107-45/2024-11-22_14-51-21 b/Code/java/src/main/resources/application/AM107/AM107-45/2024-11-22_14-51-21 new file mode 100644 index 000000000..3302ac70d --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-45/2024-11-22_14-51-21 @@ -0,0 +1 @@ +{14.9, 49, 443} diff --git a/Code/java/src/main/resources/application/AM107/AM107-46/2024-11-22_14-51-19 b/Code/java/src/main/resources/application/AM107/AM107-46/2024-11-22_14-51-19 new file mode 100644 index 000000000..e7a7dfaa2 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-46/2024-11-22_14-51-19 @@ -0,0 +1 @@ +{20.5, 49.5, 1292} diff --git a/Code/java/src/main/resources/application/AM107/AM107-47/2024-11-22_14-52-49 b/Code/java/src/main/resources/application/AM107/AM107-47/2024-11-22_14-52-49 new file mode 100644 index 000000000..6d6f123e8 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-47/2024-11-22_14-52-49 @@ -0,0 +1 @@ +{48.9, 45.5, 790} diff --git a/Code/java/src/main/resources/application/AM107/AM107-49/2024-11-22_14-49-49 b/Code/java/src/main/resources/application/AM107/AM107-49/2024-11-22_14-49-49 new file mode 100644 index 000000000..fb7f1213b --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-49/2024-11-22_14-49-49 @@ -0,0 +1 @@ +{19.6, 41, 683} diff --git a/Code/java/src/main/resources/application/AM107/AM107-5/2024-11-22_14-51-08 b/Code/java/src/main/resources/application/AM107/AM107-5/2024-11-22_14-51-08 new file mode 100644 index 000000000..0f7dfae69 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-5/2024-11-22_14-51-08 @@ -0,0 +1 @@ +{20.2, 50.5, 1395} diff --git a/Code/java/src/main/resources/application/AM107/AM107-50/2024-11-22_14-49-19 b/Code/java/src/main/resources/application/AM107/AM107-50/2024-11-22_14-49-19 new file mode 100644 index 000000000..83a3d862e --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-50/2024-11-22_14-49-19 @@ -0,0 +1 @@ +{19.3, 42.5, 702} diff --git a/Code/java/src/main/resources/application/AM107/AM107-51/2024-11-22_14-47-49 b/Code/java/src/main/resources/application/AM107/AM107-51/2024-11-22_14-47-49 new file mode 100644 index 000000000..363697c1f --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-51/2024-11-22_14-47-49 @@ -0,0 +1 @@ +{21.2, 40.5, 440} diff --git a/Code/java/src/main/resources/application/AM107/AM107-53/2024-11-22_14-47-16 b/Code/java/src/main/resources/application/AM107/AM107-53/2024-11-22_14-47-16 new file mode 100644 index 000000000..07faf109d --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-53/2024-11-22_14-47-16 @@ -0,0 +1 @@ +{18.4, 47, 554} diff --git a/Code/java/src/main/resources/application/AM107/AM107-54/2024-11-22_14-45-48 b/Code/java/src/main/resources/application/AM107/AM107-54/2024-11-22_14-45-48 new file mode 100644 index 000000000..e15af2950 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-54/2024-11-22_14-45-48 @@ -0,0 +1 @@ +{21.1, 41.5, 651} diff --git a/Code/java/src/main/resources/application/AM107/AM107-55/2024-11-22_14-51-49 b/Code/java/src/main/resources/application/AM107/AM107-55/2024-11-22_14-51-49 new file mode 100644 index 000000000..d22e9949a --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-55/2024-11-22_14-51-49 @@ -0,0 +1 @@ +{22.3, 38, 576} diff --git a/Code/java/src/main/resources/application/AM107/AM107-6/2024-11-22_14-47-49 b/Code/java/src/main/resources/application/AM107/AM107-6/2024-11-22_14-47-49 new file mode 100644 index 000000000..14c54f563 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-6/2024-11-22_14-47-49 @@ -0,0 +1 @@ +{20.6, 49, 1315} diff --git a/Code/java/src/main/resources/application/AM107/AM107-7/2024-11-22_14-50-49 b/Code/java/src/main/resources/application/AM107/AM107-7/2024-11-22_14-50-49 new file mode 100644 index 000000000..737b181e7 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-7/2024-11-22_14-50-49 @@ -0,0 +1 @@ +{21.6, 43.5, 669} diff --git a/Code/java/src/main/resources/application/AM107/AM107-8/2024-11-22_14-52-08 b/Code/java/src/main/resources/application/AM107/AM107-8/2024-11-22_14-52-08 new file mode 100644 index 000000000..13801bba8 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/AM107-8/2024-11-22_14-52-08 @@ -0,0 +1 @@ +{18.2, 50, 2229} diff --git a/Code/java/src/main/resources/application/AM107/B001/2024-11-22_14-50-49 b/Code/java/src/main/resources/application/AM107/B001/2024-11-22_14-50-49 new file mode 100644 index 000000000..737b181e7 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B001/2024-11-22_14-50-49 @@ -0,0 +1 @@ +{21.6, 43.5, 669} diff --git a/Code/java/src/main/resources/application/AM107/B002/2024-11-22_14-52-08 b/Code/java/src/main/resources/application/AM107/B002/2024-11-22_14-52-08 new file mode 100644 index 000000000..13801bba8 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B002/2024-11-22_14-52-08 @@ -0,0 +1 @@ +{18.2, 50, 2229} diff --git a/Code/java/src/main/resources/application/AM107/B103/2024-11-22_14-58-32 b/Code/java/src/main/resources/application/AM107/B103/2024-11-22_14-58-32 new file mode 100644 index 000000000..132254b6b --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B103/2024-11-22_14-58-32 @@ -0,0 +1 @@ +{22.1, 37.5, 2199} diff --git a/Code/java/src/main/resources/application/AM107/B105/2024-11-22_14-52-48 b/Code/java/src/main/resources/application/AM107/B105/2024-11-22_14-52-48 new file mode 100644 index 000000000..f129602b2 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B105/2024-11-22_14-52-48 @@ -0,0 +1 @@ +{20, 47.5, 1678} diff --git a/Code/java/src/main/resources/application/AM107/B106/2024-11-22_14-50-11 b/Code/java/src/main/resources/application/AM107/B106/2024-11-22_14-50-11 new file mode 100644 index 000000000..a9a5170f5 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B106/2024-11-22_14-50-11 @@ -0,0 +1 @@ +{19.4, 51.5, 1407} diff --git a/Code/java/src/main/resources/application/AM107/B108/2024-11-22_14-46-39 b/Code/java/src/main/resources/application/AM107/B108/2024-11-22_14-46-39 new file mode 100644 index 000000000..7d59b073f --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B108/2024-11-22_14-46-39 @@ -0,0 +1 @@ +{17.9, 50.5, 876} diff --git a/Code/java/src/main/resources/application/AM107/B109/2024-11-22_14-51-50 b/Code/java/src/main/resources/application/AM107/B109/2024-11-22_14-51-50 new file mode 100644 index 000000000..767181bbb --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B109/2024-11-22_14-51-50 @@ -0,0 +1 @@ +{20.2, 48, 866} diff --git a/Code/java/src/main/resources/application/AM107/B110/2024-11-22_14-49-48 b/Code/java/src/main/resources/application/AM107/B110/2024-11-22_14-49-48 new file mode 100644 index 000000000..0673cb3ec --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B110/2024-11-22_14-49-48 @@ -0,0 +1 @@ +{21.9, 48, 1252} diff --git a/Code/java/src/main/resources/application/AM107/B111/2024-11-22_14-53-08 b/Code/java/src/main/resources/application/AM107/B111/2024-11-22_14-53-08 new file mode 100644 index 000000000..b6f793ea4 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B111/2024-11-22_14-53-08 @@ -0,0 +1 @@ +{22.1, 47, 1361} diff --git a/Code/java/src/main/resources/application/AM107/B112/2024-11-22_14-45-39 b/Code/java/src/main/resources/application/AM107/B112/2024-11-22_14-45-39 new file mode 100644 index 000000000..5604875bd --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B112/2024-11-22_14-45-39 @@ -0,0 +1 @@ +{21.7, 52.5, 2070} diff --git a/Code/java/src/main/resources/application/AM107/B113/2024-11-22_14-53-48 b/Code/java/src/main/resources/application/AM107/B113/2024-11-22_14-53-48 new file mode 100644 index 000000000..f850b08e0 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B113/2024-11-22_14-53-48 @@ -0,0 +1 @@ +{18.3, 56, 1406} diff --git a/Code/java/src/main/resources/application/AM107/B201/2024-11-22_14-51-37 b/Code/java/src/main/resources/application/AM107/B201/2024-11-22_14-51-37 new file mode 100644 index 000000000..34f03df62 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B201/2024-11-22_14-51-37 @@ -0,0 +1 @@ +{22.5, 47, 1924} diff --git a/Code/java/src/main/resources/application/AM107/B202/2024-11-22_14-51-08 b/Code/java/src/main/resources/application/AM107/B202/2024-11-22_14-51-08 new file mode 100644 index 000000000..0f7dfae69 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B202/2024-11-22_14-51-08 @@ -0,0 +1 @@ +{20.2, 50.5, 1395} diff --git a/Code/java/src/main/resources/application/AM107/B203/2024-11-22_14-47-49 b/Code/java/src/main/resources/application/AM107/B203/2024-11-22_14-47-49 new file mode 100644 index 000000000..14c54f563 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B203/2024-11-22_14-47-49 @@ -0,0 +1 @@ +{20.6, 49, 1315} diff --git a/Code/java/src/main/resources/application/AM107/B217/2024-11-22_14-45-39 b/Code/java/src/main/resources/application/AM107/B217/2024-11-22_14-45-39 new file mode 100644 index 000000000..d6015dce9 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B217/2024-11-22_14-45-39 @@ -0,0 +1 @@ +{20.1, 47, 936} diff --git a/Code/java/src/main/resources/application/AM107/B234/2024-11-22_14-53-17 b/Code/java/src/main/resources/application/AM107/B234/2024-11-22_14-53-17 new file mode 100644 index 000000000..17aab3a59 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/B234/2024-11-22_14-53-17 @@ -0,0 +1 @@ +{21.6, 41, 1097} diff --git a/Code/java/src/main/resources/application/AM107/C001/2024-11-22_14-51-49 b/Code/java/src/main/resources/application/AM107/C001/2024-11-22_14-51-49 new file mode 100644 index 000000000..d22e9949a --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/C001/2024-11-22_14-51-49 @@ -0,0 +1 @@ +{22.3, 38, 576} diff --git a/Code/java/src/main/resources/application/AM107/C002/2024-11-22_14-45-48 b/Code/java/src/main/resources/application/AM107/C002/2024-11-22_14-45-48 new file mode 100644 index 000000000..e15af2950 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/C002/2024-11-22_14-45-48 @@ -0,0 +1 @@ +{21.1, 41.5, 651} diff --git a/Code/java/src/main/resources/application/AM107/C004/2024-11-22_14-51-17 b/Code/java/src/main/resources/application/AM107/C004/2024-11-22_14-51-17 new file mode 100644 index 000000000..4f03e4f03 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/C004/2024-11-22_14-51-17 @@ -0,0 +1 @@ +{19.9, 51.5, 1424} diff --git a/Code/java/src/main/resources/application/AM107/C006/2024-11-22_14-49-18 b/Code/java/src/main/resources/application/AM107/C006/2024-11-22_14-49-18 new file mode 100644 index 000000000..9d997ad6e --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/C006/2024-11-22_14-49-18 @@ -0,0 +1 @@ +{20.1, 48, 877} diff --git a/Code/java/src/main/resources/application/AM107/C102/2024-11-22_14-47-16 b/Code/java/src/main/resources/application/AM107/C102/2024-11-22_14-47-16 new file mode 100644 index 000000000..07faf109d --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/C102/2024-11-22_14-47-16 @@ -0,0 +1 @@ +{18.4, 47, 554} diff --git a/Code/java/src/main/resources/application/AM107/E001/2024-11-22_14-56-18 b/Code/java/src/main/resources/application/AM107/E001/2024-11-22_14-56-18 new file mode 100644 index 000000000..6db052e17 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E001/2024-11-22_14-56-18 @@ -0,0 +1 @@ +{19.5, 39, 469} diff --git a/Code/java/src/main/resources/application/AM107/E003/2024-11-22_14-44-50 b/Code/java/src/main/resources/application/AM107/E003/2024-11-22_14-44-50 new file mode 100644 index 000000000..df8acefbd --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E003/2024-11-22_14-44-50 @@ -0,0 +1 @@ +{21.6, 39.5, 889} diff --git a/Code/java/src/main/resources/application/AM107/E004/2024-11-22_14-50-47 b/Code/java/src/main/resources/application/AM107/E004/2024-11-22_14-50-47 new file mode 100644 index 000000000..88247ced9 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E004/2024-11-22_14-50-47 @@ -0,0 +1 @@ +{22.5, 43, 1228} diff --git a/Code/java/src/main/resources/application/AM107/E006/2024-11-22_14-53-48 b/Code/java/src/main/resources/application/AM107/E006/2024-11-22_14-53-48 new file mode 100644 index 000000000..aac9ad9d9 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E006/2024-11-22_14-53-48 @@ -0,0 +1 @@ +{21.1, 42, 1192} diff --git a/Code/java/src/main/resources/application/AM107/E007/2024-11-22_14-47-20 b/Code/java/src/main/resources/application/AM107/E007/2024-11-22_14-47-20 new file mode 100644 index 000000000..e2b1f8a38 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E007/2024-11-22_14-47-20 @@ -0,0 +1 @@ +{20.7, 39.5, 924} diff --git a/Code/java/src/main/resources/application/AM107/E100/2024-11-22_14-49-16 b/Code/java/src/main/resources/application/AM107/E100/2024-11-22_14-49-16 new file mode 100644 index 000000000..35b97d731 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E100/2024-11-22_14-49-16 @@ -0,0 +1 @@ +{23.2, 33.5, 579} diff --git a/Code/java/src/main/resources/application/AM107/E101/2024-11-22_14-48-47 b/Code/java/src/main/resources/application/AM107/E101/2024-11-22_14-48-47 new file mode 100644 index 000000000..2384dff57 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E101/2024-11-22_14-48-47 @@ -0,0 +1 @@ +{19.1, 39, 518} diff --git a/Code/java/src/main/resources/application/AM107/E101/2024-11-22_15-08-49 b/Code/java/src/main/resources/application/AM107/E101/2024-11-22_15-08-49 new file mode 100644 index 000000000..355c34c1c --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E101/2024-11-22_15-08-49 @@ -0,0 +1 @@ +{19.7, 39, 564} diff --git a/Code/java/src/main/resources/application/AM107/E102/2024-11-22_14-49-46 b/Code/java/src/main/resources/application/AM107/E102/2024-11-22_14-49-46 new file mode 100644 index 000000000..4c5be42bd --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E102/2024-11-22_14-49-46 @@ -0,0 +1 @@ +{20.7, 40, 639} diff --git a/Code/java/src/main/resources/application/AM107/E106/2024-11-22_14-50-47 b/Code/java/src/main/resources/application/AM107/E106/2024-11-22_14-50-47 new file mode 100644 index 000000000..7d0088b74 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E106/2024-11-22_14-50-47 @@ -0,0 +1 @@ +{20.7, 42, 1047} diff --git a/Code/java/src/main/resources/application/AM107/E207/2024-11-22_14-48-47 b/Code/java/src/main/resources/application/AM107/E207/2024-11-22_14-48-47 new file mode 100644 index 000000000..90b953505 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E207/2024-11-22_14-48-47 @@ -0,0 +1 @@ +{20.3, 38, 547} diff --git a/Code/java/src/main/resources/application/AM107/E207/2024-11-22_15-08-50 b/Code/java/src/main/resources/application/AM107/E207/2024-11-22_15-08-50 new file mode 100644 index 000000000..444cfac1f --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E207/2024-11-22_15-08-50 @@ -0,0 +1 @@ +{20.3, 37.5, 538} diff --git a/Code/java/src/main/resources/application/AM107/E208/2024-11-22_14-47-48 b/Code/java/src/main/resources/application/AM107/E208/2024-11-22_14-47-48 new file mode 100644 index 000000000..8ff1cad13 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E208/2024-11-22_14-47-48 @@ -0,0 +1 @@ +{19.8, 43.5, 1016} diff --git a/Code/java/src/main/resources/application/AM107/E209/2024-11-22_14-54-12 b/Code/java/src/main/resources/application/AM107/E209/2024-11-22_14-54-12 new file mode 100644 index 000000000..fec64399c --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E209/2024-11-22_14-54-12 @@ -0,0 +1 @@ +{21.3, 39.5, 1108} diff --git a/Code/java/src/main/resources/application/AM107/E210/2024-11-22_11-18-06 b/Code/java/src/main/resources/application/AM107/E210/2024-11-22_11-18-06 new file mode 100644 index 000000000..c9d38b8db --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E210/2024-11-22_11-18-06 @@ -0,0 +1 @@ +{19.7, 42, 441} diff --git a/Code/java/src/main/resources/application/AM107/E210/2024-11-22_14-58-07 b/Code/java/src/main/resources/application/AM107/E210/2024-11-22_14-58-07 new file mode 100644 index 000000000..cbba95551 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/E210/2024-11-22_14-58-07 @@ -0,0 +1 @@ +{21.2, 36.5, 456} diff --git "a/Code/java/src/main/resources/application/AM107/Foyer-etudiants-entr\303\251e/2024-11-22_14-52-49" "b/Code/java/src/main/resources/application/AM107/Foyer-etudiants-entr\303\251e/2024-11-22_14-52-49" new file mode 100644 index 000000000..6d6f123e8 --- /dev/null +++ "b/Code/java/src/main/resources/application/AM107/Foyer-etudiants-entr\303\251e/2024-11-22_14-52-49" @@ -0,0 +1 @@ +{48.9, 45.5, 790} diff --git a/Code/java/src/main/resources/application/AM107/Foyer-personnels/2024-11-22_14-51-19 b/Code/java/src/main/resources/application/AM107/Foyer-personnels/2024-11-22_14-51-19 new file mode 100644 index 000000000..e7a7dfaa2 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/Foyer-personnels/2024-11-22_14-51-19 @@ -0,0 +1 @@ +{20.5, 49.5, 1292} diff --git a/Code/java/src/main/resources/application/AM107/Local-velo/2024-11-22_14-51-21 b/Code/java/src/main/resources/application/AM107/Local-velo/2024-11-22_14-51-21 new file mode 100644 index 000000000..3302ac70d --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/Local-velo/2024-11-22_14-51-21 @@ -0,0 +1 @@ +{14.9, 49, 443} diff --git a/Code/java/src/main/resources/application/AM107/Salle-conseil/2024-11-22_14-52-15 b/Code/java/src/main/resources/application/AM107/Salle-conseil/2024-11-22_14-52-15 new file mode 100644 index 000000000..62a4d20a9 --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/Salle-conseil/2024-11-22_14-52-15 @@ -0,0 +1 @@ +{22.2, 39.5, 514} diff --git a/Code/java/src/main/resources/application/AM107/amphi1/2024-11-22_14-47-49 b/Code/java/src/main/resources/application/AM107/amphi1/2024-11-22_14-47-49 new file mode 100644 index 000000000..363697c1f --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/amphi1/2024-11-22_14-47-49 @@ -0,0 +1 @@ +{21.2, 40.5, 440} diff --git a/Code/java/src/main/resources/application/AM107/hall-amphi/2024-11-22_14-49-19 b/Code/java/src/main/resources/application/AM107/hall-amphi/2024-11-22_14-49-19 new file mode 100644 index 000000000..83a3d862e --- /dev/null +++ b/Code/java/src/main/resources/application/AM107/hall-amphi/2024-11-22_14-49-19 @@ -0,0 +1 @@ +{19.3, 42.5, 702} diff --git "a/Code/java/src/main/resources/application/AM107/hall-entr\303\251e-principale/2024-11-22_14-49-49" "b/Code/java/src/main/resources/application/AM107/hall-entr\303\251e-principale/2024-11-22_14-49-49" new file mode 100644 index 000000000..fb7f1213b --- /dev/null +++ "b/Code/java/src/main/resources/application/AM107/hall-entr\303\251e-principale/2024-11-22_14-49-49" @@ -0,0 +1 @@ +{19.6, 41, 683} From 81198c143cd2c1a7785f1e4fe71b5a72817cf93b Mon Sep 17 00:00:00 2001 From: Pierre Cornu <161845979+PierreCornu@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:34:36 +0100 Subject: [PATCH 5/5] =?UTF-8?q?MAJ=20du=20Client=20MQTT=20(S=C3=A9lection?= =?UTF-8?q?=20du=20r=C3=A9pertoire=20de=20stockage=20des=20donn=C3=A9es)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AM107/AM107-18/2024-11-25_12-33-49 | 1 + .../AM107/AM107-29/2024-11-25_12-33-47 | 1 + .../capteur/AM107/B113/2024-11-25_12-33-49 | 1 + .../capteur/AM107/E006/2024-11-25_12-33-47 | 1 + .../capteur/solaredge/2024-11-25_12-33-35 | 1 + .../Python/AM107/AM107-12/2024-11-22_14-58-32 | 1 - .../Python/AM107/AM107-13/2024-11-22_14-52-48 | 1 - .../Python/AM107/AM107-14/2024-11-22_14-50-11 | 1 - .../Python/AM107/AM107-15/2024-11-22_14-46-39 | 1 - .../Python/AM107/AM107-16/2024-11-22_14-51-50 | 1 - .../Python/AM107/AM107-17/2024-11-22_14-45-39 | 1 - .../Python/AM107/AM107-18/2024-11-22_14-53-48 | 1 - Code/Python/AM107/AM107-2/2024-11-22_14-49-48 | 1 - .../Python/AM107/AM107-20/2024-11-22_14-45-39 | 1 - .../Python/AM107/AM107-22/2024-11-22_14-53-17 | 1 - .../Python/AM107/AM107-23/2024-11-22_14-51-17 | 1 - .../Python/AM107/AM107-24/2024-11-22_14-49-18 | 1 - .../Python/AM107/AM107-26/2024-11-22_14-44-50 | 1 - .../Python/AM107/AM107-27/2024-11-22_14-50-47 | 1 - .../Python/AM107/AM107-28/2024-11-22_14-56-18 | 1 - .../Python/AM107/AM107-29/2024-11-22_14-53-48 | 1 - Code/Python/AM107/AM107-3/2024-11-22_14-53-08 | 1 - .../Python/AM107/AM107-30/2024-11-22_14-47-20 | 1 - .../Python/AM107/AM107-31/2024-11-22_14-48-47 | 1 - .../Python/AM107/AM107-31/2024-11-22_15-08-49 | 1 - .../Python/AM107/AM107-32/2024-11-22_14-49-46 | 1 - .../Python/AM107/AM107-36/2024-11-22_14-50-47 | 1 - .../Python/AM107/AM107-37/2024-11-22_14-49-16 | 1 - .../Python/AM107/AM107-38/2024-11-22_14-47-48 | 1 - .../Python/AM107/AM107-39/2024-11-22_14-54-12 | 1 - Code/Python/AM107/AM107-4/2024-11-22_14-51-37 | 1 - .../Python/AM107/AM107-41/2024-11-22_14-48-47 | 1 - .../Python/AM107/AM107-41/2024-11-22_15-08-50 | 1 - .../Python/AM107/AM107-42/2024-11-22_11-18-06 | 1 - .../Python/AM107/AM107-42/2024-11-22_14-58-07 | 1 - .../Python/AM107/AM107-43/2024-11-22_14-52-15 | 1 - .../Python/AM107/AM107-45/2024-11-22_14-51-21 | 1 - .../Python/AM107/AM107-46/2024-11-22_14-51-19 | 1 - .../Python/AM107/AM107-47/2024-11-22_14-52-49 | 1 - .../Python/AM107/AM107-49/2024-11-22_14-49-49 | 1 - Code/Python/AM107/AM107-5/2024-11-22_14-51-08 | 1 - .../Python/AM107/AM107-50/2024-11-22_14-49-19 | 1 - .../Python/AM107/AM107-51/2024-11-22_14-47-49 | 1 - .../Python/AM107/AM107-53/2024-11-22_14-47-16 | 1 - .../Python/AM107/AM107-54/2024-11-22_14-45-48 | 1 - .../Python/AM107/AM107-55/2024-11-22_14-51-49 | 1 - Code/Python/AM107/AM107-6/2024-11-22_14-47-49 | 1 - Code/Python/AM107/AM107-7/2024-11-22_14-50-49 | 1 - Code/Python/AM107/AM107-8/2024-11-22_14-52-08 | 1 - Code/Python/AM107/B001/2024-11-22_14-50-49 | 1 - Code/Python/AM107/B002/2024-11-22_14-52-08 | 1 - Code/Python/AM107/B103/2024-11-22_14-58-32 | 1 - Code/Python/AM107/B105/2024-11-22_14-52-48 | 1 - Code/Python/AM107/B106/2024-11-22_14-50-11 | 1 - Code/Python/AM107/B108/2024-11-22_14-46-39 | 1 - Code/Python/AM107/B109/2024-11-22_14-51-50 | 1 - Code/Python/AM107/B110/2024-11-22_14-49-48 | 1 - Code/Python/AM107/B111/2024-11-22_14-53-08 | 1 - Code/Python/AM107/B112/2024-11-22_14-45-39 | 1 - Code/Python/AM107/B113/2024-11-22_14-53-48 | 1 - Code/Python/AM107/B201/2024-11-22_14-51-37 | 1 - Code/Python/AM107/B202/2024-11-22_14-51-08 | 1 - Code/Python/AM107/B203/2024-11-22_14-47-49 | 1 - Code/Python/AM107/B217/2024-11-22_14-45-39 | 1 - Code/Python/AM107/B234/2024-11-22_14-53-17 | 1 - Code/Python/AM107/C001/2024-11-22_14-51-49 | 1 - Code/Python/AM107/C002/2024-11-22_14-45-48 | 1 - Code/Python/AM107/C004/2024-11-22_14-51-17 | 1 - Code/Python/AM107/C006/2024-11-22_14-49-18 | 1 - Code/Python/AM107/C102/2024-11-22_14-47-16 | 1 - Code/Python/AM107/E001/2024-11-22_14-56-18 | 1 - Code/Python/AM107/E003/2024-11-22_14-44-50 | 1 - Code/Python/AM107/E004/2024-11-22_14-50-47 | 1 - Code/Python/AM107/E006/2024-11-22_14-53-48 | 1 - Code/Python/AM107/E007/2024-11-22_14-47-20 | 1 - Code/Python/AM107/E100/2024-11-22_14-49-16 | 1 - Code/Python/AM107/E101/2024-11-22_14-48-47 | 1 - Code/Python/AM107/E101/2024-11-22_15-08-49 | 1 - Code/Python/AM107/E102/2024-11-22_14-49-46 | 1 - Code/Python/AM107/E106/2024-11-22_14-50-47 | 1 - Code/Python/AM107/E207/2024-11-22_14-48-47 | 1 - Code/Python/AM107/E207/2024-11-22_15-08-50 | 1 - Code/Python/AM107/E208/2024-11-22_14-47-48 | 1 - Code/Python/AM107/E209/2024-11-22_14-54-12 | 1 - Code/Python/AM107/E210/2024-11-22_11-18-06 | 1 - Code/Python/AM107/E210/2024-11-22_14-58-07 | 1 - .../2024-11-22_14-52-49" | 1 - .../Foyer-personnels/2024-11-22_14-51-19 | 1 - .../AM107/Local-velo/2024-11-22_14-51-21 | 1 - .../AM107/Salle-conseil/2024-11-22_14-52-15 | 1 - Code/Python/AM107/amphi1/2024-11-22_14-47-49 | 1 - .../AM107/hall-amphi/2024-11-22_14-49-19 | 1 - .../2024-11-22_14-49-49" | 1 - Code/Python/clientMQTT.py | 25 ++++++++++--------- Code/Python/config.ini | 1 + Code/Python/solaredge/2024-11-22_11-18-03 | 1 - Code/Python/solaredge/2024-11-22_14-44-29 | 1 - Code/Python/solaredge/2024-11-22_15-01-01 | 1 - 98 files changed, 19 insertions(+), 103 deletions(-) create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-18/2024-11-25_12-33-49 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/AM107-29/2024-11-25_12-33-47 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/B113/2024-11-25_12-33-49 create mode 100644 Code/Java/src/main/resources/application/capteur/AM107/E006/2024-11-25_12-33-47 create mode 100644 Code/Java/src/main/resources/application/capteur/solaredge/2024-11-25_12-33-35 delete mode 100644 Code/Python/AM107/AM107-12/2024-11-22_14-58-32 delete mode 100644 Code/Python/AM107/AM107-13/2024-11-22_14-52-48 delete mode 100644 Code/Python/AM107/AM107-14/2024-11-22_14-50-11 delete mode 100644 Code/Python/AM107/AM107-15/2024-11-22_14-46-39 delete mode 100644 Code/Python/AM107/AM107-16/2024-11-22_14-51-50 delete mode 100644 Code/Python/AM107/AM107-17/2024-11-22_14-45-39 delete mode 100644 Code/Python/AM107/AM107-18/2024-11-22_14-53-48 delete mode 100644 Code/Python/AM107/AM107-2/2024-11-22_14-49-48 delete mode 100644 Code/Python/AM107/AM107-20/2024-11-22_14-45-39 delete mode 100644 Code/Python/AM107/AM107-22/2024-11-22_14-53-17 delete mode 100644 Code/Python/AM107/AM107-23/2024-11-22_14-51-17 delete mode 100644 Code/Python/AM107/AM107-24/2024-11-22_14-49-18 delete mode 100644 Code/Python/AM107/AM107-26/2024-11-22_14-44-50 delete mode 100644 Code/Python/AM107/AM107-27/2024-11-22_14-50-47 delete mode 100644 Code/Python/AM107/AM107-28/2024-11-22_14-56-18 delete mode 100644 Code/Python/AM107/AM107-29/2024-11-22_14-53-48 delete mode 100644 Code/Python/AM107/AM107-3/2024-11-22_14-53-08 delete mode 100644 Code/Python/AM107/AM107-30/2024-11-22_14-47-20 delete mode 100644 Code/Python/AM107/AM107-31/2024-11-22_14-48-47 delete mode 100644 Code/Python/AM107/AM107-31/2024-11-22_15-08-49 delete mode 100644 Code/Python/AM107/AM107-32/2024-11-22_14-49-46 delete mode 100644 Code/Python/AM107/AM107-36/2024-11-22_14-50-47 delete mode 100644 Code/Python/AM107/AM107-37/2024-11-22_14-49-16 delete mode 100644 Code/Python/AM107/AM107-38/2024-11-22_14-47-48 delete mode 100644 Code/Python/AM107/AM107-39/2024-11-22_14-54-12 delete mode 100644 Code/Python/AM107/AM107-4/2024-11-22_14-51-37 delete mode 100644 Code/Python/AM107/AM107-41/2024-11-22_14-48-47 delete mode 100644 Code/Python/AM107/AM107-41/2024-11-22_15-08-50 delete mode 100644 Code/Python/AM107/AM107-42/2024-11-22_11-18-06 delete mode 100644 Code/Python/AM107/AM107-42/2024-11-22_14-58-07 delete mode 100644 Code/Python/AM107/AM107-43/2024-11-22_14-52-15 delete mode 100644 Code/Python/AM107/AM107-45/2024-11-22_14-51-21 delete mode 100644 Code/Python/AM107/AM107-46/2024-11-22_14-51-19 delete mode 100644 Code/Python/AM107/AM107-47/2024-11-22_14-52-49 delete mode 100644 Code/Python/AM107/AM107-49/2024-11-22_14-49-49 delete mode 100644 Code/Python/AM107/AM107-5/2024-11-22_14-51-08 delete mode 100644 Code/Python/AM107/AM107-50/2024-11-22_14-49-19 delete mode 100644 Code/Python/AM107/AM107-51/2024-11-22_14-47-49 delete mode 100644 Code/Python/AM107/AM107-53/2024-11-22_14-47-16 delete mode 100644 Code/Python/AM107/AM107-54/2024-11-22_14-45-48 delete mode 100644 Code/Python/AM107/AM107-55/2024-11-22_14-51-49 delete mode 100644 Code/Python/AM107/AM107-6/2024-11-22_14-47-49 delete mode 100644 Code/Python/AM107/AM107-7/2024-11-22_14-50-49 delete mode 100644 Code/Python/AM107/AM107-8/2024-11-22_14-52-08 delete mode 100644 Code/Python/AM107/B001/2024-11-22_14-50-49 delete mode 100644 Code/Python/AM107/B002/2024-11-22_14-52-08 delete mode 100644 Code/Python/AM107/B103/2024-11-22_14-58-32 delete mode 100644 Code/Python/AM107/B105/2024-11-22_14-52-48 delete mode 100644 Code/Python/AM107/B106/2024-11-22_14-50-11 delete mode 100644 Code/Python/AM107/B108/2024-11-22_14-46-39 delete mode 100644 Code/Python/AM107/B109/2024-11-22_14-51-50 delete mode 100644 Code/Python/AM107/B110/2024-11-22_14-49-48 delete mode 100644 Code/Python/AM107/B111/2024-11-22_14-53-08 delete mode 100644 Code/Python/AM107/B112/2024-11-22_14-45-39 delete mode 100644 Code/Python/AM107/B113/2024-11-22_14-53-48 delete mode 100644 Code/Python/AM107/B201/2024-11-22_14-51-37 delete mode 100644 Code/Python/AM107/B202/2024-11-22_14-51-08 delete mode 100644 Code/Python/AM107/B203/2024-11-22_14-47-49 delete mode 100644 Code/Python/AM107/B217/2024-11-22_14-45-39 delete mode 100644 Code/Python/AM107/B234/2024-11-22_14-53-17 delete mode 100644 Code/Python/AM107/C001/2024-11-22_14-51-49 delete mode 100644 Code/Python/AM107/C002/2024-11-22_14-45-48 delete mode 100644 Code/Python/AM107/C004/2024-11-22_14-51-17 delete mode 100644 Code/Python/AM107/C006/2024-11-22_14-49-18 delete mode 100644 Code/Python/AM107/C102/2024-11-22_14-47-16 delete mode 100644 Code/Python/AM107/E001/2024-11-22_14-56-18 delete mode 100644 Code/Python/AM107/E003/2024-11-22_14-44-50 delete mode 100644 Code/Python/AM107/E004/2024-11-22_14-50-47 delete mode 100644 Code/Python/AM107/E006/2024-11-22_14-53-48 delete mode 100644 Code/Python/AM107/E007/2024-11-22_14-47-20 delete mode 100644 Code/Python/AM107/E100/2024-11-22_14-49-16 delete mode 100644 Code/Python/AM107/E101/2024-11-22_14-48-47 delete mode 100644 Code/Python/AM107/E101/2024-11-22_15-08-49 delete mode 100644 Code/Python/AM107/E102/2024-11-22_14-49-46 delete mode 100644 Code/Python/AM107/E106/2024-11-22_14-50-47 delete mode 100644 Code/Python/AM107/E207/2024-11-22_14-48-47 delete mode 100644 Code/Python/AM107/E207/2024-11-22_15-08-50 delete mode 100644 Code/Python/AM107/E208/2024-11-22_14-47-48 delete mode 100644 Code/Python/AM107/E209/2024-11-22_14-54-12 delete mode 100644 Code/Python/AM107/E210/2024-11-22_11-18-06 delete mode 100644 Code/Python/AM107/E210/2024-11-22_14-58-07 delete mode 100644 "Code/Python/AM107/Foyer-etudiants-entr\303\251e/2024-11-22_14-52-49" delete mode 100644 Code/Python/AM107/Foyer-personnels/2024-11-22_14-51-19 delete mode 100644 Code/Python/AM107/Local-velo/2024-11-22_14-51-21 delete mode 100644 Code/Python/AM107/Salle-conseil/2024-11-22_14-52-15 delete mode 100644 Code/Python/AM107/amphi1/2024-11-22_14-47-49 delete mode 100644 Code/Python/AM107/hall-amphi/2024-11-22_14-49-19 delete mode 100644 "Code/Python/AM107/hall-entr\303\251e-principale/2024-11-22_14-49-49" delete mode 100644 Code/Python/solaredge/2024-11-22_11-18-03 delete mode 100644 Code/Python/solaredge/2024-11-22_14-44-29 delete mode 100644 Code/Python/solaredge/2024-11-22_15-01-01 diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-18/2024-11-25_12-33-49 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-18/2024-11-25_12-33-49 new file mode 100644 index 000000000..a22ddef09 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-18/2024-11-25_12-33-49 @@ -0,0 +1 @@ +{'temperature': 20.4, 'humidity': 67.5, 'co2': 2689} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/AM107-29/2024-11-25_12-33-47 b/Code/Java/src/main/resources/application/capteur/AM107/AM107-29/2024-11-25_12-33-47 new file mode 100644 index 000000000..8a66d26e0 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/AM107-29/2024-11-25_12-33-47 @@ -0,0 +1 @@ +{'temperature': 22.2, 'humidity': 55, 'co2': 1088} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/B113/2024-11-25_12-33-49 b/Code/Java/src/main/resources/application/capteur/AM107/B113/2024-11-25_12-33-49 new file mode 100644 index 000000000..a22ddef09 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/B113/2024-11-25_12-33-49 @@ -0,0 +1 @@ +{'temperature': 20.4, 'humidity': 67.5, 'co2': 2689} diff --git a/Code/Java/src/main/resources/application/capteur/AM107/E006/2024-11-25_12-33-47 b/Code/Java/src/main/resources/application/capteur/AM107/E006/2024-11-25_12-33-47 new file mode 100644 index 000000000..8a66d26e0 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/AM107/E006/2024-11-25_12-33-47 @@ -0,0 +1 @@ +{'temperature': 22.2, 'humidity': 55, 'co2': 1088} diff --git a/Code/Java/src/main/resources/application/capteur/solaredge/2024-11-25_12-33-35 b/Code/Java/src/main/resources/application/capteur/solaredge/2024-11-25_12-33-35 new file mode 100644 index 000000000..6673d1865 --- /dev/null +++ b/Code/Java/src/main/resources/application/capteur/solaredge/2024-11-25_12-33-35 @@ -0,0 +1 @@ +{'lastUpdateTime': '2024-11-25 12:24:34', 'lifeTimeData': {'energy': 3357308}, 'lastYearData': {'energy': 2876278}, 'lastMonthData': {'energy': 241406}, 'lastDayData': {'energy': 3631}, 'currentPower': {'power': 1753.0835}, 'measuredBy': 'INVERTER'} diff --git a/Code/Python/AM107/AM107-12/2024-11-22_14-58-32 b/Code/Python/AM107/AM107-12/2024-11-22_14-58-32 deleted file mode 100644 index 132254b6b..000000000 --- a/Code/Python/AM107/AM107-12/2024-11-22_14-58-32 +++ /dev/null @@ -1 +0,0 @@ -{22.1, 37.5, 2199} diff --git a/Code/Python/AM107/AM107-13/2024-11-22_14-52-48 b/Code/Python/AM107/AM107-13/2024-11-22_14-52-48 deleted file mode 100644 index f129602b2..000000000 --- a/Code/Python/AM107/AM107-13/2024-11-22_14-52-48 +++ /dev/null @@ -1 +0,0 @@ -{20, 47.5, 1678} diff --git a/Code/Python/AM107/AM107-14/2024-11-22_14-50-11 b/Code/Python/AM107/AM107-14/2024-11-22_14-50-11 deleted file mode 100644 index a9a5170f5..000000000 --- a/Code/Python/AM107/AM107-14/2024-11-22_14-50-11 +++ /dev/null @@ -1 +0,0 @@ -{19.4, 51.5, 1407} diff --git a/Code/Python/AM107/AM107-15/2024-11-22_14-46-39 b/Code/Python/AM107/AM107-15/2024-11-22_14-46-39 deleted file mode 100644 index 7d59b073f..000000000 --- a/Code/Python/AM107/AM107-15/2024-11-22_14-46-39 +++ /dev/null @@ -1 +0,0 @@ -{17.9, 50.5, 876} diff --git a/Code/Python/AM107/AM107-16/2024-11-22_14-51-50 b/Code/Python/AM107/AM107-16/2024-11-22_14-51-50 deleted file mode 100644 index 767181bbb..000000000 --- a/Code/Python/AM107/AM107-16/2024-11-22_14-51-50 +++ /dev/null @@ -1 +0,0 @@ -{20.2, 48, 866} diff --git a/Code/Python/AM107/AM107-17/2024-11-22_14-45-39 b/Code/Python/AM107/AM107-17/2024-11-22_14-45-39 deleted file mode 100644 index 5604875bd..000000000 --- a/Code/Python/AM107/AM107-17/2024-11-22_14-45-39 +++ /dev/null @@ -1 +0,0 @@ -{21.7, 52.5, 2070} diff --git a/Code/Python/AM107/AM107-18/2024-11-22_14-53-48 b/Code/Python/AM107/AM107-18/2024-11-22_14-53-48 deleted file mode 100644 index f850b08e0..000000000 --- a/Code/Python/AM107/AM107-18/2024-11-22_14-53-48 +++ /dev/null @@ -1 +0,0 @@ -{18.3, 56, 1406} diff --git a/Code/Python/AM107/AM107-2/2024-11-22_14-49-48 b/Code/Python/AM107/AM107-2/2024-11-22_14-49-48 deleted file mode 100644 index 0673cb3ec..000000000 --- a/Code/Python/AM107/AM107-2/2024-11-22_14-49-48 +++ /dev/null @@ -1 +0,0 @@ -{21.9, 48, 1252} diff --git a/Code/Python/AM107/AM107-20/2024-11-22_14-45-39 b/Code/Python/AM107/AM107-20/2024-11-22_14-45-39 deleted file mode 100644 index d6015dce9..000000000 --- a/Code/Python/AM107/AM107-20/2024-11-22_14-45-39 +++ /dev/null @@ -1 +0,0 @@ -{20.1, 47, 936} diff --git a/Code/Python/AM107/AM107-22/2024-11-22_14-53-17 b/Code/Python/AM107/AM107-22/2024-11-22_14-53-17 deleted file mode 100644 index 17aab3a59..000000000 --- a/Code/Python/AM107/AM107-22/2024-11-22_14-53-17 +++ /dev/null @@ -1 +0,0 @@ -{21.6, 41, 1097} diff --git a/Code/Python/AM107/AM107-23/2024-11-22_14-51-17 b/Code/Python/AM107/AM107-23/2024-11-22_14-51-17 deleted file mode 100644 index 4f03e4f03..000000000 --- a/Code/Python/AM107/AM107-23/2024-11-22_14-51-17 +++ /dev/null @@ -1 +0,0 @@ -{19.9, 51.5, 1424} diff --git a/Code/Python/AM107/AM107-24/2024-11-22_14-49-18 b/Code/Python/AM107/AM107-24/2024-11-22_14-49-18 deleted file mode 100644 index 9d997ad6e..000000000 --- a/Code/Python/AM107/AM107-24/2024-11-22_14-49-18 +++ /dev/null @@ -1 +0,0 @@ -{20.1, 48, 877} diff --git a/Code/Python/AM107/AM107-26/2024-11-22_14-44-50 b/Code/Python/AM107/AM107-26/2024-11-22_14-44-50 deleted file mode 100644 index df8acefbd..000000000 --- a/Code/Python/AM107/AM107-26/2024-11-22_14-44-50 +++ /dev/null @@ -1 +0,0 @@ -{21.6, 39.5, 889} diff --git a/Code/Python/AM107/AM107-27/2024-11-22_14-50-47 b/Code/Python/AM107/AM107-27/2024-11-22_14-50-47 deleted file mode 100644 index 88247ced9..000000000 --- a/Code/Python/AM107/AM107-27/2024-11-22_14-50-47 +++ /dev/null @@ -1 +0,0 @@ -{22.5, 43, 1228} diff --git a/Code/Python/AM107/AM107-28/2024-11-22_14-56-18 b/Code/Python/AM107/AM107-28/2024-11-22_14-56-18 deleted file mode 100644 index 6db052e17..000000000 --- a/Code/Python/AM107/AM107-28/2024-11-22_14-56-18 +++ /dev/null @@ -1 +0,0 @@ -{19.5, 39, 469} diff --git a/Code/Python/AM107/AM107-29/2024-11-22_14-53-48 b/Code/Python/AM107/AM107-29/2024-11-22_14-53-48 deleted file mode 100644 index aac9ad9d9..000000000 --- a/Code/Python/AM107/AM107-29/2024-11-22_14-53-48 +++ /dev/null @@ -1 +0,0 @@ -{21.1, 42, 1192} diff --git a/Code/Python/AM107/AM107-3/2024-11-22_14-53-08 b/Code/Python/AM107/AM107-3/2024-11-22_14-53-08 deleted file mode 100644 index b6f793ea4..000000000 --- a/Code/Python/AM107/AM107-3/2024-11-22_14-53-08 +++ /dev/null @@ -1 +0,0 @@ -{22.1, 47, 1361} diff --git a/Code/Python/AM107/AM107-30/2024-11-22_14-47-20 b/Code/Python/AM107/AM107-30/2024-11-22_14-47-20 deleted file mode 100644 index e2b1f8a38..000000000 --- a/Code/Python/AM107/AM107-30/2024-11-22_14-47-20 +++ /dev/null @@ -1 +0,0 @@ -{20.7, 39.5, 924} diff --git a/Code/Python/AM107/AM107-31/2024-11-22_14-48-47 b/Code/Python/AM107/AM107-31/2024-11-22_14-48-47 deleted file mode 100644 index 2384dff57..000000000 --- a/Code/Python/AM107/AM107-31/2024-11-22_14-48-47 +++ /dev/null @@ -1 +0,0 @@ -{19.1, 39, 518} diff --git a/Code/Python/AM107/AM107-31/2024-11-22_15-08-49 b/Code/Python/AM107/AM107-31/2024-11-22_15-08-49 deleted file mode 100644 index 355c34c1c..000000000 --- a/Code/Python/AM107/AM107-31/2024-11-22_15-08-49 +++ /dev/null @@ -1 +0,0 @@ -{19.7, 39, 564} diff --git a/Code/Python/AM107/AM107-32/2024-11-22_14-49-46 b/Code/Python/AM107/AM107-32/2024-11-22_14-49-46 deleted file mode 100644 index 4c5be42bd..000000000 --- a/Code/Python/AM107/AM107-32/2024-11-22_14-49-46 +++ /dev/null @@ -1 +0,0 @@ -{20.7, 40, 639} diff --git a/Code/Python/AM107/AM107-36/2024-11-22_14-50-47 b/Code/Python/AM107/AM107-36/2024-11-22_14-50-47 deleted file mode 100644 index 7d0088b74..000000000 --- a/Code/Python/AM107/AM107-36/2024-11-22_14-50-47 +++ /dev/null @@ -1 +0,0 @@ -{20.7, 42, 1047} diff --git a/Code/Python/AM107/AM107-37/2024-11-22_14-49-16 b/Code/Python/AM107/AM107-37/2024-11-22_14-49-16 deleted file mode 100644 index 35b97d731..000000000 --- a/Code/Python/AM107/AM107-37/2024-11-22_14-49-16 +++ /dev/null @@ -1 +0,0 @@ -{23.2, 33.5, 579} diff --git a/Code/Python/AM107/AM107-38/2024-11-22_14-47-48 b/Code/Python/AM107/AM107-38/2024-11-22_14-47-48 deleted file mode 100644 index 8ff1cad13..000000000 --- a/Code/Python/AM107/AM107-38/2024-11-22_14-47-48 +++ /dev/null @@ -1 +0,0 @@ -{19.8, 43.5, 1016} diff --git a/Code/Python/AM107/AM107-39/2024-11-22_14-54-12 b/Code/Python/AM107/AM107-39/2024-11-22_14-54-12 deleted file mode 100644 index fec64399c..000000000 --- a/Code/Python/AM107/AM107-39/2024-11-22_14-54-12 +++ /dev/null @@ -1 +0,0 @@ -{21.3, 39.5, 1108} diff --git a/Code/Python/AM107/AM107-4/2024-11-22_14-51-37 b/Code/Python/AM107/AM107-4/2024-11-22_14-51-37 deleted file mode 100644 index 34f03df62..000000000 --- a/Code/Python/AM107/AM107-4/2024-11-22_14-51-37 +++ /dev/null @@ -1 +0,0 @@ -{22.5, 47, 1924} diff --git a/Code/Python/AM107/AM107-41/2024-11-22_14-48-47 b/Code/Python/AM107/AM107-41/2024-11-22_14-48-47 deleted file mode 100644 index 90b953505..000000000 --- a/Code/Python/AM107/AM107-41/2024-11-22_14-48-47 +++ /dev/null @@ -1 +0,0 @@ -{20.3, 38, 547} diff --git a/Code/Python/AM107/AM107-41/2024-11-22_15-08-50 b/Code/Python/AM107/AM107-41/2024-11-22_15-08-50 deleted file mode 100644 index 444cfac1f..000000000 --- a/Code/Python/AM107/AM107-41/2024-11-22_15-08-50 +++ /dev/null @@ -1 +0,0 @@ -{20.3, 37.5, 538} diff --git a/Code/Python/AM107/AM107-42/2024-11-22_11-18-06 b/Code/Python/AM107/AM107-42/2024-11-22_11-18-06 deleted file mode 100644 index c9d38b8db..000000000 --- a/Code/Python/AM107/AM107-42/2024-11-22_11-18-06 +++ /dev/null @@ -1 +0,0 @@ -{19.7, 42, 441} diff --git a/Code/Python/AM107/AM107-42/2024-11-22_14-58-07 b/Code/Python/AM107/AM107-42/2024-11-22_14-58-07 deleted file mode 100644 index cbba95551..000000000 --- a/Code/Python/AM107/AM107-42/2024-11-22_14-58-07 +++ /dev/null @@ -1 +0,0 @@ -{21.2, 36.5, 456} diff --git a/Code/Python/AM107/AM107-43/2024-11-22_14-52-15 b/Code/Python/AM107/AM107-43/2024-11-22_14-52-15 deleted file mode 100644 index 62a4d20a9..000000000 --- a/Code/Python/AM107/AM107-43/2024-11-22_14-52-15 +++ /dev/null @@ -1 +0,0 @@ -{22.2, 39.5, 514} diff --git a/Code/Python/AM107/AM107-45/2024-11-22_14-51-21 b/Code/Python/AM107/AM107-45/2024-11-22_14-51-21 deleted file mode 100644 index 3302ac70d..000000000 --- a/Code/Python/AM107/AM107-45/2024-11-22_14-51-21 +++ /dev/null @@ -1 +0,0 @@ -{14.9, 49, 443} diff --git a/Code/Python/AM107/AM107-46/2024-11-22_14-51-19 b/Code/Python/AM107/AM107-46/2024-11-22_14-51-19 deleted file mode 100644 index e7a7dfaa2..000000000 --- a/Code/Python/AM107/AM107-46/2024-11-22_14-51-19 +++ /dev/null @@ -1 +0,0 @@ -{20.5, 49.5, 1292} diff --git a/Code/Python/AM107/AM107-47/2024-11-22_14-52-49 b/Code/Python/AM107/AM107-47/2024-11-22_14-52-49 deleted file mode 100644 index 6d6f123e8..000000000 --- a/Code/Python/AM107/AM107-47/2024-11-22_14-52-49 +++ /dev/null @@ -1 +0,0 @@ -{48.9, 45.5, 790} diff --git a/Code/Python/AM107/AM107-49/2024-11-22_14-49-49 b/Code/Python/AM107/AM107-49/2024-11-22_14-49-49 deleted file mode 100644 index fb7f1213b..000000000 --- a/Code/Python/AM107/AM107-49/2024-11-22_14-49-49 +++ /dev/null @@ -1 +0,0 @@ -{19.6, 41, 683} diff --git a/Code/Python/AM107/AM107-5/2024-11-22_14-51-08 b/Code/Python/AM107/AM107-5/2024-11-22_14-51-08 deleted file mode 100644 index 0f7dfae69..000000000 --- a/Code/Python/AM107/AM107-5/2024-11-22_14-51-08 +++ /dev/null @@ -1 +0,0 @@ -{20.2, 50.5, 1395} diff --git a/Code/Python/AM107/AM107-50/2024-11-22_14-49-19 b/Code/Python/AM107/AM107-50/2024-11-22_14-49-19 deleted file mode 100644 index 83a3d862e..000000000 --- a/Code/Python/AM107/AM107-50/2024-11-22_14-49-19 +++ /dev/null @@ -1 +0,0 @@ -{19.3, 42.5, 702} diff --git a/Code/Python/AM107/AM107-51/2024-11-22_14-47-49 b/Code/Python/AM107/AM107-51/2024-11-22_14-47-49 deleted file mode 100644 index 363697c1f..000000000 --- a/Code/Python/AM107/AM107-51/2024-11-22_14-47-49 +++ /dev/null @@ -1 +0,0 @@ -{21.2, 40.5, 440} diff --git a/Code/Python/AM107/AM107-53/2024-11-22_14-47-16 b/Code/Python/AM107/AM107-53/2024-11-22_14-47-16 deleted file mode 100644 index 07faf109d..000000000 --- a/Code/Python/AM107/AM107-53/2024-11-22_14-47-16 +++ /dev/null @@ -1 +0,0 @@ -{18.4, 47, 554} diff --git a/Code/Python/AM107/AM107-54/2024-11-22_14-45-48 b/Code/Python/AM107/AM107-54/2024-11-22_14-45-48 deleted file mode 100644 index e15af2950..000000000 --- a/Code/Python/AM107/AM107-54/2024-11-22_14-45-48 +++ /dev/null @@ -1 +0,0 @@ -{21.1, 41.5, 651} diff --git a/Code/Python/AM107/AM107-55/2024-11-22_14-51-49 b/Code/Python/AM107/AM107-55/2024-11-22_14-51-49 deleted file mode 100644 index d22e9949a..000000000 --- a/Code/Python/AM107/AM107-55/2024-11-22_14-51-49 +++ /dev/null @@ -1 +0,0 @@ -{22.3, 38, 576} diff --git a/Code/Python/AM107/AM107-6/2024-11-22_14-47-49 b/Code/Python/AM107/AM107-6/2024-11-22_14-47-49 deleted file mode 100644 index 14c54f563..000000000 --- a/Code/Python/AM107/AM107-6/2024-11-22_14-47-49 +++ /dev/null @@ -1 +0,0 @@ -{20.6, 49, 1315} diff --git a/Code/Python/AM107/AM107-7/2024-11-22_14-50-49 b/Code/Python/AM107/AM107-7/2024-11-22_14-50-49 deleted file mode 100644 index 737b181e7..000000000 --- a/Code/Python/AM107/AM107-7/2024-11-22_14-50-49 +++ /dev/null @@ -1 +0,0 @@ -{21.6, 43.5, 669} diff --git a/Code/Python/AM107/AM107-8/2024-11-22_14-52-08 b/Code/Python/AM107/AM107-8/2024-11-22_14-52-08 deleted file mode 100644 index 13801bba8..000000000 --- a/Code/Python/AM107/AM107-8/2024-11-22_14-52-08 +++ /dev/null @@ -1 +0,0 @@ -{18.2, 50, 2229} diff --git a/Code/Python/AM107/B001/2024-11-22_14-50-49 b/Code/Python/AM107/B001/2024-11-22_14-50-49 deleted file mode 100644 index 737b181e7..000000000 --- a/Code/Python/AM107/B001/2024-11-22_14-50-49 +++ /dev/null @@ -1 +0,0 @@ -{21.6, 43.5, 669} diff --git a/Code/Python/AM107/B002/2024-11-22_14-52-08 b/Code/Python/AM107/B002/2024-11-22_14-52-08 deleted file mode 100644 index 13801bba8..000000000 --- a/Code/Python/AM107/B002/2024-11-22_14-52-08 +++ /dev/null @@ -1 +0,0 @@ -{18.2, 50, 2229} diff --git a/Code/Python/AM107/B103/2024-11-22_14-58-32 b/Code/Python/AM107/B103/2024-11-22_14-58-32 deleted file mode 100644 index 132254b6b..000000000 --- a/Code/Python/AM107/B103/2024-11-22_14-58-32 +++ /dev/null @@ -1 +0,0 @@ -{22.1, 37.5, 2199} diff --git a/Code/Python/AM107/B105/2024-11-22_14-52-48 b/Code/Python/AM107/B105/2024-11-22_14-52-48 deleted file mode 100644 index f129602b2..000000000 --- a/Code/Python/AM107/B105/2024-11-22_14-52-48 +++ /dev/null @@ -1 +0,0 @@ -{20, 47.5, 1678} diff --git a/Code/Python/AM107/B106/2024-11-22_14-50-11 b/Code/Python/AM107/B106/2024-11-22_14-50-11 deleted file mode 100644 index a9a5170f5..000000000 --- a/Code/Python/AM107/B106/2024-11-22_14-50-11 +++ /dev/null @@ -1 +0,0 @@ -{19.4, 51.5, 1407} diff --git a/Code/Python/AM107/B108/2024-11-22_14-46-39 b/Code/Python/AM107/B108/2024-11-22_14-46-39 deleted file mode 100644 index 7d59b073f..000000000 --- a/Code/Python/AM107/B108/2024-11-22_14-46-39 +++ /dev/null @@ -1 +0,0 @@ -{17.9, 50.5, 876} diff --git a/Code/Python/AM107/B109/2024-11-22_14-51-50 b/Code/Python/AM107/B109/2024-11-22_14-51-50 deleted file mode 100644 index 767181bbb..000000000 --- a/Code/Python/AM107/B109/2024-11-22_14-51-50 +++ /dev/null @@ -1 +0,0 @@ -{20.2, 48, 866} diff --git a/Code/Python/AM107/B110/2024-11-22_14-49-48 b/Code/Python/AM107/B110/2024-11-22_14-49-48 deleted file mode 100644 index 0673cb3ec..000000000 --- a/Code/Python/AM107/B110/2024-11-22_14-49-48 +++ /dev/null @@ -1 +0,0 @@ -{21.9, 48, 1252} diff --git a/Code/Python/AM107/B111/2024-11-22_14-53-08 b/Code/Python/AM107/B111/2024-11-22_14-53-08 deleted file mode 100644 index b6f793ea4..000000000 --- a/Code/Python/AM107/B111/2024-11-22_14-53-08 +++ /dev/null @@ -1 +0,0 @@ -{22.1, 47, 1361} diff --git a/Code/Python/AM107/B112/2024-11-22_14-45-39 b/Code/Python/AM107/B112/2024-11-22_14-45-39 deleted file mode 100644 index 5604875bd..000000000 --- a/Code/Python/AM107/B112/2024-11-22_14-45-39 +++ /dev/null @@ -1 +0,0 @@ -{21.7, 52.5, 2070} diff --git a/Code/Python/AM107/B113/2024-11-22_14-53-48 b/Code/Python/AM107/B113/2024-11-22_14-53-48 deleted file mode 100644 index f850b08e0..000000000 --- a/Code/Python/AM107/B113/2024-11-22_14-53-48 +++ /dev/null @@ -1 +0,0 @@ -{18.3, 56, 1406} diff --git a/Code/Python/AM107/B201/2024-11-22_14-51-37 b/Code/Python/AM107/B201/2024-11-22_14-51-37 deleted file mode 100644 index 34f03df62..000000000 --- a/Code/Python/AM107/B201/2024-11-22_14-51-37 +++ /dev/null @@ -1 +0,0 @@ -{22.5, 47, 1924} diff --git a/Code/Python/AM107/B202/2024-11-22_14-51-08 b/Code/Python/AM107/B202/2024-11-22_14-51-08 deleted file mode 100644 index 0f7dfae69..000000000 --- a/Code/Python/AM107/B202/2024-11-22_14-51-08 +++ /dev/null @@ -1 +0,0 @@ -{20.2, 50.5, 1395} diff --git a/Code/Python/AM107/B203/2024-11-22_14-47-49 b/Code/Python/AM107/B203/2024-11-22_14-47-49 deleted file mode 100644 index 14c54f563..000000000 --- a/Code/Python/AM107/B203/2024-11-22_14-47-49 +++ /dev/null @@ -1 +0,0 @@ -{20.6, 49, 1315} diff --git a/Code/Python/AM107/B217/2024-11-22_14-45-39 b/Code/Python/AM107/B217/2024-11-22_14-45-39 deleted file mode 100644 index d6015dce9..000000000 --- a/Code/Python/AM107/B217/2024-11-22_14-45-39 +++ /dev/null @@ -1 +0,0 @@ -{20.1, 47, 936} diff --git a/Code/Python/AM107/B234/2024-11-22_14-53-17 b/Code/Python/AM107/B234/2024-11-22_14-53-17 deleted file mode 100644 index 17aab3a59..000000000 --- a/Code/Python/AM107/B234/2024-11-22_14-53-17 +++ /dev/null @@ -1 +0,0 @@ -{21.6, 41, 1097} diff --git a/Code/Python/AM107/C001/2024-11-22_14-51-49 b/Code/Python/AM107/C001/2024-11-22_14-51-49 deleted file mode 100644 index d22e9949a..000000000 --- a/Code/Python/AM107/C001/2024-11-22_14-51-49 +++ /dev/null @@ -1 +0,0 @@ -{22.3, 38, 576} diff --git a/Code/Python/AM107/C002/2024-11-22_14-45-48 b/Code/Python/AM107/C002/2024-11-22_14-45-48 deleted file mode 100644 index e15af2950..000000000 --- a/Code/Python/AM107/C002/2024-11-22_14-45-48 +++ /dev/null @@ -1 +0,0 @@ -{21.1, 41.5, 651} diff --git a/Code/Python/AM107/C004/2024-11-22_14-51-17 b/Code/Python/AM107/C004/2024-11-22_14-51-17 deleted file mode 100644 index 4f03e4f03..000000000 --- a/Code/Python/AM107/C004/2024-11-22_14-51-17 +++ /dev/null @@ -1 +0,0 @@ -{19.9, 51.5, 1424} diff --git a/Code/Python/AM107/C006/2024-11-22_14-49-18 b/Code/Python/AM107/C006/2024-11-22_14-49-18 deleted file mode 100644 index 9d997ad6e..000000000 --- a/Code/Python/AM107/C006/2024-11-22_14-49-18 +++ /dev/null @@ -1 +0,0 @@ -{20.1, 48, 877} diff --git a/Code/Python/AM107/C102/2024-11-22_14-47-16 b/Code/Python/AM107/C102/2024-11-22_14-47-16 deleted file mode 100644 index 07faf109d..000000000 --- a/Code/Python/AM107/C102/2024-11-22_14-47-16 +++ /dev/null @@ -1 +0,0 @@ -{18.4, 47, 554} diff --git a/Code/Python/AM107/E001/2024-11-22_14-56-18 b/Code/Python/AM107/E001/2024-11-22_14-56-18 deleted file mode 100644 index 6db052e17..000000000 --- a/Code/Python/AM107/E001/2024-11-22_14-56-18 +++ /dev/null @@ -1 +0,0 @@ -{19.5, 39, 469} diff --git a/Code/Python/AM107/E003/2024-11-22_14-44-50 b/Code/Python/AM107/E003/2024-11-22_14-44-50 deleted file mode 100644 index df8acefbd..000000000 --- a/Code/Python/AM107/E003/2024-11-22_14-44-50 +++ /dev/null @@ -1 +0,0 @@ -{21.6, 39.5, 889} diff --git a/Code/Python/AM107/E004/2024-11-22_14-50-47 b/Code/Python/AM107/E004/2024-11-22_14-50-47 deleted file mode 100644 index 88247ced9..000000000 --- a/Code/Python/AM107/E004/2024-11-22_14-50-47 +++ /dev/null @@ -1 +0,0 @@ -{22.5, 43, 1228} diff --git a/Code/Python/AM107/E006/2024-11-22_14-53-48 b/Code/Python/AM107/E006/2024-11-22_14-53-48 deleted file mode 100644 index aac9ad9d9..000000000 --- a/Code/Python/AM107/E006/2024-11-22_14-53-48 +++ /dev/null @@ -1 +0,0 @@ -{21.1, 42, 1192} diff --git a/Code/Python/AM107/E007/2024-11-22_14-47-20 b/Code/Python/AM107/E007/2024-11-22_14-47-20 deleted file mode 100644 index e2b1f8a38..000000000 --- a/Code/Python/AM107/E007/2024-11-22_14-47-20 +++ /dev/null @@ -1 +0,0 @@ -{20.7, 39.5, 924} diff --git a/Code/Python/AM107/E100/2024-11-22_14-49-16 b/Code/Python/AM107/E100/2024-11-22_14-49-16 deleted file mode 100644 index 35b97d731..000000000 --- a/Code/Python/AM107/E100/2024-11-22_14-49-16 +++ /dev/null @@ -1 +0,0 @@ -{23.2, 33.5, 579} diff --git a/Code/Python/AM107/E101/2024-11-22_14-48-47 b/Code/Python/AM107/E101/2024-11-22_14-48-47 deleted file mode 100644 index 2384dff57..000000000 --- a/Code/Python/AM107/E101/2024-11-22_14-48-47 +++ /dev/null @@ -1 +0,0 @@ -{19.1, 39, 518} diff --git a/Code/Python/AM107/E101/2024-11-22_15-08-49 b/Code/Python/AM107/E101/2024-11-22_15-08-49 deleted file mode 100644 index 355c34c1c..000000000 --- a/Code/Python/AM107/E101/2024-11-22_15-08-49 +++ /dev/null @@ -1 +0,0 @@ -{19.7, 39, 564} diff --git a/Code/Python/AM107/E102/2024-11-22_14-49-46 b/Code/Python/AM107/E102/2024-11-22_14-49-46 deleted file mode 100644 index 4c5be42bd..000000000 --- a/Code/Python/AM107/E102/2024-11-22_14-49-46 +++ /dev/null @@ -1 +0,0 @@ -{20.7, 40, 639} diff --git a/Code/Python/AM107/E106/2024-11-22_14-50-47 b/Code/Python/AM107/E106/2024-11-22_14-50-47 deleted file mode 100644 index 7d0088b74..000000000 --- a/Code/Python/AM107/E106/2024-11-22_14-50-47 +++ /dev/null @@ -1 +0,0 @@ -{20.7, 42, 1047} diff --git a/Code/Python/AM107/E207/2024-11-22_14-48-47 b/Code/Python/AM107/E207/2024-11-22_14-48-47 deleted file mode 100644 index 90b953505..000000000 --- a/Code/Python/AM107/E207/2024-11-22_14-48-47 +++ /dev/null @@ -1 +0,0 @@ -{20.3, 38, 547} diff --git a/Code/Python/AM107/E207/2024-11-22_15-08-50 b/Code/Python/AM107/E207/2024-11-22_15-08-50 deleted file mode 100644 index 444cfac1f..000000000 --- a/Code/Python/AM107/E207/2024-11-22_15-08-50 +++ /dev/null @@ -1 +0,0 @@ -{20.3, 37.5, 538} diff --git a/Code/Python/AM107/E208/2024-11-22_14-47-48 b/Code/Python/AM107/E208/2024-11-22_14-47-48 deleted file mode 100644 index 8ff1cad13..000000000 --- a/Code/Python/AM107/E208/2024-11-22_14-47-48 +++ /dev/null @@ -1 +0,0 @@ -{19.8, 43.5, 1016} diff --git a/Code/Python/AM107/E209/2024-11-22_14-54-12 b/Code/Python/AM107/E209/2024-11-22_14-54-12 deleted file mode 100644 index fec64399c..000000000 --- a/Code/Python/AM107/E209/2024-11-22_14-54-12 +++ /dev/null @@ -1 +0,0 @@ -{21.3, 39.5, 1108} diff --git a/Code/Python/AM107/E210/2024-11-22_11-18-06 b/Code/Python/AM107/E210/2024-11-22_11-18-06 deleted file mode 100644 index c9d38b8db..000000000 --- a/Code/Python/AM107/E210/2024-11-22_11-18-06 +++ /dev/null @@ -1 +0,0 @@ -{19.7, 42, 441} diff --git a/Code/Python/AM107/E210/2024-11-22_14-58-07 b/Code/Python/AM107/E210/2024-11-22_14-58-07 deleted file mode 100644 index cbba95551..000000000 --- a/Code/Python/AM107/E210/2024-11-22_14-58-07 +++ /dev/null @@ -1 +0,0 @@ -{21.2, 36.5, 456} diff --git "a/Code/Python/AM107/Foyer-etudiants-entr\303\251e/2024-11-22_14-52-49" "b/Code/Python/AM107/Foyer-etudiants-entr\303\251e/2024-11-22_14-52-49" deleted file mode 100644 index 6d6f123e8..000000000 --- "a/Code/Python/AM107/Foyer-etudiants-entr\303\251e/2024-11-22_14-52-49" +++ /dev/null @@ -1 +0,0 @@ -{48.9, 45.5, 790} diff --git a/Code/Python/AM107/Foyer-personnels/2024-11-22_14-51-19 b/Code/Python/AM107/Foyer-personnels/2024-11-22_14-51-19 deleted file mode 100644 index e7a7dfaa2..000000000 --- a/Code/Python/AM107/Foyer-personnels/2024-11-22_14-51-19 +++ /dev/null @@ -1 +0,0 @@ -{20.5, 49.5, 1292} diff --git a/Code/Python/AM107/Local-velo/2024-11-22_14-51-21 b/Code/Python/AM107/Local-velo/2024-11-22_14-51-21 deleted file mode 100644 index 3302ac70d..000000000 --- a/Code/Python/AM107/Local-velo/2024-11-22_14-51-21 +++ /dev/null @@ -1 +0,0 @@ -{14.9, 49, 443} diff --git a/Code/Python/AM107/Salle-conseil/2024-11-22_14-52-15 b/Code/Python/AM107/Salle-conseil/2024-11-22_14-52-15 deleted file mode 100644 index 62a4d20a9..000000000 --- a/Code/Python/AM107/Salle-conseil/2024-11-22_14-52-15 +++ /dev/null @@ -1 +0,0 @@ -{22.2, 39.5, 514} diff --git a/Code/Python/AM107/amphi1/2024-11-22_14-47-49 b/Code/Python/AM107/amphi1/2024-11-22_14-47-49 deleted file mode 100644 index 363697c1f..000000000 --- a/Code/Python/AM107/amphi1/2024-11-22_14-47-49 +++ /dev/null @@ -1 +0,0 @@ -{21.2, 40.5, 440} diff --git a/Code/Python/AM107/hall-amphi/2024-11-22_14-49-19 b/Code/Python/AM107/hall-amphi/2024-11-22_14-49-19 deleted file mode 100644 index 83a3d862e..000000000 --- a/Code/Python/AM107/hall-amphi/2024-11-22_14-49-19 +++ /dev/null @@ -1 +0,0 @@ -{19.3, 42.5, 702} diff --git "a/Code/Python/AM107/hall-entr\303\251e-principale/2024-11-22_14-49-49" "b/Code/Python/AM107/hall-entr\303\251e-principale/2024-11-22_14-49-49" deleted file mode 100644 index fb7f1213b..000000000 --- "a/Code/Python/AM107/hall-entr\303\251e-principale/2024-11-22_14-49-49" +++ /dev/null @@ -1 +0,0 @@ -{19.6, 41, 683} diff --git a/Code/Python/clientMQTT.py b/Code/Python/clientMQTT.py index 7f6c252f8..233e22f62 100644 --- a/Code/Python/clientMQTT.py +++ b/Code/Python/clientMQTT.py @@ -16,6 +16,7 @@ AM107_ROOMS = config["MQTT"]["AM107_rooms"].split(", ") AM107_INFO_TYPES = config["MQTT"]["AM107_info_types"].split(", ") SOLAREDGE_INFO_TYPES = config["MQTT"]["solaredge_info_types"].split(", ") +BASE_PATH = config["MQTT"]["base_path"] SEUIL_ALERT = config["MQTT"]["seuil_alert"].split(", ") PERIOD = int(config["MQTT"]["period"]) @@ -41,8 +42,8 @@ def on_message(client, userdata, msg): data = payload if flux_mqtt == "solaredge": - if exists(flux_mqtt): - repertoire = Path("./solaredge/") + if exists(BASE_PATH+flux_mqtt): + repertoire = Path(BASE_PATH+"solaredge/") liste_fichiers = [f for f in repertoire.iterdir() if f.is_file()] liste_fichiers_tries = sorted(liste_fichiers, key=lambda f: f.stat().st_mtime) dernier_fichier = liste_fichiers_tries[-1] if liste_fichiers_tries else None @@ -57,7 +58,7 @@ def on_message(client, userdata, msg): i=0 for info in SOLAREDGE_INFO_TYPES: donnees = data[info] - message = message + f"{donnees}" + message = message + f"'{info}': {donnees}" i=i+1 if(i<=nb_info-1): message = message + ", " @@ -68,8 +69,8 @@ def on_message(client, userdata, msg): if flux_mqtt == "AM107": salle = parties[2] if len(parties) > 2 else "inconnue" if salle in AM107_ROOMS or AM107_ROOMS[0] == "all": - if exists(flux_mqtt+"/"+salle): - chemin="./"+flux_mqtt+"/"+salle+"/" + if exists(BASE_PATH+flux_mqtt+"/"+salle): + chemin=BASE_PATH+flux_mqtt+"/"+salle+"/" repertoire = Path(chemin) liste_fichiers = [f for f in repertoire.iterdir() if f.is_file()] liste_fichiers_tries = sorted(liste_fichiers, key=lambda f: f.stat().st_mtime) @@ -88,7 +89,7 @@ def on_message(client, userdata, msg): seuil_alert = SEUIL_ALERT[i] if(donnees>=int(seuil_alert)): print("ALERTE (Seuil "+info+" dépassé : "+seuil_alert+") en "+salle+" : "+f"{donnees}") - message = message + f"{donnees}" + message = message + f"'{info}': {donnees}" i=i+1 if(i<=nb_info-1): message = message + ", " @@ -100,16 +101,16 @@ def enregistrer_donnees(data,topic): date=datetime.now().strftime("%Y-%m-%d_%H-%M-%S") parties = topic.split("/") flux_mqtt = parties[0] - if not exists(flux_mqtt): - os.mkdir(flux_mqtt) + if not exists(BASE_PATH+flux_mqtt): + os.makedirs(BASE_PATH+flux_mqtt) if flux_mqtt == "solaredge": - with open(flux_mqtt+"/"+date, "a") as f: + with open(BASE_PATH+flux_mqtt+"/"+date, "a") as f: f.write(data + "\n") else: salle=parties[2] - if not exists(flux_mqtt+"/"+salle): - os.mkdir(flux_mqtt+"/"+salle) - with open(flux_mqtt+"/"+salle+"/"+date, "a") as f: + if not exists(BASE_PATH+flux_mqtt+"/"+salle): + os.mkdir(BASE_PATH+flux_mqtt+"/"+salle) + with open(BASE_PATH+flux_mqtt+"/"+salle+"/"+date, "a") as f: f.write(data + "\n") def gestion_periode(date_sans_seuil): diff --git a/Code/Python/config.ini b/Code/Python/config.ini index 92ea5baba..19704828d 100644 --- a/Code/Python/config.ini +++ b/Code/Python/config.ini @@ -5,5 +5,6 @@ topics = AM107, solaredge AM107_rooms = all AM107_info_types = temperature, humidity, co2 solaredge_info_types = all +base_path = ../Java/src/main/resources/application/capteur/ seuil_alert = 30, 60, 1000 period = 15 diff --git a/Code/Python/solaredge/2024-11-22_11-18-03 b/Code/Python/solaredge/2024-11-22_11-18-03 deleted file mode 100644 index 363d08b7d..000000000 --- a/Code/Python/solaredge/2024-11-22_11-18-03 +++ /dev/null @@ -1 +0,0 @@ -{'lastUpdateTime': '2024-11-22 11:04:33', 'lifeTimeData': {'energy': 3320702}, 'lastYearData': {'energy': 2839672}, 'lastMonthData': {'energy': 204800}, 'lastDayData': {'energy': 1093}, 'currentPower': {'power': 746.456}, 'measuredBy': 'INVERTER'} diff --git a/Code/Python/solaredge/2024-11-22_14-44-29 b/Code/Python/solaredge/2024-11-22_14-44-29 deleted file mode 100644 index 53e968ab1..000000000 --- a/Code/Python/solaredge/2024-11-22_14-44-29 +++ /dev/null @@ -1 +0,0 @@ -{'lastUpdateTime': '2024-11-22 14:29:33', 'lifeTimeData': {'energy': 3327160}, 'lastYearData': {'energy': 2846130}, 'lastMonthData': {'energy': 211258}, 'lastDayData': {'energy': 7551}, 'currentPower': {'power': 2719.1514}, 'measuredBy': 'INVERTER'} diff --git a/Code/Python/solaredge/2024-11-22_15-01-01 b/Code/Python/solaredge/2024-11-22_15-01-01 deleted file mode 100644 index 4b62e7ac7..000000000 --- a/Code/Python/solaredge/2024-11-22_15-01-01 +++ /dev/null @@ -1 +0,0 @@ -{'lastUpdateTime': '2024-11-22 15:00:28', 'lifeTimeData': {'energy': 3328063}, 'lastYearData': {'energy': 2847033}, 'lastMonthData': {'energy': 212161}, 'lastDayData': {'energy': 8454}, 'currentPower': {'power': 2567.5698}, 'measuredBy': 'INVERTER'}