From 0e30731d3e60b4ff8e27fa47cdc0dc2dfab8d757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Wed, 8 Nov 2023 22:40:05 +0100
Subject: [PATCH 1/2] skautbold h2, typography (#1100)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Staněk <jan.stanek2@firma.seznam.cz>
---
 www/css/web/layout.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/www/css/web/layout.css b/www/css/web/layout.css
index fe9aa8a9f..104ab6af2 100644
--- a/www/css/web/layout.css
+++ b/www/css/web/layout.css
@@ -61,7 +61,7 @@
 
 body {
     font-family: themix, sans-serif;
-    font-size: 14px;
+    font-size: 1rem;
 }
 
 h1 {
@@ -69,9 +69,15 @@ h1 {
     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 {

From 42bc272318e567d96992e991d12ad1bb460ed3a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Sun, 12 Nov 2023 11:27:20 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Informace=20o=20propojen=C3=A9m=20=C3=BA?=
 =?UTF-8?q?=C4=8Dtu=20pro=20kontrolu=20vstupenek=20(#1101)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* isMember in ticket info

* docs
---
 app/ApiModule/Dto/Tickets/TicketCheckInfo.php | 28 +++++++++++++++++--
 app/ApiModule/Presenters/TicketsPresenter.php |  1 +
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/ApiModule/Dto/Tickets/TicketCheckInfo.php b/app/ApiModule/Dto/Tickets/TicketCheckInfo.php
index 882c656a6..33a7c5985 100644
--- 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
index 00aa093fb..9d461753b 100644
--- 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);