diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/WellnessAndExercise/Facility/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/WellnessAndExercise/Facility/index.tsx index 054ce7498..e8c90a9ac 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/WellnessAndExercise/Facility/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/WellnessAndExercise/Facility/index.tsx @@ -11,6 +11,7 @@ import styles from "./facility.module.css" import { ExternalGymDetails, HealthFacilitiesEnum, + OpeningHoursType, } from "@/types/components/hotelPage/facilities" import type { FacilityProps } from "@/types/components/hotelPage/sidepeek/facility" @@ -29,7 +30,9 @@ export default async function Facility({ data }: FacilityProps) { details: data.details, type: data.type, }) - + const showOpeningHours = + data.openingDetails.openingHoursType !== OpeningHoursType.SetFreeText && + !isExternalGym return (
{image ? : null} @@ -46,7 +49,12 @@ export default async function Facility({ data }: FacilityProps) { )} - {isExternalGym ? null : ( + {shortDescription ? ( + +

{shortDescription}

+
+ ) : null} + {showOpeningHours ? (

@@ -92,11 +100,6 @@ export default async function Facility({ data }: FacilityProps) {

- )} - {shortDescription ? ( - -

{shortDescription}

-
) : null} diff --git a/apps/scandic-web/server/routers/hotels/schemas/hotel/healthFacilities.ts b/apps/scandic-web/server/routers/hotels/schemas/hotel/healthFacilities.ts index 7589d4728..058fa36dd 100644 --- a/apps/scandic-web/server/routers/hotels/schemas/hotel/healthFacilities.ts +++ b/apps/scandic-web/server/routers/hotels/schemas/hotel/healthFacilities.ts @@ -53,6 +53,7 @@ export const healthFacilitySchema = z.object({ .boolean() .nullish() .transform((b) => !!b), + openingHoursType: nullableStringValidator, }), type: nullableStringValidator, }) diff --git a/apps/scandic-web/types/components/hotelPage/facilities.ts b/apps/scandic-web/types/components/hotelPage/facilities.ts index da88ac0c4..3dbcf4d30 100644 --- a/apps/scandic-web/types/components/hotelPage/facilities.ts +++ b/apps/scandic-web/types/components/hotelPage/facilities.ts @@ -108,3 +108,8 @@ export enum OutdoorPoolDetails { export enum SaunaDetails { SeparateMenAndWomen = "SeparateMenAndWomen", } + +export const OpeningHoursType = { + SetWeekDayAndWeekEndSchema: "SetWeekDayAndWeekEndSchema", + SetFreeText: "SetFreeText", +} as const