Merge pull request 'observation à finir' (#26 ) from jave.Emile into main

Reviewed-on: #26
observation à finir
2025-03-13 14:39:20 +01:00 · 2025-03-13 14:38:35 +01:00 · 2025-03-13 13:18:17 +01:00 · 2025-03-13 13:17:30 +01:00
8 changed files with 206 additions and 125 deletions
--- a/GSBapplication/src/Metier/famille.java
+++ b/GSBapplication/src/Metier/famille.java
@@ -0,0 +1,38 @@
+/*
+ * 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 Metier;
+
+/**
+ *
+ * @author medhi.rodrigues
+ */
+public class famille {
+    /**
+     * l'identifiant permettant de connaitre la famille du m<>dicament
+     */
+    private String id;
+
+    /** LE CONSTRUCTEUR DEFAULT
+     * 
+     * @param id 
+     */
+    public famille(String id) {
+        this.id = id;
+    }
+
+    // LES SETTEUR 
+    /**
+     * @return the id
+     */
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return "famille{" + "id=" + id + '}';
+    }
+  
+}
--- a/GSBapplication/src/acces_aux_donnes/observationSQL.java
+++ b/GSBapplication/src/acces_aux_donnes/observationSQL.java
@@ -4,10 +4,12 @@
 */
 package acces_aux_donnes;

+import java.lang.reflect.Array;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.ArrayList;

 /**
 *
@@ -60,4 +62,21 @@ public class observationSQL {
        }
        return passer;
    }
+    
+    public ArrayList<String> selectionObservation(String idMedoc){
+        ArrayList<String> observationMedoc = new ArrayList<String>();
+        try {
+            stmt = connexionTest.createStatement();
+            // Acc<63>s <20> 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;
+    }
 }
--- a/GSBapplication/src/acces_aux_donnes/praticienSQL.java
+++ b/GSBapplication/src/acces_aux_donnes/praticienSQL.java
@@ -8,6 +8,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.ArrayList;

 /**
 *
@@ -22,16 +23,16 @@ public class praticienSQL {
        connexionTest = connexionSQL.getConnect("10.121.38.75","bdgsb","adminGSB","mdpGSB");
    }
     
-      public String[] rechercherPraticien(String login, String mdp) {
-        String[] praticienCherche = new String [2];
+      public ArrayList<String> rechercherPraticien(String login, String mdp) {
+        ArrayList<String> praticienCherche = new ArrayList<String>();
        try {
            stmt = connexionTest.createStatement();
            // Acc<63>s <20> la table 
            result = stmt.executeQuery("SELECT * FROM PRATICIENLOG WHERE id='"+login+
                    "' AND mdp='"+mdp + "';");
            if (result.next()) {   // Le praticien a <20>t<EFBFBD> touv<75>
-               praticienCherche[0] = result.getString(1);
-               praticienCherche[1] = result.getString(2);
+               praticienCherche.add(result.getString(1));
+               praticienCherche.add(result.getString(2));
                
            } 
            result.close();
--- a/GSBapplication/src/presentation/jffConnexion.java
+++ b/GSBapplication/src/presentation/jffConnexion.java
@@ -5,7 +5,7 @@
 package presentation;

 import acces_aux_donnes.praticienSQL;
-import javax.swing.JOptionPane;
+import java.util.ArrayList;

 /**
 *
@@ -160,12 +160,12 @@ public class jffConnexion extends javax.swing.JFrame {
        String identifiant = jTFIdentifiant.getText();
        String mdp = String.valueOf(jPFmdp.getPassword());
        praticienSQL testPraticien = new praticienSQL();
-        String [] lePraticien = testPraticien.rechercherPraticien(identifiant,mdp);
-        if (lePraticien[0] != null){
+        ArrayList<String>lePraticien = testPraticien.rechercherPraticien(identifiant,mdp);
+        if (lePraticien.get(0) != null){
            System.out.print("TEST REUSSIE");
-            JOptionPane.showMessageDialog(null,"Bienvenue" + lePraticien[1]);
+            new jffFamilleMedoc().setVisible(true);
        }else {
-            JOptionPane.showMessageDialog(null, "Erreur d'authentification, veuillez r<>esayer");
+            System.out.print("TEST EMILE RACISTE");
        } 
    }//GEN-LAST:event_jBValiderActionPerformed

--- a/GSBapplication/src/presentation/jffFamilleMedoc.form
+++ b/GSBapplication/src/presentation/jffFamilleMedoc.form
@@ -1,48 +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="jMenu1">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="File"/>
-          </Properties>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIAPropos">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="&#xe0; propos"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIAProposActionPerformed"/>
-              </Events>
-            </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="jMIQuitter">
-              <Properties>
-                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
-                  <KeyStroke key="Alt+F4"/>
-                </Property>
-                <Property name="text" type="java.lang.String" value="Quitter"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMIQuitterActionPerformed"/>
-              </Events>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
-        <Menu class="javax.swing.JMenu" name="jMenu2">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Edit"/>
-          </Properties>
-        </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>
@@ -113,7 +75,7 @@
                  <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"/>
+              <EmptySpace pref="287" max="32767" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
--- a/GSBapplication/src/presentation/jffFamilleMedoc.java
+++ b/GSBapplication/src/presentation/jffFamilleMedoc.java
@@ -10,7 +10,6 @@ import acces_aux_donnes.familleMedocSQL;
 import java.util.ArrayList;
 import java.util.Vector;
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.JOptionPane;

 /**
 *
@@ -42,11 +41,6 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
        jBRechercheValide = new javax.swing.JButton();
        jCBFamille = new javax.swing.JComboBox<>();
        jCBMedocListe = new javax.swing.JComboBox<>();
-        jMenuBar1 = new javax.swing.JMenuBar();
-        jMenu1 = new javax.swing.JMenu();
-        jMIAPropos = new javax.swing.JMenuItem();
-        jMIQuitter = new javax.swing.JMenuItem();
-        jMenu2 = new javax.swing.JMenu();

        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);

@@ -81,32 +75,6 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
            }
        });

-        jMenu1.setText("File");
-
-        jMIAPropos.setText("<EFBFBD> propos");
-        jMIAPropos.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIAProposActionPerformed(evt);
-            }
-        });
-        jMenu1.add(jMIAPropos);
-
-        jMIQuitter.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_F4, java.awt.event.InputEvent.ALT_DOWN_MASK));
-        jMIQuitter.setText("Quitter");
-        jMIQuitter.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMIQuitterActionPerformed(evt);
-            }
-        });
-        jMenu1.add(jMIQuitter);
-
-        jMenuBar1.add(jMenu1);
-
-        jMenu2.setText("Edit");
-        jMenuBar1.add(jMenu2);
-
-        setJMenuBar(jMenuBar1);
-
        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
        getContentPane().setLayout(layout);
        layout.setHorizontalGroup(
@@ -150,7 +118,7 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
                .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))
+                .addContainerGap(287, Short.MAX_VALUE))
        );

        pack();
@@ -178,7 +146,8 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
       
            
        }else {
-            JOptionPane.showMessageDialog(null,"Erreur, Veuillez r<>esayer");        }
+            //ajout d'un JoptionPane
+        }
    }//GEN-LAST:event_jBRechercheValideActionPerformed

    private void jCBFamilleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCBFamilleActionPerformed
@@ -212,14 +181,6 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
        }
    }//GEN-LAST:event_jCBMedocListeActionPerformed

-    private void jMIAProposActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIAProposActionPerformed
-        JOptionPane.showMessageDialog(null,"Fait par Medhi et un Raciste");
-    }//GEN-LAST:event_jMIAProposActionPerformed
-
-    private void jMIQuitterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMIQuitterActionPerformed
-        System.exit(0);
-    }//GEN-LAST:event_jMIQuitterActionPerformed
-
    /**
     * @param args the command line arguments
     */
