demo invoicing workflow 👍

Author: clstaudt

app/Tuttle.py

@@ -1,3 +1,4 @@
+import datetime
 from loguru import logger
 from textwrap import dedent
 from pathlib import Path
@@ -17,6 +18,8 @@
     Icon,
     Dropdown,
     Markdown,
+    FilePicker,
+    FilePickerResultEvent,
 )
 from flet import icons, colors, dropdown
 
@@ -178,15 +181,43 @@ def __init__(
         app: App,
     ):
         super().__init__(app)
+        self.calendar_file_path = None
 
     def update(self):
         super().update()
 
+    def on_click_generate_invoices(self, event):
+        """Generate invoices for the selected project and date range."""
+        logger.info("Generate invoices clicked")
+        if not self.calendar_file_path:
+            logger.error("No calendar file selected!")
+            return
+        self.app.con.billing(
+            project_tags=[self.project_select.value],
+            period_start=str(self.date_from_select.get_date()),
+            period_end=str(self.date_to_select.get_date()),
+            timetracking_method="file_calendar",
+            calendar_file_path=self.calendar_file_path,
+        )
+
+    def on_pick_calendar_file(self, event: FilePickerResultEvent):
+        """Handle the result of the calendar file picker."""
+        if event.files:
+            logger.info(f"Calendar file picked: {event.files[0].path}")
+            self.calendar_file_path = Path(event.files[0].path)
+        else:
+            logger.info("Cancelled!")
+
     def update_content(self):
         super().update_content()
 
         self.main_column.controls.clear()
 
+        self.calendar_file_picker = FilePicker(on_result=self.on_pick_calendar_file)
+
+        self.app.page.overlay.append(self.calendar_file_picker)
+
+        # select project
         projects = self.app.con.query(Project)
 
         self.project_select = Dropdown(
@@ -196,8 +227,8 @@ def update_content(self):
             autofocus=True,
         )
 
-        self.date_from_select = widgets.DateSelector()
-        self.date_to_select = widgets.DateSelector()
+        self.date_from_select = widgets.DateSelector(preset=datetime.date(2022, 1, 1))
+        self.date_to_select = widgets.DateSelector(preset=datetime.date(2022, 12, 31))
 
         self.main_column.controls = [
             Row(
@@ -220,6 +251,17 @@ def update_content(self):
                     )
                 ]
             ),
+            Row(
+                [
+                    ElevatedButton(
+                        "Pick Calendar File",
+                        icon=icons.UPLOAD_FILE,
+                        on_click=lambda _: self.calendar_file_picker.pick_files(
+                            allow_multiple=False
+                        ),
+                    ),
+                ]
+            ),
             Row(
                 [
                     views.make_card(
@@ -260,24 +302,13 @@ def update_content(self):
                     ElevatedButton(
                         "Generate invoice",
                         icon=icons.EDIT_NOTE,
-                        on_click=self.generate_invoices_clicked,
+                        on_click=self.on_click_generate_invoices,
                     ),
                 ]
             ),
         ]
         self.update()
 
-    def generate_invoices_clicked(self, event):
-        """Generate invoices for the selected project and date range."""
-        logger.info("Generate invoices clicked")
-        self.app.con.billing(
-            project_tags=[self.project_select.value],
-            period_start=self.date_from_select.get_date(),
-            period_end=self.date_to_select.get_date(),
-            timetracking_method="file_calendar",
-            calendar_file_path=None,
-        )
-
 
 def main(page: Page):
 
@@ -349,7 +380,7 @@ def main(page: Page):
         (
             NavigationRailDestination(
                 icon=icons.OUTGOING_MAIL,
-                label="Invocing",
+                label="Invoicing",
             ),
             InvoicingPage(app),
         ),

app/widgets.py

@@ -1,4 +1,5 @@
 import datetime
+import pytz
 
 from flet import (
     UserControl,
@@ -15,26 +16,36 @@
 class DateSelector(UserControl):
     """Timeframe selector."""
 
-    def __init__(self):
+    def __init__(
+        self,
+        preset: datetime.date = None,
+    ):
         super().__init__()
 
+        self.preset = preset
         self.day_dropdown = Dropdown(
             label="D",
             options=[dropdown.Option(day) for day in range(1, 32)],
             width=50,
         )
+        if self.preset:
+            self.day_dropdown.value = str(self.preset.day)
 
         self.month_dropdown = Dropdown(
             label="M",
             options=[dropdown.Option(month) for month in range(1, 13)],
             width=50,
         )
+        if self.preset:
+            self.month_dropdown.value = str(self.preset.month)
 
         self.year_dropdown = Dropdown(
             label="Y",
             options=[dropdown.Option(year) for year in range(2015, 2025)],
             width=100,
         )
+        if self.preset:
+            self.year_dropdown.value = str(self.preset.year)
 
         self.view = Container(
             content=Row(
@@ -54,11 +65,18 @@ def __init__(self):
     def build(self):
         return self.view
 
-    def get_date(self) -> datetime.date:
+    def get_date(
+        self,
+        as_datetime: bool = False,
+    ):
         """Return the selected timeframe."""
         date = datetime.date(
             year=int(self.year_dropdown.value),
             month=int(self.month_dropdown.value),
             day=int(self.day_dropdown.value),
         )
+        if as_datetime:
+            date = datetime.datetime.combine(date, datetime.time())
+            date = pytz.utc.localize(date)
+
         return date

tuttle/controller.py

@@ -227,6 +227,11 @@ def billing(
                 path=calendar_file_path,
                 name=calendar_file_path.stem,
             )
+            if timetracking_calendar.to_data().empty:
+                raise ValueError(
+                    f"empty calendar loaded from file {calendar_file_path}"
+                )
+            logger.info(f"calendar data: \\ {timetracking_calendar.to_data()}")
         else:
             raise ValueError(f"unsupported time tracking method: {timetracking_method}")
 

tuttle/model.py

@@ -288,7 +288,7 @@ class Timesheet(SQLModel, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
     title: str
     date: datetime.date
-    period: str
+    # period: str
     # table: pandas.DataFrame
     # TODO: store dataframe as dict
     # table: Dict = Field(default={}, sa_column=sqlalchemy.Column(sqlalchemy.JSON))

tuttle/timetracking.py

@@ -52,6 +52,7 @@ def generate_timesheet(
         raise ValueError(f"unknown source: {source}")
     tag_query = f"tag == '{project.tag}'"
     if period_end:
+        print(f"timetracking_data.index: {timetracking_data.index}")
         ts_table = (
             timetracking_data.loc[period_start:period_end].query(tag_query).sort_index()
         )