diff --git a/class/animal.php b/class/animal.php
index 72c20b1da0b998f637b64f97926724da42e23941..532e31f071c0b8a6823542d76f1b8197dfeb1674 100644
--- a/class/animal.php
+++ b/class/animal.php
@@ -1,6 +1,6 @@
<?php
-class Animal
+class Animal extends Objet
{
private $nom;
private $proprio;
diff --git a/class/employe.php b/class/employe.php
index c53f7271601a39c823189f9b5b0fcbb4bc59b30f..73c483779e63d48c9785fd985245ed2769e8ea1b 100644
--- a/class/employe.php
+++ b/class/employe.php
@@ -2,15 +2,26 @@
class Employe extends Personne
{
- private $id;
+ private $idNational;
+ private $isVeterinaire;
- public function id()
+ public function idNational()
{
- return $this->id;
+ return $this->idNational;
}
- public function setId($id)
+ public function setIdNational($idNational)
{
- $this->id = $id;
+ $this->idNational = $idNational;
+ }
+
+ public function isVeterinaire()
+ {
+ return $this->isVeterinaire;
+ }
+
+ public function setIsVeterinaire($isVeterinaire)
+ {
+ $this->isVeterinaire = $isVeterinaire;
}
}
\ No newline at end of file
diff --git a/class/espece.php b/class/espece.php
index 9a02c8908b9e472a3ecfac32ecb741ef76621305..af9a00864e681fcff0a3b1f46e3b3697b4ba766a 100644
--- a/class/espece.php
+++ b/class/espece.php
@@ -1,6 +1,6 @@
<?php
-class Espece
+class Espece extends Objet
{
private $nom;
private $prix_consult;
diff --git a/class/facture.php b/class/facture.php
index 0ee09399d69a31b613a3c9cb62266bf76c74eb6a..73fb3160e53df83eb40c0a1556a1adbaaa54d510 100644
--- a/class/facture.php
+++ b/class/facture.php
@@ -1,6 +1,6 @@
<?php
-class Facture
+class Facture extends Objet
{
private $id;
private $employe;
diff --git a/class/ligneFacture.php b/class/ligneFacture.php
index 9f2bc364ff6e53cc99d3b6c99a4473f0701ab74b..c2568dcea3476572c2de0142cca56691d0d38849 100644
--- a/class/ligneFacture.php
+++ b/class/ligneFacture.php
@@ -1,21 +1,66 @@
<?php
-class LigneFacture
+class LigneFacture extends Objet
{
- private $num;
+ private $id;
+ private $facture;
+ private $prestation;
+ private $ordonnance;
+ private $produit;
private $quantite;
private $remise;
- public function num()
+ public function id()
{
- return $this->num;
+ return $this->id;
}
- public function setNum($num)
+ public function setId($id)
{
- $this->num = $num;
+ $this->id = $id;
}
+ public function facture()
+ {
+ return $this->facture;
+ }
+
+ public function setFacture($facture)
+ {
+ $this->facture = $facture;
+ }
+
+ public function prestation()
+ {
+ return $this->prestation;
+ }
+
+ public function setPrestation($prestation)
+ {
+ $this->prestation = $prestation;
+ }
+
+ public function ordonnance()
+ {
+ return $this->ordonnance;
+ }
+
+ public function setOrdonnance($ordonnance)
+ {
+ $this->ordonnance = $ordonnance;
+ }
+
+ public function produit()
+ {
+ return $this->produit;
+ }
+
+ public function setProduit($produit)
+ {
+ $this->produit = $produit;
+ }
+
+
public function quantite()
{
return $this->quantite;
diff --git a/class/ligneOrdonnance.php b/class/ligneOrdonnance.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a0c3c810ad51d614c2852170a6ae9aca2ae4593
--- /dev/null
+++ b/class/ligneOrdonnance.php
@@ -0,0 +1,48 @@
+<?php
+
+class LigneOrdonnance extends Objet
+{
+ private $ordonnance;
+ private $medicament;
+ private $quantite;
+ private $instruction;
+
+ public function ordonnance()
+ {
+ return $this->ordonnance;
+ }
+
+ public function setOrdonnance($ordonnance)
+ {
+ $this->ordonnance = $ordonnance;
+ }
+
+ public function medicament()
+ {
+ return $this->medicament;
+ }
+
+ public function setMedicament($medicament)
+ {
+ $this->medicament = $medicament;
+ }
+
+ public function quantite()
+ {
+ return $this->quantite;
+ }
+
+ public function setQuantite($quantite)
+ {
+ $this->quantite = $quantite;
+ }
+
+ public function instruction()
+ {
+ return $this->instruction;
+ }
+
+ public function setInstruction($instruction)
+ {
+ $this->instruction = $instruction;
+ }
\ No newline at end of file
diff --git a/class/ordonnance.php b/class/ordonnance.php
index c624ba0b308af951ffb75b5f7e1bb9ca62478b44..7c84e0c12d2d711e1003a90cc51be4900da80f23 100644
--- a/class/ordonnance.php
+++ b/class/ordonnance.php
@@ -1,9 +1,11 @@
<?php
-class Ordonnance
+class Ordonnance extends Objet
{
private $id;
- private $date_edition;
+ private $veterinaire;
+ private $animal;
+ private $date;
private $prix;
public function id()
@@ -26,6 +28,26 @@ class Ordonnance
$this->date = $date;
}
+ public function veterinaire()
+ {
+ return $this->veterinaire;
+ }
+
+ public function setVeterinaire($veterinaire)
+ {
+ $this->veterinaire = $veterinaire;
+ }
+
+ public function animal()
+ {
+ return $this->animal;
+ }
+
+ public function setAnimal($animal)
+ {
+ $this->animal = $animal;
+ }
+
public function prix()
{
return $this->prix;
diff --git a/class/prestation.php b/class/prestation.php
index f0cc24618a0f4aa8d00f66e737e79d9d3b1738d3..57f2672bd81de17a91f33cb1543de9f7a4a61301 100644
--- a/class/prestation.php
+++ b/class/prestation.php
@@ -1,6 +1,6 @@
<?php
-class Prestation
+class Prestation extends Objet
{
private $id;
private $description;
diff --git a/class/consommable.php b/class/produit.php
similarity index 53%
rename from class/consommable.php
rename to class/produit.php
index e4b7b595dbfc6fd5d7ba858b704524d3f4764c49..b08ff4270908dc619bedef82b43f16f49f568d1e 100644
--- a/class/consommable.php
+++ b/class/produit.php
@@ -1,20 +1,20 @@
<?php
-class Consommable
+class Produit extends Objet
{
- private $ref;
+ private $id;
private $nom;
private $prix;
- private $type;
+ private $isMedicament;
- public function ref()
+ public function id()
{
- return $this->ref;
+ return $this->id;
}
- public function setRef($ref)
+ public function setId($id)
{
- $this->ref = $ref;
+ $this->id = $id;
}
public function nom()
@@ -37,13 +37,13 @@ class Consommable
$this->prix = $prix;
}
- public function type()
+ public function isMedicament()
{
- return $this->type;
+ return $this->isMedicament;
}
- public function setType($type)
+ public function setIsMedicament($isMedicament)
{
- $this->type = $type;
+ $this->isMedicament = $isMedicament;
}
}
diff --git a/class/race.php b/class/race.php
index 15e64c2713002dc67455965aacd3221f5b05674f..0718fcc64099a608094ac94946d18a9c843ff886 100644
--- a/class/race.php
+++ b/class/race.php
@@ -1,8 +1,9 @@
<?php
-class Race
+class Race extends Objet
{
private $nom;
+ private $espece;
private $prix_intervention;
public function nom()
@@ -15,6 +16,16 @@ class Race
$this->nom = $nom;
}
+ public function espece()
+ {
+ return $this->espece;
+ }
+
+ public function setEspece($espece)
+ {
+ $this->espece = $espece;
+ }
+
public function prix_consult()
{
return $this->prix_intervention;
diff --git a/class/rdv.php b/class/rdv.php
index 8fc6b44cffe39f97e1f500b0d74e24da3275bdcf..1032ee833c6d88a1b692126bbffdd02722d1a66a 100644
--- a/class/rdv.php
+++ b/class/rdv.php
@@ -1,8 +1,10 @@
<?php
-class Rdv
+class Rdv extends Objet
{
private $id;
+ private $veterinaire;
+ private $animal;
private $date;
private $duree;
@@ -17,6 +19,22 @@ class Rdv
$this->id = $id;
}
+
+ public function veterinaire()
+ {
+ return $this->veterinaire;
+ }
+
+ public function setVeterinaire($veterinaire)
+ {
+ $this->veterinaire = $veterinaire;
+ }
+
+ public function animal()
+ {
+ return $this->animal;
+ }
+
public function date()
{
return $this->date;
diff --git a/class/veterinaire.php b/class/veterinaire.php
deleted file mode 100644
index a59c817351edaa042e7943f216cef1b18c95a291..0000000000000000000000000000000000000000
--- a/class/veterinaire.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class Veterinaire extends Employe
-{
- private $idNational;
-
- public function idNational()
- {
- return $this->idNational;
- }
-
- public function setIdNational($idNational)
- {
- $this->idNational = $idNational;
- }
-}
\ No newline at end of file