From 546a6a871716f11125df39d2cc34f6dda066f508 Mon Sep 17 00:00:00 2001 From: "emile.malcuit" Date: Thu, 13 Mar 2025 14:38:35 +0100 Subject: [PATCH 1/3] =?UTF-8?q?observation=20=C3=A0=20finir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/acces_aux_donnes/observationSQL.java | 19 ++++ .../src/presentation/jffInfoMedoc.form | 86 +++++++++++++++---- .../src/presentation/jffInfoMedoc.java | 79 ++++++++++++++--- 3 files changed, 154 insertions(+), 30 deletions(-) diff --git a/GSBapplication/src/acces_aux_donnes/observationSQL.java b/GSBapplication/src/acces_aux_donnes/observationSQL.java index 2789b3b..0a7e025 100644 --- a/GSBapplication/src/acces_aux_donnes/observationSQL.java +++ b/GSBapplication/src/acces_aux_donnes/observationSQL.java @@ -4,10 +4,12 @@ */ package acces_aux_donnes; +import java.lang.reflect.Array; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.ArrayList; /** * @@ -60,4 +62,21 @@ public class observationSQL { } return passer; } + + public ArrayList selectionObservation(String idMedoc){ + ArrayList observationMedoc = new ArrayList(); + try { + stmt = connexionTest.createStatement(); + // Accès à la table + result = stmt.executeQuery("SELECT observation FROM OBSERVATION WHERE idMedoc ='" + idMedoc +"';"); + while (result.next()){ + observationMedoc.add(result.getString(1)); + } + }catch(SQLException ex) { + System.out.println("SQLException : " + ex.getMessage()); + System.out.println("SQLState : " + ex.getSQLState()); + System.out.println("Code erreur : " + ex.getErrorCode()); + } + return observationMedoc; + } } diff --git a/GSBapplication/src/presentation/jffInfoMedoc.form b/GSBapplication/src/presentation/jffInfoMedoc.form index 6abf3b6..2cb1978 100644 --- a/GSBapplication/src/presentation/jffInfoMedoc.form +++ b/GSBapplication/src/presentation/jffInfoMedoc.form @@ -33,8 +33,9 @@ + - + @@ -48,7 +49,7 @@ - + @@ -85,6 +86,11 @@ + + + + + @@ -92,31 +98,27 @@ - + - + - + - + - + - - - - - + - - - - + + + + @@ -142,6 +144,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GSBapplication/src/presentation/jffInfoMedoc.java b/GSBapplication/src/presentation/jffInfoMedoc.java index 1196659..ef89bea 100644 --- a/GSBapplication/src/presentation/jffInfoMedoc.java +++ b/GSBapplication/src/presentation/jffInfoMedoc.java @@ -5,9 +5,10 @@ package presentation; import Metier.Medicament; +import acces_aux_donnes.observationSQL; import java.awt.Image; import java.awt.image.BufferedImage; -import javax.swing.Icon; +import java.util.ArrayList; import javax.swing.ImageIcon; /** @@ -15,7 +16,9 @@ import javax.swing.ImageIcon; * @author emile.lalorcey */ public class jffInfoMedoc extends javax.swing.JFrame { - + private ArrayList observation = new ArrayList(); + observationSQL observ = new observationSQL(); + /** * Creates new form jffInfoMedoc */ @@ -29,6 +32,10 @@ public class jffInfoMedoc extends javax.swing.JFrame { jLComposition.setText(medocTrouve.getComposition()); jLContrindication.setText(medocTrouve.getContreindication()); jLEffet.setText(medocTrouve.getEffet()); + observation = observ.selectionObservation(medocTrouve.getNom()); + if (observation.size()!= 0){ + jLObservation.setText(observation.get(0)); + } } @@ -49,12 +56,49 @@ public class jffInfoMedoc extends javax.swing.JFrame { jLImage = new javax.swing.JLabel(); jSeparator1 = new javax.swing.JSeparator(); jLEffet = new javax.swing.JLabel(); + jPanel1 = new javax.swing.JPanel(); + jBsuivant = new javax.swing.JButton(); + jBprecedent = new javax.swing.JButton(); + jLObservation = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); jLNomMedoc.setFont(new java.awt.Font("Segoe UI Black", 0, 18)); // NOI18N jLNomMedoc.setText("Nom du Médicament :"); + jBsuivant.setText("Suivant"); + + jBprecedent.setText("Précédent"); + + jLObservation.setText("Text"); + + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); + jPanel1.setLayout(jPanel1Layout); + jPanel1Layout.setHorizontalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jBprecedent) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jBsuivant) + .addContainerGap()) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(24, 24, 24) + .addComponent(jLObservation, javax.swing.GroupLayout.PREFERRED_SIZE, 431, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(169, Short.MAX_VALUE)) + ); + jPanel1Layout.setVerticalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jBsuivant) + .addComponent(jBprecedent)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jLObservation, javax.swing.GroupLayout.PREFERRED_SIZE, 113, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(19, Short.MAX_VALUE)) + ); + javax.swing.GroupLayout jPFondLayout = new javax.swing.GroupLayout(jPFond); jPFond.setLayout(jPFondLayout); jPFondLayout.setHorizontalGroup( @@ -87,31 +131,33 @@ public class jffInfoMedoc extends javax.swing.JFrame { .addComponent(jLNomMedoc))) .addGap(0, 163, Short.MAX_VALUE))) .addContainerGap()) + .addGroup(jPFondLayout.createSequentialGroup() + .addContainerGap() + .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); jPFondLayout.setVerticalGroup( jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPFondLayout.createSequentialGroup() .addContainerGap() .addComponent(jLNomMedoc) - .addGap(18, 18, 18) + .addGap(35, 35, 35) .addGroup(jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPFondLayout.createSequentialGroup() .addComponent(jLNomCo, javax.swing.GroupLayout.PREFERRED_SIZE, 37, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(28, 28, 28) .addComponent(jLComposition, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 60, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 26, Short.MAX_VALUE) .addGroup(jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPFondLayout.createSequentialGroup() .addComponent(jLContrindication, javax.swing.GroupLayout.PREFERRED_SIZE, 141, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(169, 169, 169)) - .addGroup(jPFondLayout.createSequentialGroup() - .addComponent(jLEffet, javax.swing.GroupLayout.PREFERRED_SIZE, 131, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addGroup(jPFondLayout.createSequentialGroup() - .addComponent(jLImage, javax.swing.GroupLayout.PREFERRED_SIZE, 172, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE)))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE) + .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jLEffet, javax.swing.GroupLayout.PREFERRED_SIZE, 131, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(jLImage, javax.swing.GroupLayout.PREFERRED_SIZE, 172, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap()) ); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); @@ -126,8 +172,9 @@ public class jffInfoMedoc extends javax.swing.JFrame { layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() + .addContainerGap() .addComponent(jPFond, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGap(16, 16, 16)) + .addGap(10, 10, 10)) ); pack(); @@ -168,13 +215,17 @@ public class jffInfoMedoc extends javax.swing.JFrame { } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton jBprecedent; + private javax.swing.JButton jBsuivant; private javax.swing.JLabel jLComposition; private javax.swing.JLabel jLContrindication; private javax.swing.JLabel jLEffet; private javax.swing.JLabel jLImage; private javax.swing.JLabel jLNomCo; private javax.swing.JLabel jLNomMedoc; + private javax.swing.JLabel jLObservation; private javax.swing.JPanel jPFond; + private javax.swing.JPanel jPanel1; private javax.swing.JSeparator jSeparator1; // End of variables declaration//GEN-END:variables } -- 2.47.2 From 2e3414be26f7efb03c7654ac30993aa1547d8eae Mon Sep 17 00:00:00 2001 From: "emile.malcuit" Date: Fri, 14 Mar 2025 09:03:04 +0100 Subject: [PATCH 2/3] visiteurSql --- .../src/acces_aux_donnes/MedicamentSQL.java | 2 +- .../src/acces_aux_donnes/familleMedocSQL.java | 2 +- .../src/acces_aux_donnes/observationSQL.java | 2 +- .../src/acces_aux_donnes/praticienSQL.java | 2 +- .../src/acces_aux_donnes/visiteurSQL.java | 13 ++++--- .../src/presentation/jffConnexion.java | 35 +++++++++++++------ 6 files changed, 37 insertions(+), 19 deletions(-) diff --git a/GSBapplication/src/acces_aux_donnes/MedicamentSQL.java b/GSBapplication/src/acces_aux_donnes/MedicamentSQL.java index baa8764..b4a8d40 100644 --- a/GSBapplication/src/acces_aux_donnes/MedicamentSQL.java +++ b/GSBapplication/src/acces_aux_donnes/MedicamentSQL.java @@ -19,7 +19,7 @@ public class MedicamentSQL { private ResultSet result = null; public MedicamentSQL() { - connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB"); + connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z"); } public ArrayList rechercherMedicament (String nomCo){ diff --git a/GSBapplication/src/acces_aux_donnes/familleMedocSQL.java b/GSBapplication/src/acces_aux_donnes/familleMedocSQL.java index 38e5bb4..181850d 100644 --- a/GSBapplication/src/acces_aux_donnes/familleMedocSQL.java +++ b/GSBapplication/src/acces_aux_donnes/familleMedocSQL.java @@ -21,7 +21,7 @@ public class familleMedocSQL { private ResultSet result = null; public familleMedocSQL(){ - connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB"); + connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z"); } public Vector rechercheFamille(){ diff --git a/GSBapplication/src/acces_aux_donnes/observationSQL.java b/GSBapplication/src/acces_aux_donnes/observationSQL.java index 0a7e025..99b6d44 100644 --- a/GSBapplication/src/acces_aux_donnes/observationSQL.java +++ b/GSBapplication/src/acces_aux_donnes/observationSQL.java @@ -21,7 +21,7 @@ public class observationSQL { private ResultSet result = null; public observationSQL() { - connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB"); + connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z"); } public int compterLignes(){ diff --git a/GSBapplication/src/acces_aux_donnes/praticienSQL.java b/GSBapplication/src/acces_aux_donnes/praticienSQL.java index 90bca84..6b5781a 100644 --- a/GSBapplication/src/acces_aux_donnes/praticienSQL.java +++ b/GSBapplication/src/acces_aux_donnes/praticienSQL.java @@ -20,7 +20,7 @@ public class praticienSQL { private ResultSet result = null; public praticienSQL() { - connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB"); + connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z"); } public ArrayList rechercherPraticien(String login, String mdp) { diff --git a/GSBapplication/src/acces_aux_donnes/visiteurSQL.java b/GSBapplication/src/acces_aux_donnes/visiteurSQL.java index 97e1c7f..6cf858b 100644 --- a/GSBapplication/src/acces_aux_donnes/visiteurSQL.java +++ b/GSBapplication/src/acces_aux_donnes/visiteurSQL.java @@ -20,7 +20,7 @@ public class visiteurSQL { private ResultSet result = null; public visiteurSQL() { - connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB"); + connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z"); } public ArrayList rechercherVisiteur(String login, String mdp) { @@ -28,11 +28,14 @@ public class visiteurSQL { try { stmt = connexionTest.createStatement(); // Accès à la table - result = stmt.executeQuery("SELECT * FROM PRATICIENLOG WHERE nom='"+login+ - "' AND Mdp='"+mdp + "';"); + + result = stmt.executeQuery("SELECT * FROM VISITEUR WHERE vNom='"+login+ + "' AND vMdp='"+mdp + "';"); + if (result.next()) { // Le praticien a été touvé - visiteurCherche.add(result.getString(1)); - visiteurCherche.add(result.getString(2)); + visiteurCherche.add(result.getString(1)); + visiteurCherche.add(result.getString(2)); + System.out.println(visiteurCherche.add(result.getString(1))); } result.close(); diff --git a/GSBapplication/src/presentation/jffConnexion.java b/GSBapplication/src/presentation/jffConnexion.java index 13a50dd..038711a 100644 --- a/GSBapplication/src/presentation/jffConnexion.java +++ b/GSBapplication/src/presentation/jffConnexion.java @@ -5,6 +5,7 @@ package presentation; import acces_aux_donnes.praticienSQL; +import acces_aux_donnes.visiteurSQL; import java.util.ArrayList; import javax.swing.JOptionPane; @@ -158,15 +159,30 @@ public class jffConnexion extends javax.swing.JFrame { }//GEN-LAST:event_jPFmdpActionPerformed private void jBValiderActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBValiderActionPerformed - String identifiant = jTFIdentifiant.getText(); - String mdp = String.valueOf(jPFmdp.getPassword()); - praticienSQL testPraticien = new praticienSQL(); - ArrayListlePraticien = testPraticien.rechercherPraticien(identifiant,mdp); - if (lePraticien.get(0) != null){ - new jffFamilleMedoc().setVisible(true); - }else { - JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer"); - } + if(this.profession == 0){ + String identifiant = jTFIdentifiant.getText(); + String mdp = String.valueOf(jPFmdp.getPassword()); + praticienSQL testPraticien = new praticienSQL(); + ArrayListlePraticien = testPraticien.rechercherPraticien(identifiant,mdp); + if (lePraticien.get(0) != null){ + new jffFamilleMedoc().setVisible(true); + }else { + JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer"); + } + + }else{ + String identifiant = jTFIdentifiant.getText(); + String mdp = String.valueOf(jPFmdp.getPassword()); + visiteurSQL testVisiteur = new visiteurSQL(); + ArrayListleVisiteur = testVisiteur.rechercherVisiteur(identifiant,mdp); + System.out.println(leVisiteur.get(0)); + if (leVisiteur.get(0) != null){ + new jffFamilleMedoc().setVisible(true); + }else { + JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer"); + } + } + this.setVisible(false); }//GEN-LAST:event_jBValiderActionPerformed /** @@ -199,7 +215,6 @@ public class jffConnexion extends javax.swing.JFrame { /* Create and display the form */ java.awt.EventQueue.invokeLater(new Runnable() { public void run() { - new jffConnexion(1).setVisible(true); } }); } -- 2.47.2 From 7be498e60d250274fb98c6b16e01a315dcf1d379 Mon Sep 17 00:00:00 2001 From: "emile.malcuit" Date: Fri, 14 Mar 2025 09:07:29 +0100 Subject: [PATCH 3/3] visiteurSql --- GSBapplication/src/presentation/jffConnexion.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GSBapplication/src/presentation/jffConnexion.java b/GSBapplication/src/presentation/jffConnexion.java index 038711a..5414b3e 100644 --- a/GSBapplication/src/presentation/jffConnexion.java +++ b/GSBapplication/src/presentation/jffConnexion.java @@ -167,7 +167,7 @@ public class jffConnexion extends javax.swing.JFrame { if (lePraticien.get(0) != null){ new jffFamilleMedoc().setVisible(true); }else { - JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer"); + //JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer"); } }else{ @@ -179,7 +179,9 @@ public class jffConnexion extends javax.swing.JFrame { if (leVisiteur.get(0) != null){ new jffFamilleMedoc().setVisible(true); }else { - JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer"); + leVisiteur.add("12"); + //JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer"); + } } this.setVisible(false); -- 2.47.2