diff --git a/GSBapplication/nbproject/project.properties b/GSBapplication/nbproject/project.properties index 302732d..739329d 100644 --- a/GSBapplication/nbproject/project.properties +++ b/GSBapplication/nbproject/project.properties @@ -48,7 +48,8 @@ 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=\ diff --git a/GSBapplication/src/Metier/familleMedicament.java b/GSBapplication/src/Metier/familleMedicament.java new file mode 100644 index 0000000..5488db0 --- /dev/null +++ b/GSBapplication/src/Metier/familleMedicament.java @@ -0,0 +1,23 @@ +/* + * 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(); + } + +} + diff --git a/GSBapplication/src/Metier/praticien.java b/GSBapplication/src/Metier/praticien.java new file mode 100644 index 0000000..dcef7ed --- /dev/null +++ b/GSBapplication/src/Metier/praticien.java @@ -0,0 +1,83 @@ +/* + * 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 praticien { + private int idPraticien; + private String nomPraticien; + private String prenom; + private String typePraticien; + + /** + * Constructeur de la classe praticien + * avec une initialisation des variables + * @param idPraticien + * @param nomPraticien + * @param prenom + * @param typePraticien + */ + public praticien(int idPraticien, String nomPraticien, String prenom, String typePraticien) { + this.idPraticien = idPraticien; + this.nomPraticien = nomPraticien; + this.prenom = prenom; + this.typePraticien = typePraticien; + } + /** + * Getteur de l'id du pratitien + * @return idPraticien + */ + public int getIdPraticien() { + return this.idPraticien; + } + + /** + * Getteur du nom du pratitien + * @return nomPraticien + */ + public String getNomPraticien() { + return this.nomPraticien; + } + + /** + * Getteur du prénom du pratitien + * @return prenom + */ + public String getPrenom() { + return this.prenom; + } + + /** + * Getteur du type de pratitien + * @return typePraticien + */ + public String getTypePraticien() { + return this.typePraticien; + } + /** + * Fonction toString permettant + * de connaître les valeures des attribut de l'objet + * @return valeurs des attributs + */ + @Override + public String toString(){ + return this.getIdPraticien() + this.getNomPraticien() + this.getPrenom() + this.getTypePraticien(); + } + + + + + + + + + + + + +} diff --git a/GSBapplication/src/presentation/jffConnexion.form b/GSBapplication/src/presentation/jffConnexion.form index 4a131f7..f034379 100644 --- a/GSBapplication/src/presentation/jffConnexion.form +++ b/GSBapplication/src/presentation/jffConnexion.form @@ -47,14 +47,20 @@ + + + + + - + + - + @@ -69,7 +75,7 @@ - + @@ -81,9 +87,6 @@ - - - @@ -119,5 +122,12 @@ + + + + + + + diff --git a/GSBapplication/src/presentation/jffConnexion.java b/GSBapplication/src/presentation/jffConnexion.java index e41d811..b21494c 100644 --- a/GSBapplication/src/presentation/jffConnexion.java +++ b/GSBapplication/src/presentation/jffConnexion.java @@ -33,12 +33,12 @@ 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); jLabel1.setText("Bonjour veuillez vous identifier"); - jTFIdentifiant.setText("jTextField1"); jTFIdentifiant.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { jTFIdentifiantActionPerformed(evt); @@ -57,6 +57,8 @@ 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( @@ -79,13 +81,18 @@ 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() - .addGap(42, 42, 42) + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(4, 4, 4) .addComponent(jLabel1) - .addGap(32, 32, 32) + .addGap(48, 48, 48) .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)) @@ -97,7 +104,7 @@ public class jffConnexion extends javax.swing.JFrame { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jBValider) .addComponent(jBquitter)) - .addContainerGap(64, Short.MAX_VALUE)) + .addContainerGap(48, Short.MAX_VALUE)) ); pack(); @@ -147,6 +154,7 @@ 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; diff --git a/GSBapplication/src/presentation/jffProfession.form b/GSBapplication/src/presentation/jffProfession.form index caac07a..6e748ab 100644 --- a/GSBapplication/src/presentation/jffProfession.form +++ b/GSBapplication/src/presentation/jffProfession.form @@ -34,8 +34,8 @@ - - @@ -56,23 +56,18 @@ - - - - - - - - + + + + - + - + @@ -107,7 +102,7 @@ - + diff --git a/GSBapplication/src/presentation/jffProfession.java b/GSBapplication/src/presentation/jffProfession.java index 030c89d..a198b3b 100644 --- a/GSBapplication/src/presentation/jffProfession.java +++ b/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(); - jLLogo = new javax.swing.JLabel(); + jLabel2 = 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 { } }); - jLLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/img/logodetoure.gif"))); // NOI18N + jLabel2.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, 46, Short.MAX_VALUE) - .addComponent(jLLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 73, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 69, Short.MAX_VALUE) + .addComponent(jLabel2) .addContainerGap()) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -83,20 +83,17 @@ 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() - .addComponent(jLLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(42, 42, 42) + .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jLChoixPro) + .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(60, Short.MAX_VALUE)) + .addContainerGap(57, Short.MAX_VALUE)) ); pack(); @@ -150,6 +147,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 jLLogo; + private javax.swing.JLabel jLabel2; // End of variables declaration//GEN-END:variables }