From e07fd5156025bef6d0778d946dbaa4c2a920b184 Mon Sep 17 00:00:00 2001 From: Adrian Andersen Date: Thu, 16 May 2024 22:38:38 +0200 Subject: [PATCH 1/2] feat(categories): make the 'Annet' category more special --- rezervo/providers/brpsystems/provider.py | 4 +--- rezervo/utils/category_utils.py | 17 +++++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/rezervo/providers/brpsystems/provider.py b/rezervo/providers/brpsystems/provider.py index c421864..7e9ec6f 100644 --- a/rezervo/providers/brpsystems/provider.py +++ b/rezervo/providers/brpsystems/provider.py @@ -299,9 +299,7 @@ def rezervo_class_from_brp_class( subdomain: BrpSubdomain, brp_class: BrpClass | DetailedBrpClass, ) -> RezervoClass: - category = determine_activity_category( - brp_class.name, brp_class.externalMessage is not None - ) + category = determine_activity_category(brp_class.name) return RezervoClass( id=str(brp_class.id), # TODO: check if unique across all subdomains start_time=datetime.datetime.fromisoformat( diff --git a/rezervo/utils/category_utils.py b/rezervo/utils/category_utils.py index 73f4028..b7f9386 100644 --- a/rezervo/utils/category_utils.py +++ b/rezervo/utils/category_utils.py @@ -1,4 +1,3 @@ -from typing import Optional from pydantic.main import BaseModel @@ -41,6 +40,10 @@ class RezervoCategory(RezervoBaseCategory): "senior", "baby", "mama", + "familie", + "kids", + "sprek", + "walk", ], ), RezervoCategory( @@ -68,6 +71,7 @@ class RezervoCategory(RezervoBaseCategory): "ashtanga", "shape", "flexibility", + "balance", ], ), RezervoCategory( @@ -118,16 +122,17 @@ class RezervoCategory(RezervoBaseCategory): "bootcamp", "olympia", "absolution", + "bodyweight", + "x-fit", + "kettlebell", + "skill athletic", + "sirkel", ], ), ] -def determine_activity_category( - activity_name: str, has_additional_information: Optional[bool] = False -) -> RezervoCategory: - if has_additional_information: - return OTHER_ACTIVITY_CATEGORY +def determine_activity_category(activity_name: str) -> RezervoCategory: for category in ACTIVITY_CATEGORIES: for keyword in category.keywords: if keyword in activity_name.lower(): From 4e27f5cc4deca3daff98ac51ad2bc647f333f239 Mon Sep 17 00:00:00 2001 From: Adrian Andersen Date: Thu, 16 May 2024 23:22:36 +0200 Subject: [PATCH 2/2] feat(categories): update colors to improve contrast --- rezervo/utils/category_utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rezervo/utils/category_utils.py b/rezervo/utils/category_utils.py index b7f9386..dc2fba2 100644 --- a/rezervo/utils/category_utils.py +++ b/rezervo/utils/category_utils.py @@ -1,4 +1,3 @@ - from pydantic.main import BaseModel @@ -31,7 +30,7 @@ class RezervoCategory(RezervoBaseCategory): ), RezervoCategory( name="Mosjon", - color="#00B050", + color="#00A050", keywords=[ "mosjon", "godt voksen", @@ -81,7 +80,7 @@ class RezervoCategory(RezervoBaseCategory): ), RezervoCategory( name="Kondisjon", - color="#6AD3B4", + color="#C040A0", keywords=[ "kondis", "step",