django-spire 0.24.2__py3-none-any.whl → 0.25.0__py3-none-any.whl

django_spire/metric/report/templates/django_spire/metric/report/form/report_form.html

@@ -4,7 +4,7 @@
     <div class="col-11 col-md-10 col-lg-8 col-xl-6 mx-auto my-3">
 
         <div class="row">
-            <div class="col fs-5 text-center">
+            <div class="col h5 text-center text-app-primary">
                 {{ report.title }}
             </div>
         </div>
@@ -23,12 +23,19 @@
 
             {% for argument, params in report_run_arguments.items %}
                 <div class="row">
-                    <div class="col mb-2">
-
+                    <div class="col">
                         <label class="form-label">
-                            {{ argument|underscores_to_spaces|title }}
+                            {{ argument|underscores_to_spaces|title }} <span class="text-danger">*</span>
                         </label>
-                        {% if params.annotation == 'str' %}
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col mb-2 ps-4">
+                        {% if params.annotation == 'date' %}
+                            <input class="form-control" type="date" name="{{ argument }}" value="{{ params.default|date:'Y-m-d' }}">
+                        {% elif params.annotation == 'datetime' %}
+                            <input class="form-control" type="datetime-local" name="{{ argument }}" value="{{ params.default|date:'Y-m-d\\TH:i:s' }}">
+                        {% elif params.annotation == 'str' %}
                             <input class="form-control" type="text" name="{{ argument }}" value="{{ params.default }}">
                         {% elif params.annotation == 'int' %}
                             <input class="form-control" type="number" name="{{ argument }}"
@@ -37,22 +44,37 @@
                             <input class="form-control" type="number" name="{{ argument }}"
                                    value="{{ params.default }}">
                         {% elif params.annotation == 'bool' %}
-                            <br><input class="form-check-input" type="checkbox" name="{{ argument }}"
-                                       value="{{ params.default }}">
+                            <div class="form-check form-switch">
+                                <input class="form-check-input" type="checkbox" role="switch" {% if params.default %}checked{% endif %} id="flexSwitchCheckDefault">
+                            </div>
+                        {% elif params.annotation == 'multi_select' %}
+                            <select class="form-select" multiple size="8" name="{{ argument }}" aria-selected="{{ params.default }}">
+                                {% for key, val in params.choices %}
+                                    <option value="{{ key }}">{{ val }}</option>
+                                {% endfor %}
+                            </select>
                         {% elif params.annotation == 'select' %}
                             <select class="form-select" name="{{ argument }}" aria-selected="{{ params.default }}">
                                 {% for key, val in params.choices %}
                                     <option value="{{ key }}">{{ val }}</option>
                                 {% endfor %}
                             </select>
+                        {% else %}
+                            <br>
+                            <span class="text-danger">Unsupported parameter type: {{ params.annotation }}</span>
                         {% endif %}
                     </div>
                 </div>
             {% endfor %}
 
-            <div class="row">
-                <div class="col mt-3 text-center">
-                    <input class="btn btn-primary" type="submit" value="Run Report">
+            <div x-data="{
+                loading: false
+            }" class="row">
+                <div class="col mt-3 text-center" x-show="!loading">
+                    <input class="btn btn-app-primary" @click="loading = true" type="submit" value="Run Report">
+                </div>
+                <div class="col mt-3 text-center text-app-primary" x-show="loading">
+                    <span class="spinner-border" role="status" aria-hidden="true"></span>
                 </div>
             </div>
             <div class="row">

django_spire/metric/report/templates/django_spire/metric/report/print/report_print.html

@@ -2,41 +2,41 @@
 
 <div class="row mb-1 font-monospace">
     <div class="col">
-        <div class="fw-bold">
+        <div class="h5 fw-bold">
             {{ report.title }}
         </div>
     </div>
 </div>
 
-<div class="row mx-0 mb-3 text-muted fw-normal fs--2 border font-monospace">
+<div class="row mx-0 mb-3 text-muted fw-normal fs-print-2 border font-monospace">
     {% if report.description %}
         <div class="col-auto ps-1 pe-3">
-            Description: {{ report.description }}
+            Description: <span class="fw-bold">{{ report.description }}</span>
         </div>
     {% endif %}
-        <div class="col-auto ps-1 pe-3">
-        Printed On: {% now "D, M j, Y" %} at {% now "g:i A" %}
+    <div class="col-auto ps-1 pe-3">
+        Printed On: <span class="fw-bold">{% now "D, M j, Y" %} at {% now "g:i A" %}</span>
     </div>
