1 files changed, 22 insertions, 13 deletions

diff --git a/src/model/Model.php b/src/model/Model.php
index 07826af..d6597f0 100644
--- a/src/model/Model.php
+++ b/src/model/Model.php
@@ -37,6 +37,11 @@ abstract class Model extends DB
         }
         return $this;
     }
+    public function setTable(string $value)
+    {
+        $this->table = $value;
+        return($this);
+    }
     
         public function hydrate(array $data): bool // $data = tableau associatif en entrée: nom_du_champ => valeur
         {
@@ -60,6 +65,7 @@ abstract class Model extends DB
         }
     
     // cette fonction reçoit des données d'un tableau simple, permettant d'associer des champs de formulaires aux noms différents des champs de la BDD
+    // méthode lancée par des objets de type enfants
     function hydrateFromForm(string $data_string, Object $Presta = NULL): bool // quand l'objet est $Details, on hydrate aussi $Presta
     {
         //~ $tableSize = count(StructTablesDB::$structureOfTables[$this->getTable()]); // int
@@ -84,18 +90,25 @@ abstract class Model extends DB
                 case 'prestations'; // inutilisé
                     break;
                 case 'devis';
-                    //~ $check = $Presta->hydrate(['mode_paiement' => $data_array[6]]);
-                    //~ if($check)
-                    //~ {
-                        //~ $check = $this->hydrate(['taches' => $data_array[0], 'total_main_d_oeuvre' => $data_array[1], 'pieces' => $data_array[2], 'total_pieces' => $data_array[3], 'deplacement' => $data_array[4], 'total_HT' => $data_array[5], 'delai_livraison' => $data_array[7], 'validite_devis' => $data_array[8], 'signature_devis' => $data_array[9]]);
-                    $check = $this->hydrate(['taches' => $data_array[0], 'total_main_d_oeuvre' => $data_array[1], 'pieces' => $data_array[2], 'total_pieces' => $data_array[3], 'deplacement' => $data_array[4], 'total_HT' => $data_array[5], 'delai_livraison' => $data_array[6], 'validite_devis' => $data_array[7]]);
-                    //~ }
+                    $check = $this->hydrate(['taches' => $data_array[0], 'total_main_d_oeuvre' => $data_array[1], 'pieces' => $data_array[2], 'total_pieces' => $data_array[3], 'deplacement' => $data_array[4], 'prix_devis' => $data_array[5], 'total_HT' => $data_array[6], 'delai_livraison' => $data_array[7], 'validite_devis' => $data_array[8]]);
                     break;
                 case 'factures';
-                    $check = $Presta->hydrate(['mode_paiement' => $data_array[10]]);
-                    if($check)
+                    if(count($data_array) === 11)
+                    {
+                        $check = $Presta->hydrate(['mode_paiement' => $data_array[10]]);
+                        if($check)
+                        {
+                            $check = $this->hydrate(['taches' => $data_array[0], 'machine' => $data_array[1], 'OS' => $data_array[2], 'donnees' => $data_array[3], 'cles_licences' => $data_array[4], 'total_main_d_oeuvre' => $data_array[5], 'pieces' => $data_array[6], 'total_pieces' => $data_array[7], 'deplacement' => $data_array[8], 'total_HT' => $data_array[9]]);
+                        }
+                    }
+                    elseif(count($data_array) === 5)
                     {
-                        $check = $this->hydrate(['taches' => $data_array[0], 'machine' => $data_array[1], 'OS' => $data_array[2], 'donnees' => $data_array[3], 'cles_licences' => $data_array[4], 'total_main_d_oeuvre' => $data_array[5], 'pieces' => $data_array[6], 'total_pieces' => $data_array[7], 'deplacement' => $data_array[8], 'total_HT' => $data_array[9]]);
+                        $check = $this->hydrate(['machine' => $data_array[1], 'OS' => $data_array[2], 'donnees' => $data_array[3], 'cles_licences' => $data_array[4]]);
+                    }
+                    else
+                    {
+                        echo "debug: le tableau \$data_array n'a pas la taille attendue.\n";
+                        return false;
                     }
                     break;
                 case 'cesu';
@@ -106,11 +119,7 @@ abstract class Model extends DB
                     }
                     break;
                 case 'locations';
-                    //~ $check = $Presta->hydrate(['mode_paiement' => $data_array[11]]);
-                    //~ if($check)
-                    //~ {
                     $check = $this->hydrate(['designation' => $data_array[0], 'modele_description' => $data_array[1], 'valeur' => $data_array[2], 'etat_des_lieux_debut' => $data_array[3], 'etat_des_lieux_fin' => $data_array[4], 'duree_location' => $data_array[5], 'loyer_mensuel' => $data_array[6], 'loyers_payes' => $data_array[7], 'caution' => $data_array[8]]);
-                    //~ }
                     break;
                 default: // inutilisé
                     echo "debug: table inconnue hydrateFromForm()";