Merge branch 'master' of gitlab.utc.fr:nf17-camp-p14/clivi

class/animal.php

@@ -9,8 +9,8 @@ class Animal extends Objet
     private $poids;
     private $genre;
     private $sterile;
-    private $date_naissance;
-    private $date_deces;
+    private $dateNaissance;
+    private $dateDeces;
     private $taille;
     private $code;
 

class/espece.php

@@ -3,7 +3,7 @@
 class Espece extends Objet
 {
     private $nom;
-    private $prix_consult;
+    private $prixConsult;
 
     public function nom()
     {

class/facture.php

@@ -5,10 +5,10 @@ class Facture extends Objet
     private $id;
     private $employe;
     private $animal;
-    private $date_edition;
-    private $date_paiement;
-    private $moyen_paiement;
-    private $prix_total;
+    private $dateEdition;
+    private $datePaiement;
+    private $moyenPaiement;
+    private $prixTotal;
 
     public function id()
     {

class/race.php

@@ -4,7 +4,7 @@ class Race extends Objet
 {
     private $nom;
     private $espece;
-    private $prix_intervention;
+    private $prixIntervention;
 
     public function nom()
     {

controller/animal.php

@@ -15,7 +15,7 @@ switch($action) {
 	case "listeAnimal":
 		$listArray = Animal::getAll();
 		$listParams = array("title" => "Liste des animaux de la clinique",
-							"keys" => array("nom", "proprio", "race", "poids", "genre", "sterile", "date de naissance", "date de décès", "taille", "code d'identification"));
+							"keys" => array("nom", "proprio", "race", "poids", "genre", "sterile", "dateNaissance", "dateDeces", "taille", "code"));
 		include 'view/list.php';
 		break;
 	case "addAnimal":

controller/fact.php

@@ -15,7 +15,7 @@ switch($action) {
 	case "listeFact":
 		$listArray = Employe::getAll();
 		$listParams = array("title" => "Liste des factures",
-							"keys" => array("id", "employe", "animal", "date_edition", "date_paiement", "moyen_paiement", "prix_total"));
+							"keys" => array("id", "employe", "animal", "dateEdition", "datePaiement", "moyenPaiement", "prixTotal"));
 		include 'view/list.php';
 		break;
 	case "addFact":