diff --git a/pom.xml b/pom.xml index 07eece2..e96e450 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,11 @@ AidePersonnesApp 1.0-SNAPSHOT + + UTF-8 + UTF-8 + + @@ -30,6 +35,7 @@ mysql-connector-java 8.0.28 + diff --git a/src/main/java/controller/LoginPage.java b/src/main/java/controller/LoginPage.java index b7010e3..93bfcd2 100644 --- a/src/main/java/controller/LoginPage.java +++ b/src/main/java/controller/LoginPage.java @@ -5,6 +5,7 @@ import database.DatabaseConnection; import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.nio.charset.Charset; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -106,6 +107,8 @@ public class LoginPage extends JFrame { } public static void main(String[] args) { + System.out.println("encodage par défaut: " + Charset.defaultCharset().displayName()); + LoginPage loginPage = new LoginPage(); loginPage.setVisible(true); } diff --git a/src/main/java/controller/SoumettreDemande.java b/src/main/java/controller/SoumettreDemande.java index 97275c2..01e2cc3 100644 --- a/src/main/java/controller/SoumettreDemande.java +++ b/src/main/java/controller/SoumettreDemande.java @@ -260,7 +260,7 @@ public class SoumettreDemande extends JFrame { if (resultSet.next()) { String currentStatus = resultSet.getString("statut"); - if ("finalisée".equals(currentStatus)) { + if ("finaliseé".equals(currentStatus)) { String avis = JOptionPane.showInputDialog(this, "Veuillez entrer votre avis (500 caractères max):", "Modification de l'avis", JOptionPane.PLAIN_MESSAGE); if (!avis.isEmpty()) { diff --git a/src/main/java/controller/Validateur.java b/src/main/java/controller/Validateur.java index 61fdc9d..d241af3 100644 --- a/src/main/java/controller/Validateur.java +++ b/src/main/java/controller/Validateur.java @@ -155,4 +155,5 @@ public class Validateur extends JFrame { JOptionPane.showMessageDialog(this, "Le motif de rejet ne peut pas être vide."); } } + } diff --git a/src/main/java/database/DatabaseConnection.java b/src/main/java/database/DatabaseConnection.java index 7f938a4..c2475d6 100644 --- a/src/main/java/database/DatabaseConnection.java +++ b/src/main/java/database/DatabaseConnection.java @@ -7,7 +7,7 @@ import java.sql.SQLException; public class DatabaseConnection { static final String URL = System.getenv("DB_URL") != null ? - System.getenv("DB_URL") : "jdbc:mysql://srv-bdens.insa-toulouse.fr:3306/projet_gei_023"; + System.getenv("DB_URL") : "jdbc:mysql://srv-bdens.insa-toulouse.fr:3306/projet_gei_023?useUnicode=true&characterEncoding=UTF-8"; private static final String USER = System.getenv("DB_USER") != null ? System.getenv("DB_USER") : "projet_gei_023"; private static final String PASSWORD = System.getenv("DB_PASSWORD") != null ?