-        <div class="col-auto ps-1 pe-3">
-        Financially Accurate: {% if report.is_financially_accurate %}True{% else %}False{% endif %}
+    <div class="col-auto ps-1 pe-3">
+        Financially Accurate: <span class="fw-bold">{% if report.is_financially_accurate %}True{% else %}False{% endif %}</span>
     </div>
     {% for argument, value in report_run_arguments_values.items %}
         <div class="col-auto ps-1 pe-3">
-            {{ argument|underscores_to_spaces|title }}: {{ value }}
+            {{ argument|underscores_to_spaces|title }}: <span class="fw-bold">{{ value }}</span>
         </div>
     {% endfor %}
 </div>
 
 <div class="row">
-    <div class="col fs--2">
+    <div class="col fs-print-2">
 
-        <table class="table table-sm table-hover table-print">
+        <table class="table table-sm table-hover table-print align-middle">
             <thead>
             {% for column in report.columns %}
-                <th class="align-text-top {{ column.css_class }}">
+                <th class="align-text-top {{ column.css_class }}" style="border-bottom-width: 4px;">
                     {{ column.title }}
                     {% if column.sub_title %}
-                        <span class="text-muted fw-normal fs--2">
+                        <span class="text-muted fw-normal fs-print-3">
                             <br>{{ column.sub_title }}
                         </span>
                     {% endif %}
@@ -45,12 +45,24 @@
             </thead>
             <tbody>
             {% for row in report.rows %}
+                {% if row.page_break %}
+                    <tr style="page-break-before: always;"></tr>
+                {% endif %}
                 <tr class="{% if row.bold %}fw-bold{% endif %}"
-                    {% if row.page_break %}style="page-break-before: always;"{% endif %}>
+                    style="{% if row.border_top %}border-top-width: 4px;{% endif %}{% if row.border_bottom %}border-bottom-width: 4px;{% endif %}">
                     {% if row.span_all_columns %}
                         <td colspan="{{ report.column_count }}">
                             {% for cell in row.cells %}
-                                {{ cell.value|safe }}
+                                {% if cell.value %}
+                                    {{ cell.value }}
+                                {% else %}
+                                    &nbsp;
+                                {% endif %}
+                                {% if cell.sub_value %}
+                                    <span class="text-muted fw-normal fs-print-3">
+                                        <br>{{ cell.sub_value_verbose }}
+                                    </span>
+                                {% endif %}
                             {% endfor %}
                         </td>
                     {% else %}
@@ -58,8 +70,9 @@
                             <td class="{{ cell.css_class }}">
                                 {{ cell.value_verbose }}
                                 {% if cell.sub_value %}
-                                    <br>
-                                    {{ cell.sub_value_verbose }}
+                                    <span class="text-muted fw-normal fs-print-3">
+                                        <br>{{ cell.sub_value_verbose }}
+                                    </span>
                                 {% endif %}
                             </td>
                         {% endfor %}

django_spire/metric/report/tools.py

@@ -1,3 +1,5 @@
+import datetime
+
 from django_spire.metric.report.enums import ColumnType
 
 

django_spire/metric/report/views/page_views.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from datetime import datetime
 from typing import TYPE_CHECKING
 
 from django.conf import settings
@@ -37,9 +38,9 @@ def report_view(request: WSGIRequest) -> TemplateResponse:
             report_registry_class()
         )
 
-    context_data = {
-        'registry': page_report_registry,
-    }
+    context_data = dict()
+
+    context_data['registry'] = page_report_registry
 
     if request.GET:
         report_key_stack = request.GET.get('report_key_stack', None)
@@ -57,9 +58,30 @@ def report_view(request: WSGIRequest) -> TemplateResponse:
 
                 context_data['report_run_arguments_values'] = {}
 
-                for argument in report.run_arguments:
+                for argument in context_data['report_run_arguments']:
                     if context_data['report_run_arguments'][argument]['annotation'] == 'bool':
                         get_request_value = request.GET.get(argument, False)
+
+                    elif context_data['report_run_arguments'][argument]['annotation'] == 'date':
+                        date_str = request.GET.get(argument, None)
+
+                        if date_str:
+                            get_request_value = datetime.strptime(date_str, '%Y-%m-%d').date()
+                        else:
+                            get_request_value = date_str
+
+
+                    elif context_data['report_run_arguments'][argument]['annotation'] == 'datetime':
+                        datetime_str = request.GET.get(argument, None)
+
+                        if datetime_str:
+                            get_request_value = datetime.strptime(datetime_str, '%Y-%m-%dT%H:%M:%S')
+                        else:
+                            get_request_value = datetime_str
+
+                    elif context_data['report_run_arguments'][argument]['annotation'] == 'multi_select':
+                        get_request_value = request.GET.getlist(argument, [])
+
                     else:
                         get_request_value = request.GET.get(argument, None)
 
