fix export dates are not localized (kimai#5368)

kernie · Feb 20, 2025 · afaa845 · afaa845
1 parent 928b520
commit afaa845
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Entity/Invoice.php b/src/Entity/Invoice.php
@@ -80,7 +80,6 @@ class Invoice implements EntityWithMetaFields
     #[Assert\NotNull]
     #[Serializer\Expose]
     #[Serializer\Groups(['Default'])]
-    #[Exporter\Expose(label: 'date', type: 'datetime')]
     private ?\DateTime $createdAt = null;
     #[ORM\Column(name: 'timezone', type: 'string', length: 64, nullable: false)]
     private ?string $timezone = null;
@@ -176,6 +175,7 @@ public function getTotal(): float
         return $this->total;
     }
 
+    #[Exporter\Expose(name: 'createdAt', label: 'date', type: 'datetime')]
     public function getCreatedAt(): ?\DateTime
     {
         if (!$this->localized) {

diff --git a/src/Entity/Project.php b/src/Entity/Project.php
@@ -87,7 +87,6 @@ class Project implements EntityWithMetaFields, EntityWithBudget, CreatedAt
     #[Serializer\Groups(['Project_Entity'])]
     #[Serializer\Type(name: "DateTime<'Y-m-d'>")]
     #[Serializer\Accessor(getter: 'getOrderDate')]
-    #[Exporter\Expose(label: 'orderDate', type: 'datetime')]
     private ?\DateTime $orderDate = null;
     /**
      * Project start date (times before this date cannot be recorded)
@@ -99,7 +98,6 @@ class Project implements EntityWithMetaFields, EntityWithBudget, CreatedAt
     #[Serializer\Groups(['Project'])]
     #[Serializer\Type(name: "DateTime<'Y-m-d'>")]
     #[Serializer\Accessor(getter: 'getStart')]
-    #[Exporter\Expose(label: 'project_start', type: 'datetime')]
     private ?\DateTime $start = null;
     /**
      * Project end time (times after this date cannot be recorded)
@@ -111,7 +109,6 @@ class Project implements EntityWithMetaFields, EntityWithBudget, CreatedAt
     #[Serializer\Groups(['Project'])]
     #[Serializer\Type(name: "DateTime<'Y-m-d'>")]
     #[Serializer\Accessor(getter: 'getEnd')]
-    #[Exporter\Expose(label: 'project_end', type: 'datetime')]
     private ?\DateTime $end = null;
     #[ORM\Column(name: 'timezone', type: 'string', length: 64, nullable: true)]
     private ?string $timezone = null;
@@ -291,6 +288,7 @@ protected function localizeDates(): void
         $this->localized = true;
     }
 
+    #[Exporter\Expose(name: 'orderDate', label: 'orderDate', type: 'date')]
     public function getOrderDate(): ?\DateTime
     {
         $this->localizeDates();
@@ -309,6 +307,7 @@ public function setOrderDate(?\DateTime $orderDate): Project
         return $this;
     }
 
+    #[Exporter\Expose(name: 'start', label: 'project_start', type: 'date')]
     public function getStart(): ?\DateTime
     {
         $this->localizeDates();
@@ -327,6 +326,7 @@ public function setStart(?\DateTime $start): Project
         return $this;
     }
 
+    #[Exporter\Expose(name: 'end', label: 'project_end', type: 'date')]
     public function getEnd(): ?\DateTime
     {
         $this->localizeDates();

diff --git a/tests/Entity/ProjectTest.php b/tests/Entity/ProjectTest.php
@@ -174,9 +174,9 @@ public function testExportAnnotations(): void
             ['name', 'string'],
             ['customer', 'string'],
             ['orderNumber', 'string'],
-            ['orderDate', 'datetime'],
-            ['project_start', 'datetime'],
-            ['project_end', 'datetime'],
+            ['orderDate', 'date'],
+            ['project_start', 'date'],
+            ['project_end', 'date'],
             ['budget', 'float'],
             ['timeBudget', 'duration'],
             ['budgetType', 'string'],