From 6dfcfe4e217c8f06dd3bf011fa489a3270e82aec Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Tue, 29 Aug 2023 21:20:05 +0200
Subject: [PATCH] sorting tasks in pdf

---
 .idea/watcherTasks.xml                       |  2 +-
 httpdocs/composer.json                       |  1 +
 httpdocs/composer.lock                       |  2 +-
 httpdocs/src/Controller/UserController.php   | 14 +-------------
 httpdocs/src/Repository/UserRepository.php   | 18 +++++++++++++++++-
 httpdocs/templates/pages/worksheet.html.twig |  1 +
 httpdocs/templates/pdf/pdf.html.twig         |  5 +++--
 7 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 72ef692..ba358ee 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -16,7 +16,7 @@
       <option name="outputFromStdout" value="false" />
       <option name="program" value="sass" />
       <option name="runOnExternalChanges" value="true" />
-      <option name="scopeName" value="Unnamed" />
+      <option name="scopeName" value="mpp" />
       <option name="trackOnlyRoot" value="true" />
       <option name="workingDir" value="$FileDir$" />
       <envs />
diff --git a/httpdocs/composer.json b/httpdocs/composer.json
index 3f32710..bb6dd2e 100644
--- a/httpdocs/composer.json
+++ b/httpdocs/composer.json
@@ -39,6 +39,7 @@
         "symfony/string": "5.2.*",
         "symfony/swiftmailer-bundle": "^3.5",
         "symfony/translation": "5.2.*",
+        "symfony/twig-bridge": "5.2.*",
         "symfony/twig-bundle": "^5.2",
         "symfony/validator": "5.2.*",
         "symfony/web-link": "5.2.*",
diff --git a/httpdocs/composer.lock b/httpdocs/composer.lock
index ca23327..7e2d3b1 100644
--- a/httpdocs/composer.lock
+++ b/httpdocs/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "358bc2359e8ab59c4f397e9c581de202",
+    "content-hash": "93fc15fd27716975eb0f217f93074d24",
     "packages": [
         {
             "name": "brick/math",
diff --git a/httpdocs/src/Controller/UserController.php b/httpdocs/src/Controller/UserController.php
index 88f17e5..fcca932 100644
--- a/httpdocs/src/Controller/UserController.php
+++ b/httpdocs/src/Controller/UserController.php
@@ -202,22 +202,10 @@ class UserController extends AbstractController
             throw new \Exception('not allowed or not exists');
         }
 
-        $sortedWorksheetTasks = $worksheet->getUserWorkSheetTasks()->toArray();
-
-        usort($sortedWorksheetTasks, function($a, $b) {
-            $delimComparison = strcmp($a->getDelimitation(), $b->getDelimitation());
-
-            if ($delimComparison === 0) {
-                return strcmp($a->getTask(), $b->getTask());
-            }
-
-            return $delimComparison;
-        });
-
         return $this->render('pages/worksheet.html.twig',
             [
                 'worksheet' => $worksheet,
-                'sortedWorksheetTasks' => $sortedWorksheetTasks,
+                'sortedWorksheetTasks' => UserRepository::getSortedWorksheetTasks($worksheet),
                 'isPdf' => false
             ]
         );
diff --git a/httpdocs/src/Repository/UserRepository.php b/httpdocs/src/Repository/UserRepository.php
index ec660fe..b5497c0 100644
--- a/httpdocs/src/Repository/UserRepository.php
+++ b/httpdocs/src/Repository/UserRepository.php
@@ -60,11 +60,11 @@ class UserRepository extends ServiceEntityRepository
         $dompdf = new Dompdf($pdfOptions);
         $dompdf->setPaper('A4', 'portrait');
 
-
         // Retrieve the HTML generated in our twig file
         $html = $twig->render('pdf/pdf.html.twig',
             [
                 'worksheet' => $worksheet,
+                'sortedWorksheetTasks' => UserRepository::getSortedWorksheetTasks($worksheet),
                 'isPdf' => true
             ]
         );
@@ -94,4 +94,20 @@ class UserRepository extends ServiceEntityRepository
 
         return $dompdf;
     }
+
+    public static function getSortedWorksheetTasks(UserWorksheet $worksheet)
+    {
+        $sortedWorksheetTasks = $worksheet->getUserWorkSheetTasks()->toArray();
+
+        usort($sortedWorksheetTasks, function($a, $b) {
+            $delimComparison = strcmp($a->getDelimitation(), $b->getDelimitation());
+
+            if ($delimComparison === 0) {
+                return strcmp($a->getTask(), $b->getTask());
+            }
+
+            return $delimComparison;
+        });
+        return $sortedWorksheetTasks;
+    }
 }
diff --git a/httpdocs/templates/pages/worksheet.html.twig b/httpdocs/templates/pages/worksheet.html.twig
index f997679..0992fde 100644
--- a/httpdocs/templates/pages/worksheet.html.twig
+++ b/httpdocs/templates/pages/worksheet.html.twig
@@ -10,6 +10,7 @@
     {% include 'snippets/worksheet-result.html.twig' with {
         data: {
             'worksheet': worksheet,
+            'sortedWorksheetTasks': sortedWorksheetTasks,
             'isPdf': isPdf
         }
     } %}
diff --git a/httpdocs/templates/pdf/pdf.html.twig b/httpdocs/templates/pdf/pdf.html.twig
index 2bbc45b..34de1b1 100644
--- a/httpdocs/templates/pdf/pdf.html.twig
+++ b/httpdocs/templates/pdf/pdf.html.twig
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="UTF-8" />
-    <title>MPPTool</title>
+    <title>Instandhaltungsplanung</title>
     <style>
         body, table, td, th {text-align: left;font-size: 11px;line-height: 16px;font-weight: normal;font-style:normal;font-family: Arial, Verdana, sans-serif;}
         table {margin: 0;}
@@ -27,12 +27,13 @@
         </tr>
         <tr>
             <td width="70%"><h1>MPP Tool - Arbeitsblatt <span>(erstellt am: {{ worksheet.creationDate|date("d.m.Y H:i") }})</span></h1></td>
-            <td width="30%" style="text-align: right;"><img src="{{ app.request.getSchemeAndHttpHost() }}/assets/images/logos/real-fm.png" alt="RealFM e.V." style="display: block;width: auto;height: 40px;" /></td>
+            <td width="30%" style="text-align: right;"><img src="{{ app.request.getSchemeAndHttpHost() ~ '/assets/images/logos/real-fm.png' }}" alt="RealFM e.V." style="display: block;width: auto;height: 40px;" /></td>
         </tr>
     </table>
     {% include 'snippets/worksheet-result.html.twig' with {
         data: {
             'worksheet': worksheet,
+            'sortedWorksheetTasks': sortedWorksheetTasks,
             'isPdf': isPdf
         }
     } %}