@@ -73,7 +95,7 @@ def report_view(request: WSGIRequest) -> TemplateResponse:
                         ReportRun.objects.create(
                             report_key_stack=report_key_stack,
                         )
-                        report.run()
+                        report.run(**context_data['report_run_arguments_values'])
 
                 context_data['report'] = report
                 context_data['report_run_count'] = ReportRun.objects.run_count(report_key_stack)

django_spire/notification/app/templates/django_spire/notification/app/dropdown/notification_dropdown.html

@@ -4,28 +4,28 @@
     <div x-data="{
         new_notification: false,
         async init(){
-            await this.check_new_notifications()
+            await this.check_new_notifications();
             setInterval(await this.check_new_notifications, 30000);
         },
 
         async check_new_notifications(){
-            let url = '{% url "django_spire:notification:app:json:check_new" %}'
-            let response = await django_glue_fetch(url)
-            this.new_notification = response.has_new_notifications
+            let url = '{% url "django_spire:notification:app:json:check_new" %}';
+            let response = await django_glue_fetch(url);
+            this.new_notification = response.has_new_notifications;
         },
 
         async render_dropdown(){
             let dropdown_content = new ViewGlue(
                 url='{% url "django_spire:notification:app:template:notification_dropdown" %}',
                 shared_payload={app_notification_list_url: '{{ app_notification_list_url|default:"" }}'}
-            )
-            await dropdown_content.render_inner($refs.spire_notification_dropdown_content)
-            await this.mark_notifications_as_viewed()
+            );
+            await dropdown_content.render_inner($refs.spire_notification_dropdown_content);
+            await this.mark_notifications_as_viewed();
         },
 
         async mark_notifications_as_viewed(){
-            let response = await django_glue_fetch('{% url "django_spire:notification:app:json:set_viewed" %}')
-            this.new_notification = false
+            let response = await django_glue_fetch('{% url "django_spire:notification:app:json:set_viewed" %}');
+            this.new_notification = false;
         }
 
     }"
@@ -44,5 +44,5 @@
 {% block dropdown_position %}top-100 end-50{% endblock %}
 
 {% block dropdown_content %}
-    <div x-ref="spire_notification_dropdown_content"></div>
+    <div :style="{ width: window.innerWidth < 768 ? (window.innerWidth / 2).toFixed(0) + 'px' : '350px' }" x-ref="spire_notification_dropdown_content"></div>
 {% endblock %}

django_spire/notification/app/templates/django_spire/notification/app/dropdown/notification_dropdown_content.html

@@ -1,33 +1 @@
-<div
-    :style="window.innerWidth < 768
-    ? 'width: 350px; position: fixed; top: 5%; left: 50%; transform: translateX(-50%);'
-    : 'width: 350px'"
-    class="container border rounded-2 bg-app-layer-two"
->
-    <div class="col-12 w-100">
-        <h6 class="mt-2 ms-2 text-center">Notifications</h6>
-        <hr class="m-0">
-    </div>
-
-    <div
-        style="max-height: 300px !important;"
-        class="text-start overflow-y-scroll overflow-x-hidden"
-    >
-        {% for app_notification in app_notification_list %}
-            <div class="col-12">
-                {% include app_notification.template %}
-            </div>
-        {% empty %}
-            No Notifications
-        {% endfor %}
-    </div>
-    <div class="col-12">
-        <hr class="m-0">
-    </div>
-    <div class="col-12 fs-7 text-center py-1">
-        {% if not app_notification_list_url %}
-            {% url "django_spire:notification:app:page:list" as app_notification_list_url %}
-        {% endif %}
-        <a href='{{ app_notification_list_url }}' class="text-decoration-none text-app-secondary my-2">View All</a>
-    </div>
-</div>
+{% include 'django_spire/notification/app/scroll/container/dropdown_container.html' with endpoint=notification_endpoint container_height='300px' batch_size=10 %}

django_spire/notification/app/templates/django_spire/notification/app/item/notification_item.html

