feature/3404-improve-date-handling-in-project-settings

OTAnalytics/adapter_ui/default_values.py

@@ -4,3 +4,9 @@
 DATE_FORMAT: str = r"%Y-%m-%d"
 DATETIME_FORMAT: str = r"%Y-%m-%d %H:%M:%S"
 DATE_FORMAT_PLACEHOLDER = "yyyy-mm-dd"
+
+DATE_FORMAT_GERMAN: str = r"%d.%m.%Y"
+DATETIME_FORMAT_GERMAN: str = r"%d.%m.%Y %H:%M:%S"
+DATE_FORMAT_PLACEHOLDER_GERMAN = "dd.mm.yyyy"
+
+SUPPORTED_FORMATS: list[str] = [DATE_FORMAT, DATE_FORMAT_GERMAN]

OTAnalytics/adapter_ui/view_model.py

@@ -21,7 +21,6 @@
 
 DISTANCES: str = "distances"
 
-
 MetadataProvider = Callable[[], dict]
 
 
@@ -74,10 +73,6 @@ def set_filter_frame(self, filter_frame: AbstractFrameFilter) -> None:
     def set_frame_project(self, project_frame: AbstractFrameProject) -> None:
         pass
 
-    @abstractmethod
-    def update_project(self, name: str, start_date: Optional[datetime]) -> None:
-        pass
-
     @abstractmethod
     def load_otconfig(self) -> None:
         pass

OTAnalytics/application/application.py

@@ -218,9 +218,6 @@ def remove_flow(self, flow_id: FlowId) -> None:
     def update_flow(self, flow: Flow) -> None:
         self._datastore.update_flow(flow)
 
-    def update_project(self, name: str, start_date: Optional[datetime]) -> None:
-        self._project_updater(name, start_date)
-
     def save_otconfig(self, file: Path) -> None:
         self._save_otconfig(file)
 

OTAnalytics/plugin_ui/customtkinter_gui/dummy_viewmodel.py

@@ -18,9 +18,9 @@
 from OTAnalytics.adapter_ui.abstract_main_window import AbstractMainWindow
 from OTAnalytics.adapter_ui.abstract_treeview_interface import AbstractTreeviewInterface
 from OTAnalytics.adapter_ui.default_values import (
-    DATE_FORMAT,
     DATETIME_FORMAT,
     RELATIVE_SECTION_OFFSET,
+    SUPPORTED_FORMATS,
 )
 from OTAnalytics.adapter_ui.flow_adapter import (
     GeometricCenterCalculator,
@@ -433,9 +433,6 @@ def _show_current_project(self) -> None:
         project = self._application._datastore.project
         self._frame_project.update(name=project.name, start_date=project.start_date)
 
-    def update_project(self, name: str, start_date: Optional[datetime]) -> None:
-        self._application.update_project(name, start_date)
-
     def save_otconfig(self) -> None:
         title = "Save configuration as"
         file_types = [(f"{OTCONFIG} file", f"*.{OTCONFIG}")]
@@ -1353,7 +1350,9 @@ def change_track_offset_to_section_offset(self) -> None:
         self.update_section_offset_button_state()
 
     def validate_date(self, date: str) -> bool:
-        return validate_date(date, DATE_FORMAT)
+        return any(
+            [validate_date(date, date_format) for date_format in SUPPORTED_FORMATS]
+        )
 
     def validate_hour(self, hour: str) -> bool:
         try:

OTAnalytics/plugin_ui/customtkinter_gui/frame_filter.py

@@ -17,9 +17,9 @@
 
 from OTAnalytics.adapter_ui.abstract_frame_filter import AbstractFrameFilter
 from OTAnalytics.adapter_ui.default_values import (
-    DATE_FORMAT,
-    DATE_FORMAT_PLACEHOLDER,
+    DATE_FORMAT_PLACEHOLDER_GERMAN,
     DATETIME_FORMAT,
+    SUPPORTED_FORMATS,
 )
 from OTAnalytics.adapter_ui.dto import DateRangeDto
 from OTAnalytics.adapter_ui.helpers import WidgetPositionProvider
@@ -437,26 +437,32 @@ def set_datetime(self, date_time: Optional[datetime]) -> None:
             self.reset()
 
     def get_datetime(self) -> Optional[datetime]:
+        """
+        Get the currently set date and time as datetime. If the date can not be parsed,
+        an InvalidDatetimeFormatError will be raised.
+        """
         if (
             self.date == ""
             and self.hour == ""
             and self.minute == ""
             and self.second == ""
         ):
             return None
-        try:
-            date = datetime.strptime(self.date, DATE_FORMAT)
-            return datetime(
-                year=date.year,
-                month=date.month,
-                day=date.day,
-                hour=int(self.hour),
-                minute=int(self.minute),
-                second=int(self.second),
-                tzinfo=timezone.utc,
-            )
-        except ValueError:
-            raise InvalidDatetimeFormatError(f"{self._name} datetime is not valid.")
+        for date_format in SUPPORTED_FORMATS:
+            try:
+                date = datetime.strptime(self.date, date_format)
+                return datetime(
+                    year=date.year,
+                    month=date.month,
+                    day=date.day,
+                    hour=int(self.hour),
+                    minute=int(self.minute),
+                    second=int(self.second),
+                    tzinfo=timezone.utc,
+                )
+            except ValueError:
+                pass
+        raise InvalidDatetimeFormatError(f"{self._name} datetime is not valid.")
 
     def _get_widgets(self) -> None:
         self.validation_info_label = CTkLabel(
@@ -467,7 +473,7 @@ def _get_widgets(self) -> None:
         )
         self.date_entry = CTkEntry(
             master=self,
-            placeholder_text=DATE_FORMAT_PLACEHOLDER,
+            placeholder_text=DATE_FORMAT_PLACEHOLDER_GERMAN,
             width=95,
             textvariable=self._date_var,
             validate="key",
@@ -553,7 +559,7 @@ def _validate_date_format(self, value: str, widget_name: str) -> bool:
         else:
             widget.configure(border_color=COLOR_RED)
             self._display_invalid_validation_info(
-                f"Date must be of format: '{DATE_FORMAT_PLACEHOLDER}'"
+                f"Date must be of format: '{DATE_FORMAT_PLACEHOLDER_GERMAN}'"
             )
         return True