@@ -261,11 +222,6 @@ public class jffFamilleMedoc extends javax.swing.JFrame {
    private javax.swing.JComboBox<String> jCBMedocListe;
    private javax.swing.JLabel jLRecherche;
    private javax.swing.JLabel jLabel1;
-    private javax.swing.JMenuItem jMIAPropos;
-    private javax.swing.JMenuItem jMIQuitter;
-    private javax.swing.JMenu jMenu1;
-    private javax.swing.JMenu jMenu2;
-    private javax.swing.JMenuBar jMenuBar1;
    private javax.swing.JTextField jTFRecherche;
    // End of variables declaration//GEN-END:variables
 }
--- a/GSBapplication/src/presentation/jffInfoMedoc.form
+++ b/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>
--- a/GSBapplication/src/presentation/jffInfoMedoc.java
+++ b/GSBapplication/src/presentation/jffInfoMedoc.java
@@ -5,9 +5,10 @@
 package presentation;

 import Metier.Medicament;
+import acces_aux_donnes.observationSQL;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
-import javax.swing.Icon;
+import java.util.ArrayList;
 import javax.swing.ImageIcon;

 /**
@@ -15,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<EFBFBD>c<EFBFBD>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
 }
Author	SHA1	Message	Date
emile.lalorcey	9de77dc9ea	Merge pull request 'observation à finir' (#26 ) from jave.Emile into main Reviewed-on: #26	2025-03-13 14:39:20 +01:00
emile.malcuit	86f1731141	observation à finir	2025-03-13 14:38:35 +01:00
emile.lalorcey	35043c5d54	Merge pull request 'fin fonction' (#24 ) from jave.Emile into main Reviewed-on: #24	2025-03-13 13:18:17 +01:00
emile.malcuit	3eca7c4d6a	fin fonction	2025-03-13 13:17:30 +01:00