Merge pull request #7 from aakb/feature/itstyr-64-export-comments

Feature/itstyr 64 export comments

Author: rimi-itk

CHANGELOG.md

@@ -1,5 +1,10 @@
 # ITStyr CHANGELOG
 
+## in develop
+
+* Adds export of comments on answers instead of results.
+* Adds color option for each answer in export.
+
 ## 1.9.0
 
 * Added eDoc url to Report and System.

src/Controller/ExportController.php

@@ -13,11 +13,18 @@
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 
-
+/**
+ * Class ExportController
+ * @package App\Controller
+ */
 class ExportController extends Controller
 {
     /**
      * @Route("/export/report", name="export_report")
+     *
+     * @param \App\Service\DataExporter $dataExporter
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      */
     public function exportReports(
         DataExporter $dataExporter
@@ -27,6 +34,10 @@ public function exportReports(
 
     /**
      * @Route("/export/system", name="export_system")
+     *
+     * @param \App\Service\DataExporter $dataExporter
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      */
     public function exportSystems(
         DataExporter $dataExporter
@@ -36,6 +47,12 @@ public function exportSystems(
 
     /**
      * @Route("/export", name="export_page")
+     *
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @param \App\Service\DataExporter $dataExporter
+     * @return \Symfony\Component\HttpFoundation\Response
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      */
     public function exportPage(Request $request, DataExporter $dataExporter)
     {
@@ -53,6 +70,20 @@ public function exportPage(Request $request, DataExporter $dataExporter)
                 'system' => 'system',
             ]))
             ->add('group', ChoiceType::class, array('label' => 'Gruppe', 'choices' => $choices))
+            ->add('export_type', ChoiceType::class, [
+                'label' => 'Eksport type',
+                'choices' => [
+                    'Resultater' => 'results',
+                    'Kommentarer' => 'comments',
+                ]
+            ])
+            ->add('color', ChoiceType::class, [
+                'label' => 'Farve',
+                'choices' => [
+                    'Uden farver' => false,
+                    'Med farver' => true,
+                ],
+            ])
             ->add('submit', SubmitType::class, array('label' => 'Hent'))
             ->getForm();
 
@@ -62,12 +93,14 @@ public function exportPage(Request $request, DataExporter $dataExporter)
             $data = $form->getData();
             $selectedGroupId = $data['group'];
             $selectedEntity = $data['entity'];
+            $selectedExportType = $data['export_type'];
+            $withColor = $data['color'];
 
             if ($selectedEntity == 'report') {
-                return $dataExporter->exportReport($selectedGroupId, true);
+                $dataExporter->exportReport($selectedGroupId, true, $selectedExportType === 'comments', $withColor);
             }
             else if ($selectedEntity == 'system') {
-                return $dataExporter->exportSystem($selectedGroupId, true);
+                $dataExporter->exportSystem($selectedGroupId, true, $selectedExportType === 'comments', $withColor);
             }
         }