Merge branch 'master' into obrok/master

skaut · Nov 13, 2023 · 96d900b · 96d900b
2 parents 6b09e12 + 42bc272
commit 96d900b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/app/ApiModule/Dto/Tickets/TicketCheckInfo.php b/app/ApiModule/Dto/Tickets/TicketCheckInfo.php
@@ -15,27 +15,44 @@ class TicketCheckInfo
 {
     use Nette\SmartObject;
 
+    /** Jméno účastníka. */
     #[JMS\Type(values: 'string')]
     private string $attendeeName;
 
+    /** Věk účastníka. */
     #[JMS\Type(values: 'integer')]
     private int $attendeeAge;
 
+    /** Odkaz na fotku účastníka. */
     #[JMS\Type(values: 'string')]
     private string|null $attendeePhoto;
 
-    /** @var string[] */
+    /** Má účastník propojený účet? */
+    #[JMS\Type(values: 'boolean')]
+    private bool $attendeeMember;
+
+    /**
+     * Role účastníka.
+     * @var string[]
+     */
     #[JMS\Type(values: 'array')]
     private array $roles;
 
-    /** @var SubeventInfo[] */
+    /**
+     * Podakce účastníka.
+     * @var SubeventInfo[]
+     */
     #[JMS\Type(values: 'array<App\ApiModule\Dto\Tickets\SubeventInfo>')]
     private array $subevents;
 
+    /** Má účastník podakci? */
     #[JMS\Type(values: 'boolean')]
     private bool $hasSubevent;
 
-    /** @var DateTimeImmutable[] */
+    /**
+     * Seznam časů kontroly vstupenky.
+     * @var DateTimeImmutable[]
+     */
     #[JMS\Type(values: 'array<DateTimeImmutable>')]
     private array $subeventChecks;
 
@@ -54,6 +71,11 @@ public function setAttendeePhoto(string|null $attendeePhoto): void
         $this->attendeePhoto = $attendeePhoto;
     }
 
+    public function setAttendeeMember(bool $attendeeMember): void
+    {
+        $this->attendeeMember = $attendeeMember;
+    }
+
     /** @param string[] $roles */
     public function setRoles(array $roles): void
     {

diff --git a/app/ApiModule/Presenters/TicketsPresenter.php b/app/ApiModule/Presenters/TicketsPresenter.php
@@ -119,6 +119,7 @@ public function actionCheckTicket(int $userId, int $subeventId): void
         $data->setAttendeeName($user->getDisplayName());
         $data->setAttendeeAge($user->getAge());
         $data->setAttendeePhoto($user->getPhoto());
+        $data->setAttendeeMember($user->isMember());
         $data->setRoles($roles);
         $data->setSubevents($subevents);
         $data->setHasSubevent($hasSubevent);

diff --git a/www/css/web/layout.css b/www/css/web/layout.css
@@ -61,17 +61,23 @@
 
 body {
     font-family: themix, sans-serif;
-    font-size: 14px;
+    font-size: 1rem;
 }
 
 h1 {
     font-family: skautbold, sans-serif;
     font-weight: normal;
 }
 
+h2 {
+    font-family: skautbold, sans-serif;
+    font-weight: normal;
+}
+
 p {
     font-weight: 400;
     font-style: normal;
+    line-height: 1.8rem;
 }
 
 #flashes .alert {