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

class/animal.php

@@ -13,6 +13,10 @@ class Animal extends Objet
     protected $date_deces;
     protected $taille;
     protected $code;
+    public $_specialFields = array(
+        "sterile" => array(
+            "t" => "BoolField"
+        ));
 
     public function id()
     {

class/objet.php

@@ -53,7 +53,7 @@ class Objet
         $ret = array();
         foreach(array_keys(get_object_vars($this)) as $keyName) {
             if($keyName[0] == "_") { continue; }
-            if($keyName == $this->_primaryAttr && $this->_primaryAttr == "") { $ret[] = new Field($keyName, $this->$keyName, true); continue; }
+            if($keyName == $this->_primaryAttr && $this->_primaryAttr == "id") { $ret[] = new Field($keyName, $this->$keyName, true); continue; }
             if(in_array($keyName, array_keys($this->_specialFields))) {
                 $ret[] = new $this->_specialFields[$keyName]["t"]($keyName, $this->$keyName);
             } else {

class/produit.php

@@ -6,6 +6,10 @@ class Produit extends Objet
     protected $nom;
     protected $prix;
     protected $is_medicament;
+    public $_specialFields = array(
+        "is_medicament" => array(
+            "t" => "BoolField"
+        ));
     
     public function id()
     {