accrete 0.0.80__tar.gz → 0.0.82__tar.gz

{accrete-0.0.80 → accrete-0.0.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: accrete
-Version: 0.0.80
+Version: 0.0.82
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek
@@ -35,6 +35,7 @@ Requires-Dist: django>=4.2
 Provides-Extra: contrib
 Requires-Dist: celery>=5.3.4; extra == 'contrib'
 Requires-Dist: django-celery-beat; extra == 'contrib'
+Requires-Dist: django-template-partials; extra == 'contrib'
 Requires-Dist: sqlalchemy; extra == 'contrib'
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'

accrete-0.0.82/accrete/contrib/tags/admin.py

@@ -0,0 +1,12 @@
+from django.contrib import admin
+from .models import Tag
+from accrete.models import TenantManager
+
+
+class TagAdmin(admin.ModelAdmin):
+    model = Tag
+    list_display = ('name', 'color', 'tag_group', 'tenant')
+    search_fields = ('name', 'tag_group', 'tenant__name')
+
+
+admin.site.register(Tag, TagAdmin)

accrete-0.0.82/accrete/contrib/tags/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class TagsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'accrete.contrib.tags'

accrete-0.0.82/accrete/contrib/tags/migrations/0001_initial.py

@@ -0,0 +1,42 @@
+# Generated by Django 5.0.7 on 2024-08-01 05:28
+
+import accrete.annotation
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('accrete', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50, verbose_name='Name')),
+                ('color', models.CharField(max_length=7, verbose_name='Color')),
+                ('tag_group', models.CharField(max_length=255, verbose_name='Group')),
+                ('tenant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='accrete.tenant')),
+            ],
+            options={
+                'verbose_name': 'Tag',
+                'verbose_name_plural': 'Tags',
+                'db_table': 'accrete_tag',
+                'default_related_name': 'tags',
+            },
+            bases=(models.Model, accrete.annotation.AnnotationModelMixin),
+        ),
+        migrations.AddConstraint(
+            model_name='tag',
+            constraint=models.UniqueConstraint(fields=('tenant', 'name'), name='unique_tag_name_per_tenant'),
+        ),
+        migrations.AddConstraint(
+            model_name='tag',
+            constraint=models.UniqueConstraint(fields=('tenant', 'tag_group'), name='unique_tag_group_per_tenant'),
+        ),
+    ]

accrete-0.0.82/accrete/contrib/tags/models.py

@@ -0,0 +1,50 @@
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+from accrete.models import TenantModel
+from accrete.managers import TenantManager
+from accrete.tenant import get_tenant
+
+
+class TagManager(TenantManager):
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        if group := not getattr(self.model, 'tag_group', None):
+            print(group)
+        if group := getattr(self.model, 'tag_group', False) and get_tenant():
+            return queryset.filter(tag_group=group)
+        return queryset
+
+
+class Tag(TenantModel):
+
+    class Meta:
+        verbose_name = _('Tag')
+        verbose_name_plural = _('Tags')
+        db_table = 'accrete_tag'
+        default_related_name = 'tags'
+        constraints= [
+            models.UniqueConstraint(
+                fields=['tenant', 'name'], name='unique_tag_name_per_tenant'
+            ),
+            models.UniqueConstraint(
+                fields=['tenant', 'tag_group'], name='unique_tag_group_per_tenant'
+            )
+        ]
+
+    objects = TagManager()
+
+    name = models.CharField(
+        verbose_name=_('Name'),
+        max_length=50
+    )
+
+    color = models.CharField(
+        verbose_name=_('Color'),
+        max_length=7
+    )
+
+    tag_group = models.CharField(
+        verbose_name=_('Group'),
+        max_length=255
+    )

accrete-0.0.82/accrete/contrib/tags/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

{accrete-0.0.80 → accrete-0.0.82}/accrete/contrib/ui/context.py

@@ -4,7 +4,7 @@ from urllib.parse import quote_plus
 from uuid import uuid4
 from dataclasses import dataclass, field
 from functools import partial
-from typing import Type, TypedDict, Callable
+from typing import Type, TypedDict
 from django.utils.translation import gettext_lazy as _t
 from django.db import models
 from django.db.models import Model, QuerySet
@@ -12,6 +12,7 @@ from django.core.paginator import Paginator
 from django.core import paginator, exceptions
 from django.forms import Form, ModelForm
 from accrete.annotation import Annotation
+from accrete.utils.http import cast_param
 from .elements import (
     ClientAction, BreadCrumb, TableField, TableFieldType, TableFieldAlignment,
     ClientActionGroup
@@ -210,16 +211,6 @@ class ModalContext(BaseContext):
             self.modal_id = f'modal{str(uuid4())[:8]}'
 
 
-def cast_param(params: dict, param: str, cast_to: Callable, default):
-    if param not in params:
-        return default
-    try:
-        return cast_to(params.get(param, default))
-    except Exception as e:
-        _logger.exception(e)
-        return default
-
-
 def url_param_dict(get_params: dict) -> dict:
     return {
         key: f'&{key}={quote_plus(value)}'

{accrete-0.0.80 → accrete-0.0.82}/accrete/contrib/ui/static/css/accrete.css

@@ -20616,7 +20616,7 @@ td {
   height: 100%;
   display: flex;
   flex-direction: column;
-  justify-content: end;
+  justify-content: start;
   font-weight: 300;
   word-break: break-word;
   padding: 12px 12px 12px 0;
@@ -20923,7 +20923,12 @@ select:focus {
 
 .card-header-icon:has(span.icon):hover {
   background: var(--accrete-hover-color);
-  border-radius: var(--bulma-radius-small);
+  border-radius: 0;
+}
+
+.card-header-icon:has(span.icon):last-of-type:hover {
+  background: var(--accrete-hover-color);
+  border-top-right-radius: var(--bulma-radius-large);
 }
 
 .dropdown.is-active * .side-panel-action-content {