accrete 0.0.10__tar.gz → 0.0.11__tar.gz

{accrete-0.0.10 → accrete-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accrete
-Version: 0.0.10
+Version: 0.0.11
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek

{accrete-0.0.10 → accrete-0.0.11}/accrete/contrib/ui/helper.py

@@ -11,6 +11,8 @@ from accrete.contrib.ui.filter import Filter
 
 _logger = logging.getLogger(__name__)
 
+DEFAULT_PAGINATE_BY = 40
+
 
 @dataclass
 class ClientAction:
@@ -49,13 +51,13 @@ class ListContext:
     extra_query: Q = None
     related_fields: list[str] = field(default_factory=list)
     prefetch_fields: list[str] = field(default_factory=list)
-    paginate_by: int = 20
+    paginate_by: int = DEFAULT_PAGINATE_BY
     order_by: list[str] = None
     column_width: int = 12
     filter_relation_depth: int = 4
     actions: list[ClientAction] = field(default_factory=list)
     breadcrumbs: list[BreadCrumb] = field(default_factory=list)
-    obj_label: str = 'Name'
+    obj_label: str = None
     fields: list[TableField] = field(default_factory=list)
 
     def get_queryset(self):
@@ -112,7 +114,7 @@ class ListContext:
             'breadcrumbs': self.breadcrumbs,
             'querystring': build_querystring(self.get_params),
             'actions': self.actions,
-            'obj_label': self.obj_label,
+            'obj_label': self.obj_label or _('Name'),
             'fields': self.fields
         }
         context.update(self.context)
@@ -125,7 +127,7 @@ class DetailContext:
     obj: Model
     get_params: dict
     order_by: str = None
-    paginate_by: int = 20
+    paginate_by: int = DEFAULT_PAGINATE_BY
     title: str = None
     queryset: type[QuerySet] = None
     extra_query: Q = None
@@ -205,7 +207,7 @@ class DetailContext:
 @dataclass
 class FormContext:
 
-    model: Model|type[Model]
+    model: Model | type[Model]
     get_params: dict
     title: str = None
     context: dict = field(default_factory=dict)
@@ -225,12 +227,11 @@ class FormContext:
         ]
         try:
             url = self.discard_url or self.model.get_absolute_url()
