Merge pull request #160 from dbarzin/dev

fix documents
dbarzin · Oct 9, 2024 · dd63a3f · dd63a3f
2 parents 4e9e543 + ec5da01
commit dd63a3f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/app/Http/Controllers/ControlController.php b/app/Http/Controllers/ControlController.php
@@ -1624,7 +1624,9 @@ public function template()
         $templateProcessor = new PhpWordTemplateProcessor($template_filename);
 
         // Replace names
-        $templateProcessor->setValue('ref', $control->clause);
+        $clauses = $control->measures->map(function($measure) { return $measure->clause; })->implode(", ");
+
+        $templateProcessor->setValue('ref', $clauses);
         $templateProcessor->setValue('name', $control->name);
         $templateProcessor->setValue('scope', $control->scope);
         $templateProcessor->setValue('attributes', $control->attributes);

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "laravel/tinker": "^2.9",
         "laravel/ui": "^4.5",
         "maatwebsite/excel": "^3.1",
-        "phpoffice/phpword": "^1.1.0"
+        "phpoffice/phpword": "^1.3"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",

diff --git a/composer.lock b/composer.lock
diff --git a/storage/app/models/control.docx b/storage/app/models/control.docx