diff --git a/fbl_integration/models.py b/fbl_integration/models.py index c36f1ab..bfd7e7d 100644 --- a/fbl_integration/models.py +++ b/fbl_integration/models.py @@ -10,6 +10,9 @@ class FblAccount(models.Model): created_at = models.DateTimeField(auto_now_add=True) status = models.CharField(max_length=64) + def tags_list(self): + return self.tags_secured.split(',') + @classmethod def create_user(cls, username) -> PawUser: if not PawUser.objects.filter(username=username).exists(): diff --git a/fbl_integration/templates/partials/attendee_info.html b/fbl_integration/templates/partials/attendee_info.html index 6f7c582..894421d 100644 --- a/fbl_integration/templates/partials/attendee_info.html +++ b/fbl_integration/templates/partials/attendee_info.html @@ -1,9 +1,21 @@ {% block attendee_info %} {% load i18n %} +{% if fbl_account %}

{% trans 'Rawrgister Info' %}

-
-{{ fbl_account.username }}
#{{ fbl_account.badge_number }}
-{% trans 'Status' %}:
{{ fbl_account.status }}
+
+
+ {{ fbl_account.username }}
#{{ fbl_account.badge_number }}
+
+
+
{{ fbl_account.status }}
+
+
+

{% trans 'Tags' %}

+ {% for tag in fbl_account.tags_list %} +
{{ tag }}
+ {% endfor %} +
+{% endif %} {% endblock %} \ No newline at end of file diff --git a/paw/__init__.py b/paw/__init__.py index 36f7bc8..398c8fb 100644 --- a/paw/__init__.py +++ b/paw/__init__.py @@ -1,6 +1,6 @@ from django import get_version PAW_VERSION = (0, 5, 8, "final", 0) -FBL_ITERATION = 3 +FBL_ITERATION = 4 __version__ = f"{get_version(PAW_VERSION)}-fbl{FBL_ITERATION}" diff --git a/paw/static/css/paw.css b/paw/static/css/paw.css index 766f45a..4372dcf 100644 --- a/paw/static/css/paw.css +++ b/paw/static/css/paw.css @@ -1889,6 +1889,14 @@ html { color: var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity))); } +.badge-info { + border-color: transparent; + --tw-bg-opacity: 1; + background-color: var(--fallback-in,oklch(var(--in)/var(--tw-bg-opacity))); + --tw-text-opacity: 1; + color: var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity))); +} + .badge-success { border-color: transparent; --tw-bg-opacity: 1; @@ -1913,16 +1921,38 @@ html { color: var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity))); } +.badge-outline { + border-color: currentColor; + --tw-border-opacity: 0.5; + background-color: transparent; + color: currentColor; +} + .badge-outline.badge-neutral { --tw-text-opacity: 1; color: var(--fallback-n,oklch(var(--n)/var(--tw-text-opacity))); } +.badge-outline.badge-primary { + --tw-text-opacity: 1; + color: var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity))); +} + +.badge-outline.badge-secondary { + --tw-text-opacity: 1; + color: var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity))); +} + .badge-outline.badge-accent { --tw-text-opacity: 1; color: var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity))); } +.badge-outline.badge-info { + --tw-text-opacity: 1; + color: var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity))); +} + .badge-outline.badge-success { --tw-text-opacity: 1; color: var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity))); @@ -3292,6 +3322,16 @@ html:has(.drawer-toggle:checked) { margin-bottom: 1rem; } +.my-1 { + margin-top: 0.25rem; + margin-bottom: 0.25rem; +} + +.my-2 { + margin-top: 0.5rem; + margin-bottom: 0.5rem; +} + .mb-1 { margin-bottom: 0.25rem; }