Merge pull request #658 from Amsterdam/feature/93474-add-datum-of-mel…

…ding Feature/93474 add datum of melding
Amsterdam · Sep 4, 2024 · 9afbc1f · 9afbc1f
2 parents 155881f + d4ac884
commit 9afbc1f
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 682 deletions.
diff --git a/src/components/HolidayRental/HolidayRental.tsx b/src/components/HolidayRental/HolidayRental.tsx
diff --git a/src/components/HolidayRental/VakantieverhuurReportInformation.ts b/src/components/HolidayRental/VakantieverhuurReportInformation.ts
diff --git a/src/components/HolidayRental/components/HolidayRentalReport.tsx b/src/components/HolidayRental/components/HolidayRentalReport.tsx
diff --git a/src/components/HolidayRental/components/Report.tsx b/src/components/HolidayRental/components/Report.tsx
diff --git a/src/components/HolidayRental/components/hooks/useVacationRentalReportValues.tsx b/src/components/HolidayRental/components/hooks/useVacationRentalReportValues.tsx
diff --git a/src/components/HolidayRental/components/hooks/useVacationRentalValues.tsx b/src/components/HolidayRental/components/hooks/useVacationRentalValues.tsx
diff --git a/src/components/HolidayRental/tests/HolidayRental.test.tsx b/src/components/HolidayRental/tests/HolidayRental.test.tsx
diff --git a/src/components/HolidayRentalReports/components/hooks/useReportValues.tsx b/src/components/HolidayRentalReports/components/hooks/useReportValues.tsx
@@ -7,5 +7,6 @@ export default (report: RentalReport) => ({
   "Check out": <DateDisplay date={ report?.eindDatum } />,
   "Gasten": report?.gasten,
   "Gewijzigd": report?.isAangepast ? "Ja" : "Nee",
-  "Verwijderd": report?.isVerwijderd ? "Ja" : "Nee"
+  "Verwijderd": report?.isVerwijderd ? "Ja" : "Nee",
+  "Aangemaakt op": <DateDisplay date={ report?.gemaaktOp } />
 })
diff --git a/src/components/HolidayRentalReports/types.ts b/src/components/HolidayRentalReports/types.ts
@@ -5,4 +5,5 @@ export type RentalReport = {
   gasten: number
   isAangepast: Boolean
   isVerwijderd: Boolean
+  gemaaktOp: string // date-time
 }
diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,6 @@
 import type CaseEvent from "./components/EventsTimeline/CaseEvent"
 import type Permit from "./components/PermitsOverview/Permit"
 import type PermitType from "./components/PermitsSynopsis/PermitType"
-import type VakantieverhuurReportInformation from "./components/HolidayRental/VakantieverhuurReportInformation"
 import type { RentalReport } from "./components/HolidayRentalReports/types"
 import type { DefinitionListData } from "./components/Data/DefinitionList/DefinitionList"
 import type { ColumnType, Sorting } from "./components/Data/Table/types"
@@ -12,7 +11,6 @@ import DayDisplay from "./components/DayDisplay/DayDisplay"
 import DefinitionList from "./components/Data/DefinitionList/DefinitionList"
 import EventsTimeline from "./components/EventsTimeline/EventsTimeline"
 import FinancialDisplay from "./components/FinancialDisplay/FinancialDisplay"
-import HolidayRental from "./components/HolidayRental/HolidayRental"
 import HolidayRentalReports from "./components/HolidayRentalReports/HolidayRentalReports"
 import List from "./components/Data/List/List"
 import LoadingRows from "./components/Data/components/LoadingRows"
@@ -33,7 +31,6 @@ export type {
   CaseEvent,
   Permit,
   PermitType,
-  VakantieverhuurReportInformation,
   RentalReport,
   DefinitionListData,
   ColumnType,
@@ -50,7 +47,6 @@ export {
   EventsTimeline,
   FinancialDisplay,
   getValidPermits,
-  HolidayRental,
   HolidayRentalReports,
   Icons,
   isValidDate,

diff --git a/src/stories/HolidayRental.stories.tsx b/src/stories/HolidayRental.stories.tsx