diff --git a/httpdocs/src/Controller/UserController.php b/httpdocs/src/Controller/UserController.php index adea851..53976d0 100644 --- a/httpdocs/src/Controller/UserController.php +++ b/httpdocs/src/Controller/UserController.php @@ -349,8 +349,8 @@ class UserController extends AbstractController $sheet->setCellValue('A23', 'Tätigkeiten'); $sheet->getStyle('A23:I24')->getFont()->setSize(14); $sheet->getStyle('A24:I24')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('ffa4ffa4'); - $sheet->setCellValue('A24', 'Aufgabe'); - $sheet->setCellValue('B24', 'Baugruppen'); + $sheet->setCellValue('A24', 'Baugruppe'); + $sheet->setCellValue('B24', 'Aufgabe'); $sheet->setCellValue('C24', 'Inspektion'); $sheet->setCellValue('D24', 'Wartung'); $sheet->setCellValue('E24', 'Instandsetzung'); @@ -363,8 +363,8 @@ class UserController extends AbstractController $worksheetTasks = UserRepository::getSortedWorksheetTasks($worksheet); /** @var UserWorksheetTask $task */ foreach ($worksheetTasks as $task) { - $sheet->setCellValue('A'.$row, (($row-24) .". ").$task->getTask()); - $sheet->setCellValue('B'.$row, $task->getDelimitation()); + $sheet->setCellValue('A'.$row, $task->getDelimitation()); + $sheet->setCellValue('B'.$row, (($row-24) .". ").$task->getTask()); $sheet->setCellValue('C'.$row, $task->getInspection() ? 'Ja' : 'Nein'); $sheet->setCellValue('D'.$row, $task->getMaintenance() ? 'Ja' : 'Nein'); $sheet->setCellValue('E'.$row, $task->getService() ? 'Ja' : 'Nein'); diff --git a/httpdocs/templates/snippets/worksheet-result.html.twig b/httpdocs/templates/snippets/worksheet-result.html.twig index 6e31552..c29908a 100644 --- a/httpdocs/templates/snippets/worksheet-result.html.twig +++ b/httpdocs/templates/snippets/worksheet-result.html.twig @@ -63,8 +63,8 @@ + Baugruppe Aufgabe - Baugruppen Inspektion Wartung Instandsetzung @@ -78,8 +78,8 @@ {% for index, task in sortedWorksheetTasks %} {{ index + 1 }}. - {{ task.task }} {% if task.delimitation is not null %}{{ task.delimitation }}{% else %}-{% endif %} + {{ task.task }} {% if task.inspection == 1 %}