@@ -1,25 +1,26 @@
-<div class="row pt-1 px-3">
-    <div class="col-12">
-            <div class="row bg-app-layer-two-hover rounded">
-                {% if app_notification.notification.url %}
-                    <a href="{{ app_notification.notification.url }}" class="col-12">
-                {% endif %}
-                        <div class="col-12">
-                            <div>
-                                <span class="fs-7 fw-semibold">{{ app_notification.notification.title }}</span>
-                                {% if not app_notification.viewed %}
-                                    {% include 'django_spire/badge/primary_badge.html' with badge_text='New' %}
-                                {% endif %}
-                            </div>
-                            <span class="fs--1">{{ app_notification.notification.body }}</span><br>
-                            <span class="text-app-secondary text-muted fs--2">{{ app_notification.verbose_time_since_delivered }}</span>
-                        </div>
-                {% if app_notification.notification.url %}
-                    </a>
-                {% endif %}
-            </div>
+{% extends 'django_spire/item/infinite_scroll_item.html' %}
+
+{% block item_content %}
+    {% if app_notification.notification.url %}
+    <a href="{{ app_notification.notification.url }}"
+    {% else %}
+    <div
+    {% endif %}
+        class="row bg-app-layer-two-hover rounded m-0"
+    >
+        <div  class="col-12">
+            <span class="fs-7 fw-semibold">{{ app_notification.notification.title }}</span>
+            {% if not app_notification.viewed %}
+                {% include 'django_spire/badge/primary_badge.html' with badge_text='New' %}
+            {% endif %}
+        </div>
+        <div class="col-12">
+            <span class="fs--1">{{ app_notification.notification.body }}</span><br>
+            <span class="text-app-secondary text-muted fs--2">{{ app_notification.verbose_time_since_delivered }}</span>
+        </div>
+    {% if app_notification.notification.url %}
+    </a>
+    {% else %}
     </div>
-    {% if not forloop.last %}
-        <hr class="m-0 mt-1">
     {% endif %}
-</div>
+{% endblock %}

django_spire/notification/app/templates/django_spire/notification/app/page/list_page.html

@@ -1,5 +1,5 @@
 {% extends 'django_spire/page/full_page.html' %}
 
 {% block full_page_content %}
-    {% include "django_spire/notification/app/card/list_card.html" %}
+    {% include "django_spire/card/infinite_scroll_card.html" with card_title='Notifications' endpoint=notification_endpoint scroll_height='55vh' %}
 {% endblock  %}

django_spire/notification/app/templates/django_spire/notification/app/scroll/container/dropdown_container.html

@@ -0,0 +1,54 @@
+{% extends 'django_spire/infinite_scroll/base.html' %}
+
+{% block scroll_wrapper_class %}bg-app-layer-two rounded-2{% endblock %}
+
+{% block scroll_container %}
+    <div class="row">
+        <div class="col-12">
+            <div
+                :style="{
+                    maxHeight: '{{ container_height|default:'300px' }}',
+                    overflowX: 'hidden',
+                    overflowY: 'auto',
+                    overscrollBehavior: 'contain',
+                    WebkitOverflowScrolling: 'touch',
+                    maxWidth: window.innerWidth < 768 ? (window.innerWidth / 2).toFixed(0) + 'px' : '350px',
+                }"
+                x-ref="scroll_container"
+                :data-scroll-id="scroll_id"
+            >
+                <div x-ref="content_container">
+                    {% block scroll_content %}{% endblock %}
+                </div>
+
+                <div style="height: 10px;" x-ref="infinite_scroll_trigger"></div>
+            </div>
+
+            <template x-if="show_loading && !is_refreshing">
+                <div
+                    class="position-absolute d-flex justify-content-center align-items-center"
+                    style="top: 0; left: 0; right: 0; bottom: 0; background: color-mix(in srgb, var(--app-layer-one) 85%, transparent);"
+                >
+                    <div class="spinner-border text-app-primary" role="status"></div>
+                </div>
+            </template>
+        </div>
+    </div>
+{% endblock %}
+
+{% block scroll_footer %}
+    <div class="row text-center border-top border-dark-subtle m-0">
+        <div class="col-12">
+            <span class="fs-7 text-app-secondary">
+                Showing <span x-text="loaded_count"></span> of <span x-text="total_count"></span> {{ footer_label|default:'items' }}
+            </span>
+        </div>
+
+        <div class="col-12 fs-7 text-center py-1">
+            {% if not app_notification_list_url %}
+                {% url "django_spire:notification:app:page:list" as app_notification_list_url %}
+            {% endif %}
+            <a href='{{ app_notification_list_url }}' class="text-decoration-none text-app-secondary my-2">View All</a>
+        </div>
+    </div>
+{% endblock %}