-        except TypeError as e:
-            _logger.exception(
+        except TypeError:
+            raise TypeError(
                 'Supply the discard_url parameter if FormContext is called '
                 'with a model class instead of an instance.'
             )
-            raise e
         except AttributeError as e:
             _logger.error(
                 'Supply the discard_url parameter if FormContext is '
@@ -275,6 +276,8 @@ def build_querystring(get_params: dict, extra_params: list[str] = None) -> str:
     querystring = f'?q={get_params.get("q", "[]")}'
     if paginate_by := get_params.get('paginate_by', False):
         querystring += f'&paginate_by={paginate_by}'
+    # if page := get_params.get('page', False):
+    #     querystring += f'&page={page}'
     if order_by := get_params.get('order_by', False):
         querystring += f'&order_by={order_by}'
     for param in extra_params or []:

{accrete-0.0.10 → accrete-0.0.11}/accrete/contrib/ui/static/css/accrete.css

@@ -149,3 +149,9 @@ select:focus {
 .label.is-required {
     font-weight: 700;
 }
+
+@media screen and (max-width: 768px) {
+    .label.has-field {
+        padding: 12px 0 12px 0;
+    }
+}

{accrete-0.0.10 → accrete-0.0.11}/accrete/contrib/ui/templates/ui/layout.html

@@ -112,7 +112,7 @@
         </div>
 
         <div class="column" style="overflow-x: auto">
-            <div class="is-flex is-flex-direction-column" style="height: 100%">
+            <div class="is-flex is-flex-direction-column" style="height: 100%; overflow: hidden">
                 <div>
                     {% include 'ui/partials/header.html' %}
                 </div>
@@ -120,7 +120,19 @@
                     {% block messages %}{% endblock %}
                     {% block content %}{% endblock %}
                 </div>
-                <div style="height: 0"></div>
+                <div>
+                    {% if list_pagination or detail_pagination %}
+                        <div class="level is-hidden-tablet is-align-self-flex-start m-3">
+                            <div class="level-item is-align-content-flex-start">
+                                {% if list_pagination %}
+                                    {% include 'ui/partials/pagination_list.html' %}
+                                {% elif detail_pagination %}
+                                    {% include 'ui/partials/pagination_detail.html' %}
+                                {% endif %}
+                            </div>
+                        </div>
+                    {% endif %}
+                </div>
             </div>
         </div>
     </div>

{accrete-0.0.10 → accrete-0.0.11}/accrete/contrib/ui/templates/ui/partials/header.html

@@ -1,17 +1,6 @@
 {% load i18n %}
 
 <div class="pt-3">
-    {% if list_pagination or detail_pagination %}
-        <div class="level is-hidden-tablet is-align-self-flex-start mb-3 px-3">
-            <div class="level-item is-align-content-flex-start">
-                {% if list_pagination %}
-                    {% include 'ui/partials/pagination_list.html' %}
-                {% elif detail_pagination %}
-                    {% include 'ui/partials/pagination_detail.html' %}
-                {% endif %}
-            </div>
-        </div>
-    {% endif %}
     <div class="level level-is-shrinkable is-flex mb-2 pl-3 {% if detail_pagination %}is-mobile {% endif %}">
         <div class="level-left">
             <div class="level-item has-text-weight-bold">
@@ -39,7 +28,7 @@
     </div>
 
     <div class="is-flex is-hidden-fullhd is-justify-content-space-between mb-2">
-        <div class="is-flex py-1 pr-1 pl-3" style="overflow-x: auto">
+        <div class="is-flex py-1 px-1 ml-2" style="overflow-x: auto">
             {% for action in actions %}
                 {% if action.submit %}
                     <input class="button mr-2 {{ action.class_list|join:' ' }}"
@@ -61,4 +50,4 @@
             </div>
         {% endif %}
     </div>
-</div>
+</div>

accrete-0.0.11/accrete/contrib/ui/templates/ui/partials/pagination_detail.html

@@ -0,0 +1,23 @@
+<div id="detail-pagination" class="field has-addons" style="width: 100%">
+    <p class="control">
+        <button class="button"
+                hx-get="{{ previous_object_url }}{{ querystring }}"
+                hx-replace-url="true"
+                hx-select-oob="#content,#detail-pagination,#panel-actions"
+        ><
+        </button>
+
+    </p>
+    <p class="control is-expanded">
+        <button class="button is-fullwidth px-1" style="white-space: normal">
+            <span class="{% if total_objects > 99999 %}is-size-7{% endif %}">{{ current_object_idx }} / {{ total_objects }}</span>
+        </button>
+    </p>
+    <p class="control">
+        <button class="button" hx-get="{{ next_object_url }}{{ querystring }}"
+                hx-replace-url="true"
+                hx-select-oob="#content,#detail-pagination,#panel-actions"
+        >>
+        </button>
+    </p>
+</div>

{accrete-0.0.10 → accrete-0.0.11}/accrete/contrib/ui/templates/ui/partials/pagination_list.html

@@ -4,25 +4,23 @@
         <button class="button"
                 hx-get="{{ querystring }}&page={% if page.has_previous %}{{ page.previous_page_number }}{% else %}{{ paginator.num_pages }}{% endif %}"
                 hx-replace-url="true"
-                hx-select-oob="#content,#list-pagination"
+                hx-select-oob="#content,#list-pagination,#panel-actions"
         >
             <
         </button>
     </p>
     <p class="control is-expanded">
-        {% if paginator.count > 9999 %}
-            <button class="button is-fullwidth px-0">
-                <span class="is-size-7">{{ page.start_index }}-{{ page.end_index }}<br>/{{ paginator.count }}</span>
-            </button>
-        {% else %}
-            <button class="button is-fullwidth">{{ page.start_index }}-{{ page.end_index }}/{{ paginator.count }}</button>
-        {% endif %}
+        <button class="button is-fullwidth px-1" style="white-space: normal">
+            <span class="{% if paginator.count > 9999 %}is-size-7{% endif %}">
+                {{ page.start_index }}-{{ page.end_index }} / {{ paginator.count }}
+            </span>
+        </button>
     </p>
     <p class="control">
         <button class="button"
                 hx-get="{{ querystring }}&page={% if page.has_next %}{{ page.next_page_number }}{% else %}1{% endif %}"
                 hx-replace-url="true"
-                hx-select-oob="#content,#list-pagination"
+                hx-select-oob="#content,#list-pagination,#panel-actions"
         >
             >
         </button>

{accrete-0.0.10 → accrete-0.0.11}/accrete/contrib/ui/templates/ui/table.html

@@ -27,7 +27,7 @@
                 {% block table_data_row %}
                     <tr>
                         {% block table_data %}
-                            <td><a class="is-underlined" href="{{ obj.get_absolute_url }}{{ querystring }}">{{ obj }}</a></td>
+                            <td><a class="is-underlined" href="{{ obj.get_absolute_url }}{{ querystring }}&page={{ page.number }}">{{ obj }}</a></td>
                             {% for field in fields %}
                                 <td>{{ obj|get_attr:field.name|default_if_none:'---' }}</td>
                             {% endfor %}

{accrete-0.0.10 → accrete-0.0.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.10'
+version = '0.0.11'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]

accrete-0.0.10/accrete/contrib/ui/templates/ui/partials/pagination_detail.html

@@ -1,27 +0,0 @@
-<div id="detail-pagination" class="field has-addons" style="width: 100%">
-    <p class="control">
-        <button class="button"
-                hx-get="{{ previous_object_url }}{{ querystring }}"
-                hx-replace-url="true"
-                hx-select-oob="#content,#detail-pagination"
-        ><
-        </button>
-
-    </p>
-    {% if total_objects > 99999 %}
-        <p class="control is-expanded">
-            <button class="button is-fullwidth px-1"><span class="is-size-7">{{ current_object_idx }}<br>/{{ total_objects }}</span></button>
-        </p>
-    {% else %}
-        <p class="control is-expanded">
-            <button class="button is-fullwidth px-1">{{ current_object_idx }} / {{ total_objects }}</button>
-        </p>
-    {% endif %}
-    <p class="control">
-        <button class="button" hx-get="{{ next_object_url }}{{ querystring }}"
-                hx-replace-url="true"
-                hx-select-oob="#content,#detail-pagination"
-        >>
-        </button>
-    </p>
-</div>