sorting tasks in pdf

2 лет назад · 6dfcfe4e21
--- 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 />
--- 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.*",
--- 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",
--- 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
            ]
        );
--- 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;
    }
 }
--- 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
        }
    } %}
--- 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
        }
    } %}