allow empty date in export (kimai#1338)

jeph864 · Dec 31, 2019 · 022dbe3 · 022dbe3
1 parent baac4eb
commit 022dbe3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,7 +3,8 @@ root = true
 
 ; Unix-style newlines
 [*]
-end_of_line = LF
+end_of_line = lf
+charset = utf-8
 
 [*.php]
 indent_style = space

diff --git a/src/Controller/ExportController.php b/src/Controller/ExportController.php
@@ -143,8 +143,12 @@ protected function getDefaultQuery(): ExportQuery
      */
     protected function getEntries(ExportQuery $query): array
     {
-        $query->getBegin()->setTime(0, 0, 0);
-        $query->getEnd()->setTime(23, 59, 59);
+        if (null !== $query->getBegin()) {
+            $query->getBegin()->setTime(0, 0, 0);
+        }
+        if (null !== $query->getEnd()) {
+            $query->getEnd()->setTime(23, 59, 59);
+        }
 
         return $this->timesheetRepository->getTimesheetsForQuery($query, true);
     }

diff --git a/src/Form/Toolbar/AbstractToolbarForm.php b/src/Form/Toolbar/AbstractToolbarForm.php
@@ -122,10 +122,10 @@ protected function addUserRoleChoice(FormBuilderInterface $builder)
         ]);
     }
 
-    protected function addDateRangeChoice(FormBuilderInterface $builder, $allowEmpty = true)
+    protected function addDateRangeChoice(FormBuilderInterface $builder, $allowEmpty = true, $required = false)
     {
         $builder->add('daterange', DateRangeType::class, [
-            'required' => false,
+            'required' => $required,
             'allow_empty' => $allowEmpty,
         ]);
     }

diff --git a/templates/export/index.html.twig b/templates/export/index.html.twig
@@ -83,7 +83,7 @@
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'unit_price') }} text-nowrap">
                         {{ rate|money(currency) }}
                     </td>
-                    <td class="{{ tables.data_table_column_class(tableName, columns, 'duration') }} text-nowrap">
+                    <td class="{{ tables.data_table_column_class(tableName, columns, 'duration') }} text-nowrap" data-duration="{{ entry.duration }}">
                         {{ duration }}
                     </td>
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'total_rate') }} text-nowrap">

diff --git a/templates/invoice/index.html.twig b/templates/invoice/index.html.twig
@@ -83,7 +83,7 @@
                     </td>
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'unit_price') }} text-center">{{ rate|money(model.calculator.currency) }}</td>
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'amount') }} text-center text-nowrap">{{ amount }}</td>
-                    <td class="{{ tables.data_table_column_class(tableName, columns, 'duration') }} text-center text-nowrap">{{ duration }}</td>
+                    <td class="{{ tables.data_table_column_class(tableName, columns, 'duration') }} text-center text-nowrap" data-duration="{{ entry.duration }}">{{ duration }}</td>
                     <td class="text-right text-nowrap">{{ entry.rate|money(model.calculator.currency) }}</td>
                 </tr>
             {% endfor %}