Merge pull request 'jave.Emile' (#27) from jave.Emile into main

Reviewed-on: #27

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<String> rechercherMedicament (String nomCo){

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<String> rechercheFamille(){

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;
 
 /**
  *
@@ -19,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(){
@@ -60,4 +62,21 @@ public class observationSQL {
         }
         return passer;
     }
+    
+    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

@@ -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<String> rechercherPraticien(String login, String mdp) {

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<String> 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));
+                System.out.println(visiteurCherche.add(result.getString(1)));
                 
             } 
             result.close();

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,6 +159,7 @@ 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 mdp = String.valueOf(jPFmdp.getPassword());
             praticienSQL testPraticien = new praticienSQL();
@@ -165,8 +167,24 @@ 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{
+            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().setVisible(true);
+            }else {
+                leVisiteur.add("12");
+                //JOptionPane.showMessageDialog(null,"Erreur de connexion, Veuillez recommencer");
+                
+            }
+        }
+        this.setVisible(false);
     }//GEN-LAST:event_jBValiderActionPerformed
 
     /**
@@ -199,7 +217,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);
             }
         });
     }

GSBapplication/src/presentation/jffInfoMedoc.form

@@ -33,8 +33,9 @@
     <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="16" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -48,7 +49,7 @@
               <Group type="102" attributes="0">
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Component id="jSeparator1" alignment="1" max="32767" attributes="0"/>
-                      <Group type="102" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
                           <Group type="103" groupAlignment="0" attributes="0">
                               <Group type="102" alignment="0" attributes="0">
                                   <EmptySpace max="-2" attributes="0"/>
@@ -85,6 +86,11 @@
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
+              <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="32767" attributes="0"/>
+              </Group>
           </Group>
         </DimensionLayout>
         <DimensionLayout dim="1">
@@ -92,31 +98,27 @@
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="jLNomMedoc" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="35" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
                           <Component id="jLNomCo" min="-2" pref="37" max="-2" attributes="0"/>
                           <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
                           <Component id="jLComposition" min="-2" pref="74" max="-2" attributes="0"/>
-                          <EmptySpace pref="60" max="32767" attributes="0"/>
+                          <EmptySpace pref="26" max="32767" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="102" attributes="0">
+                              <Group type="102" alignment="0" attributes="0">
                                   <Component id="jLContrindication" min="-2" pref="141" max="-2" attributes="0"/>
-                                  <EmptySpace max="32767" attributes="0"/>
+                                  <EmptySpace pref="7" max="32767" attributes="0"/>
                                   <Component id="jSeparator1" min="-2" pref="10" max="-2" attributes="0"/>
-                                  <EmptySpace min="-2" pref="169" max="-2" attributes="0"/>
                               </Group>
-                              <Group type="102" attributes="0">
-                                  <Component id="jLEffet" min="-2" pref="131" max="-2" attributes="0"/>
-                                  <EmptySpace max="32767" attributes="0"/>
+                              <Component id="jLEffet" alignment="0" min="-2" pref="131" max="-2" attributes="0"/>
                           </Group>
                       </Group>
+                      <Component id="jLImage" alignment="0" min="-2" pref="172" max="-2" attributes="0"/>
                   </Group>
-                      <Group type="102" attributes="0">
-                          <Component id="jLImage" min="-2" pref="172" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
-                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -142,6 +144,58 @@
         </Component>
         <Component class="javax.swing.JLabel" name="jLEffet">
         </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>
       </SubComponents>
     </Container>
   </SubComponents>

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,6 +16,8 @@ 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();
     
     /**
      * 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
 }