Merge pull request #503 from dbarzin/dev

fix fiche de contrôle

Author: dbarzin

app/Http/Controllers/ControlController.php

@@ -1823,9 +1823,10 @@ public function template(Request $request)
         $templateProcessor = new PhpWordTemplateProcessor($template_filename);
 
         // Replace names
-        $clauses = $control->measures()->map(function ($measure) {
-            return $measure->clause;
-        })->implode(', ');
+        $clauses = $control->measures()
+            ->pluck('measures.clause') 
+            ->implode(', ');
+
 
         $templateProcessor->setValue('ref', $clauses);
         $templateProcessor->setValue('name', $control->name);

app/Models/Control.php

@@ -53,6 +53,7 @@ class Control extends Model
 
     public function measures()
     {
+        // return $this->belongsToMany(Measure::class,'control_measure','control_id')->orderBy('clause');
         return $this->belongsToMany(Measure::class)->orderBy('clause');
     }