django_spire/notification/app/templates/django_spire/notification/app/scroll/item/items.html

@@ -0,0 +1,5 @@
+{% for app_notification in notifications %}
+    <div class="col-12 p-0">
+        {% include app_notification.template %}
+    </div>
+{% endfor %}

django_spire/notification/app/urls/template_urls.py

@@ -8,7 +8,14 @@ from django_spire.notification.app.views import template_views
 app_name = 'django_spire_notification'
 
 urlpatterns = [
-    path('notficiation/dropdown/template/',
+    path(
+        'notficiation/scroll/items',
+        template_views.notification_infinite_scroll_view,
+        name='scroll_items'
+    ),
+    path(
+        'notficiation/dropdown/template/',
         template_views.notification_dropdown_template_view,
-        name='notification_dropdown')
+        name='notification_dropdown'
+    )
 ]

django_spire/notification/app/views/page_views.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from django.contrib.auth.decorators import login_required
+from django.urls import reverse
 
 from django_spire.contrib.generic_views import portal_views
 
@@ -15,18 +16,9 @@ if TYPE_CHECKING:
 
 @login_required()
 def app_notification_list_view(request: WSGIRequest) -> TemplateResponse:
-    app_notification_list = (
-        AppNotification.objects.active()
-        .is_sent()
-        .annotate_is_viewed_by_user(request.user)
-        .select_related('notification')
-        .distinct()
-        .ordered_by_priority_and_sent_datetime()
-    )
-
     return portal_views.list_view(
         request,
-        context_data={'notification_list': app_notification_list},
+        context_data={'notification_endpoint': reverse('django_spire:notification:app:template:scroll_items')},
         model=AppNotification,
         template='django_spire/notification/app/page/list_page.html'
     )

django_spire/notification/app/views/template_views.py

@@ -1,24 +1,25 @@
 from __future__ import annotations
 
 import json
-
 from typing import TYPE_CHECKING
 
 from django.contrib.auth.models import AnonymousUser
-from django.template.response import TemplateResponse
+from django.urls import reverse
 
+from django_spire.contrib.generic_views.portal_views import infinite_scrolling_view
+from django.template.response import TemplateResponse
 from django_spire.notification.app.models import AppNotification
 
+
 if TYPE_CHECKING:
     from django.core.handlers.wsgi import WSGIRequest
 
-
-def notification_dropdown_template_view(request: WSGIRequest) -> TemplateResponse:
+def notification_infinite_scroll_view(request: WSGIRequest) -> TemplateResponse:
     if isinstance(request.user, AnonymousUser):
-        app_notification_list = []
+        notifications = []
 
     else:
-        app_notification_list = (
+        notifications = (
             AppNotification.objects.active()
             .is_sent()
             .annotate_is_viewed_by_user(request.user)
@@ -29,11 +30,25 @@ def notification_dropdown_template_view(request: WSGIRequest) -> TemplateRespons
 
     body_data = json.loads(request.body.decode('utf-8'))
 
+    return infinite_scrolling_view(
+        request,
+        queryset=notifications,
+        queryset_name='notifications',
+        context_data={
+            'app_notification_list_url': body_data.get('app_notification_list_url'),
+        },
+        template='django_spire/notification/app/scroll/item/items.html',
+    )
+
+
+def notification_dropdown_template_view(request: WSGIRequest) -> TemplateResponse:
+    body_data = json.loads(request.body.decode('utf-8'))
+
     return TemplateResponse(
         request,
         context={
-            'app_notification_list': app_notification_list,
             'app_notification_list_url': body_data.get('app_notification_list_url'),
+            'notification_endpoint': reverse('django_spire:notification:app:template:scroll_items')
         },
         template='django_spire/notification/app/dropdown/notification_dropdown_content.html'
     )

{django_spire-0.24.2.dist-info → django_spire-0.25.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.24.2
+Version: 0.25.0
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2025 Stratus Advanced Technologies and Contributors.
@@ -52,7 +52,7 @@ Requires-Dist: crispy-bootstrap5==2024.10
 Requires-Dist: dandy>=1.3.5
 Requires-Dist: django>=5.1.8
 Requires-Dist: django-crispy-forms==2.3
-Requires-Dist: django-glue>=0.8.1
+Requires-Dist: django-glue>=0.8.12
 Requires-Dist: django-sendgrid-v5
 Requires-Dist: django-storages==1.14.5
 Requires-Dist: docutils