diff --git a/class/animal.php b/class/animal.php index c63d81c690f136423a3286ee2002cc861a10b1ab..2249e2c76eb7d84079fa9512dd7e449e4ae5ba6e 100644 --- a/class/animal.php +++ b/class/animal.php @@ -28,11 +28,13 @@ class Animal extends Objet ), "date_naissance" => array( "i" => 8, - "label" => "Date de naissance" + "label" => "Date de naissance", + "t" => "DateField" ), "date_deces" => array( "i" => 9, - "label" => "Date de deces" + "label" => "Date de deces", + "t" => "DateField" ), "sterile" => array( "t" => "BoolField", diff --git a/class/client.php b/class/client.php index f4caeb13d70920a653ba2a6ae07a662c10afef40..caaadc2c1f0e8d4f6df1bf65f12d5d4088916714 100644 --- a/class/client.php +++ b/class/client.php @@ -2,6 +2,7 @@ class Client extends Personne { + protected $num_tel; public $_specialFields = array( "num_tel" => array( @@ -9,8 +10,6 @@ class Client extends Personne "label" => "Numero de telephone", )); - protected $num_tel; - public function num_tel() { return $this->num_tel; diff --git a/class/datefield.php b/class/datefield.php index 07879d584c5c6f14b11d2a270af91a2dce77fde4..801bcef4cb284dfe43e7dd14c2c338831d2faed8 100644 --- a/class/datefield.php +++ b/class/datefield.php @@ -6,28 +6,18 @@ class DateField extends Field // Todo, if isset($_POST[$this->name]) && !$this->validate() => Show a error msg explanation for this line. $html = '<div class="form-group"> <label for="form'.$this->name.'">'.$this->label.'</label> - <input type="number" class="form-control" name="'.$this->name.'" value="'.$this->value.'"> + <input type="date" class="form-control" name="'.$this->name.'" value="'.$this->value.'"> </div>'; return $html; } public function validate() { - - if (isset($_POST[$this->name])) - { - $this->value = $_POST[$this->name]; - if ($this->value > -1) { - return true; - } - } - return false; + $this->value = $_POST[$this->name]; + return true; } public function show() { - $prix = $this->value; - $html = (string)$prix; - $html .= "€"; - return $html; + return $this->value; } } diff --git a/class/facture.php b/class/facture.php index 8171392c66f77654b4c3e6893821c3e824667817..371b93f5a478947910212cfad53f0273dbef4a79 100644 --- a/class/facture.php +++ b/class/facture.php @@ -18,11 +18,13 @@ class Facture extends Objet ), "date_edition" => array( "label" => "Date d'édition", - "i" => 8 + "i" => 8, + "t" => "DateField" ), "date_paiement" => array( "label" => "Date de paiement", - "i" => 8 + "i" => 8, + "t" => "DateField" ), "moyen_paiement" => array( "label" => "Moyen de paiement", diff --git a/class/ordonnance.php b/class/ordonnance.php index 7ccc0602a0ffff71ab8e68be12f5efc5f67ddeff..42914dad2724d289fe8d3bda5cf36d3f6e7bcc8f 100644 --- a/class/ordonnance.php +++ b/class/ordonnance.php @@ -12,7 +12,8 @@ class Ordonnance extends Objet "i" => 1 ), "date" => array( - "i" => 2 + "i" => 2, + "t" => "DateField" ), "animal" => array( "i" => 3 diff --git a/class/pricefield.php b/class/pricefield.php index d48240bad3d7d6f8792fc60c99e6badeaa8ed52a..f925096145f63d999c38f38e4affaf8368f6ea61 100644 --- a/class/pricefield.php +++ b/class/pricefield.php @@ -27,7 +27,7 @@ class PriceField extends Field public function show() { $prix = $this->value; $html = (string)$prix; - $html .= "€"; + $html .= " €"; return $html; } } diff --git a/class/rdv.php b/class/rdv.php index 230da613cb604741d1825e106a53cf5d9536a612..32a53709f92507998734389742acf5b1ac618b72 100644 --- a/class/rdv.php +++ b/class/rdv.php @@ -20,7 +20,8 @@ class Rdv extends Objet "i" => 1 ), "date" => array( - "i" => 4 + "i" => 4, + "t" => "DateField" ), "duree" => array( "i" => 5