refactor: fix: project and contract status

* Fixed bug - getting active status
* Removed unnecessary call to get_filter_button_label

Author: vlad-ed-git

app/contracts/view.py

@@ -150,17 +150,8 @@ class ContractStates(Enum):
     COMPLETED = 3
     UPCOMING = 4
 
-
-def get_filter_button_label(state: ContractStates):
-    """Returns the label for the given state"""
-    if state.value == ContractStates.ACTIVE.value:
-        return "Active"
-    elif state.value == ContractStates.UPCOMING.value:
-        return "Upcoming"
-    elif state.value == ContractStates.COMPLETED.value:
-        return "Completed"
-    else:
-        return "All"
+    def __str__(self):
+        return self.name.capitalize()
 
 
 def get_filter_button_tooltip(state: ContractStates):
@@ -224,7 +215,7 @@ def set_filter_buttons(self):
         """Sets all the filter buttons"""
         for state in ContractStates:
             button = self.filter_button(
-                label=get_filter_button_label(state),
+                label=state.__str__(),
                 state=state,
                 onClick=self.on_filter_button_clicked,
                 tooltip=get_filter_button_tooltip(state),

app/projects/view.py

@@ -205,17 +205,8 @@ class ProjectStates(Enum):
     COMPLETED = 3
     UPCOMING = 4
 
-
-def get_filter_button_label(state: ProjectStates):
-    """returns the label for the filter button"""
-    if state.value == ProjectStates.ACTIVE.value:
-        return "Active"
-    elif state.value == ProjectStates.UPCOMING.value:
-        return "Upcoming"
-    elif state.value == ProjectStates.COMPLETED.value:
-        return "Completed"
-    else:
-        return "All"
+    def __str__(self):
+        return self.name.capitalize()
 
 
 def get_filter_button_tooltip(state: ProjectStates):
@@ -279,7 +270,7 @@ def set_filter_buttons(self):
         """sets the filter buttons for each project state"""
         for state in ProjectStates:
             button = self.filter_button(
-                label=get_filter_button_label(state),
+                label=state.__str__(),
                 state=state,
                 onClick=self.on_filter_button_clicked,
                 tooltip=get_filter_button_tooltip(state),

tuttle/model.py

@@ -350,6 +350,8 @@ def is_active(self) -> bool:
         """Check if contract is active.A contract is active if it is not completed and the end date is in the future."""
         if self.is_completed:
             return False
+        if self.is_upcoming():
+            return False
         if self.end_date:
             today = datetime.date.today()
             return self.end_date > today
@@ -440,6 +442,8 @@ def is_active(self) -> bool:
         """Is the project active? A project is active if it is not completed and if the end date is in the future."""
         if self.is_completed:
             return False
+        if self.is_upcoming():
+            return False
         if self.end_date:
             today = datetime.date.today()
             return self.end_date >= today