Merge pull request 'Test git' (#8) from MedhiJava into main

Reviewed-on: #8

GSBapplication/nbproject/project.properties

@@ -48,8 +48,7 @@ javac.source=21
 javac.target=21
 javac.test.classpath=\
     ${javac.classpath}:\
-    ${build.classes.dir}:\
+    ${build.classes.dir}
-    ${libs.junit_5.classpath}
 javac.test.modulepath=\
     ${javac.modulepath}
 javac.test.processorpath=\

GSBapplication/src/Metier/Observation.java

@@ -0,0 +1,31 @@
+/*
+ * 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 Observation {
+    /**
+     * observation = l'observation d'un m<>dicament
+     */
+    private String observation;
+
+    
+    
+    //LES GUETTEUR
+    /**
+     * @return the observation
+     */
+    public String getObservation() {
+        return observation;
+    }
+    
+    
+    
+    
+    
+}

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 + '}';
+    }
+  
+}

GSBapplication/src/Metier/familleMedicament.java

@@ -1,23 +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 Metier;
-
-/**
- *
- * @author lalor
- */
-public class familleMedicament {
-    private String nomFamille;
-    
-    public familleMedicament(String nom){
-        this.nomFamille = nom;
-    }
-    
-    public String getNom(){
-        return this.getNom();
-    }
-    
-}
-

GSBapplication/src/Metier/praticien.java

