From f2b7f22611b268c64b7e426ca09d20dc73ac8453 Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Mon, 25 Oct 2021 20:23:02 +0200
Subject: [PATCH] Fixing problems after merge with master
---
frontend/src/interfaces/index.ts | 6 +++--
.../src/routes/sponsor/frontpage/index.tsx | 22 +++++++++++++++----
.../src/routes/sponsor/guestInfo/index.tsx | 4 ++++
gregui/views.py | 4 ++--
4 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/frontend/src/interfaces/index.ts b/frontend/src/interfaces/index.ts
index d1eb44ed..2fcb3953 100644
--- a/frontend/src/interfaces/index.ts
+++ b/frontend/src/interfaces/index.ts
@@ -6,6 +6,8 @@ export type Guest = {
mobile: string
fnr: string
active: boolean
+ registered: boolean
+ verified: boolean
roles: Role[]
}
@@ -17,6 +19,8 @@ export interface FetchedGuest {
mobile: string
fnr: string
active: boolean
+ registered: boolean
+ verified: boolean
roles: FetchedRole[]
}
@@ -40,6 +44,4 @@ export type FetchedRole = {
start_date: string
end_date: string
max_days: number
- registered: boolean
- verified: boolean
}
diff --git a/frontend/src/routes/sponsor/frontpage/index.tsx b/frontend/src/routes/sponsor/frontpage/index.tsx
index e9961b67..d20af82b 100644
--- a/frontend/src/routes/sponsor/frontpage/index.tsx
+++ b/frontend/src/routes/sponsor/frontpage/index.tsx
@@ -115,9 +115,19 @@ const WaitingForGuestRegistration = ({ persons }: GuestProps) => {
</TableRow>
</TableHead>
<TableBody>
- {guests.map((person) => (
- <PersonLine person={person} />
- ))}
+ {guests.length > 0 ? (
+ guests.map((person) =>
+ person.roles ? (
+ person.roles.map((role) => (
+ <PersonLine role={role} person={person} />
+ ))
+ ) : (
+ <></>
+ )
+ )
+ ) : (
+ <></>
+ )}
<TableRow>
<TableCell>
@@ -172,7 +182,11 @@ const ActiveGuests = ({ persons }: GuestProps) => {
guests.map((person) =>
person.roles ? (
person.roles.map((role) => (
- <PersonLine role={role} person={person} showStatusColumn/>
+ <PersonLine
+ role={role}
+ person={person}
+ showStatusColumn
+ />
))
) : (
<></>
diff --git a/frontend/src/routes/sponsor/guestInfo/index.tsx b/frontend/src/routes/sponsor/guestInfo/index.tsx
index 0e46c079..ea8dad32 100644
--- a/frontend/src/routes/sponsor/guestInfo/index.tsx
+++ b/frontend/src/routes/sponsor/guestInfo/index.tsx
@@ -67,6 +67,8 @@ export default function GuestInfo() {
fnr: '',
mobile: '',
active: false,
+ registered: false,
+ verified: false,
roles: [],
})
const [roles, setRoles] = useState<Role[]>([])
@@ -84,6 +86,8 @@ export default function GuestInfo() {
mobile: rjson.mobile,
fnr: rjson.fnr,
active: rjson.active,
+ registered: rjson.registered,
+ verified: rjson.verified,
roles: rjson.roles,
})
setRoles(rjson.roles.map((role: FetchedRole) => parseRole(role)))
diff --git a/gregui/views.py b/gregui/views.py
index f03cfcda..15e6e264 100644
--- a/gregui/views.py
+++ b/gregui/views.py
@@ -106,8 +106,8 @@ class GuestInfoView(APIView):
"mobile": person.private_mobile and person.private_mobile.value,
"fnr": person.fnr and "".join((person.fnr.value[:-5], "*****")),
"active": person.is_registered and person.is_verified,
- "registered": i.person.is_registered,
- "verified": i.person.is_verified,
+ "registered": person.is_registered,
+ "verified": person.is_verified,
"roles": [
{
"id": role.id,
--
GitLab