Merge branch 'master' of ssh://gitea.spawntree.de:1122/spawntree/mpp-tool

httpdocs/src/Controller/AdminController.php

@@ -10,6 +10,7 @@ namespace App\Controller;
 use App\Entity\Catalogue;
 use App\Entity\User;
 use App\Entity\UserType;
+use App\Entity\UserWorksheet;
 use App\Repository\UserRepository;
 use App\Repository\UserTypeRepository;
 use App\Utils\Utils;
@@ -21,6 +22,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\Annotation\Route;
+use Twig\Environment;
 
 /**
  * @Security("is_granted('ROLE_ADMIN')")
@@ -219,25 +221,18 @@ class AdminController extends AbstractController
     }
 
     /**
-     * @Route("/get-user-catalogue/{catalogueId}", name="admin_user_catalogue", methods={"GET"})
-     *
-     * @param Request $request
-     * @param $catalogueId
-     * @return \Symfony\Component\HttpFoundation\JsonResponse
-     * @throws \Twig\Error\LoaderError
-     * @throws \Twig\Error\RuntimeError
-     * @throws \Twig\Error\SyntaxError
+     * @Route("/get-user-catalogue/{userWorksheetId}", name="admin_user_worksheet", methods={"GET"})
      */
-    public function getUserCatalogue(Request $request, $catalogueId)
+    public function getUserCatalogue(Environment $twig, $userWorksheetId)
     {
-        /** @var Catalogue $catalogue */
-        $catalogue = $this->getDoctrine()->getRepository(Catalogue::class)->find($catalogueId);
-        if ($catalogue === null || !$catalogue->getFinished()) {
-            return $this->json('Katalog exitiert nicht oder ist nicht abgeschlossen', 409);
+        /** @var UserWorksheet $worksheet */
+        $worksheet = $this->getDoctrine()->getRepository(UserWorksheet::class)->find($userWorksheetId);
+        if ($worksheet === null) {
+            return $this->json('Katalog exitiert nicht', 409);
         }
-        $dompdf = UserRepository::renderCatalogue($this->get('twig'), $catalogue);
+        $dompdf = UserRepository::renderCatalogue($twig, $worksheet);
         // Output the generated PDF to Browser (force download)
-        $fileName = "Fragenkatalog_".$catalogue->getUser()->getId()."_".$catalogue->getFinishDate()->format('Y-m-d_H-i');
+        $fileName = "Arbeitsblatt_".$worksheet->getUser()->getId()."_".$worksheet->getCreationDate()->format('Y-m-d_H-i');
         $dompdf->stream($fileName, [
             "Attachment" => true
         ]);

httpdocs/templates/pages-admin/admin_start.html.twig

@@ -15,17 +15,10 @@
                     <h3>{{ user.firstname }} {{ user.lastname }}{% if not user.active %} (inaktiv){% endif %}</h3>
                     <div class="buttons">
                         <div class="pdfs">
-                            {% set userCats = [] %}
-                            {% for catalogue in user.catalogues %}
-                                {% if catalogue.finished %}
-                                    {% set userCats = userCats|merge([catalogue]) %}
-                                {% endif %}
-                            {% endfor %}
                             {% set i = 1 %}
-                            {% set cntCats = userCats|length %}
-                            {% for userCat in userCats %}
-                                
-                                <a href="{{ path('admin_user_catalogue', {'catalogueId': userCat.id}) }}" title="Fragenkatalog abgeschlossen am: {{ userCat.finishDate | date("d.m.Y H:i") }}" {{ i == cntCats ? 'class="latest"' : '' }}></a>
+                            {% set cntWorksheets = user.worksheets|length %}
+                            {% for worksheet in user.worksheets %}
+                                <a href="{{ path('admin_user_worksheet', {'userWorksheetId': worksheet.id}) }}" title="Arbeitskarte abgeschlossen am: {{ worksheet.creationDate | date("d.m.Y H:i") }}" {{ i == cntWorksheets ? 'class="latest"' : '' }}></a>
                                 {% set i = i + 1 %}
                             {% endfor %}
                         </div>

httpdocs/templates/snippets/listing-form.html.twig

@@ -44,7 +44,7 @@
         </div>
         <div class="form--wrapper mandatory">
             <label for="inputMaxCatalogues{{ user.id }}">Max. Anzahl Durchgänge *</label>
-            <input type="number" step="1" value="{{ user.maxCatalogues }}" name="maxCatalogues" id="inputMaxCatalogues{{ user.id }}" required />
+            <input type="number" step="1" value="{{ user.maxWorksheets }}" name="maxCatalogues" id="inputMaxCatalogues{{ user.id }}" required />
         </div>
         <div class="form--wrapper">
             <label for="inputValidUntilDate{{ user.id }}">Lizenz gültig bis</label>