From 5ca48d7f192d75071cc15c5d8ce81f90e22f300d Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Wed, 6 May 2020 12:19:24 +0200
Subject: [PATCH 1/4] musique fonctionnel dans le menu pause

---
 src/ihm/controller/PauseController.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/ihm/controller/PauseController.java b/src/ihm/controller/PauseController.java
index d2b2278..80ead1f 100644
--- a/src/ihm/controller/PauseController.java
+++ b/src/ihm/controller/PauseController.java
@@ -28,7 +28,7 @@ public class PauseController implements Initializable {
 	private CheckBox cbEffet;
 
 	String filepathMusique = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav";
-	InputStream fileMusique = getClass().getResourceAsStream("src//ihm//ressources//musique//The_Red_Fox_Tavern.wav");
+	InputStream fileMusique = getClass().getResourceAsStream("/ihm/ressources/musique/The_Red_Fox_Tavern.wav");
 
 	boolean MusiqueLancee = ParametreController.cbMusiqueCoche;
 	boolean SonLance = ParametreController.cbSonCoche;
@@ -53,24 +53,21 @@ public class PauseController implements Initializable {
 		// Pour la musique
 
 		if (fileMusique != null) {
-			System.out.println("point d'arret 1");
 			if (cbMusique.isSelected()) {
 				System.out.println("\tLancement de la musique");
 				
 				if (Musique.clipTimePosition == 0 && MusiqueLancee == false) { // si la musique n'a jamais été lancé
 					Musique.playMusique(fileMusique);
 					MusiqueLancee = true;
-					System.out.println("point d'arret 2");
 				} else
-					Musique.resumeMusique(Musique.clip); // si elle a deja été lancé mais mis en pause, reprend a partir du point d'arret
-					System.out.println("point d'arret 3");										
+					Musique.resumeMusique(Musique.clip); // si elle a deja été lancé mais mis en pause, reprend a partir du point d'arret									
 			} else {
 				Musique.pauseMusique(Musique.clip); // met en pause la musique
 				System.out.println("\tMise en pause de la musique");
 			}
 		}
 		else {
-			System.out.println("ON A UN PROBLEME, AUCUN POINT D'ARRET N'EST PASSE");
+			System.out.println("fichier audio non trouvé");
 		}
 
 		// Pour les effets sonores

From 173b9d6de00b83ebc3c7c3de8250f030a028555e Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Wed, 6 May 2020 12:47:56 +0200
Subject: [PATCH 2/4] ajout d'un bouton parametre dans le menu

---
 src/domaine/properties/langue_fr.properties |  2 +-
 src/ihm/controller/MenuController.java      | 17 +++++++++++++++++
 src/ihm/ressources/Menu.fxml                | 14 +++++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/domaine/properties/langue_fr.properties b/src/domaine/properties/langue_fr.properties
index 4b8faf2..56790ca 100644
--- a/src/domaine/properties/langue_fr.properties
+++ b/src/domaine/properties/langue_fr.properties
@@ -67,5 +67,5 @@ se.soigner=Se soigner
 mode.claire=Mode clair
 musique=Musique
 langue=Langue
-parametre=Paramétre
+parametre=Paramètre
 enregistrer=Enregistrer
\ No newline at end of file
diff --git a/src/ihm/controller/MenuController.java b/src/ihm/controller/MenuController.java
index 5db3678..4dc6e02 100644
--- a/src/ihm/controller/MenuController.java
+++ b/src/ihm/controller/MenuController.java
@@ -16,6 +16,7 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
 public class MenuController  implements Initializable{
@@ -48,6 +49,22 @@ public class MenuController  implements Initializable{
         appStage.show();
         
        
+    }
+	
+	@FXML
+	public void ouvrirParametres(MouseEvent mouseEvent) throws IOException{
+    	InputStream fileSound1 =  getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");		
+		EffetSonore.playSoundEffect(fileSound1);
+			
+		System.out.println("Passage à l'écran des paramètres");		
+		final URL fxmlURL = getClass().getResource("/ihm/ressources/parametre.fxml");
+		final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
+		final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
+		Pane pane = fxmlLoader.load();
+
+        rootPane.getChildren().setAll(pane);
+        
+       
     }
     
     public void afficherRegle(MouseEvent mouseEvent) {
diff --git a/src/ihm/ressources/Menu.fxml b/src/ihm/ressources/Menu.fxml
index 857a225..c60402b 100644
--- a/src/ihm/ressources/Menu.fxml
+++ b/src/ihm/ressources/Menu.fxml
@@ -9,11 +9,11 @@
 
 <AnchorPane fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="background" stylesheets="@style/plateau.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.MenuController">
    <children>
-      <VBox alignment="CENTER" prefHeight="802.0" prefWidth="1290.0">
+      <VBox alignment="CENTER" layoutX="-3.0" layoutY="-7.0" prefHeight="802.0" prefWidth="1290.0">
          <children>
             <ImageView fx:id="titre" fitHeight="190.0" fitWidth="528.0" pickOnBounds="true" preserveRatio="true">
                <VBox.margin>
-                  <Insets top="-250.0" />
+                  <Insets top="-200.0" />
                </VBox.margin>
             </ImageView>
             <Button mnemonicParsing="false" onMouseClicked="#commencerPartie" prefHeight="51.0" prefWidth="102.0" styleClass="bouton" text="%jouer">
@@ -21,7 +21,15 @@
                   <Font size="24.0" />
                </font>
                <VBox.margin>
-                  <Insets top="150.0" />
+                  <Insets top="100.0" />
+               </VBox.margin>
+            </Button>
+            <Button layoutX="602.0" layoutY="480.0" mnemonicParsing="false" onMouseClicked="#ouvrirParametres" prefHeight="59.0" prefWidth="164.0" styleClass="bouton" text="Paramètres">
+               <font>
+                  <Font size="24.0" />
+               </font>
+               <VBox.margin>
+                  <Insets top="50.0" />
                </VBox.margin>
             </Button>
             <Button mnemonicParsing="false" onMouseClicked="#afficherRegle" prefHeight="59.0" prefWidth="106.0" styleClass="bouton" text="%regles">

From ff73b605a6ca5595c303f3ca0ae0649e691e7633 Mon Sep 17 00:00:00 2001
From: JunkJumper <jose.srifi@gmail.com>
Date: Wed, 6 May 2020 13:21:16 +0200
Subject: [PATCH 3/4] querry readAllBytes OK #4

---
 src/database/QueryGenerator.java | 77 ++++++++++++++++++++++++++++----
 1 file changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/database/QueryGenerator.java b/src/database/QueryGenerator.java
index d91faae..fb773be 100644
--- a/src/database/QueryGenerator.java
+++ b/src/database/QueryGenerator.java
@@ -1,21 +1,35 @@
 package database;
 
-public class QueryGenerator {
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectOutputStream;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 
-	public static String AllFrom(String table) {
-		return "SELECT * FROM " + getTable(table);
+public class QueryGenerator {
+	
+	private final static String url = "jdbc:postgresql://localhost:5432/ShadowHunterDatabase";
+    private final static String user = "shManager";
+    private final static String password = "shadowhunter1234";
+
+	public static String AllFrom(String tableName) {
+		return "SELECT * FROM " + getTable(tableName);
 	}
 	
-	public static String WithId(String table, int d) {
-		return "SELECT * FROM " + getTable(table) + "WHERE id =" + d;
+	public static String WithId(String tableName, int d) {
+		return "SELECT * FROM " + getTable(tableName) + "WHERE id =" + d;
 	}
 	
-	public static String WithName(String table, String name) {
-		return "SELECT * FROM " + getTable(table) + "WHERE nom ='" + name + "'";
+	public static String WithName(String tableName, String name) {
+		return "SELECT * FROM " + getTable(tableName) + "WHERE nom ='" + name + "'";
 	}
 	
-	public static String getTable(String s) {
-		return "public." + '"' + s + '"';
+	public static String getTable(String tableName) {
+		return "public." + '"' + tableName + '"';
 	}
 	
 	public static String getIdWithNameFrom(String table, String name) {
@@ -26,5 +40,50 @@ public class QueryGenerator {
 		return "SELECT name FROM " + getTable(table) + "WHERE id =" + d;
 	}
 	
+	public static String selectObjectWithId(int id, String tableName) {
+		return "SELECT objet FROM" + getTable(tableName) + " WHERE id =" + id;
+	}
+	
+	 public static Connection connect() throws SQLException {
+	        return DriverManager.getConnection(url, user, password);
+	   }
+	
+	public static String queryInsertObject(int id, Object o) throws IOException, SQLException {
+		
+		String table = null;
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		ObjectOutputStream oos;
+		
+		oos = new ObjectOutputStream(baos);
+		oos.writeObject(o);
+		oos.close();
+			
+		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+
+		byte[] object = bais.readAllBytes();
+		InputStream objectIS = new ByteArrayInputStream(object);
+				
+		if(id <= 16) {
+			table = getTable("CartesLumiere");
+		} else if(id <= 32) {
+			table = getTable("CartesTenebre");
+		} else if(id <= 47) {
+			table = getTable("CartesVision");
+		} else if(id <= 57) {
+			table = getTable("CartesPersonnage");
+		} else if(id <= 61) {
+			table = getTable("CartesDos");
+		}
+		
+		String query = null;
+		query = "UPDATE" + table + " SET objet = ";
+		
+		Connection conn = connect();
+		PreparedStatement pst = conn.prepareStatement(query);
+		pst.setBinaryStream(1, objectIS);
+		pst.executeUpdate();
+		
+		return query;
+	}
 	
 }

From 975cedb6907185b7f9183b06e06ccfcc0304a55b Mon Sep 17 00:00:00 2001
From: JunkJumper <jose.srifi@gmail.com>
Date: Wed, 6 May 2020 13:24:50 +0200
Subject: [PATCH 4/4] querry readAllBytes OK #4

---
 src/database/QueryGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/database/QueryGenerator.java b/src/database/QueryGenerator.java
index fb773be..2aade4e 100644
--- a/src/database/QueryGenerator.java
+++ b/src/database/QueryGenerator.java
@@ -80,7 +80,7 @@ public class QueryGenerator {
 		
 		Connection conn = connect();
 		PreparedStatement pst = conn.prepareStatement(query);
-		pst.setBinaryStream(1, objectIS);
+		pst.setBinaryStream(4, objectIS);
 		pst.executeUpdate();
 		
 		return query;