Merge origin/master

src/métiers/Commande.java

@@ -1,13 +1,97 @@
-/*
- * 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 métiers;
-
-/**
- *
- * @author famille Thevenot
- */
-public class Commande {
-    
-}
+/*
+ * 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 métiers;
+
+import java.util.Objects;
+import java.util.HashMap;
+/**
+ *
+ * @author ilona
+ */
+public class Commande {
+    
+private int noCom, noVendeur;
+private String dateCom;
+private HashMap <Instrument, int> lesLignes = new HashMap(); 
+
+
+
+    public Commande(int noCom, int noVendeur, String dateCom) {
+        this.noCom = noCom;
+        this.noVendeur = noVendeur;
+        this.dateCom = dateCom;
+    }
+
+
+    /**
+    * Ajoute une quantité donnée d'un instrument à la commande
+    * @param unInstrument instrument à ajouter
+    * @param qte quantité à ajouter 
+    * @return true si l'ajout est bon
+    */
+    public boolean ajouter(Instrument unInstrument, int qte){
+        boolean ajoutOK = lesLignes.put(unInstrument,qte);
+        return ajoutOK;
+    }
+    /**
+    * Supprimer un instrument de la commande
+    * @param unInstrument instrument à supprimer
+    * @return true si la suppression est effectuée
+    */
+    public boolean supprimer(Instrument unInstrument){
+        boolean suppOK = lesLignes.remove(unInstrument);
+        return suppOK;
+    }
+   
+/////////////////////////////////////////////////////////////////////////////////
+    
+    public int getNoCom() {
+        return noCom;
+    }
+
+    public int getNoVendeur() {
+        return noVendeur;
+    }
+
+    public String getDateCom() {
+        return dateCom;
+    }
+
+    public void setNoCom(int noCom) {
+        this.noCom = noCom;
+    }
+
+    public void setNoVendeur(int noVendeur) {
+        this.noVendeur = noVendeur;
+    }
+
+    public void setDateCom(String dateCom) {
+        this.dateCom = dateCom;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Commande other = (Commande) obj;
+        if (this.noCom != other.noCom) {
+            return false;
+        }
+        if (this.noVendeur != other.noVendeur) {
+            return false;
+        }
+        return Objects.equals(this.dateCom, other.dateCom);
+    }
+    
+    
+}

src/métiers/Instrument.java

@@ -1,13 +1,63 @@
-/*
- * 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 métiers;
-
-/**
- *
- * @author famille Thevenot
- */
-public class Instrument {
-    
-}
+/*
+ * 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 métiers;
+
+/**
+ *
+ * @author famille Thevenot
+ */
+public class Instrument {
+  
+    private int ref;
+    private String designation;
+    private int qteStock;
+    private float prix;
+   
+    public Instrument(int ref, String designation, int qteStock, float prix){
+    this.ref=ref;
+    this.designation=designation;
+    this.qteStock=qteStock;
+    this.prix=prix;
+   
+    }
+
+    @Override
+    public String toString() {
+        return "Instrument{" + "ref=" + ref + ", designation=" + designation + ", qteStock=" + qteStock + ", prix=" + prix + '}';
+    }
+
+    public void setRef(int ref) {
+        this.ref = ref;
+    }
+
+    public void setDesignation(String designation) {
+        this.designation = designation;
+    }
+
+    public void setQteStock(int qteStock) {
+        this.qteStock = qteStock;
+    }
+
+    public void setPrix(float prix) {
+        this.prix = prix;
+    }
+
+    public int getRef() {
+        return ref;
+    }
+
+    public String getDesignation() {
+        return designation;
+    }
+
+    public int getQteStock() {
+        return qteStock;
+    }
+
+    public float getPrix() {
+        return prix;
+    }
+
+}