Merge branch 'dev' into dev-feat-timesheets

Author: clstaudt

app/clients/view.py

@@ -60,7 +60,7 @@ def build(self):
             ListTile(
                 leading=Icon(
                     utils.TuttleComponentIcons.client_icon,
-                    size=dimens.ICON_SIZE,
+                    size=dimens.MD_ICON_SIZE,
                 ),
                 title=views.TBodyText(self.client.name),
                 trailing=editor_controls,

app/contacts/view.py

@@ -48,7 +48,7 @@ def build(self):
             ListTile(
                 leading=Icon(
                     utils.TuttleComponentIcons.contact_icon,
-                    size=dimens.ICON_SIZE,
+                    size=dimens.MD_ICON_SIZE,
                 ),
                 title=views.TBodyText(utils.truncate_str(self.contact.name)),
                 subtitle=views.TBodyText(

app/contracts/view.py

@@ -60,7 +60,7 @@ def build(self):
             ListTile(
                 leading=Icon(
                     utils.TuttleComponentIcons.contract_icon,
-                    size=dimens.ICON_SIZE,
+                    size=dimens.MD_ICON_SIZE,
                 ),
                 title=views.TBodyText(self.contract.title),
                 subtitle=views.TBodyText(

app/core/views.py

@@ -40,6 +40,20 @@
 class Spacer(Container):
     """Creates a space between controls"""
 
+    # FIXME: Unpythonic code, replace with
+    # class Spacer(Container):
+    #     SPACE_SIZES = {
+    #         'lg': 40,
+    #         'md': 20,
+    #         'sm': 10,
+    #         'xs': 5,
+    #         None: 15,
+    #     }
+
+    #     def __init__(self, size=None, **kwargs):
+    #         self._space_size = self.SPACE_SIZES[size]
+    #         super().__init__(height=self._space_size, width=self._space_size, **kwargs)
+
     def __init__(
         self,
         lg_space: bool = False,
@@ -827,7 +841,7 @@ def __init__(
             leading=Container(
                 content=TSubHeading(
                     subtitle=title,
-                    align=utils.START_ALIGNMENT,
+                    align=utils.TXT_ALIGN_LEFT,
                     expand=True,
                     color=colors.GRAY_DARK_COLOR,
                 ),

app/demo.py

@@ -1,75 +1,72 @@
-from typing import List, Optional, Callable
+from typing import Callable, List, Optional
 
+import datetime
 import random
+from datetime import date, timedelta
 from pathlib import Path
-from tuttle.calendar import Calendar, ICSCalendar
+from decimal import Decimal
+
 import faker
-import random
-import datetime
-from datetime import timedelta, date
 import ics
-from sqlmodel import Field, SQLModel, create_engine, Session, select
+import numpy
 import sqlalchemy
 from loguru import logger
-import numpy
+from sqlmodel import Field, Session, SQLModel, create_engine, select
 
+from tuttle import rendering
+from tuttle.calendar import Calendar, ICSCalendar
 from tuttle.model import (
     Address,
-    Contact,
+    BankAccount,
     Client,
-    Project,
+    Contact,
     Contract,
-    TimeUnit,
     Cycle,
-    User,
-    BankAccount,
     Invoice,
     InvoiceItem,
     Timesheet,
     TimeTrackingItem,
+    Project,
+    TimeUnit,
+    User,
 )
-from tuttle import rendering
 
 
 def create_fake_contact(
     fake: faker.Faker,
 ):
-    try:
-        street_line, city_line = fake.address().splitlines()
-        a = Address(
-            id=id,
-            street=street_line.split(" ")[0],
-            number=street_line.split(" ")[1],
-            city=city_line.split(" ")[1],
-            postal_code=city_line.split(" ")[0],
-            country=fake.country(),
-        )
-        first_name, last_name = fake.name().split(" ", 1)
-        contact = Contact(
-            id=id,
-            first_name=first_name,
-            last_name=last_name,
-            email=fake.email(),
-            company=fake.company(),
-            address_id=a.id,
-            address=a,
-        )
-        return contact
-    except Exception as ex:
-        logger.error(ex)
-        logger.error(f"Failed to create fake contact, trying again")
-        return create_fake_contact(fake)
+
+    split_address_lines = fake.address().splitlines()
+    street_line = split_address_lines[0]
+    city_line = split_address_lines[1]
+    a = Address(
+        street=street_line,
+        number=city_line,
+        city=city_line.split(" ")[1],
+        postal_code=city_line.split(" ")[0],
+        country=fake.country(),
+    )
+    first_name, last_name = fake.name().split(" ", 1)
+    contact = Contact(
+        first_name=first_name,
+        last_name=last_name,
+        email=fake.email(),
+        company=fake.company(),
+        address_id=a.id,
+        address=a,
+    )
+    return contact
 
 
 def create_fake_client(
     invoicing_contact: Contact,
     fake: faker.Faker,
 ):
     client = Client(
-        id=id,
         name=fake.company(),
         invoicing_contact=invoicing_contact,
     )
+    assert client.invoicing_contact is not None
     return client
 
 
@@ -94,7 +91,7 @@ def create_fake_contract(
         start_date=fake.date_this_year(after_today=True),
         rate=rate,
         currency="EUR",  # TODO: Use actual currency
-        VAT_rate=round(random.uniform(0.05, 0.2), 2),
+        VAT_rate=Decimal(round(random.uniform(0.05, 0.2), 2)),
         unit=unit,
         units_per_workday=random.randint(1, 12),
         volume=fake.random_int(1, 1000),
@@ -108,11 +105,12 @@ def create_fake_project(
     fake: faker.Faker,
 ):
     project_title = fake.bs()
+    project_tag = f"#{'-'.join(project_title.split(' ')[:2]).lower()}"
+
     project = Project(
         title=project_title,
-        tag="-".join(project_title.split(" ")[:2]).lower(),
+        tag=project_tag,
         description=fake.paragraph(nb_sentences=2),
-        unique_tag=project_title.split(" ")[0].lower(),
         is_completed=fake.pybool(),
         start_date=datetime.date.today(),
         end_date=datetime.date.today() + datetime.timedelta(days=80),
@@ -188,7 +186,7 @@ def create_fake_invoice(
     """
     invoice_number = next(invoice_number_counter)
     invoice = Invoice(
-        number=str(invoice_number),  # TODO: replace with generated number
+        number=str(invoice_number),
         date=datetime.date.today(),
         sent=fake.pybool(),
         paid=fake.pybool(),
@@ -200,6 +198,7 @@ def create_fake_invoice(
     number_of_items = fake.random_int(min=1, max=5)
     for _ in range(number_of_items):
         unit = fake.random_element(elements=("hours", "days"))
+        unit_price = 0
         if unit == "hours":
             unit_price = abs(round(numpy.random.normal(50, 20), 2))
         elif unit == "days":
@@ -210,12 +209,11 @@ def create_fake_invoice(
             end_date=fake.date_this_decade(),
             quantity=fake.random_int(min=1, max=10),
             unit=unit,
-            unit_price=unit_price,
+            unit_price=Decimal(unit_price),
             description=fake.sentence(),
-            VAT_rate=vat_rate,
+            VAT_rate=Decimal(vat_rate),
             invoice=invoice,
         )
-        assert invoice_item.invoice == invoice
 
         try:
             rendering.render_invoice(
@@ -272,7 +270,6 @@ def create_demo_user() -> User:
         phone_number="+55555555555",
         VAT_number="27B-6",
         address=Address(
-            name="Harry Tuttle",
             street="Main Street",
             number="450",
             city="Somewhere",
@@ -289,6 +286,14 @@ def create_demo_user() -> User:
 
 
 def create_fake_calendar(project_list: List[Project]) -> ics.Calendar:
+    def random_datetime(start, end):
+        return start + timedelta(
+            seconds=random.randint(0, int((end - start).total_seconds()))
+        )
+
+    def random_duration():
+        return timedelta(hours=random.randint(1, 8))
+
     # create a new calendar
     calendar = ics.Calendar()
 
@@ -303,7 +308,7 @@ def create_fake_calendar(project_list: List[Project]) -> ics.Calendar:
         for _ in range(random.randint(1, 5)):
             # create a new event
             event = ics.Event()
-            event.name = f"Meeting for #{project.tag}"
+            event.name = f"Meeting for {project.tag}"
 
             # set the event's begin and end datetime
             event.begin = random_datetime(month_ago, now)
@@ -314,16 +319,6 @@ def create_fake_calendar(project_list: List[Project]) -> ics.Calendar:
     return calendar
 
 
-def random_datetime(start, end):
-    return start + timedelta(
-        seconds=random.randint(0, int((end - start).total_seconds()))
-    )
-
-
-def random_duration():
-    return timedelta(hours=random.randint(1, 8))
-
-
 def install_demo_data(
     n_projects: int,
     db_path: str,
@@ -377,7 +372,3 @@ def install_demo_data(
         for project in projects:
             session.add(project)
             session.commit()
-
-
-if __name__ == "__main__":
-    install_demo_data(n_projects=10)

app/projects/view.py

@@ -58,11 +58,11 @@ def build(self):
             ListTile(
                 leading=Icon(
                     utils.TuttleComponentIcons.project_icon,
-                    size=dimens.ICON_SIZE,
+                    size=dimens.MD_ICON_SIZE,
                 ),
                 title=views.TBodyText(self.project.title),
                 subtitle=views.TBodyText(
-                    f"#{self.project.tag}",
+                    f"{self.project.tag}",
                     color=colors.GRAY_COLOR,
                     weight=FontWeight.BOLD,
                 ),
@@ -76,6 +76,7 @@ def build(self):
                 on_click=lambda e: self.on_view_details_clicked(self.project.id),
             ),
             views.Spacer(md_space=True),
+            views.Spacer(md_space=True),
             ResponsiveRow(
                 controls=[
                     views.TBodyText(

tuttle/calendar.py

@@ -21,7 +21,7 @@
 
 def extract_hashtag(string) -> str:
     """Extract the first hashtag from a string."""
-    match = re.search(r"#(\S+)", string)
+    match = re.search(r"(#\S+)", string)
     if match:
         return match.group(1)
     else: