Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Check in list improvements

Dave Earleyba71ab1e3425
diff --git a/backend/app/DomainObjects/Generated/AttendeeCheckInDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/AttendeeCheckInDomainObjectAbstract.php
index d092b3fc4..ffb56a8d5 100644
--- a/backend/app/DomainObjects/Generated/AttendeeCheckInDomainObjectAbstract.php
+++ b/backend/app/DomainObjects/Generated/AttendeeCheckInDomainObjectAbstract.php
@@ -14,6 +14,7 @@ abstract class AttendeeCheckInDomainObjectAbstract extends \HiEvents\DomainObjec
final public const CHECK_IN_LIST_ID = 'check_in_list_id';
final public const TICKET_ID = 'ticket_id';
final public const ATTENDEE_ID = 'attendee_id';
+ final public const EVENT_ID = 'event_id';
final public const SHORT_ID = 'short_id';
final public const IP_ADDRESS = 'ip_address';
final public const DELETED_AT = 'deleted_at';
@@ -24,6 +25,7 @@ abstract class AttendeeCheckInDomainObjectAbstract extends \HiEvents\DomainObjec
protected int $check_in_list_id;
protected int $ticket_id;
protected int $attendee_id;
+ protected int $event_id;
protected string $short_id;
protected string $ip_address;
protected ?string $deleted_at = null;
@@ -37,6 +39,7 @@ abstract class AttendeeCheckInDomainObjectAbstract extends \HiEvents\DomainObjec
'check_in_list_id' => $this->check_in_list_id ?? null,
'ticket_id' => $this->ticket_id ?? null,
'attendee_id' => $this->attendee_id ?? null,
+ 'event_id' => $this->event_id ?? null,
'short_id' => $this->short_id ?? null,
'ip_address' => $this->ip_address ?? null,
'deleted_at' => $this->deleted_at ?? null,
@@ -89,6 +92,17 @@ abstract class AttendeeCheckInDomainObjectAbstract extends \HiEvents\DomainObjec
return $this->attendee_id;
}
+ public function setEventId(int $event_id): self
+ {
+ $this->event_id = $event_id;
+ return $this;
+ }
+
+ public function getEventId(): int
+ {
+ return $this->event_id;
+ }
+
public function setShortId(string $short_id): self
{
$this->short_id = $short_id;
diff --git a/backend/app/DomainObjects/Generated/AttendeeDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/AttendeeDomainObjectAbstract.php
index de65908cd..59b052de0 100644
--- a/backend/app/DomainObjects/Generated/AttendeeDomainObjectAbstract.php
+++ b/backend/app/DomainObjects/Generated/AttendeeDomainObjectAbstract.php
@@ -14,6 +14,8 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
final public const ORDER_ID = 'order_id';
final public const TICKET_ID = 'ticket_id';
final public const EVENT_ID = 'event_id';
+ final public const CHECKED_IN_BY = 'checked_in_by';
+ final public const CHECKED_OUT_BY = 'checked_out_by';
final public const TICKET_PRICE_ID = 'ticket_price_id';
final public const SHORT_ID = 'short_id';
final public const FIRST_NAME = 'first_name';
@@ -21,6 +23,7 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
final public const EMAIL = 'email';
final public const PUBLIC_ID = 'public_id';
final public const STATUS = 'status';
+ final public const CHECKED_IN_AT = 'checked_in_at';
final public const CREATED_AT = 'created_at';
final public const UPDATED_AT = 'updated_at';
final public const DELETED_AT = 'deleted_at';
@@ -30,6 +33,8 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
protected int $order_id;
protected int $ticket_id;
protected int $event_id;
+ protected ?int $checked_in_by = null;
+ protected ?int $checked_out_by = null;
protected int $ticket_price_id;
protected string $short_id;
protected string $first_name = '';
@@ -37,6 +42,7 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
protected string $email;
protected string $public_id;
protected string $status;
+ protected ?string $checked_in_at = null;
protected string $created_at;
protected string $updated_at;
protected ?string $deleted_at = null;
@@ -49,6 +55,8 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
'order_id' => $this->order_id ?? null,
'ticket_id' => $this->ticket_id ?? null,
'event_id' => $this->event_id ?? null,
+ 'checked_in_by' => $this->checked_in_by ?? null,
+ 'checked_out_by' => $this->checked_out_by ?? null,
'ticket_price_id' => $this->ticket_price_id ?? null,
'short_id' => $this->short_id ?? null,
'first_name' => $this->first_name ?? null,
@@ -56,6 +64,7 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
'email' => $this->email ?? null,
'public_id' => $this->public_id ?? null,
'status' => $this->status ?? null,
+ 'checked_in_at' => $this->checked_in_at ?? null,
'created_at' => $this->created_at ?? null,
'updated_at' => $this->updated_at ?? null,
'deleted_at' => $this->deleted_at ?? null,
@@ -107,6 +116,28 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
return $this->event_id;
}
+ public function setCheckedInBy(?int $checked_in_by): self
+ {
+ $this->checked_in_by = $checked_in_by;
+ return $this;
+ }
+
+ public function getCheckedInBy(): ?int
+ {
+ return $this->checked_in_by;
+ }
+
+ public function setCheckedOutBy(?int $checked_out_by): self
+ {
+ $this->checked_out_by = $checked_out_by;
+ return $this;
+ }
+
+ public function getCheckedOutBy(): ?int
+ {
+ return $this->checked_out_by;
+ }
+
public function setTicketPriceId(int $ticket_price_id): self
{
$this->ticket_price_id = $ticket_price_id;
@@ -184,6 +215,17 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
return $this->status;
}
+ public function setCheckedInAt(?string $checked_in_at): self
+ {
+ $this->checked_in_at = $checked_in_at;
+ return $this;
+ }
+
+ public function getCheckedInAt(): ?string
+ {
+ return $this->checked_in_at;
+ }
+
public function setCreatedAt(string $created_at): self
{
$this->created_at = $created_at;
diff --git a/backend/app/Helper/IdHelper.php b/backend/app/Helper/IdHelper.php
index db2b23e16..5a124effb 100644
--- a/backend/app/Helper/IdHelper.php
+++ b/backend/app/Helper/IdHelper.php
@@ -19,8 +19,8 @@ class IdHelper
return sprintf('%s_%s', $prefix, Str::random($length));
}
- public static function publicId(int $length = 7, string $suffix = ''): string
+ public static function publicId(string $prefix = '', string $suffix = '', int $length = 7): string
{
- return Str::upper(Str::random($length)) . $suffix;
+ return Str::upper($prefix . '-' . Str::random($length) . $suffix);
}
}
diff --git a/backend/app/Http/Actions/CheckInLists/Public/CreateAttendeeCheckInPublicAction.php b/backend/app/Http/Actions/CheckInLists/Public/CreateAttendeeCheckInPublicAction.php
index 6cc0d4ee1..d3d3ae777 100644
--- a/backend/app/Http/Actions/CheckInLists/Public/CreateAttendeeCheckInPublicAction.php
+++ b/backend/app/Http/Actions/CheckInLists/Public/CreateAttendeeCheckInPublicAction.php
@@ -9,7 +9,6 @@ use HiEvents\Resources\CheckInList\AttendeeCheckInPublicResource;
use HiEvents\Services\Handlers\CheckInList\Public\CreateAttendeeCheckInPublicHandler;
use HiEvents\Services\Handlers\CheckInList\Public\DTO\CreateAttendeeCheckInPublicDTO;
use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
use Illuminate\Http\Response;
class CreateAttendeeCheckInPublicAction extends BaseAction
@@ -21,7 +20,7 @@ class CreateAttendeeCheckInPublicAction extends BaseAction
}
public function __invoke(
- string $checkInListUuid,
+ string $checkInListUuid,
CreateAttendeeCheckInPublicRequest $request,
): JsonResponse
{
diff --git a/backend/app/Http/Actions/CheckInLists/Public/GetCheckInListAttendeesPublicAction.php b/backend/app/Http/Actions/CheckInLists/Public/GetCheckInListAttendeesPublicAction.php
index 6cfb47c73..5ca181866 100644
--- a/backend/app/Http/Actions/CheckInLists/Public/GetCheckInListAttendeesPublicAction.php
+++ b/backend/app/Http/Actions/CheckInLists/Public/GetCheckInListAttendeesPublicAction.php
@@ -2,12 +2,14 @@
namespace HiEvents\Http\Actions\CheckInLists\Public;
+use HiEvents\Exceptions\CannotCheckInException;
use HiEvents\Http\Actions\BaseAction;
use HiEvents\Http\DTO\QueryParamsDTO;
use HiEvents\Resources\Attendee\AttendeeWithCheckInPublicResource;
use HiEvents\Services\Handlers\CheckInList\Public\GetCheckInListAttendeesPublicHandler;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
class GetCheckInListAttendeesPublicAction extends BaseAction
{
@@ -19,10 +21,17 @@ class GetCheckInListAttendeesPublicAction extends BaseAction
public function __invoke(string $uuid, Request $request): JsonResponse
{
- $attendees = $this->getCheckInListAttendeesPublicHandler->handle(
- shortId: $uuid,
- queryParams: QueryParamsDTO::fromArray($request->query->all())
- );
+ try {
+ $attendees = $this->getCheckInListAttendeesPublicHandler->handle(
+ shortId: $uuid,
+ queryParams: QueryParamsDTO::fromArray($request->query->all())
+ );
+ } catch (CannotCheckInException $e) {
+ return $this->errorResponse(
+ message: $e->getMessage(),
+ statusCode: Response::HTTP_FORBIDDEN,
+ );
+ }
return $this->resourceResponse(
resource: AttendeeWithCheckInPublicResource::class,
diff --git a/backend/app/Services/Domain/CheckInList/CreateAttendeeCheckInService.php b/backend/app/Services/Domain/CheckInList/CreateAttendeeCheckInService.php
index 8952f041d..3b3c2191a 100644
--- a/backend/app/Services/Domain/CheckInList/CreateAttendeeCheckInService.php
+++ b/backend/app/Services/Domain/CheckInList/CreateAttendeeCheckInService.php
@@ -11,6 +11,7 @@ use HiEvents\Exceptions\CannotCheckInException;
use HiEvents\Helper\DateHelper;
use HiEvents\Helper\IdHelper;
use HiEvents\Repository\Interfaces\AttendeeCheckInRepositoryInterface;
+use HiEvents\Services\Domain\CheckInList\DTO\CreateAttendeeCheckInsResponseDTO;
use Illuminate\Support\Collection;
class CreateAttendeeCheckInService
@@ -44,6 +45,9 @@ class CreateAttendeeCheckInService
)->map(
fn(AttendeeDomainObject $attendee) => $attendee->getId()
)->toArray(),
+ additionalWhere: [
+ AttendeeCheckInDomainObjectAbstract::EVENT_ID => $checkInList->getEventId(),
+ ],
);
$errors = new ErrorBagDTO();
@@ -74,6 +78,7 @@ class CreateAttendeeCheckInService
AttendeeCheckInDomainObjectAbstract::IP_ADDRESS => $checkInUserIpAddress,
AttendeeCheckInDomainObjectAbstract::TICKET_ID => $attendee->getTicketId(),
AttendeeCheckInDomainObjectAbstract::SHORT_ID => IdHelper::shortId(IdHelper::CHECK_IN_PREFIX),
+ AttendeeCheckInDomainObjectAbstract::EVENT_ID => $checkInList->getEventId(),
])
);
}
diff --git a/backend/app/Services/Domain/CheckInList/CreateAttendeeCheckInsResponseDTO.php b/backend/app/Services/Domain/CheckInList/DTO/CreateAttendeeCheckInsResponseDTO.php
similarity index 86%
rename from backend/app/Services/Domain/CheckInList/CreateAttendeeCheckInsResponseDTO.php
rename to backend/app/Services/Domain/CheckInList/DTO/CreateAttendeeCheckInsResponseDTO.php
index f419a2892..cecfb8d79 100644
--- a/backend/app/Services/Domain/CheckInList/CreateAttendeeCheckInsResponseDTO.php
+++ b/backend/app/Services/Domain/CheckInList/DTO/CreateAttendeeCheckInsResponseDTO.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Services\Domain\CheckInList;
+namespace HiEvents\Services\Domain\CheckInList\DTO;
use HiEvents\DataTransferObjects\BaseDTO;
use HiEvents\DataTransferObjects\ErrorBagDTO;
diff --git a/backend/app/Services/Domain/Order/OrderManagementService.php b/backend/app/Services/Domain/Order/OrderManagementService.php
index 2d5a0cec8..f1d0833cf 100644
--- a/backend/app/Services/Domain/Order/OrderManagementService.php
+++ b/backend/app/Services/Domain/Order/OrderManagementService.php
@@ -51,7 +51,7 @@ class OrderManagementService
'status' => OrderStatus::RESERVED->name,
'session_id' => $sessionId,
'currency' => $event->getCurrency(),
- 'public_id' => IdHelper::publicId(),
+ 'public_id' => IdHelper::publicId(IdHelper::ORDER_PREFIX),
'promo_code_id' => $promoCode?->getId(),
'promo_code' => $promoCode?->getCode(),
'locale' => $locale,
diff --git a/backend/app/Services/Handlers/Attendee/CreateAttendeeHandler.php b/backend/app/Services/Handlers/Attendee/CreateAttendeeHandler.php
index ad9fe3295..af23fbb33 100644
--- a/backend/app/Services/Handlers/Attendee/CreateAttendeeHandler.php
+++ b/backend/app/Services/Handlers/Attendee/CreateAttendeeHandler.php
@@ -116,7 +116,7 @@ class CreateAttendeeHandler
? OrderPaymentStatus::NO_PAYMENT_REQUIRED->name
: OrderPaymentStatus::PAYMENT_RECEIVED->name,
OrderDomainObjectAbstract::CURRENCY => $event->getCurrency(),
- OrderDomainObjectAbstract::PUBLIC_ID => IdHelper::publicId(),
+ OrderDomainObjectAbstract::PUBLIC_ID => IdHelper::publicId(IdHelper::ORDER_PREFIX),
OrderDomainObjectAbstract::IS_MANUALLY_CREATED => true,
OrderDomainObjectAbstract::LOCALE => $attendeeDTO->locale,
]
@@ -218,7 +218,7 @@ class CreateAttendeeHandler
AttendeeDomainObjectAbstract::FIRST_NAME => $attendeeDTO->first_name,
AttendeeDomainObjectAbstract::LAST_NAME => $attendeeDTO->last_name,
AttendeeDomainObjectAbstract::ORDER_ID => $order->getId(),
- AttendeeDomainObjectAbstract::PUBLIC_ID => $order->getPublicId() . '-1',
+ AttendeeDomainObjectAbstract::PUBLIC_ID => IdHelper::publicId(IdHelper::ATTENDEE_PREFIX),
AttendeeDomainObjectAbstract::SHORT_ID => IdHelper::shortId(IdHelper::ATTENDEE_PREFIX),
AttendeeDomainObjectAbstract::LOCALE => $attendeeDTO->locale,
]);
diff --git a/backend/app/Services/Handlers/CheckInList/Public/CreateAttendeeCheckInPublicHandler.php b/backend/app/Services/Handlers/CheckInList/Public/CreateAttendeeCheckInPublicHandler.php
index d12565001..de22ea2fc 100644
--- a/backend/app/Services/Handlers/CheckInList/Public/CreateAttendeeCheckInPublicHandler.php
+++ b/backend/app/Services/Handlers/CheckInList/Public/CreateAttendeeCheckInPublicHandler.php
@@ -5,7 +5,7 @@ namespace HiEvents\Services\Handlers\CheckInList\Public;
use HiEvents\DomainObjects\AttendeeCheckInDomainObject;
use HiEvents\Exceptions\CannotCheckInException;
use HiEvents\Services\Domain\CheckInList\CreateAttendeeCheckInService;
-use HiEvents\Services\Domain\CheckInList\CreateAttendeeCheckInsResponseDTO;
+use HiEvents\Services\Domain\CheckInList\DTO\CreateAttendeeCheckInsResponseDTO;
use HiEvents\Services\Handlers\CheckInList\Public\DTO\CreateAttendeeCheckInPublicDTO;
use Psr\Log\LoggerInterface;
diff --git a/backend/app/Services/Handlers/CheckInList/Public/GetCheckInListAttendeesPublicHandler.php b/backend/app/Services/Handlers/CheckInList/Public/GetCheckInListAttendeesPublicHandler.php
index 367c9d235..de6332ea0 100644
--- a/backend/app/Services/Handlers/CheckInList/Public/GetCheckInListAttendeesPublicHandler.php
+++ b/backend/app/Services/Handlers/CheckInList/Public/GetCheckInListAttendeesPublicHandler.php
@@ -2,20 +2,60 @@
namespace HiEvents\Services\Handlers\CheckInList\Public;
+use HiEvents\DomainObjects\CheckInListDomainObject;
+use HiEvents\DomainObjects\EventDomainObject;
+use HiEvents\DomainObjects\Generated\CheckInListDomainObjectAbstract;
+use HiEvents\DomainObjects\TicketDomainObject;
+use HiEvents\Exceptions\CannotCheckInException;
+use HiEvents\Helper\DateHelper;
use HiEvents\Http\DTO\QueryParamsDTO;
+use HiEvents\Repository\Eloquent\Value\Relationship;
use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
+use HiEvents\Repository\Interfaces\CheckInListRepositoryInterface;
use Illuminate\Contracts\Pagination\Paginator;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
class GetCheckInListAttendeesPublicHandler
{
public function __construct(
- private readonly AttendeeRepositoryInterface $attendeeRepository,
+ private readonly AttendeeRepositoryInterface $attendeeRepository,
+ private readonly CheckInListRepositoryInterface $checkInListRepository,
)
{
}
+ /**
+ * @throws CannotCheckInException
+ */
public function handle(string $shortId, QueryParamsDTO $queryParams): Paginator
{
+ $checkInList = $this->checkInListRepository
+ ->loadRelation(TicketDomainObject::class)
+ ->loadRelation(new Relationship(EventDomainObject::class, name: 'event'))
+ ->findFirstWhere([
+ CheckInListDomainObjectAbstract::SHORT_ID => $shortId,
+ ]);
+
+ if (!$checkInList) {
+ throw new ResourceNotFoundException(__('Check-in list not found'));
+ }
+
+ $this->validateCheckInListIsActive($checkInList);
+
return $this->attendeeRepository->getAttendeesByCheckInShortId($shortId, $queryParams);
}
+
+ /**
+ * @throws CannotCheckInException
+ */
+ private function validateCheckInListIsActive(CheckInListDomainObject $checkInList): void
+ {
+ if ($checkInList->getExpiresAt() && DateHelper::utcDateIsPast($checkInList->getExpiresAt())) {
+ throw new CannotCheckInException(__('Check-in list has expired'));
+ }
+
+ if ($checkInList->getActivatesAt() && DateHelper::utcDateIsFuture($checkInList->getActivatesAt())) {
+ throw new CannotCheckInException(__('Check-in list is not active yet'));
+ }
+ }
}
diff --git a/backend/app/Services/Handlers/Order/CompleteOrderHandler.php b/backend/app/Services/Handlers/Order/CompleteOrderHandler.php
index cef262b11..33a181970 100644
--- a/backend/app/Services/Handlers/Order/CompleteOrderHandler.php
+++ b/backend/app/Services/Handlers/Order/CompleteOrderHandler.php
@@ -112,7 +112,7 @@ readonly class CompleteOrderHandler
AttendeeDomainObjectAbstract::FIRST_NAME => $attendee->first_name,
AttendeeDomainObjectAbstract::LAST_NAME => $attendee->last_name,
AttendeeDomainObjectAbstract::ORDER_ID => $order->getId(),
- AttendeeDomainObjectAbstract::PUBLIC_ID => $order->getPublicId() . '-' . $publicIdIndex++,
+ AttendeeDomainObjectAbstract::PUBLIC_ID => IdHelper::publicId(IdHelper::ATTENDEE_PREFIX),
AttendeeDomainObjectAbstract::SHORT_ID => IdHelper::shortId(IdHelper::ATTENDEE_PREFIX),
AttendeeDomainObjectAbstract::LOCALE => $order->getLocale(),
];
diff --git a/backend/database/migrations/2024_08_17_140325_add_event_id_to_attendee_check_ins.php b/backend/database/migrations/2024_08_17_140325_add_event_id_to_attendee_check_ins.php
new file mode 100644
index 000000000..79d4f5244
--- /dev/null
+++ b/backend/database/migrations/2024_08_17_140325_add_event_id_to_attendee_check_ins.php
@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+ public function up(): void
+ {
+ DB::transaction(static function () {
+ Schema::table('attendee_check_ins', static function (Blueprint $table) {
+ // Add the event_id column without a foreign key constraint first
+ $table->unsignedBigInteger('event_id')->nullable()->after('attendee_id');
+ });
+
+ DB::statement('
+ UPDATE attendee_check_ins
+ SET event_id = attendees.event_id
+ FROM attendees
+ WHERE attendee_check_ins.attendee_id = attendees.id
+ ');
+
+ // Now, set the event_id column to be not nullable and add the foreign key constraint
+ Schema::table('attendee_check_ins', static function (Blueprint $table) {
+ $table->unsignedBigInteger('event_id')->nullable(false)->change();
+ $table->foreign('event_id')->references('id')->on('events')->cascadeOnDelete();
+
+ $table->index('event_id');
+ });
+ });
+ }
+
+ public function down(): void
+ {
+ DB::transaction(static function () {
+ Schema::table('attendee_check_ins', static function (Blueprint $table) {
+ $table->dropForeign(['event_id']);
+ $table->dropIndex(['event_id']);
+ $table->dropColumn('event_id');
+ });
+ });
+ }
+};
diff --git a/frontend/src/components/common/CheckInListList/CheckInListList.module.scss b/frontend/src/components/common/CheckInListList/CheckInListList.module.scss
index 89d425999..efb2fdfbf 100644
--- a/frontend/src/components/common/CheckInListList/CheckInListList.module.scss
+++ b/frontend/src/components/common/CheckInListList/CheckInListList.module.scss
@@ -83,6 +83,10 @@
.capacityText {
margin-top: 10px;
color: #999;
+ display: flex;
+ align-items: center;
+ gap: 5px;
+ font-size: 0.9rem;
}
}
diff --git a/frontend/src/components/common/CheckInListList/index.tsx b/frontend/src/components/common/CheckInListList/index.tsx
index c8f21eb67..8d8118071 100644
--- a/frontend/src/components/common/CheckInListList/index.tsx
+++ b/frontend/src/components/common/CheckInListList/index.tsx
@@ -1,7 +1,16 @@
import {CheckInList, IdParam} from "../../../types";
import {Badge, Button, Progress} from "@mantine/core";
import {t, Trans} from "@lingui/macro";
-import {IconCopy, IconExternalLink, IconHelp, IconLink, IconPencil, IconPlus, IconTrash} from "@tabler/icons-react";
+import {
+ IconCopy,
+ IconExternalLink,
+ IconHelp,
+ IconLink,
+ IconPencil,
+ IconPlus,
+ IconTrash,
+ IconUsers
+} from "@tabler/icons-react";
import Truncate from "../Truncate";
import {NoResultsSplash} from "../NoResultsSplash";
import classes from './CheckInListList.module.scss';
@@ -134,7 +143,7 @@ export const CheckInListList = ({checkInLists, openCreateModal}: CheckInListList
style={{marginTop: '10px'}}
/>
<div className={classes.capacityText}>
- {list.checked_in_attendees} / {list.total_attendees}
+ <IconUsers size={18}/> {list.checked_in_attendees} / {list.total_attendees}
</div>
</div>
<div className={classes.checkInListActions}>
diff --git a/frontend/src/components/layouts/CheckIn/index.tsx b/frontend/src/components/layouts/CheckIn/index.tsx
index 659607288..52f7d182f 100644
--- a/frontend/src/components/layouts/CheckIn/index.tsx
+++ b/frontend/src/components/layouts/CheckIn/index.tsx
@@ -42,7 +42,11 @@ const CheckIn = () => {
status: ['ACTIVE'],
},
};
- const attendeesQuery = useGetCheckInListAttendees(checkInListShortId, queryFilters);
+ const attendeesQuery = useGetCheckInListAttendees(
+ checkInListShortId,
+ queryFilters,
+ checkInList?.is_active && !checkInList?.is_expired,
+ );
const attendees = attendeesQuery?.data?.data;
const checkInMutation = useCreateCheckInPublic(queryFilters);
const deleteCheckInMutation = useDeleteCheckInPublic(queryFilters);
diff --git a/frontend/src/queries/useGetCheckInListAttendeesPublic.ts b/frontend/src/queries/useGetCheckInListAttendeesPublic.ts
index 887a0393f..7cfbc6de6 100644
--- a/frontend/src/queries/useGetCheckInListAttendeesPublic.ts
+++ b/frontend/src/queries/useGetCheckInListAttendeesPublic.ts
@@ -1,15 +1,16 @@
-import { useQuery } from '@tanstack/react-query';
-import {CheckIn, QueryFilters, GenericPaginatedResponse, IdParam, Attendee} from '../types';
+import {useQuery} from '@tanstack/react-query';
+import {Attendee, GenericPaginatedResponse, IdParam, QueryFilters} from '../types';
import {publicCheckInClient} from "../api/check-in.client";
export const GET_CHECK_IN_LIST_ATTENDEES_PUBLIC_QUERY_KEY = 'getCheckInListAttendees';
-export const useGetCheckInListAttendees = (checkInListShortId: IdParam, pagination: QueryFilters) => {
+export const useGetCheckInListAttendees = (checkInListShortId: IdParam, pagination: QueryFilters, enabled: boolean = true) => {
return useQuery<GenericPaginatedResponse<Attendee>>({
queryKey: [GET_CHECK_IN_LIST_ATTENDEES_PUBLIC_QUERY_KEY, checkInListShortId, pagination],
queryFn: async () => {
const data = await publicCheckInClient.getCheckInListAttendees(checkInListShortId, pagination);
return data;
- }
+ },
+ enabled: enabled,
});
};