diff --git a/src/components/HolidayRentalReports/HolidayRentalReports.tsx b/src/components/HolidayRentalReports/HolidayRentalReports.tsx index ab433683..6be33266 100644 --- a/src/components/HolidayRentalReports/HolidayRentalReports.tsx +++ b/src/components/HolidayRentalReports/HolidayRentalReports.tsx @@ -1,12 +1,12 @@ import React from "react" import { Spinner } from "@amsterdam/asc-ui" -import type { RentalReport } from "./types" +import type { HolidayRentalReport } from "./types" import ReportsPerYear from "./components/ReportsPerYear" import Report from "./components/Report" import { Placeholder, LoadingRows } from "../Data/components" type Props = { - data: RentalReport[] + data: HolidayRentalReport[] horizontalBordered?: boolean loading?: boolean loadingRows?: number diff --git a/src/components/HolidayRentalReports/components/Report.tsx b/src/components/HolidayRentalReports/components/Report.tsx index 2215b9f6..62db83ed 100644 --- a/src/components/HolidayRentalReports/components/Report.tsx +++ b/src/components/HolidayRentalReports/components/Report.tsx @@ -3,10 +3,10 @@ import styled from "styled-components" import { themeSpacing } from "@amsterdam/asc-ui" import useReportValues from "./hooks/useReportValues" import DefinitionList from "../../Data/DefinitionList/DefinitionList" -import type { RentalReport } from "../types" +import type { HolidayRentalReport } from "../types" type Props = { - report: RentalReport + report: HolidayRentalReport horizontalBordered: boolean } diff --git a/src/components/HolidayRentalReports/components/ReportsPerYear.tsx b/src/components/HolidayRentalReports/components/ReportsPerYear.tsx index f88bf7e1..04da79c8 100644 --- a/src/components/HolidayRentalReports/components/ReportsPerYear.tsx +++ b/src/components/HolidayRentalReports/components/ReportsPerYear.tsx @@ -2,11 +2,11 @@ import React from "react" import styled from "styled-components" import { themeSpacing } from "@amsterdam/asc-ui" import DefinitionList from "../../Data/DefinitionList/DefinitionList" -import type { RentalReport } from "../types" +import type { HolidayRentalReport } from "../types" import useReportsPerYearValues from "./hooks/useReportsPerYearValues" type Props = { - data: RentalReport[] + data: HolidayRentalReport[] } export const TITLE = "Vakantieverhuur meldingen" diff --git a/src/components/HolidayRentalReports/components/hooks/useReportValues.tsx b/src/components/HolidayRentalReports/components/hooks/useReportValues.tsx index 3ddfea3e..c0e70c52 100644 --- a/src/components/HolidayRentalReports/components/hooks/useReportValues.tsx +++ b/src/components/HolidayRentalReports/components/hooks/useReportValues.tsx @@ -1,8 +1,8 @@ import React from "react" import DateDisplay from "../../../DateDisplay/DateDisplay" -import type { RentalReport } from "../../types" +import type { HolidayRentalReport } from "../../types" -export default (report: RentalReport) => ({ +export default (report: HolidayRentalReport) => ({ "Check in": , "Check out": , "Gasten": report?.gasten, diff --git a/src/components/HolidayRentalReports/components/hooks/useReportsPerYearValues.tsx b/src/components/HolidayRentalReports/components/hooks/useReportsPerYearValues.tsx index a829843f..1ab0b013 100644 --- a/src/components/HolidayRentalReports/components/hooks/useReportsPerYearValues.tsx +++ b/src/components/HolidayRentalReports/components/hooks/useReportsPerYearValues.tsx @@ -1,7 +1,7 @@ import dayjs from "dayjs" -import type { RentalReport } from "../../types" +import type { HolidayRentalReport } from "../../types" -export default (data: RentalReport[]) => { +export default (data: HolidayRentalReport[]) => { let totals: { [key: string]: number } = {} data.forEach((item) => { // Don't count removed items diff --git a/src/components/HolidayRentalReports/types.ts b/src/components/HolidayRentalReports/types.ts index 668bb645..fabc5ab1 100644 --- a/src/components/HolidayRentalReports/types.ts +++ b/src/components/HolidayRentalReports/types.ts @@ -1,4 +1,4 @@ -export type RentalReport = { +export type HolidayRentalReport = { startDatum: string // date-time eindDatum: string // date-time nachten: number diff --git a/src/index.ts b/src/index.ts index 6f77a804..3092ef6a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,7 @@ import type CaseEvent from "./components/EventsTimeline/CaseEvent" import type Permit from "./components/PermitsOverview/Permit" import type PermitType from "./components/PermitsSynopsis/PermitType" import type { HolidayRentalRegistration } from "./components/HolidayRentalRegistrations/types" -import type { RentalReport } from "./components/HolidayRentalReports/types" +import type { HolidayRentalReport } from "./components/HolidayRentalReports/types" import type { DefinitionListData } from "./components/Data/DefinitionList/DefinitionList" import type { ColumnType, Sorting } from "./components/Data/Table/types" @@ -34,7 +34,7 @@ export type { HolidayRentalRegistration, Permit, PermitType, - RentalReport, + HolidayRentalReport, DefinitionListData, ColumnType, Sorting diff --git a/src/stories/mockedData/holidayRentalReportsData.ts b/src/stories/mockedData/holidayRentalReportsData.ts index adfb7968..b7dbbe1f 100644 --- a/src/stories/mockedData/holidayRentalReportsData.ts +++ b/src/stories/mockedData/holidayRentalReportsData.ts @@ -1,6 +1,6 @@ -import { RentalReport } from "../../components/HolidayRentalReports/types" +import { HolidayRentalReport } from "../../components/HolidayRentalReports/types" -const holidayRentalData: RentalReport[] = [ +const holidayRentalData: HolidayRentalReport[] = [ { "startDatum": "2023-04-01T00:00:00Z", "eindDatum": "2023-04-04T00:00:00Z",