Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • komasolver
  • main
  • renovate/django-5.x
  • renovate/django-debug-toolbar-5.x
  • renovate/django_csp-4.x
  • renovate/djangorestframework-3.x
  • renovate/tzdata-2025.x
  • renovate/uwsgi-2.x
8 results

Target

Select target project
  • konstantin/akplanning
  • matedealer/akplanning
  • kif/akplanning
  • mirco/akplanning
  • lordofthevoid/akplanning
  • voidptr/akplanning
  • xayomer/akplanning-fork
  • mollux/akplanning
  • neumantm/akplanning
  • mmarx/akplanning
  • nerf/akplanning
  • felix_bonn/akplanning
  • sebastian.uschmann/akplanning
13 results
Select Git revision
  • ak-import
  • feature/clear-schedule-button
  • feature/json-export-via-rest-framework
  • feature/json-schedule-import-tests
  • feature/preference-polling
  • feature/preference-polling-form
  • feature/preference-polling-form-rebased
  • feature/preference-polling-rebased
  • fix/add-room-import-only-once
  • main
  • merge-to-upstream
  • renovate/django-5.x
  • renovate/django-debug-toolbar-4.x
  • renovate/django-simple-history-3.x
  • renovate/mysqlclient-2.x
15 results
Show changes
Showing
with 853 additions and 121 deletions
...@@ -13,36 +13,61 @@ from AKModel.models import Event ...@@ -13,36 +13,61 @@ from AKModel.models import Event
class EventSlugMixin: class EventSlugMixin:
""" """
Mixin to handle views with event slugs Mixin to handle views with event slugs
This will make the relevant event available as self.event in all kind types of requests
(generic GET and POST views, list views, dispatching, create views)
""" """
# pylint: disable=no-member
event = None event = None
def _load_event(self): def _load_event(self):
"""
Perform the real loading of the event data (as specified by event_slug in the URL) into self.event
"""
# Find event based on event slug # Find event based on event slug
if self.event is None: if self.event is None:
self.event = get_object_or_404(Event, slug=self.kwargs.get("event_slug", None)) self.event = get_object_or_404(Event, slug=self.kwargs.get("event_slug", None))
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
"""
Override GET request handling to perform loading event first
"""
self._load_event() self._load_event()
return super().get(request, *args, **kwargs) return super().get(request, *args, **kwargs)
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
"""
Override POST request handling to perform loading event first
"""
self._load_event() self._load_event()
return super().post(request, *args, **kwargs) return super().post(request, *args, **kwargs)
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
"""
Override list view request handling to perform loading event first
"""
self._load_event() self._load_event()
return super().list(request, *args, **kwargs) return super().list(request, *args, **kwargs)
def create(self, request, *args, **kwargs): def create(self, request, *args, **kwargs):
"""
Override create view request handling to perform loading event first
"""
self._load_event() self._load_event()
return super().create(request, *args, **kwargs) return super().create(request, *args, **kwargs)
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
"""
Override dispatch which is called in many generic views to perform loading event first
"""
if self.event is None: if self.event is None:
self._load_event() self._load_event()
return super().dispatch(request, *args, **kwargs) return super().dispatch(request, *args, **kwargs)
def get_context_data(self, *, object_list=None, **kwargs): def get_context_data(self, *, object_list=None, **kwargs):
"""
Override `get_context_data` to make the event information available in the rendering context as `event`. too
"""
context = super().get_context_data(object_list=object_list, **kwargs) context = super().get_context_data(object_list=object_list, **kwargs)
# Add event to context (to make it accessible in templates) # Add event to context (to make it accessible in templates)
context["event"] = self.event context["event"] = self.event
...@@ -55,15 +80,29 @@ class FilterByEventSlugMixin(EventSlugMixin): ...@@ -55,15 +80,29 @@ class FilterByEventSlugMixin(EventSlugMixin):
""" """
def get_queryset(self): def get_queryset(self):
# Filter current queryset based on url event slug or return 404 if event slug is invalid """
Get adapted queryset:
Filter current queryset based on url event slug or return 404 if event slug is invalid
:return: Queryset
"""
return super().get_queryset().filter(event=self.event) return super().get_queryset().filter(event=self.event)
class AdminViewMixin: class AdminViewMixin:
"""
Mixin to provide context information needed in custom admin views
Will either use default information for `site_url` and `title` or allows to set own values for that
"""
# pylint: disable=too-few-public-methods
site_url = '' site_url = ''
title = '' title = ''
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
"""
Extend context
"""
extra = admin.site.each_context(self.request) extra = admin.site.each_context(self.request)
extra.update(super().get_context_data(**kwargs)) extra.update(super().get_context_data(**kwargs))
...@@ -76,10 +115,19 @@ class AdminViewMixin: ...@@ -76,10 +115,19 @@ class AdminViewMixin:
class IntermediateAdminView(AdminViewMixin, FormView): class IntermediateAdminView(AdminViewMixin, FormView):
"""
Metaview: Handle typical "action but with preview and confirmation step before" workflow
"""
template_name = "admin/AKModel/action_intermediate.html" template_name = "admin/AKModel/action_intermediate.html"
form_class = AdminIntermediateForm form_class = AdminIntermediateForm
def get_preview(self): def get_preview(self):
"""
Render a preview of the action to be performed.
Default is empty
:return: preview (html)
:rtype: str
"""
return "" return ""
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
...@@ -90,7 +138,18 @@ class IntermediateAdminView(AdminViewMixin, FormView): ...@@ -90,7 +138,18 @@ class IntermediateAdminView(AdminViewMixin, FormView):
class WizardViewMixin: class WizardViewMixin:
"""
Mixin to create wizard-like views.
This visualizes the progress of the user in the creation process and provides the interlinking to the next step
In the current implementation, the steps of the wizard are hardcoded here,
hence this mixin can only be used for the event creation wizard
"""
# pylint: disable=too-few-public-methods
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
"""
Extend context
"""
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["wizard_step"] = self.wizard_step context["wizard_step"] = self.wizard_step
context["wizard_steps"] = [ context["wizard_steps"] = [
...@@ -107,10 +166,23 @@ class WizardViewMixin: ...@@ -107,10 +166,23 @@ class WizardViewMixin:
class IntermediateAdminActionView(IntermediateAdminView, ABC): class IntermediateAdminActionView(IntermediateAdminView, ABC):
"""
Abstract base view: Intermediate action view (preview & confirmation see :class:`IntermediateAdminView`)
for custom admin actions (marking multiple objects in a django admin model instances list with a checkmark and then
choosing an action from the dropdown).
This will automatically handle the decoding of the URL encoding of the list of primary keys django does to select
which objects the action should be run on, then display a preview, perform the action after confirmation and
redirect again to the object list including display of a confirmation message
"""
# pylint: disable=no-member
form_class = AdminIntermediateActionForm form_class = AdminIntermediateActionForm
entities = None entities = None
def get_queryset(self, pks=None): def get_queryset(self, pks=None):
"""
Get the queryset of objects to perform the action on
"""
if pks is None: if pks is None:
pks = self.request.GET['pks'] pks = self.request.GET['pks']
return self.model.objects.filter(pk__in=pks.split(",")) return self.model.objects.filter(pk__in=pks.split(","))
...@@ -130,7 +202,10 @@ class IntermediateAdminActionView(IntermediateAdminView, ABC): ...@@ -130,7 +202,10 @@ class IntermediateAdminActionView(IntermediateAdminView, ABC):
@abstractmethod @abstractmethod
def action(self, form): def action(self, form):
pass """
The real action to perform
:param form: form holding the data probably needed for the action
"""
def form_valid(self, form): def form_valid(self, form):
self.entities = self.get_queryset(pks=form.cleaned_data['pks']) self.entities = self.get_queryset(pks=form.cleaned_data['pks'])
...@@ -140,7 +215,21 @@ class IntermediateAdminActionView(IntermediateAdminView, ABC): ...@@ -140,7 +215,21 @@ class IntermediateAdminActionView(IntermediateAdminView, ABC):
class LoopActionMixin(ABC): class LoopActionMixin(ABC):
def action(self, form): """
Mixin for the typical kind of action where one needs to loop over all elements
and perform a certain function on each of them
The action is performed by overriding `perform_action(self, entity)`
further customization can be reached with the two callbacks `pre_action()` and `post_action()`
that are called before and after performing the action loop
"""
def action(self, form): # pylint: disable=unused-argument
"""
The real action to perform.
Will perform the loop, perform the action on each aelement and call the callbacks
:param form: form holding the data probably needed for the action
"""
self.pre_action() self.pre_action()
for entity in self.entities: for entity in self.entities:
self.perform_action(entity) self.perform_action(entity)
...@@ -149,10 +238,18 @@ class LoopActionMixin(ABC): ...@@ -149,10 +238,18 @@ class LoopActionMixin(ABC):
@abstractmethod @abstractmethod
def perform_action(self, entity): def perform_action(self, entity):
pass """
Action to perform on each entity
:param entity: entity to perform the action on
"""
def pre_action(self): def pre_action(self):
pass """
Callback for custom action before loop starts
"""
def post_action(self): def post_action(self):
pass """
Callback for custom action after loop finished
"""
...@@ -8,6 +8,9 @@ from AKModel.metaviews.admin import AdminViewMixin ...@@ -8,6 +8,9 @@ from AKModel.metaviews.admin import AdminViewMixin
class StatusWidget(ABC): class StatusWidget(ABC):
"""
Abstract parent for status page widgets
"""
title = "Status Widget" title = "Status Widget"
actions = [] actions = []
status = "primary" status = "primary"
...@@ -18,7 +21,6 @@ class StatusWidget(ABC): ...@@ -18,7 +21,6 @@ class StatusWidget(ABC):
""" """
Which model/context is needed to render this widget? Which model/context is needed to render this widget?
""" """
pass
def get_context_data(self, context) -> dict: def get_context_data(self, context) -> dict:
""" """
...@@ -32,6 +34,7 @@ class StatusWidget(ABC): ...@@ -32,6 +34,7 @@ class StatusWidget(ABC):
Render widget based on context Render widget based on context
:param context: Context for rendering :param context: Context for rendering
:param request: HTTP request, needed for rendering
:return: Dictionary containing the rendered/prepared information :return: Dictionary containing the rendered/prepared information
""" """
context = self.get_context_data(context) context = self.get_context_data(context)
...@@ -42,7 +45,7 @@ class StatusWidget(ABC): ...@@ -42,7 +45,7 @@ class StatusWidget(ABC):
"status": self.render_status(context), "status": self.render_status(context),
} }
def render_title(self, context: {}) -> str: def render_title(self, context: {}) -> str: # pylint: disable=unused-argument
""" """
Render title for widget based on context Render title for widget based on context
...@@ -52,7 +55,7 @@ class StatusWidget(ABC): ...@@ -52,7 +55,7 @@ class StatusWidget(ABC):
""" """
return self.title return self.title
def render_status(self, context: {}) -> str: def render_status(self, context: {}) -> str: # pylint: disable=unused-argument
""" """
Render status for widget based on context Render status for widget based on context
...@@ -63,16 +66,16 @@ class StatusWidget(ABC): ...@@ -63,16 +66,16 @@ class StatusWidget(ABC):
return self.status return self.status
@abstractmethod @abstractmethod
def render_body(self, context: {}, request) -> str: def render_body(self, context: {}, request) -> str: # pylint: disable=unused-argument
""" """
Render body for widget based on context Render body for widget based on context
:param context: Context for rendering :param context: Context for rendering
:param request: HTTP request (needed for rendering)
:return: Rendered widget body (HTML) :return: Rendered widget body (HTML)
""" """
pass
def render_actions(self, context: {}) -> list[dict]: def render_actions(self, context: {}) -> list[dict]: # pylint: disable=unused-argument
""" """
Render actions for widget based on context Render actions for widget based on context
...@@ -81,16 +84,30 @@ class StatusWidget(ABC): ...@@ -81,16 +84,30 @@ class StatusWidget(ABC):
:param context: Context for rendering :param context: Context for rendering
:return: List of actions :return: List of actions
""" """
return [a for a in self.actions] return self.actions
class TemplateStatusWidget(StatusWidget): class TemplateStatusWidget(StatusWidget):
"""
A :class:`StatusWidget` that produces its content by rendering a given html template
"""
@property @property
@abstractmethod @abstractmethod
def template_name(self) -> str: def template_name(self) -> str:
pass """
Configure the template to use
:return: name of the template to use
"""
def render_body(self, context: {}, request) -> str: def render_body(self, context: {}, request) -> str:
"""
Render the body of the widget using the template rendering method from django
(load and render template using the provided context)
:param context: context to use for rendering
:param request: HTTP request (needed by django)
:return: rendered content (HTML)
"""
template = loader.get_template(self.template_name) template = loader.get_template(self.template_name)
return template.render(context, request) return template.render(context, request)
...@@ -98,6 +115,8 @@ class TemplateStatusWidget(StatusWidget): ...@@ -98,6 +115,8 @@ class TemplateStatusWidget(StatusWidget):
class StatusManager: class StatusManager:
""" """
Registry for all status widgets Registry for all status widgets
Allows to register status widgets using the `@status_manager.register(name="xyz")` decorator
""" """
widgets = {} widgets = {}
widgets_by_context_type = defaultdict(list) widgets_by_context_type = defaultdict(list)
...@@ -131,6 +150,9 @@ class StatusManager: ...@@ -131,6 +150,9 @@ class StatusManager:
class StatusView(ABC, AdminViewMixin, TemplateView): class StatusView(ABC, AdminViewMixin, TemplateView):
"""
Abstract view: A generic base view to create a status page holding multiple widgets
"""
template_name = "admin/AKModel/status/status.html" template_name = "admin/AKModel/status/status.html"
@property @property
...@@ -139,12 +161,15 @@ class StatusView(ABC, AdminViewMixin, TemplateView): ...@@ -139,12 +161,15 @@ class StatusView(ABC, AdminViewMixin, TemplateView):
""" """
Which model/context is provided by this status view? Which model/context is provided by this status view?
""" """
pass
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
context = self.get_context_data(**kwargs) context = self.get_context_data(**kwargs)
from AKModel.metaviews import status_manager # Load status manager (local import to prevent cyclic import)
context['widgets'] = [w.render(context, self.request) for w in status_manager.get_by_context_type(self.provided_context_type)] from AKModel.metaviews import status_manager # pylint: disable=import-outside-toplevel
# Render all widgets and provide them as part of the context
context['widgets'] = [w.render(context, self.request)
for w in status_manager.get_by_context_type(self.provided_context_type)]
return self.render_to_response(context) return self.render_to_response(context)
# Generated by Django 4.2.11 on 2024-04-21 14:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0058_alter_ak_options'),
]
operations = [
migrations.AlterField(
model_name='event',
name='interest_start',
field=models.DateTimeField(blank=True, help_text='Opening time for expression of interest. When left blank, no interest indication will be possible.', null=True, verbose_name='Interest Window Start'),
),
]
# Generated by Django 4.2.11 on 2024-04-24 21:39
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0059_interest_default'),
]
operations = [
migrations.AddField(
model_name='akorgamessage',
name='resolved',
field=models.BooleanField(default=False, help_text='This message has been resolved (no further action needed)', verbose_name='Resolved'),
),
]
# Generated by Django 4.2.13 on 2025-02-25 20:58
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0060_orga_message_resolved'),
]
operations = [
migrations.CreateModel(
name='AKType',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(help_text='Name describing the type', max_length=128, verbose_name='Name')),
('event', models.ForeignKey(help_text='Associated event', on_delete=django.db.models.deletion.CASCADE, to='AKModel.event', verbose_name='Event')),
],
options={
'verbose_name': 'AK Type',
'verbose_name_plural': 'AK Types',
'ordering': ['name'],
'unique_together': {('event', 'name')},
},
),
migrations.AddField(
model_name='ak',
name='types',
field=models.ManyToManyField(blank=True, help_text='This AK is', to='AKModel.aktype', verbose_name='Types'),
),
]
# Generated by Django 4.2.13 on 2025-02-26 22:35
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0061_types'),
]
operations = [
migrations.RemoveField(
model_name='historicalak',
name='interest',
),
]
# Generated by Django 4.2.13 on 2025-03-03 19:59
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0062_interest_no_history'),
]
operations = [
migrations.AlterField(
model_name='ak',
name='name',
field=models.CharField(help_text='Name of the AK', max_length=256, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+'), django.core.validators.RegexValidator(message='Must contain at least one letter or digit', regex='[\\w\\s]+')], verbose_name='Name'),
),
migrations.AlterField(
model_name='ak',
name='short_name',
field=models.CharField(blank=True, help_text='Name displayed in the schedule', max_length=64, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+')], verbose_name='Short Name'),
),
migrations.AlterField(
model_name='akowner',
name='name',
field=models.CharField(help_text='Name to identify an AK owner by', max_length=64, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+'), django.core.validators.RegexValidator(message='Must contain at least one letter or digit', regex='[\\w\\s]+')], verbose_name='Nickname'),
),
migrations.AlterField(
model_name='historicalak',
name='name',
field=models.CharField(help_text='Name of the AK', max_length=256, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+'), django.core.validators.RegexValidator(message='Must contain at least one letter or digit', regex='[\\w\\s]+')], verbose_name='Name'),
),
migrations.AlterField(
model_name='historicalak',
name='short_name',
field=models.CharField(blank=True, help_text='Name displayed in the schedule', max_length=64, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+')], verbose_name='Short Name'),
),
]
This diff is collapsed.
...@@ -4,36 +4,54 @@ from AKModel.models import AK, Room, AKSlot, AKTrack, AKCategory, AKOwner ...@@ -4,36 +4,54 @@ from AKModel.models import AK, Room, AKSlot, AKTrack, AKCategory, AKOwner
class AKOwnerSerializer(serializers.ModelSerializer): class AKOwnerSerializer(serializers.ModelSerializer):
"""
REST Framework Serializer for AKOwner
"""
class Meta: class Meta:
model = AKOwner model = AKOwner
fields = '__all__' fields = '__all__'
class AKCategorySerializer(serializers.ModelSerializer): class AKCategorySerializer(serializers.ModelSerializer):
"""
REST Framework Serializer for AKCategory
"""
class Meta: class Meta:
model = AKCategory model = AKCategory
fields = '__all__' fields = '__all__'
class AKTrackSerializer(serializers.ModelSerializer): class AKTrackSerializer(serializers.ModelSerializer):
"""
REST Framework Serializer for AKTrack
"""
class Meta: class Meta:
model = AKTrack model = AKTrack
fields = '__all__' fields = '__all__'
class AKSerializer(serializers.ModelSerializer): class AKSerializer(serializers.ModelSerializer):
"""
REST Framework Serializer for AK
"""
class Meta: class Meta:
model = AK model = AK
fields = '__all__' fields = '__all__'
class RoomSerializer(serializers.ModelSerializer): class RoomSerializer(serializers.ModelSerializer):
"""
REST Framework Serializer for Room
"""
class Meta: class Meta:
model = Room model = Room
fields = '__all__' fields = '__all__'
class AKSlotSerializer(serializers.ModelSerializer): class AKSlotSerializer(serializers.ModelSerializer):
"""
REST Framework Serializer for AKSlot
"""
class Meta: class Meta:
model = AKSlot model = AKSlot
fields = '__all__' fields = '__all__'
...@@ -41,6 +59,9 @@ class AKSlotSerializer(serializers.ModelSerializer): ...@@ -41,6 +59,9 @@ class AKSlotSerializer(serializers.ModelSerializer):
treat_as_local = serializers.BooleanField(required=False, default=False, write_only=True) treat_as_local = serializers.BooleanField(required=False, default=False, write_only=True)
def create(self, validated_data:dict): def create(self, validated_data:dict):
# Handle timezone adaption based upon the control field "treat_as_local":
# If it is set, ignore timezone submitted from the browser (will always be UTC)
# and treat it as input in the events timezone instead
if validated_data['treat_as_local']: if validated_data['treat_as_local']:
validated_data['start'] = validated_data['start'].replace(tzinfo=None).astimezone( validated_data['start'] = validated_data['start'].replace(tzinfo=None).astimezone(
validated_data['event'].timezone) validated_data['event'].timezone)
......
from django.contrib.admin import AdminSite from django.contrib.admin import AdminSite
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
# from django.urls import path
from AKModel.models import Event from AKModel.models import Event
class AKAdminSite(AdminSite): class AKAdminSite(AdminSite):
"""
Custom admin interface definition (extend the admin functionality of Django)
"""
index_template = "admin/ak_index.html" index_template = "admin/ak_index.html"
site_header = f"AKPlanning - {_('Administration')}" site_header = f"AKPlanning - {_('Administration')}"
index_title = _('Administration') index_title = _('Administration')
def get_urls(self): def get_urls(self):
from django.urls import path """
Get URLs -- add further views that are not related to a certain model here if needed
"""
urls = super().get_urls() urls = super().get_urls()
urls += [ urls += [
# path('...', self.admin_view(...)), # path('...', self.admin_view(...)),
...@@ -19,6 +24,8 @@ class AKAdminSite(AdminSite): ...@@ -19,6 +24,8 @@ class AKAdminSite(AdminSite):
return urls return urls
def index(self, request, extra_context=None): def index(self, request, extra_context=None):
# Override index page rendering to provide extra context (the list of active events)
# to be used in the adapted template
if extra_context is None: if extra_context is None:
extra_context = {} extra_context = {}
extra_context["active_events"] = Event.objects.filter(active=True) extra_context["active_events"] = Event.objects.filter(active=True)
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
{% block content %} {% block content %}
<pre> <pre>
title;duration;who;requirements;prerequisites;conflicts;availabilities;category;track;reso;notes; title;duration;who;requirements;prerequisites;conflicts;availabilities;category;types;track;reso;notes;
{% for slot in slots %}{{ slot.ak.short_name }};{{ slot.duration }};{{ slot.ak.owners.all|join:", " }};{{ slot.ak.requirements.all|join:", " }};{{ slot.ak.prerequisites.all|join:", " }};{{ slot.ak.conflicts.all|join:", " }};{% for a in slot.ak.availabilities.all %}{{ a.start | timezone:event.timezone | date:"l H:i" }} - {{ a.end | timezone:event.timezone | date:"l H:i" }}, {% endfor %};{{ slot.ak.category }};{{ slot.ak.track }};{{ slot.ak.reso }};{{ slot.ak.notes }}; {% for slot in slots %}{{ slot.ak.short_name }};{{ slot.duration }};{{ slot.ak.owners.all|join:", " }};{{ slot.ak.requirements.all|join:", " }};{{ slot.ak.prerequisites.all|join:", " }};{{ slot.ak.conflicts.all|join:", " }};{% for a in slot.ak.availabilities.all %}{{ a.start | timezone:event.timezone | date:"l H:i" }} - {{ a.end | timezone:event.timezone | date:"l H:i" }}, {% endfor %};{{ slot.ak.category }};{{ slot.ak.types.all|join:", " }};{{ slot.ak.track }};{{ slot.ak.reso }};{{ slot.ak.notes }};
{% endfor %} {% endfor %}
</pre> </pre>
{% endblock %} {% endblock %}
{% extends "admin/base_site.html" %}
{% load tags_AKModel %}
{% load i18n %}
{% load tz %}
{% load fontawesome_6 %}
{% block title %}{% trans "AKs by Owner" %}: {{owner}}{% endblock %}
{% block content %}
{% timezone event.timezone %}
<h2>[{{event}}] <a href="{% url 'admin:AKModel_akowner_change' owner.pk %}">{{owner}}</a> - {% trans "AKs" %}</h2>
<div class="row mt-4">
<table class="table table-striped">
{% for ak in owner.ak_set.all %}
<tr>
<td>{{ ak }}</td>
{% if "AKSubmission"|check_app_installed %}
<td class="text-end">
<a href="{{ ak.detail_url }}" data-bs-toggle="tooltip"
title="{% trans 'Details' %}"
class="btn btn-primary">{% fa6_icon 'info' 'fas' %}</a>
{% if event.active %}
<a href="{{ ak.edit_url }}" data-bs-toggle="tooltip"
title="{% trans 'Edit' %}"
class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
{% endif %}
{% endif %}
</td>
</tr>
{% empty %}
<tr><td>{% trans "This user does not have any AKs currently" %}</td></tr>
{% endfor %}
</table>
</div>
{% endtimezone %}
{% endblock %}
...@@ -8,6 +8,11 @@ ...@@ -8,6 +8,11 @@
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
{% block extrahead %}
{{ block.super }}
{{ form.media }}
{% endblock %}
{% block content %} {% block content %}
{% include "admin/AKModel/event_wizard/wizard_steps.html" %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %}
...@@ -17,8 +22,6 @@ ...@@ -17,8 +22,6 @@
<h5 class="mb-3">{% trans "Successfully imported.<br><br>Do you want to activate your event now?" %}</h5> <h5 class="mb-3">{% trans "Successfully imported.<br><br>Do you want to activate your event now?" %}</h5>
{{ form.media }}
<form method="post">{% csrf_token %} <form method="post">{% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
......
...@@ -8,6 +8,11 @@ ...@@ -8,6 +8,11 @@
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
{% block extrahead %}
{{ block.super }}
{{ form.media }}
{% endblock %}
{% block content %} {% block content %}
{% include "admin/AKModel/event_wizard/wizard_steps.html" %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %}
...@@ -29,8 +34,6 @@ ...@@ -29,8 +34,6 @@
<h5 class="mb-3">{% trans "Your event was created and can now be further configured." %}</h5> <h5 class="mb-3">{% trans "Your event was created and can now be further configured." %}</h5>
{{ form.media }}
<form method="post">{% csrf_token %} <form method="post">{% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
......
...@@ -8,11 +8,14 @@ ...@@ -8,11 +8,14 @@
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
{% block extrahead %}
{{ block.super }}
{{ form.media }}
{% endblock %}
{% block content %} {% block content %}
{% include "admin/AKModel/event_wizard/wizard_steps.html" %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %}
{{ form.media }}
<form method="post">{% csrf_token %} <form method="post">{% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
......
...@@ -8,11 +8,14 @@ ...@@ -8,11 +8,14 @@
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
{% block extrahead %}
{{ block.super }}
{{ form.media }}
{% endblock %}
{% block content %} {% block content %}
{% include "admin/AKModel/event_wizard/wizard_steps.html" %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %}
{{ form.media }}
{% timezone timezone %} {% timezone timezone %}
<form method="post">{% csrf_token %} <form method="post">{% csrf_token %}
......
...@@ -7,6 +7,11 @@ ...@@ -7,6 +7,11 @@
{% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %}
{% block extrahead %}
{{ block.super }}
{{ form.media }}
{% endblock %}
{% block content %} {% block content %}
{% include "admin/AKModel/event_wizard/wizard_steps.html" %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %}
......
{% load tz %} {% load tz %}
{% load fontawesome_6 %}
{% timezone event.timezone %} {% timezone event.timezone %}
<table class="table table-striped"> <table class="table table-striped">
...@@ -7,7 +8,10 @@ ...@@ -7,7 +8,10 @@
<span class="text-secondary float-end"> <span class="text-secondary float-end">
{{ message.timestamp|date:"Y-m-d H:i:s" }} {{ message.timestamp|date:"Y-m-d H:i:s" }}
</span> </span>
<h5><a href="{{ message.ak.detail_url }}">{{ message.ak }}</a></h5> <h5><a href="{{ message.ak.detail_url }}">
{% if message.resolved %}{% fa6_icon "check-circle" %} {% endif %}
{{ message.ak }}
</a></h5>
<p>{{ message.text }}</p> <p>{{ message.text }}</p>
</td></tr> </td></tr>
{% endfor %} {% endfor %}
......
...@@ -3,35 +3,65 @@ from django.apps import apps ...@@ -3,35 +3,65 @@ from django.apps import apps
from django.conf import settings from django.conf import settings
from django.utils.html import format_html, mark_safe, conditional_escape from django.utils.html import format_html, mark_safe, conditional_escape
from django.templatetags.static import static from django.templatetags.static import static
from django.template.defaultfilters import date
from fontawesome_6.app_settings import get_css from fontawesome_6.app_settings import get_css
from AKModel.models import Event
register = template.Library() register = template.Library()
# Get Footer Info from settings
@register.simple_tag @register.simple_tag
def footer_info(): def footer_info():
"""
Get Footer Info from settings
:return: a dict of several strings like the impress URL to use in the footer
:rtype: Dict[str, str]
"""
return settings.FOOTER_INFO return settings.FOOTER_INFO
@register.filter @register.filter
def check_app_installed(name): def check_app_installed(name):
"""
Check whether the app with the given name is active in this instance
:param name: name of the app to check for
:return: true if app is installed
:rtype: bool
"""
return apps.is_installed(name) return apps.is_installed(name)
@register.filter @register.filter
def message_bootstrap_class(tag): def message_bootstrap_class(tag):
"""
Turn message severity classes into corresponding bootstrap css classes
:param tag: severity of the message
:return: matching bootstrap class
"""
if tag == "error": if tag == "error":
return "alert-danger" return "alert-danger"
elif tag == "success": if tag == "success":
return "alert-success" return "alert-success"
elif tag == "warning": if tag == "warning":
return "alert-warning" return "alert-warning"
return "alert-info" return "alert-info"
@register.filter @register.filter
def wiki_owners_export(owners, event): def wiki_owners_export(owners, event):
"""
Preserve owner link information for wiki export by using internal links if possible
but external links when owner specified a non-wikilink. This is applied to the full list of owners
:param owners: list of owners
:param event: event this owner belongs to and that is currently exported (specifying this directly prevents unnecessary database lookups) #pylint: disable=line-too-long
:return: linkified owners list in wiki syntax
:rtype: str
"""
def to_link(owner): def to_link(owner):
if owner.link != '': if owner.link != '':
event_link_prefix, _ = event.base_url.rsplit("/", 1) event_link_prefix, _ = event.base_url.rsplit("/", 1)
...@@ -44,17 +74,45 @@ def wiki_owners_export(owners, event): ...@@ -44,17 +74,45 @@ def wiki_owners_export(owners, event):
return ", ".join(to_link(owner) for owner in owners.all()) return ", ".join(to_link(owner) for owner in owners.all())
@register.filter
def event_month_year(event:Event):
"""
Print rough event date (month and year)
:param event: event to print the date for
:return: string containing rough date information for event
"""
if event.start.month == event.end.month:
return f"{date(event.start, 'F')} {event.start.year}"
event_start_string = date(event.start, 'F')
if event.start.year != event.end.year:
event_start_string = f"{event_start_string} {event.start.year}"
return f"{event_start_string} - {date(event.end, 'F')} {event.end.year}"
# get list of relevant css fontawesome css files for this instance
css = get_css() css = get_css()
@register.simple_tag @register.simple_tag
def fontawesome_6_css(): def fontawesome_6_css():
"""
Create html code to load all required fontawesome css files
:return: HTML code to load css
:rtype: str
"""
return mark_safe(conditional_escape('\n').join(format_html( return mark_safe(conditional_escape('\n').join(format_html(
'<link href="{}" rel="stylesheet" media="all">', stylesheet) for stylesheet in css)) '<link href="{}" rel="stylesheet" media="all">', stylesheet) for stylesheet in css))
@register.simple_tag @register.simple_tag
def fontawesome_6_js(): def fontawesome_6_js():
"""
Create html code to load all required fontawesome javascript files
:return: HTML code to load js
:rtype: str
"""
return mark_safe(format_html( return mark_safe(format_html(
'<script type="text/javascript" src="{}"></script>', static('fontawesome_6/js/django-fontawesome.js') '<script type="text/javascript" src="{}"></script>', static('fontawesome_6/js/django-fontawesome.js')
)) ))
\ No newline at end of file
This diff is collapsed.