contract view

Author: clstaudt

app/views.py

@@ -23,6 +23,10 @@
 )
 
 
+ICON_SIZE_BIG = 36
+ICON_SIZE_SMALL = 24
+
+
 class AppView(UserControl):
     def __init__(
         self,
@@ -177,10 +181,63 @@ def make_contact_view(contact: Contact):
 def make_contract_view(contract: Contract):
     return Card(
         content=Container(
-            content=Row(
+            content=Column(
                 [
-                    Icon(icons.HISTORY_EDU),
-                    Text(contract.title),
+                    ListTile(
+                        leading=Icon(icons.HISTORY_EDU, size=ICON_SIZE_BIG),
+                        title=Text(contract.title),
+                        subtitle=Text(contract.client.name),
+                        trailing=PopupMenuButton(
+                            icon=icons.MORE_VERT,
+                            items=[
+                                PopupMenuItem(
+                                    icon=icons.EDIT,
+                                    text="Edit",
+                                ),
+                                PopupMenuItem(
+                                    icon=icons.DELETE,
+                                    text="Delete",
+                                ),
+                            ],
+                        ),
+                    ),
+                    Column(
+                        [
+                            # date range
+                            Row(
+                                [
+                                    Icon(icons.DATE_RANGE),
+                                    Text(
+                                        f"{contract.start_date} - {contract.end_date}"
+                                    ),
+                                ]
+                            ),
+                            Row(
+                                [
+                                    Icon(icons.MONEY),
+                                    Text(
+                                        f"{contract.rate} {contract.currency} / {contract.unit}"
+                                    ),
+                                ]
+                            ),
+                            Row(
+                                [
+                                    Icon(icons.PERCENT),
+                                    Text(
+                                        f"VAT rate: {(contract.VAT_rate) * 100:.0f} %"
+                                    ),
+                                ]
+                            ),
+                            Row(
+                                [
+                                    Icon(icons.OUTGOING_MAIL),
+                                    Text(
+                                        f"billing cycle: {str(contract.billing_cycle)} \t term of payment: {contract.term_of_payment} days"
+                                    ),
+                                ]
+                            ),
+                        ]
+                    ),
                 ],
             ),
             padding=12,

tuttle/model.py

@@ -2,7 +2,7 @@
 
 import email
 from typing import Optional, List, Dict, Type
-from pydantic import constr, BaseModel
+from pydantic import constr, BaseModel, condecimal
 
 import datetime
 import hashlib
@@ -214,7 +214,7 @@ class Contract(SQLModel, table=True):
         default=None,
         foreign_key="client.id",
     )
-    rate: Decimal = Field(
+    rate: condecimal(decimal_places=2) = Field(
         description="Rate of remuneration",
     )
     currency: str  # TODO: currency representation

tuttle/time.py

@@ -3,18 +3,21 @@
 
 
 class Cycle(enum.Enum):
-    hourly = 0
-    daily = 1
-    weekly = 2
-    monthly = 3
-    quarterly = 4
-    yearly = 5
+    hourly = "hourly"
+    daily = "daily"
+    weekly = "weekly"
+    monthly = "monthly"
+    quarterly = "quarterly"
+    yearly = "yearly"
+
+    def __str__(self):
+        return str(self.value)
 
 
 class TimeUnit(enum.Enum):
-    minute = 0
-    hour = 1
-    day = 2
+    minute = "minute"
+    hour = "hour"
+    day = "day"
 
     def to_timedelta(self):
         if self == TimeUnit.minute:
@@ -23,3 +26,6 @@ def to_timedelta(self):
             return datetime.timedelta(hours=1)
         elif self == TimeUnit.day:
             return datetime.timedelta(days=1)
+
+    def __str__(self):
+        return str(self.value)

tuttle_tests/demo.py

@@ -116,6 +116,7 @@
     billing_cycle=time.Cycle.monthly,
     signature_date=datetime.date(2022, 2, 1),
     start_date=datetime.date(2022, 2, 1),
+    end_date=datetime.date(2022, 12, 31),
 )
 
 contract_two = Contract(
@@ -129,6 +130,7 @@
     billing_cycle=time.Cycle.monthly,
     signature_date=datetime.date(2022, 1, 1),
     start_date=datetime.date(2022, 1, 1),
+    end_date=datetime.date(2022, 12, 31),
 )
 
 # PROJECTS