7 измененных файлов: 25 добавлений и 18 удалений
-
+1 -1.idea/watcherTasks.xml
-
+1 -0httpdocs/composer.json
-
+1 -1httpdocs/composer.lock
-
+1 -13httpdocs/src/Controller/UserController.php
-
+17 -1httpdocs/src/Repository/UserRepository.php
-
+1 -0httpdocs/templates/pages/worksheet.html.twig
-
+3 -2httpdocs/templates/pdf/pdf.html.twig
+ 1
- 1
.idea/watcherTasks.xml
Просмотреть файл
| @@ -16,7 +16,7 @@ | |||||
| <option name="outputFromStdout" value="false" /> | <option name="outputFromStdout" value="false" /> | ||||
| <option name="program" value="sass" /> | <option name="program" value="sass" /> | ||||
| <option name="runOnExternalChanges" value="true" /> | <option name="runOnExternalChanges" value="true" /> | ||||
| <option name="scopeName" value="Unnamed" /> | |||||
| <option name="scopeName" value="mpp" /> | |||||
| <option name="trackOnlyRoot" value="true" /> | <option name="trackOnlyRoot" value="true" /> | ||||
| <option name="workingDir" value="$FileDir$" /> | <option name="workingDir" value="$FileDir$" /> | ||||
| <envs /> | <envs /> | ||||
+ 1
- 0
httpdocs/composer.json
Просмотреть файл
| @@ -39,6 +39,7 @@ | |||||
| "symfony/string": "5.2.*", | "symfony/string": "5.2.*", | ||||
| "symfony/swiftmailer-bundle": "^3.5", | "symfony/swiftmailer-bundle": "^3.5", | ||||
| "symfony/translation": "5.2.*", | "symfony/translation": "5.2.*", | ||||
| "symfony/twig-bridge": "5.2.*", | |||||
| "symfony/twig-bundle": "^5.2", | "symfony/twig-bundle": "^5.2", | ||||
| "symfony/validator": "5.2.*", | "symfony/validator": "5.2.*", | ||||
| "symfony/web-link": "5.2.*", | "symfony/web-link": "5.2.*", | ||||
+ 1
- 1
httpdocs/composer.lock
Просмотреть файл
| @@ -4,7 +4,7 @@ | |||||
| "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", | ||||
| "This file is @generated automatically" | "This file is @generated automatically" | ||||
| ], | ], | ||||
| "content-hash": "358bc2359e8ab59c4f397e9c581de202", | |||||
| "content-hash": "93fc15fd27716975eb0f217f93074d24", | |||||
| "packages": [ | "packages": [ | ||||
| { | { | ||||
| "name": "brick/math", | "name": "brick/math", | ||||
+ 1
- 13
httpdocs/src/Controller/UserController.php
Просмотреть файл
| @@ -202,22 +202,10 @@ class UserController extends AbstractController | |||||
| throw new \Exception('not allowed or not exists'); | 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', | return $this->render('pages/worksheet.html.twig', | ||||
| [ | [ | ||||
| 'worksheet' => $worksheet, | 'worksheet' => $worksheet, | ||||
| 'sortedWorksheetTasks' => $sortedWorksheetTasks, | |||||
| 'sortedWorksheetTasks' => UserRepository::getSortedWorksheetTasks($worksheet), | |||||
| 'isPdf' => false | 'isPdf' => false | ||||
| ] | ] | ||||
| ); | ); | ||||
+ 17
- 1
httpdocs/src/Repository/UserRepository.php
Просмотреть файл
| @@ -60,11 +60,11 @@ class UserRepository extends ServiceEntityRepository | |||||
| $dompdf = new Dompdf($pdfOptions); | $dompdf = new Dompdf($pdfOptions); | ||||
| $dompdf->setPaper('A4', 'portrait'); | $dompdf->setPaper('A4', 'portrait'); | ||||
| // Retrieve the HTML generated in our twig file | // Retrieve the HTML generated in our twig file | ||||
| $html = $twig->render('pdf/pdf.html.twig', | $html = $twig->render('pdf/pdf.html.twig', | ||||
| [ | [ | ||||
| 'worksheet' => $worksheet, | 'worksheet' => $worksheet, | ||||
| 'sortedWorksheetTasks' => UserRepository::getSortedWorksheetTasks($worksheet), | |||||
| 'isPdf' => true | 'isPdf' => true | ||||
| ] | ] | ||||
| ); | ); | ||||
| @@ -94,4 +94,20 @@ class UserRepository extends ServiceEntityRepository | |||||
| return $dompdf; | 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; | |||||
| } | |||||
| } | } | ||||
+ 1
- 0
httpdocs/templates/pages/worksheet.html.twig
Просмотреть файл
| @@ -10,6 +10,7 @@ | |||||
| {% include 'snippets/worksheet-result.html.twig' with { | {% include 'snippets/worksheet-result.html.twig' with { | ||||
| data: { | data: { | ||||
| 'worksheet': worksheet, | 'worksheet': worksheet, | ||||
| 'sortedWorksheetTasks': sortedWorksheetTasks, | |||||
| 'isPdf': isPdf | 'isPdf': isPdf | ||||
| } | } | ||||
| } %} | } %} | ||||
+ 3
- 2
httpdocs/templates/pdf/pdf.html.twig
Просмотреть файл
| @@ -2,7 +2,7 @@ | |||||
| <html> | <html> | ||||
| <head> | <head> | ||||
| <meta charset="UTF-8" /> | <meta charset="UTF-8" /> | ||||
| <title>MPPTool</title> | |||||
| <title>Instandhaltungsplanung</title> | |||||
| <style> | <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;} | 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;} | table {margin: 0;} | ||||
| @@ -27,12 +27,13 @@ | |||||
| </tr> | </tr> | ||||
| <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="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> | </tr> | ||||
| </table> | </table> | ||||
| {% include 'snippets/worksheet-result.html.twig' with { | {% include 'snippets/worksheet-result.html.twig' with { | ||||
| data: { | data: { | ||||
| 'worksheet': worksheet, | 'worksheet': worksheet, | ||||
| 'sortedWorksheetTasks': sortedWorksheetTasks, | |||||
| 'isPdf': isPdf | 'isPdf': isPdf | ||||
| } | } | ||||
| } %} | } %} | ||||