GSBapplication/src/Metier/Medicament.java

@@ -17,42 +17,43 @@ public class Medicament {
      * contreindication = les contreindications du médicament
      * prix = le prix en unité du médicament
      */
-    private String id;
+    private int id;
     private String nom;
     private String composition;
     private String effet;
     private String contreindication;
-    private String img;
+    private float prix;
 
     
     /** LE CONSTRUCTEUR DEFAULT
-     * Constructeur de médicament avec tous les attribut définis
+     * 
      * @param id
      * @param nom
      * @param composition
      * @param effet
      * @param contreindication
+     * @param prix 
      */
-    public Medicament(String id, String nom, String composition, String effet, String contreindication, String img) {
+    public Medicament(int id, String nom, String composition, String effet, String contreindication, float prix) {
         this.id = id;
         this.nom = nom;
         this.composition = composition;
         this.effet = effet;
         this.contreindication = contreindication;
-        this.img = img;
+        this.prix = prix;
     }
     
     
     
+    
     /** LES GUETTEUR
      * @return the id
      */
-    public String getId(){
+    public int getId() {
         return id;
     }
 
     /**
-     * Getteur du nom du médicament
      * @return the nom
      */
     public String getNom() {
@@ -60,7 +61,6 @@ public class Medicament {
     }
 
     /**
-     * Getteur de la Composition du médicament
      * @return the composition
      */
     public String getComposition() {
@@ -68,7 +68,6 @@ public class Medicament {
     }
 
     /**
-     * Guetteur des effets de médicament
      * @return the effet
      */
     public String getEffet() {
@@ -76,7 +75,6 @@ public class Medicament {
     }
 
     /**
-     * Guetteur des contres Indications du médicament
      * @return the contreindication
      */
     public String getContreindication() {
@@ -84,22 +82,16 @@ public class Medicament {
     }
 
     /**
-     * Getteur de l'adresse de l'image du médicament
+     * @return the prix
-     * @return the img
      */
-    public String getImg() {
+    public float getPrix() {
-        return img;
+        return prix;
     }
-    /**
+
-     * Méthode toString permettant connaitre la valeur 
+    
-     * de chaque attribut de l'objet Médicament
-     * @return retourne de façon structuré tout les attributs
-     */
     @Override
     public String toString() {
-        return "Medicament{" + "id=" + id + ", nom=" + nom + ", composition=" + composition + ", effet=" + effet + ", contreindication=" + contreindication + ",img=" + img + '}';
+        return "Medicament{" + "id=" + id + ", nom=" + nom + ", composition=" + composition + ", effet=" + effet + ", contreindication=" + contreindication + ", prix=" + prix + '}';
     }
  
 }
-
-

GSBapplication/src/Metier/famille.java

@@ -22,21 +22,14 @@ public class famille {
         this.id = id;
     }
 
-    //      LES Guetteurs
+    // LES SETTEUR 
     /**
-     * Getteur de l'id de la famille
      * @return the id
      */
     public String getId() {
         return id;
     }
 
-    //       Méthodes
-    /**
-     * Méthode toString permettant connaitre la valeur 
-     * de chaque attribut de l'objet famille
-     * @return retourne de façon structuré tout les attributs
-     */
     @Override
     public String toString() {
         return "famille{" + "id=" + id + '}';

GSBapplication/src/Metier/praticien.java

@@ -22,7 +22,7 @@ public class praticien {
     
     
     /** LE CONSTRUCTEUR DEFAULT
-     * Constructeur de praticien complétant chaque attributs
+     * 
      * @param id
      * @param nom
      * @param prenom
@@ -38,7 +38,6 @@ public class praticien {
     
     //LES GETTEUR
     /**
-     * Guetteur de l'id du praticien
      * @return the id
      */
     public int getId() {
@@ -46,7 +45,6 @@ public class praticien {
     }
 
     /**
-     * Guetteur du nom du praticien
      * @return the nom
      */
     public String getNom() {
@@ -54,7 +52,6 @@ public class praticien {
     }
 
     /**
-     * Guetteur du prénom du praticien
      * @return the prenom
      */
     public String getPrenom() {
@@ -62,18 +59,13 @@ public class praticien {
     }
 
     /**
-     * Guetteur du type de praticien
      * @return the type_praticien
      */
     public String getType_praticien() {
         return type_praticien;
     }
 
-    /**
+    
-     * Méthode toString permettant connaitre la valeur 
-     * de chaque attribut de l'objet praticien
-     * @return retourne de façon structuré tout les attributs
-     */
     @Override
     public String toString() {
         return "Praticien{" + "id=" + id + ", nom=" + nom + ", prenom=" + prenom + ", type_praticien=" + type_praticien + '}';

GSBapplication/src/Metier/visiteur_medicaux.java

@@ -21,7 +21,8 @@ public class visiteur_medicaux {
     private String region;
     
     /** LE CONSTRUCTEUR DEFAULT
-     * Constructeur de visiteur_médicaux complétant chaque attributs
+     * 
+     * 
      * @param id
      * @param nom
      * @param prenom
@@ -37,7 +38,6 @@ public class visiteur_medicaux {
     
     //LES GETTEUR
     /**
-     * Guetteur de l'id du visiteur médical
      * @return the id
      */
     public int getId() {
@@ -45,7 +45,6 @@ public class visiteur_medicaux {
     }
 
     /**
-     * Guetteur du nom du visiteur médical
      * @return the nom
      */
     public String getNom() {
@@ -53,11 +52,17 @@ public class visiteur_medicaux {
     }
 
     /**
-     * Guetteur du prénom du visiteur médical
      * @return the prenom
      */
     public String getPrenom() {
         return prenom;
     }
 
+    /**
+     * @return the region
+     */
+    public String getRegion() {
+        return region;
+    }
+
 }

GSBapplication/src/TEST/testMain.java

@@ -4,6 +4,11 @@
  */
 package TEST;
 
+import acces_aux_donnes.ConnexionSQL;
+import acces_aux_donnes.PraticienSQL;
+import acces_aux_donnes.MedicamentSQL;
+import java.sql.Connection;
+
 /**
  *
  * @author medhi.rodrigues

GSBapplication/src/acces_aux_donnes/MedicamentSQL.java

@@ -18,19 +18,10 @@ public class MedicamentSQL {
     private Statement stmt = 	null;
     private ResultSet result = 	null;
 
-    /**
-     * Constructeur de la classe médicamentSQL
-     */
     public MedicamentSQL() {
-        connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z");
+        connexionTest = ConnexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB");
     }
     
-    /**
-     * Méthode permettant la recherche d'un médicament dans une base données
-     * suivant le nom commercial de celui-ci
-     * @param nomCo 
-     * @return ArrayList<String> infoMedoc avec toutes les informations du médicament
-     */
     public ArrayList<String> rechercherMedicament (String nomCo){
         ArrayList<String> infoMedoc = new ArrayList<String>();
         

GSBapplication/src/acces_aux_donnes/connexionSQL.java

@@ -10,7 +10,7 @@ public class connexionSQL {
     private static Connection connect;      // Variable de connexion
   
   /**
-   * Constructeur d'une connexion avec une base de données
+   * Constructeur
    * @param serveur     nom du serveur, localhost si local
    * @param bdd         nom de la base de données
    * @param nomUtil     nom utilisateur

GSBapplication/src/acces_aux_donnes/familleMedocSQL.java

@@ -6,10 +6,8 @@ package acces_aux_donnes;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.Vector;
 
 /**
  *
@@ -20,84 +18,10 @@ public class familleMedocSQL {
     private Statement stmt = 	null;
     private ResultSet result = 	null;
     
-    /**
-     * Constructeur de la classe familleMedocSQL
-     */
     public familleMedocSQL(){
-        connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z");
+        connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB");
     }
     
-    public Vector<String> rechercheFamille(){
-        Vector<String> famille = new Vector<String>();
-        
-        try {
-            stmt = connexionTest.createStatement();
-            // Accès à la table 
-            result = stmt.executeQuery("SELECT fLibelle FROM FAMILLE;");
-            while(result.next()) {   // Le praticien a été touvé
-                famille.add(result.getString(1)); 
-            }
-            result.close();
-            stmt.close();
-        }catch (SQLException ex) {
-              System.out.println("SQLException : " + ex.getMessage());
-              System.out.println("SQLState : " + ex.getSQLState());
-              System.out.println("Code erreur : " + ex.getErrorCode());  
-        }      
-        return famille;
-    }
-    
-    /**
-     * Méthode permettant la recherche d'un code de famille de médicament
-     * à l'aide d'un libelle
-     * @param libelle nom de la famille de médicament
-     * @return code de la famille de médicament
-     */
-    public String rechercheCodeFamille(String libelle){
-        String code = "";  
-        try {
-            stmt = connexionTest.createStatement();
-            // Accès à la table 
-            result = stmt.executeQuery("SELECT fCode FROM FAMILLE WHERE fLibelle ='"+ libelle +"';");
-            while(result.next()) {   // Le praticien a été touvé
-                code = result.getString(1); 
-            }
-            result.close();
-            stmt.close();
-        }catch (SQLException ex) {
-              System.out.println("SQLException : " + ex.getMessage());
-              System.out.println("SQLState : " + ex.getSQLState());
-              System.out.println("Code erreur : " + ex.getErrorCode());  
-        }
-        return code;    
-    }
-    
-    /**
-     * Methode permettant de rechercher dans une base de données 
-     * les médicaments faisant partie de la même famille grâce à un code de famille
-     * @param libelle
-     * @return Tableau avec tous les noms des médicaments concernés
-     */
-    public Vector<String> rechercherMedocFamille(String libelle){
-        Vector<String> famille = new Vector<String>();  
-        try {
-            stmt = connexionTest.createStatement();
-            // Accès à la table 
-            result = stmt.executeQuery("SELECT mNomCommercial FROM MEDICAMENT WHERE fCode ='"+ libelle +"';");
-            while(result.next()) {   // Le praticien a été touvé
-                famille.add(result.getString(1)); 
-            }
-            result.close();
-            stmt.close();
-        }catch (SQLException ex) {
-              System.out.println("SQLException : " + ex.getMessage());
-              System.out.println("SQLState : " + ex.getSQLState());
-              System.out.println("Code erreur : " + ex.getErrorCode());  
-        }
-        return famille;
-    }
-    
-    
     
     
     

GSBapplication/src/acces_aux_donnes/observationSQL.java

@@ -4,12 +4,10 @@
  */
 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;
 
 /**
  *
@@ -20,18 +18,10 @@ public class observationSQL {
     private Statement stmt = 	null;
     private ResultSet result = 	null;
     
-    /**
-     * Constructeur de observationSQL
-     */
     public observationSQL() {
-        connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z");
+        connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB");
     }
     
-    /**
-     * Méthode permettant de compter le nombre d'observations 
-     * présente dans la Table observation 
-     * @return nombre de lignes
-     */
     public int compterLignes(){
         int nbLignes = 0;
         try {
@@ -51,13 +41,7 @@ public class observationSQL {
         return nbLignes;
     }
     
-    /**
+
-     * Méthode permattant d'inserer dans la base de données une nouvelle observation
-     * @param idMedoc
-     * @param idPraticien
-     * @param observation
-     * @return int
-     */
     public int ajouterObservation(String idMedoc, int idPraticien, String observation){
         int passer = 1000;
         int nbLignes = this.compterLignes();
@@ -76,26 +60,4 @@ public class observationSQL {
         }
         return passer;
     }
-    
-    /**
-     * Méthode permettant de sélectionner les observations se rapportant au médicament sélectionné
-     * @param idMedoc
-     * @return Tableau des différentes observations
-     */
-    public ArrayList<String> selectionObservation(String idMedoc){
-        ArrayList<String> observationMedoc = new ArrayList<String>();
-        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;
-    }
 }

GSBapplication/src/acces_aux_donnes/praticienSQL.java

@@ -8,7 +8,6 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
 
 /**
  *
@@ -19,29 +18,20 @@ public class praticienSQL {
     private Statement stmt = 	null;
     private ResultSet result = 	null;
     
-    /**
+     public praticienSQL() {
-     * Constructeur de praticienSQL
+        connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB");
-     */
-    public praticienSQL() {
-        connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z");
     }
      
-    /**
+      public String[] rechercherPraticien(String login, String mdp) {
-     * Méthode permattant de rechercher un praticien dans une base de données
+        String[] praticienCherche = new String [2];
-     * @param login
-     * @param mdp
-     * @return Tableau avec les informations du praticien
-     */
-    public ArrayList<String> rechercherPraticien(String login, String mdp) {
-        ArrayList<String> praticienCherche = new ArrayList<String>();
         try {
             stmt = connexionTest.createStatement();
             // Accès à la table 
             result = stmt.executeQuery("SELECT * FROM PRATICIENLOG WHERE id='"+login+
                     "' AND mdp='"+mdp + "';");
             if (result.next()) {   // Le praticien a été touvé
-               praticienCherche.add(result.getString(1));
+               praticienCherche[0] = result.getString(1);
-               praticienCherche.add(result.getString(2));
+               praticienCherche[1] = result.getString(2);
                 
             } 
             result.close();

GSBapplication/src/acces_aux_donnes/visiteurMedicalSQL.java

@@ -0,0 +1,13 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package acces_aux_donnes;
+
+/**
+ *
+ * @author emile.lalorcey
+ */
+public class visiteurMedicalSQL {
+    
+}

GSBapplication/src/acces_aux_donnes/visiteurSQL.java

@@ -1,54 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package acces_aux_donnes;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-
-/**
- *
- * @author medhi.rodrigues
- */
-public class visiteurSQL { 
-     private Connection connexionTest;
-    private Statement stmt = 	null;
-    private ResultSet result = 	null;
-    
-    /**
-     * Constructeur de visiteurSQL
-     */
-    public visiteurSQL() {
-        connexionTest = connexionSQL.getConnect("10.121.38.69","bdgsb","appliGSB","(Uq1XV0Tr01s2H9Z");
-    }
-     
-      public ArrayList<String> rechercherVisiteur(String login, String mdp) {
-        ArrayList<String> visiteurCherche = new ArrayList<String>();
-        try {
-            stmt = connexionTest.createStatement();
-            // Accès à la table 
-            
-            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));
-                System.out.println(visiteurCherche.add(result.getString(1)));
-                
-            } 
-            result.close();
-            stmt.close();
-        } catch (SQLException ex) {
-              System.out.println("SQLException : " + ex.getMessage());
-              System.out.println("SQLState : " + ex.getSQLState());
-              System.out.println("Code erreur : " + ex.getErrorCode());  
-        }
-         return visiteurCherche;
-        }
-    
-}

GSBapplication/src/presentation/jffAjoutObservation.java

@@ -4,7 +4,7 @@
  */
 package presentation;
 
-import acces_aux_donnes.observationSQL;
+import acces_aux_donnes.ObservationSQL;
 
 /**
  *
@@ -94,7 +94,7 @@ public class jffAjoutObservation extends javax.swing.JFrame {
     }// </editor-fold>//GEN-END:initComponents
 
     private void jBsoumettreActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBsoumettreActionPerformed
-        observationSQL observ = new observationSQL();
+        ObservationSQL observ = new ObservationSQL();
         observ.ajouterObservation(this.idMedoc, this.idPraticien, jTAobservation.getText());
     }//GEN-LAST:event_jBsoumettreActionPerformed
 

GSBapplication/src/presentation/jffConnexion.java

@@ -4,10 +4,7 @@
  */
 package presentation;
 
-import acces_aux_donnes.praticienSQL;
+import acces_aux_donnes.PraticienSQL;
-import acces_aux_donnes.visiteurSQL;
-import java.util.ArrayList;
-import javax.swing.JOptionPane;
 
 /**
  *
@@ -159,32 +156,15 @@ public class jffConnexion extends javax.swing.JFrame {
     }//GEN-LAST:event_jPFmdpActionPerformed
 
     private void jBValiderActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBValiderActionPerformed
-        if(this.profession == 0){    
+        String identifiant = jTFIdentifiant.getText();
-            String identifiant = jTFIdentifiant.getText();
+        String mdp = String.valueOf(jPFmdp.getPassword());
-            String mdp = String.valueOf(jPFmdp.getPassword());
+        PraticienSQL testPraticien = new PraticienSQL();
-            praticienSQL testPraticien = new praticienSQL();
+        String [] lePraticien = testPraticien.rechercherPraticien(identifiant,mdp);
-            ArrayList<String>lePraticien = testPraticien.rechercherPraticien(identifiant,mdp);
+        if (lePraticien[0] != null){
-            if (!lePraticien.isEmpty()){
+            System.out.print("TEST REUSSIE");
-                new jffFamilleMedoc(this.profession).setVisible(true);
+        }else {
-            }else {
+            System.out.print("TEST EMILE RACISTE");
-                JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer");
-            } 
-        
-        }else{
-            String identifiant = jTFIdentifiant.getText();
-            String mdp = String.valueOf(jPFmdp.getPassword());
-            visiteurSQL testVisiteur = new visiteurSQL();
-            ArrayList<String>leVisiteur = testVisiteur.rechercherVisiteur(identifiant,mdp);
-            System.out.println(leVisiteur.get(0));
-            if (leVisiteur.get(0) != null){
-                new jffFamilleMedoc(this.profession).setVisible(true);
-            }else {
-                leVisiteur.add("12");
-                //JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer");
-                
-            }
         } 
-        this.setVisible(false);
     }//GEN-LAST:event_jBValiderActionPerformed
 
     /**
@@ -217,6 +197,7 @@ 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);
             }
         });
     }

GSBapplication/src/presentation/jffFamilleMedoc.form

@@ -1,60 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
-  <NonVisualComponents>
-    <Menu class="javax.swing.JMenuBar" name="jMenuBar1">
-      <SubComponents>
-        <Menu class="javax.swing.JMenu" name="jMPage">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Page"/>
-          </Properties>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIProfession">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Choix M&#xe9;tier"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIProfessionActionPerformed"/>
-              </Events>
-            </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIFamille">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Famille Medicament"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIFamilleActionPerformed"/>
-              </Events>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
-        <Menu class="javax.swing.JMenu" name="jMInfo">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Info"/>
-          </Properties>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIguide">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Guide"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIguideActionPerformed"/>
-              </Events>
-            </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="jMcredit">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Cr&#xe9;dit"/>
-              </Properties>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
-      </SubComponents>
-    </Menu>
-  </NonVisualComponents>
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="3"/>
   </Properties>
   <SyntheticProperties>
-    <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
     <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
@@ -73,40 +23,20 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
+          <Group type="102" alignment="1" attributes="0">
-              <Group type="103" groupAlignment="0" attributes="0">
+              <EmptySpace pref="344" max="32767" attributes="0"/>
-                  <Group type="102" alignment="0" attributes="0">
+              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="jLRecherche" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                              <Component id="jTFRecherche" min="-2" pref="80" max="-2" attributes="0"/>
-                              <EmptySpace min="-2" pref="58" max="-2" attributes="0"/>
-                          </Group>
-                          <Group type="102" attributes="0">
-                              <Component id="jCBFamille" max="32767" attributes="0"/>
-                              <EmptySpace min="-2" pref="42" max="-2" attributes="0"/>
-                          </Group>
-                      </Group>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" attributes="0">
-                              <Component id="jBRechercheValide" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                          </Group>
-                          <Group type="102" attributes="0">
-                              <Component id="jCBMedocListe" min="-2" pref="176" max="-2" attributes="0"/>
-                              <EmptySpace min="-2" pref="31" max="-2" attributes="0"/>
-                          </Group>
-                      </Group>
-                  </Group>
-                  <Group type="102" alignment="1" attributes="0">
-                      <EmptySpace max="32767" attributes="0"/>
-                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                  </Group>
-              </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
+              <Component id="jLRecherche" min="-2" max="-2" attributes="0"/>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Component id="jTFRecherche" min="-2" pref="80" max="-2" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
+              <Component id="jBRechercheValide" min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -120,12 +50,7 @@
                   <Component id="jTFRecherche" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="jBRechercheValide" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
+              <EmptySpace pref="227" max="32767" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jCBFamille" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="jCBMedocListe" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace pref="264" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -156,41 +81,5 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jBRechercheValideActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JComboBox" name="jCBFamille">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="4">
-            <StringItem index="0" value="Item 1"/>
-            <StringItem index="1" value="Item 2"/>
-            <StringItem index="2" value="Item 3"/>
-            <StringItem index="3" value="Item 4"/>
-          </StringArray>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jCBFamilleActionPerformed"/>
-      </Events>
-      <AuxValues>
-        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
-      </AuxValues>
-    </Component>
-    <Component class="javax.swing.JComboBox" name="jCBMedocListe">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="4">
-            <StringItem index="0" value="Item 1"/>
-            <StringItem index="1" value="Item 2"/>
-            <StringItem index="2" value="Item 3"/>
-            <StringItem index="3" value="Item 4"/>
-          </StringArray>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jCBMedocListeActionPerformed"/>
-      </Events>
-      <AuxValues>
-        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
-      </AuxValues>
-    </Component>
   </SubComponents>
 </Form>

GSBapplication/src/presentation/jffFamilleMedoc.java

@@ -6,26 +6,19 @@ package presentation;
 
 import Metier.Medicament;
 import acces_aux_donnes.MedicamentSQL;
-import acces_aux_donnes.familleMedocSQL;
 import java.util.ArrayList;
-import java.util.Vector;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JOptionPane;
 
 /**
  *
  * @author emile.lalorcey
  */
 public class jffFamilleMedoc extends javax.swing.JFrame {
-    int metier;
+
     /**
      * Creates new form jffFamilleMedoc
      */
-    public jffFamilleMedoc(int metier) {
+    public jffFamilleMedoc() {
-        this.metier = metier;
         initComponents();
-        familleMedocSQL famille = new familleMedocSQL();
-        jCBFamille.setModel(new DefaultComboBoxModel(famille.rechercheFamille()));
     }
 
     /**
@@ -41,15 +34,6 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
         jLRecherche = new javax.swing.JLabel();
         jTFRecherche = new javax.swing.JTextField();
         jBRechercheValide = new javax.swing.JButton();
-        jCBFamille = new javax.swing.JComboBox<>();
-        jCBMedocListe = new javax.swing.JComboBox<>();
-        jMenuBar1 = new javax.swing.JMenuBar();
-        jMPage = new javax.swing.JMenu();
-        jMIProfession = new javax.swing.JMenuItem();
-        jMIFamille = new javax.swing.JMenuItem();
-        jMInfo = new javax.swing.JMenu();
-        jMIguide = new javax.swing.JMenuItem();
-        jMcredit = new javax.swing.JMenuItem();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
 
@@ -70,85 +54,22 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
             }
         });
 
-        jCBFamille.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
-        jCBFamille.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jCBFamilleActionPerformed(evt);
-            }
-        });
-
-        jCBMedocListe.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
-        jCBMedocListe.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jCBMedocListeActionPerformed(evt);
-            }
-        });
-
-        jMPage.setText("Page");
-
-        jMIProfession.setText("Choix Métier");
-        jMIProfession.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIProfessionActionPerformed(evt);
-            }
-        });
-        jMPage.add(jMIProfession);
-
-        jMIFamille.setText("Famille Medicament");
-        jMIFamille.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIFamilleActionPerformed(evt);
-            }
-        });
-        jMPage.add(jMIFamille);
-
-        jMenuBar1.add(jMPage);
-
-        jMInfo.setText("Info");
-
-        jMIguide.setText("Guide");
-        jMIguide.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIguideActionPerformed(evt);
-            }
-        });
-        jMInfo.add(jMIguide);
-
-        jMcredit.setText("Crédit");
-        jMInfo.add(jMcredit);
-
-        jMenuBar1.add(jMInfo);
-
-        setJMenuBar(jMenuBar1);
-
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addContainerGap(344, Short.MAX_VALUE)
-                    .addGroup(layout.createSequentialGroup()
+                .addComponent(jLabel1)
-                        .addGap(20, 20, 20)
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(layout.createSequentialGroup()
-                                .addComponent(jLRecherche)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                .addComponent(jTFRecherche, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addGap(58, 58, 58))
-                            .addGroup(layout.createSequentialGroup()
-                                .addComponent(jCBFamille, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                .addGap(42, 42, 42)))
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(layout.createSequentialGroup()
-                                .addComponent(jBRechercheValide)
-                                .addGap(0, 0, Short.MAX_VALUE))
-                            .addGroup(layout.createSequentialGroup()
-                                .addComponent(jCBMedocListe, javax.swing.GroupLayout.PREFERRED_SIZE, 176, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addGap(31, 31, 31))))
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(jLabel1)))
                 .addContainerGap())
+            .addGroup(layout.createSequentialGroup()
+                .addGap(20, 20, 20)
+                .addComponent(jLRecherche)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(jTFRecherche, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(jBRechercheValide)
+                .addGap(27, 27, 27))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -160,11 +81,7 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
                     .addComponent(jLRecherche)
                     .addComponent(jTFRecherche, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jBRechercheValide))
-                .addGap(29, 29, 29)
+                .addContainerGap(227, Short.MAX_VALUE))
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jCBFamille, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jCBMedocListe, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(264, Short.MAX_VALUE))
         );
 
         pack();
@@ -176,7 +93,6 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
 
     private void jBRechercheValideActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBRechercheValideActionPerformed
         String medocRechercher = jTFRecherche.getText();
-        System.out.println(medocRechercher);
         MedicamentSQL medocTest = new MedicamentSQL();
         ArrayList<String> rechercheMedoc = new ArrayList<String>();
         rechercheMedoc = medocTest.rechercherMedicament(medocRechercher);
@@ -186,61 +102,17 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
             String compositionTrouve = rechercheMedoc.get(2);
             String effetTrouve = rechercheMedoc.get(3);
             String contreIndicationTrouve = rechercheMedoc.get(4);
-            String imgTrouve = idTrouve;
+            String imgTrouve = "../img/"+ idTrouve +".jpg";
-            Medicament medocTrouve = new Medicament(idTrouve, nomTrouve , compositionTrouve, effetTrouve, contreIndicationTrouve,imgTrouve);
+            Medicament medocTrouve = new Medicament(idTrouve, nomTrouve , compositionTrouve, effetTrouve
-            new jffInfoMedoc(medocTrouve, this.metier).setVisible(true);
+            , contreIndicationTrouve,imgTrouve);
+            new jffInfoMedoc(medocTrouve).setVisible(true);
        
             
         }else {
-           JOptionPane.showMessageDialog(null,"Veuillez choisir un médicament valide");
+            //ajout d'un JoptionPane
         }
     }//GEN-LAST:event_jBRechercheValideActionPerformed
 
-    private void jCBFamilleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCBFamilleActionPerformed
-        familleMedocSQL famille = new familleMedocSQL();
-        Vector<String> medocFamille = new Vector<String>();
-        String libelleFamille = jCBFamille.getSelectedItem().toString();
-        String codeFamille = famille.rechercheCodeFamille(libelleFamille);
-        medocFamille = famille.rechercherMedocFamille(codeFamille);
-        jCBMedocListe.setModel(new DefaultComboBoxModel(medocFamille));
-        
-        
-        
-    }//GEN-LAST:event_jCBFamilleActionPerformed
-
-    private void jCBMedocListeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCBMedocListeActionPerformed
-        String nomMedoc = jCBMedocListe.getSelectedItem().toString();
-        System.out.println(nomMedoc);
-        MedicamentSQL medocTest = new MedicamentSQL();
-        ArrayList<String> rechercheMedoc = new ArrayList<String>();
-        rechercheMedoc = medocTest.rechercherMedicament(nomMedoc);
-        System.out.print("TEst");
-        if (rechercheMedoc.get(0) != null) {
-            String idTrouve = rechercheMedoc.get(0);
-            String nomTrouve = rechercheMedoc.get(1);
-            String compositionTrouve = rechercheMedoc.get(2);
-            String effetTrouve = rechercheMedoc.get(3);
-            String contreIndicationTrouve = rechercheMedoc.get(4);
-            String imgTrouve = idTrouve;
-            Medicament medocTrouve = new Medicament(idTrouve, nomTrouve , compositionTrouve, effetTrouve, contreIndicationTrouve,imgTrouve);
-            new jffInfoMedoc(medocTrouve, this.metier).setVisible(true);
-        }
-    }//GEN-LAST:event_jCBMedocListeActionPerformed
-
-    private void jMIProfessionActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIProfessionActionPerformed
-        new jffProfession().setVisible(true);
-        this.setVisible(false);
-    }//GEN-LAST:event_jMIProfessionActionPerformed
-
-    private void jMIguideActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIguideActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_jMIguideActionPerformed
-
-    private void jMIFamilleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIFamilleActionPerformed
-        new jffFamilleMedoc(this.metier).setVisible(true);
-        this.setVisible(false);
-    }//GEN-LAST:event_jMIFamilleActionPerformed
-
     /**
      * @param args the command line arguments
      */
@@ -271,23 +143,15 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
         /* Create and display the form */
         java.awt.EventQueue.invokeLater(new Runnable() {
             public void run() {
+                new jffFamilleMedoc().setVisible(true);
             }
         });
     }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton jBRechercheValide;
-    private javax.swing.JComboBox<String> jCBFamille;
-    private javax.swing.JComboBox<String> jCBMedocListe;
     private javax.swing.JLabel jLRecherche;
     private javax.swing.JLabel jLabel1;
-    private javax.swing.JMenuItem jMIFamille;
-    private javax.swing.JMenuItem jMIProfession;
-    private javax.swing.JMenuItem jMIguide;
-    private javax.swing.JMenu jMInfo;
-    private javax.swing.JMenu jMPage;
-    private javax.swing.JMenuItem jMcredit;
-    private javax.swing.JMenuBar jMenuBar1;
     private javax.swing.JTextField jTFRecherche;
     // End of variables declaration//GEN-END:variables
 }

GSBapplication/src/presentation/jffInfoMedoc.form

@@ -1,78 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
-  <NonVisualComponents>
-    <Menu class="javax.swing.JMenuBar" name="jMenuBar1">
-      <SubComponents>
-        <Menu class="javax.swing.JMenu" name="jMPage">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Page"/>
-          </Properties>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIProfession">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Choix M&#xe9;tier"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIProfessionActionPerformed"/>
-              </Events>
-            </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIFamille">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Famille Medicament"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIFamilleActionPerformed"/>
-              </Events>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
-        <Menu class="javax.swing.JMenu" name="jMObservation">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Observation"/>
-          </Properties>
-          <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMObservationActionPerformed"/>
-          </Events>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIObservation">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="jMenuItem3"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIObservationActionPerformed"/>
-              </Events>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
-        <Menu class="javax.swing.JMenu" name="jMInfo">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Info"/>
-          </Properties>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIguide">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Guide"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIguideActionPerformed"/>
-              </Events>
-            </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="jMcredit">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Cr&#xe9;dit"/>
-              </Properties>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
-      </SubComponents>
-    </Menu>
-  </NonVisualComponents>
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="3"/>
   </Properties>
   <SyntheticProperties>
-    <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
     <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
@@ -91,7 +23,7 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
+          <Group type="102" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jPFond" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
@@ -101,9 +33,8 @@
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
               <Component id="jPFond" max="32767" attributes="0"/>
-              <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -115,83 +46,65 @@
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" attributes="0">
-                  <Component id="jSeparator1" max="32767" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-              </Group>
-              <Group type="102" attributes="0">
-                  <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
+                      <Component id="jSeparator1" alignment="1" max="32767" attributes="0"/>
                       <Group type="102" attributes="0">
-                          <Component id="jLContrindication" max="32767" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="jLEffet" min="-2" pref="391" max="-2" attributes="0"/>
-                          <EmptySpace max="32767" attributes="0"/>
-                      </Group>
-                      <Group type="102" attributes="0">
                           <Group type="103" groupAlignment="0" attributes="0">
-                              <Component id="jPanel1" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <Component id="jLContrindication" min="-2" pref="265" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Component id="jLPrix" min="-2" pref="100" max="-2" attributes="0"/>
+                              </Group>
                               <Group type="102" alignment="0" attributes="0">
                                   <Group type="103" groupAlignment="0" attributes="0">
-                                      <Group type="102" alignment="1" attributes="0">
+                                      <Component id="jLComposition" min="-2" pref="265" max="-2" attributes="0"/>
-                                          <Component id="jLComposition" min="-2" pref="265" max="-2" attributes="0"/>
+                                      <Component id="jLabel1" alignment="0" min="-2" pref="265" max="-2" attributes="0"/>
-                                          <EmptySpace min="-2" pref="140" max="-2" attributes="0"/>
-                                      </Group>
-                                      <Group type="102" alignment="0" attributes="0">
-                                          <EmptySpace min="-2" pref="183" max="-2" attributes="0"/>
-                                          <Component id="jLNomCo" min="-2" pref="144" max="-2" attributes="0"/>
-                                          <EmptySpace min="-2" pref="78" max="-2" attributes="0"/>
-                                      </Group>
                                   </Group>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
                                   <Component id="jLImage" min="-2" pref="157" max="-2" attributes="0"/>
                               </Group>
                           </Group>
-                          <EmptySpace max="32767" attributes="0"/>
+                          <EmptySpace min="0" pref="26" max="32767" attributes="0"/>
                       </Group>
                   </Group>
+                  <EmptySpace max="-2" attributes="0"/>
               </Group>
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace min="-2" pref="168" max="-2" attributes="0"/>
                   <Component id="jLNomMedoc" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace pref="300" max="32767" attributes="0"/>
+                  <EmptySpace max="32767" attributes="0"/>
-                  <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="267" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
         <DimensionLayout dim="1">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jLNomMedoc" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="39" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                      <Group type="102" attributes="0">
+                          <Component id="jLabel1" min="-2" pref="86" max="-2" attributes="0"/>
+                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                          <Component id="jLComposition" min="-2" pref="74" max="-2" attributes="0"/>
+                      </Group>
+                      <Component id="jLImage" max="32767" attributes="0"/>
+                  </Group>
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" attributes="0">
-                          <EmptySpace max="-2" attributes="0"/>
+                          <EmptySpace type="unrelated" pref="18" max="32767" attributes="0"/>
-                          <Component id="jLNomMedoc" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLContrindication" min="-2" pref="70" max="-2" attributes="0"/>
+                          <EmptySpace pref="23" max="32767" attributes="0"/>
                       </Group>
-                      <Component id="jLabel1" alignment="0" min="-2" pref="42" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" alignment="0" attributes="0">
-                          <Component id="jLNomCo" min="-2" pref="37" max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="35" max="-2" attributes="0"/>
-                          <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
+                          <Component id="jLPrix" min="-2" pref="26" max="-2" attributes="0"/>
-                          <Component id="jLComposition" min="-2" pref="74" max="-2" attributes="0"/>
                           <EmptySpace max="32767" attributes="0"/>
-                          <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="102" attributes="0">
-                                  <Component id="jLContrindication" min="-2" pref="141" max="-2" attributes="0"/>
-                                  <EmptySpace max="32767" attributes="0"/>
-                                  <Component id="jSeparator1" min="-2" pref="10" max="-2" attributes="0"/>
-                              </Group>
-                              <Group type="102" attributes="0">
-                                  <Component id="jLEffet" min="-2" pref="131" max="-2" attributes="0"/>
-                                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                              </Group>
-                          </Group>
                       </Group>
-                      <Component id="jLImage" alignment="0" min="-2" pref="172" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jSeparator1" min="-2" pref="10" max="-2" attributes="0"/>
-                  <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="169" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -202,78 +115,34 @@
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
               <Font name="Segoe UI Black" size="18" style="0"/>
             </Property>
-            <Property name="text" type="java.lang.String" value="Nom du M&#xe9;dicament :"/>
+            <Property name="text" type="java.lang.String" value="Nom du M&#xe9;doc"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="jLNomCo">
+        <Component class="javax.swing.JLabel" name="jLabel1">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Les effets du m&#xe9;dicament"/>
+          </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="jLComposition">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Composition du m&#xe9;doc"/>
+          </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="jLContrindication">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Contrindications du m&#xe9;doc"/>
+          </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="jLImage">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Image"/>
+          </Properties>
         </Component>
         <Component class="javax.swing.JSeparator" name="jSeparator1">
         </Component>
-        <Component class="javax.swing.JLabel" name="jLEffet">
+        <Component class="javax.swing.JLabel" name="jLPrix">
-        </Component>
-        <Container class="javax.swing.JPanel" name="jPanel1">
-
-          <Layout>
-            <DimensionLayout dim="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="1" attributes="0">
-                      <EmptySpace max="32767" attributes="0"/>
-                      <Component id="jBprecedent" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jBsuivant" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
-                      <Component id="jLObservation" min="-2" pref="431" max="-2" attributes="0"/>
-                      <EmptySpace pref="169" max="32767" attributes="0"/>
-                  </Group>
-              </Group>
-            </DimensionLayout>
-            <DimensionLayout dim="1">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="jBsuivant" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="jBprecedent" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="jLObservation" min="-2" pref="113" max="-2" attributes="0"/>
-                      <EmptySpace pref="19" max="32767" attributes="0"/>
-                  </Group>
-              </Group>
-            </DimensionLayout>
-          </Layout>
-          <SubComponents>
-            <Component class="javax.swing.JButton" name="jBsuivant">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Suivant"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JButton" name="jBprecedent">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Pr&#xe9;c&#xe9;dent"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JLabel" name="jLObservation">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Text"/>
-              </Properties>
-            </Component>
-          </SubComponents>
-        </Container>
-        <Component class="javax.swing.JLabel" name="jLabel1">
           <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+            <Property name="text" type="java.lang.String" value="Prix :"/>
-              <Image iconType="3" name="/img/logodetoure.gif"/>
-            </Property>
           </Properties>
         </Component>
       </SubComponents>

GSBapplication/src/presentation/jffInfoMedoc.java

@@ -5,43 +5,18 @@
 package presentation;
 
 import Metier.Medicament;
-import acces_aux_donnes.observationSQL;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import javax.swing.ImageIcon;
 
 /**
  *
  * @author emile.lalorcey
  */
 public class jffInfoMedoc extends javax.swing.JFrame {
-    private ArrayList<String> observation = new ArrayList<String>();
-    observationSQL observ = new observationSQL();
-    int metier;
 
     /**
      * Creates new form jffInfoMedoc
      */
-    public jffInfoMedoc(Medicament medocTrouve, int metier) {
+    public jffInfoMedoc(Medicament medocTrouve) {
-        this.metier = metier;
         initComponents();
-        jLNomCo.setText(medocTrouve.getNom());
-        //Icon imgMedoc = new javax.swing.ImageIcon(getClass().getResource("/img/" + medocTrouve.getImg() + ".jpg"));
-        //jLImage.setIcon(imgMedoc);
-        BufferedImage imgResize = null;
-        jLImage.setIcon(new ImageIcon(new javax.swing.ImageIcon(getClass().getResource("/img/" + medocTrouve.getImg() + ".jpg")).getImage().getScaledInstance(200, 50, Image.SCALE_SMOOTH)));
-        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));
-        }
-        if(this.metier != 0){
-            jMObservation.setVisible(false);
-        }
-        
     }
 
     /**
@@ -55,186 +30,81 @@ public class jffInfoMedoc extends javax.swing.JFrame {
 
         jPFond = new javax.swing.JPanel();
         jLNomMedoc = new javax.swing.JLabel();
-        jLNomCo = new javax.swing.JLabel();
+        jLabel1 = new javax.swing.JLabel();
         jLComposition = new javax.swing.JLabel();
         jLContrindication = new javax.swing.JLabel();
         jLImage = new javax.swing.JLabel();
         jSeparator1 = new javax.swing.JSeparator();
-        jLEffet = new javax.swing.JLabel();
+        jLPrix = new javax.swing.JLabel();
-        jPanel1 = new javax.swing.JPanel();
-        jBsuivant = new javax.swing.JButton();
-        jBprecedent = new javax.swing.JButton();
-        jLObservation = new javax.swing.JLabel();
-        jLabel1 = new javax.swing.JLabel();
-        jMenuBar1 = new javax.swing.JMenuBar();
-        jMPage = new javax.swing.JMenu();
-        jMIProfession = new javax.swing.JMenuItem();
-        jMIFamille = new javax.swing.JMenuItem();
-        jMObservation = new javax.swing.JMenu();
-        jMIObservation = new javax.swing.JMenuItem();
-        jMInfo = new javax.swing.JMenu();
-        jMIguide = new javax.swing.JMenuItem();
-        jMcredit = new javax.swing.JMenuItem();
 
         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 :");
+        jLNomMedoc.setText("Nom du Médoc");
 
-        jBsuivant.setText("Suivant");
+        jLabel1.setText("Les effets du médicament");
 
-        jBprecedent.setText("Précédent");
+        jLComposition.setText("Composition du médoc");
 
-        jLObservation.setText("Text");
+        jLContrindication.setText("Contrindications du médoc");
 
-        javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
+        jLImage.setText("Image");
-        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))
-        );
 
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/img/logodetoure.gif"))); // NOI18N
+        jLPrix.setText("Prix :");
 
         javax.swing.GroupLayout jPFondLayout = new javax.swing.GroupLayout(jPFond);
         jPFond.setLayout(jPFondLayout);
         jPFondLayout.setHorizontalGroup(
             jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPFondLayout.createSequentialGroup()
-                .addComponent(jSeparator1)
-                .addContainerGap())
-            .addGroup(jPFondLayout.createSequentialGroup()
-                .addContainerGap()
                 .addGroup(jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPFondLayout.createSequentialGroup()
+                    .addComponent(jSeparator1, javax.swing.GroupLayout.Alignment.TRAILING)
-                        .addComponent(jLContrindication, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jLEffet, javax.swing.GroupLayout.PREFERRED_SIZE, 391, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                     .addGroup(jPFondLayout.createSequentialGroup()
                         .addGroup(jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addGroup(jPFondLayout.createSequentialGroup()
+                                .addContainerGap()
+                                .addComponent(jLContrindication, javax.swing.GroupLayout.PREFERRED_SIZE, 265, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addGap(18, 18, 18)
+                                .addComponent(jLPrix, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            .addGroup(jPFondLayout.createSequentialGroup()
+                                .addContainerGap()
                                 .addGroup(jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPFondLayout.createSequentialGroup()
+                                    .addComponent(jLComposition, javax.swing.GroupLayout.PREFERRED_SIZE, 265, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        .addComponent(jLComposition, javax.swing.GroupLayout.PREFERRED_SIZE, 265, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 265, javax.swing.GroupLayout.PREFERRED_SIZE))
-                                        .addGap(140, 140, 140))
+                                .addGap(18, 18, 18)
-                                    .addGroup(jPFondLayout.createSequentialGroup()
-                                        .addGap(183, 183, 183)
-                                        .addComponent(jLNomCo, javax.swing.GroupLayout.PREFERRED_SIZE, 144, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                        .addGap(78, 78, 78)))
                                 .addComponent(jLImage, javax.swing.GroupLayout.PREFERRED_SIZE, 157, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+                        .addGap(0, 26, Short.MAX_VALUE)))
+                .addContainerGap())
             .addGroup(jPFondLayout.createSequentialGroup()
                 .addGap(168, 168, 168)
                 .addComponent(jLNomMedoc)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 300, Short.MAX_VALUE)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addComponent(jLabel1)
-                .addGap(267, 267, 267))
         );
         jPFondLayout.setVerticalGroup(
             jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPFondLayout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(jLNomMedoc)
+                .addGap(39, 39, 39)
+                .addGroup(jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                    .addGroup(jPFondLayout.createSequentialGroup()
+                        .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 86, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(jLComposition, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jLImage, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addGroup(jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPFondLayout.createSequentialGroup()
-                        .addContainerGap()
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 18, Short.MAX_VALUE)
-                        .addComponent(jLNomMedoc))
+                        .addComponent(jLContrindication, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 23, Short.MAX_VALUE))
-                .addGap(25, 25, 25)
-                .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(35, 35, 35)
-                        .addGap(28, 28, 28)
+                        .addComponent(jLPrix, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addComponent(jLComposition, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
-                        .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)
-                        .addGroup(jPFondLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGap(169, 169, 169))
-                            .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))
-                            .addGroup(jPFondLayout.createSequentialGroup()
-                                .addComponent(jLEffet, javax.swing.GroupLayout.PREFERRED_SIZE, 131, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addGap(0, 0, Short.MAX_VALUE))))
-                    .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())
         );
 
-        jMPage.setText("Page");
-
-        jMIProfession.setText("Choix Métier");
-        jMIProfession.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIProfessionActionPerformed(evt);
-            }
-        });
-        jMPage.add(jMIProfession);
-
-        jMIFamille.setText("Famille Medicament");
-        jMIFamille.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIFamilleActionPerformed(evt);
-            }
-        });
-        jMPage.add(jMIFamille);
-
-        jMenuBar1.add(jMPage);
-
-        jMObservation.setText("Observation");
-        jMObservation.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMObservationActionPerformed(evt);
-            }
-        });
-
-        jMIObservation.setText("jMenuItem3");
-        jMIObservation.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIObservationActionPerformed(evt);
-            }
-        });
-        jMObservation.add(jMIObservation);
-
-        jMenuBar1.add(jMObservation);
-
-        jMInfo.setText("Info");
-
-        jMIguide.setText("Guide");
-        jMIguide.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIguideActionPerformed(evt);
-            }
-        });
-        jMInfo.add(jMIguide);
-
-        jMcredit.setText("Crédit");
-        jMInfo.add(jMcredit);
-
-        jMenuBar1.add(jMInfo);
-
-        setJMenuBar(jMenuBar1);
-
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
@@ -247,37 +117,13 @@ 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(10, 10, 10))
+                .addGap(16, 16, 16))
         );
 
         pack();
     }// </editor-fold>//GEN-END:initComponents
 
-    private void jMIProfessionActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIProfessionActionPerformed
-        new jffProfession().setVisible(true);
-        this.setVisible(false);
-    }//GEN-LAST:event_jMIProfessionActionPerformed
-
-    private void jMIFamilleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIFamilleActionPerformed
-        new jffFamilleMedoc(this.metier).setVisible(true);
-        this.setVisible(false);
-    }//GEN-LAST:event_jMIFamilleActionPerformed
-
-    private void jMObservationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMObservationActionPerformed
-           
-    }//GEN-LAST:event_jMObservationActionPerformed
-
-    private void jMIguideActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIguideActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_jMIguideActionPerformed
-
-    private void jMIObservationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIObservationActionPerformed
-
-        new jffAjoutObservation(this.observation.get(0), 1).setVisible(true);
-    }//GEN-LAST:event_jMIObservationActionPerformed
-
     /**
      * @param args the command line arguments
      */
@@ -313,27 +159,13 @@ 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.JLabel jLPrix;
     private javax.swing.JLabel jLabel1;
-    private javax.swing.JMenuItem jMIFamille;
-    private javax.swing.JMenuItem jMIObservation;
-    private javax.swing.JMenuItem jMIProfession;
-    private javax.swing.JMenuItem jMIguide;
-    private javax.swing.JMenu jMInfo;
-    private javax.swing.JMenu jMObservation;
-    private javax.swing.JMenu jMPage;
-    private javax.swing.JMenuItem jMcredit;
-    private javax.swing.JMenuBar jMenuBar1;
     private javax.swing.JPanel jPFond;
-    private javax.swing.JPanel jPanel1;
     private javax.swing.JSeparator jSeparator1;
     // End of variables declaration//GEN-END:variables
 }

GSBapplication/src/presentation/jffProfession.java

@@ -15,7 +15,6 @@ public class jffProfession extends javax.swing.JFrame {
      */
     public jffProfession() {
         initComponents();
-        
     }
 
     /**