@@ -6,78 +6,70 @@ package Metier;
 
 /**
  *
- * @author lalor
+ * @author medhi.rodrigues
  */
 public class praticien {
-    private int idPraticien;
+    /**
-    private String nomPraticien;
+     * id = L'identifiant du praticien
+     * nom = le nom du praticien
+     * prenom = le prenom du praticien
+     * type_praticien = le type de praticien (ex : M<>decine de Ville)
+     */
+    private int id;
+    private String nom;
     private String prenom;
-    private String typePraticien;
+    private String type_praticien;
     
-    /**
+    
-     * Constructeur de la classe praticien 
+    /** LE CONSTRUCTEUR DEFAULT
-     * avec une initialisation des variables
+     * 
-     * @param idPraticien
+     * @param id
-     * @param nomPraticien
+     * @param nom
      * @param prenom
-     * @param typePraticien 
+     * @param type_praticien 
      */
-    public praticien(int idPraticien, String nomPraticien, String prenom, String typePraticien) {
+    public praticien(int id, String nom, String prenom, String type_praticien) {
-        this.idPraticien = idPraticien;
+        this.id = id;
-        this.nomPraticien = nomPraticien;
+        this.nom = nom;
         this.prenom = prenom;
-        this.typePraticien = typePraticien;
+        this.type_praticien = type_praticien;
     }
+    
+    
+    //LES GETTEUR
     /**
-     * Getteur de l'id du pratitien
+     * @return the id
-     * @return idPraticien
      */
-    public int getIdPraticien() {
+    public int getId() {
-        return this.idPraticien;
+        return id;
     }
 
     /**
-     * Getteur du nom du pratitien
+     * @return the nom
-     * @return nomPraticien
      */
-    public String getNomPraticien() {
+    public String getNom() {
-        return this.nomPraticien;
+        return nom;
     }
 
     /**
-     * Getteur du pr<70>nom du pratitien
+     * @return the prenom
-     * @return prenom
      */
     public String getPrenom() {
-        return this.prenom;
+        return prenom;
     }
 
     /**
-     * Getteur du type de pratitien
+     * @return the type_praticien
-     * @return typePraticien
      */
-    public String getTypePraticien() {
+    public String getType_praticien() {
-        return this.typePraticien;
+        return type_praticien;
     }
-    /**
+
-     * Fonction toString permettant 
+    
-     * de conna<6E>tre les valeures des attribut de l'objet
-     * @return valeurs des attributs
-     */
     @Override
-    public String toString(){
+    public String toString() {
-        return this.getIdPraticien() + this.getNomPraticien() + this.getPrenom() + this.getTypePraticien();
+        return "Praticien{" + "id=" + id + ", nom=" + nom + ", prenom=" + prenom + ", type_praticien=" + type_praticien + '}';
     }
       
    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
 }

GSBapplication/src/Metier/visiteur_medicaux.java

@@ -0,0 +1,68 @@
+/*
+ * 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 visiteur_medicaux {
+    /**
+     * id = l'identifiant du visiteur
+     * nom = le nom du visiteur
+     * prenom = le prenom du visiteur
+     * region = la region du visiteur
+     */
+    private int id;
+    private String nom;
+    private String prenom;
+    private String region;
+    
+    /** LE CONSTRUCTEUR DEFAULT
+     * 
+     * 
+     * @param id
+     * @param nom
+     * @param prenom
+     * @param region 
+     */
+    public visiteur_medicaux(int id, String nom, String prenom, String region) {
+        this.id = id;
+        this.nom = nom;
+        this.prenom = prenom;
+        this.region = region;
+    }
+    
+    
+    //LES GETTEUR
+    /**
+     * @return the id
+     */
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * @return the nom
+     */
+    public String getNom() {
+        return nom;
+    }
+
+    /**
+     * @return the prenom
+     */
+    public String getPrenom() {
+        return prenom;
+    }
+
+    /**
+     * @return the region
+     */
+    public String getRegion() {
+        return region;
+    }
+
+}

GSBapplication/src/presentation/jffConnexion.form

@@ -47,20 +47,14 @@
               </Group>
               <EmptySpace pref="102" max="32767" attributes="0"/>
           </Group>
-          <Group type="102" alignment="1" attributes="0">
-              <EmptySpace max="32767" attributes="0"/>
-              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <Component id="jLabel2" min="-2" pref="38" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="42" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
               <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="48" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="32" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="jTFIdentifiant" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="jLIdentifiant" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -75,7 +69,7 @@
                   <Component id="jBValider" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="jBquitter" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="48" max="32767" attributes="0"/>
+              <EmptySpace pref="64" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -122,12 +116,5 @@
         <Property name="text" type="java.lang.String" value="Mot de passe :"/>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel2">
-      <Properties>
-        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-          <Image iconType="3" name="/img/logodetoure.gif"/>
-        </Property>
-      </Properties>
-    </Component>
   </SubComponents>
 </Form>

GSBapplication/src/presentation/jffConnexion.java

@@ -33,7 +33,6 @@ public class jffConnexion extends javax.swing.JFrame {
         jBquitter = new javax.swing.JButton();
         jLIdentifiant = new javax.swing.JLabel();
         jLmdp = new javax.swing.JLabel();
-        jLabel2 = new javax.swing.JLabel();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
 
@@ -57,8 +56,6 @@ public class jffConnexion extends javax.swing.JFrame {
 
         jLmdp.setText("Mot de passe :");
 
-        jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/img/logodetoure.gif"))); // NOI18N
-
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
@@ -81,18 +78,13 @@ public class jffConnexion extends javax.swing.JFrame {
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(jPFmdp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                 .addContainerGap(102, Short.MAX_VALUE))
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(jLabel2)
-                .addContainerGap())
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
-                .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGap(42, 42, 42)
-                .addGap(4, 4, 4)
                 .addComponent(jLabel1)
-                .addGap(48, 48, 48)
+                .addGap(32, 32, 32)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(jTFIdentifiant, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jLIdentifiant))
@@ -104,7 +96,7 @@ public class jffConnexion extends javax.swing.JFrame {
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(jBValider)
                     .addComponent(jBquitter))
-                .addContainerGap(48, Short.MAX_VALUE))
+                .addContainerGap(64, Short.MAX_VALUE))
         );
 
         pack();
@@ -154,7 +146,6 @@ public class jffConnexion extends javax.swing.JFrame {
     private javax.swing.JButton jBquitter;
     private javax.swing.JLabel jLIdentifiant;
     private javax.swing.JLabel jLabel1;
-    private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLmdp;
     private javax.swing.JPasswordField jPFmdp;
     private javax.swing.JTextField jTFIdentifiant;

GSBapplication/src/presentation/jffProfession.form

@@ -34,8 +34,8 @@
           <Group type="102" attributes="0">
               <EmptySpace min="-2" pref="137" max="-2" attributes="0"/>
               <Component id="jLChoixPro" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="69" max="32767" attributes="0"/>
+              <EmptySpace pref="46" max="32767" attributes="0"/>
-              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+              <Component id="jLLogo" min="-2" pref="73" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
           <Group type="102" alignment="1" attributes="0">
@@ -56,18 +56,23 @@
     <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="0" attributes="0">
-              <Group type="103" groupAlignment="1" attributes="0">
+                  <Group type="102" attributes="0">
+                      <EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
                       <Component id="jLChoixPro" min="-2" max="-2" attributes="0"/>
-                  <Component id="jLabel2" min="-2" pref="38" max="-2" attributes="0"/>
                   </Group>
-              <EmptySpace min="-2" pref="59" max="-2" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="jLLogo" min="-2" pref="52" max="-2" attributes="0"/>
+                  </Group>
+              </Group>
+              <EmptySpace min="-2" pref="42" max="-2" attributes="0"/>
               <Component id="jBpraticien" min="-2" pref="31" max="-2" attributes="0"/>
               <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
               <Component id="jBvisiteurMedical" min="-2" pref="31" max="-2" attributes="0"/>
               <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               <Component id="jBquitter" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="57" max="32767" attributes="0"/>
+              <EmptySpace pref="60" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -102,7 +107,7 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jBquitterActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel2">
+    <Component class="javax.swing.JLabel" name="jLLogo">
       <Properties>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
           <Image iconType="3" name="/img/logodetoure.gif"/>

GSBapplication/src/presentation/jffProfession.java

@@ -30,7 +30,7 @@ public class jffProfession extends javax.swing.JFrame {
         jBpraticien = new javax.swing.JButton();
         jBvisiteurMedical = new javax.swing.JButton();
         jBquitter = new javax.swing.JButton();
-        jLabel2 = new javax.swing.JLabel();
+        jLLogo = new javax.swing.JLabel();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
         setBackground(new java.awt.Color(255, 102, 153));
@@ -54,7 +54,7 @@ public class jffProfession extends javax.swing.JFrame {
             }
         });
 
-        jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/img/logodetoure.gif"))); // NOI18N
+        jLLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/img/logodetoure.gif"))); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
@@ -67,8 +67,8 @@ public class jffProfession extends javax.swing.JFrame {
             .addGroup(layout.createSequentialGroup()
                 .addGap(137, 137, 137)
                 .addComponent(jLChoixPro)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 69, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 46, Short.MAX_VALUE)
-                .addComponent(jLabel2)
+                .addComponent(jLLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 73, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -82,18 +82,21 @@ public class jffProfession extends javax.swing.JFrame {
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(25, 25, 25)
+                        .addComponent(jLChoixPro))
                     .addGroup(layout.createSequentialGroup()
                         .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                        .addComponent(jLLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                    .addComponent(jLChoixPro)
+                .addGap(42, 42, 42)
-                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addGap(59, 59, 59)
                 .addComponent(jBpraticien, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(29, 29, 29)
                 .addComponent(jBvisiteurMedical, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(26, 26, 26)
                 .addComponent(jBquitter)
-                .addContainerGap(57, Short.MAX_VALUE))
+                .addContainerGap(60, Short.MAX_VALUE))
         );
 
         pack();
@@ -147,6 +150,6 @@ public class jffProfession extends javax.swing.JFrame {
     private javax.swing.JButton jBquitter;
     private javax.swing.JButton jBvisiteurMedical;
     private javax.swing.JLabel jLChoixPro;
-    private javax.swing.JLabel jLabel2;
+    private javax.swing.JLabel jLLogo;
     // End of variables declaration//GEN-END:variables
 }