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
  • koma/feature/preference-polling-form
  • main
  • renovate/beautifulsoup4-4.x
  • renovate/django-5.x
  • renovate/django-bootstrap5-25.x
  • renovate/django-debug-toolbar-6.x
  • renovate/django-tex-1.x
  • renovate/djangorestframework-3.x
  • renovate/jsonschema-4.x
9 results

Target

Select target project
No results found
Select Git revision
  • 520-akowner
  • 520-fix-event-wizard-datepicker
  • 520-fix-scheduling
  • 520-improve-scheduling
  • 520-improve-scheduling-2
  • 520-improve-submission
  • 520-improve-trackmanager
  • 520-improve-wall
  • 520-message-resolved
  • 520-status
  • 520-upgrades
  • add_express_interest_to_ak_overview
  • admin-production-color
  • bugfixes
  • csp
  • featire-ical-export
  • feature-ak-requirement-lists
  • feature-akslide-export-better-filename
  • feature-akslides
  • feature-better-admin
  • feature-better-cv-list
  • feature-colors
  • feature-constraint-checking
  • feature-constraint-checking-wip
  • feature-dashboard-history-button
  • feature-event-status
  • feature-event-wizard
  • feature-export-flag
  • feature-improve-admin
  • feature-improve-filters
  • feature-improved-user-creation-workflow
  • feature-interest-view
  • feature-mails
  • feature-modular-status
  • feature-plan-autoreload
  • feature-present-default
  • feature-register-link
  • feature-remaining-constraint-validation
  • feature-room-import
  • feature-scheduler-improve
  • feature-scheduling-2.0
  • feature-special-attention
  • feature-time-input
  • feature-tracker
  • feature-wiki-wishes
  • feature-wish-slots
  • feature-wizard-buttons
  • features-availabilities
  • fix-ak-times-above-folg
  • fix-api
  • fix-constraint-violation-string
  • fix-cv-checking
  • fix-default-slot-length
  • fix-default-slot-localization
  • fix-doc-minor
  • fix-duration-display
  • fix-event-tz-pytz-update
  • fix-history-interest
  • fix-interest-view
  • fix-js
  • fix-pipeline
  • fix-plan-timezone-now
  • fix-room-add
  • fix-scheduling-drag
  • fix-slot-defaultlength
  • fix-timezone
  • fix-translation-scheduling
  • fix-virtual-room-admin
  • fix-wizard-csp
  • font-locally
  • improve-admin
  • improve-online
  • improve-slides
  • improve-submission-coupling
  • interest_restriction
  • main
  • master
  • meta-debug-toolbar
  • meta-export
  • meta-makemessages
  • meta-performance
  • meta-tests
  • meta-tests-gitlab-test
  • meta-upgrades
  • mollux-master-patch-02906
  • port-availabilites-fullcalendar
  • qs
  • remove-tags
  • renovate/configure
  • renovate/django-4.x
  • renovate/django-5.x
  • renovate/django-bootstrap-datepicker-plus-5.x
  • renovate/django-bootstrap5-23.x
  • renovate/django-bootstrap5-24.x
  • renovate/django-compressor-4.x
  • renovate/django-debug-toolbar-4.x
  • renovate/django-registration-redux-2.x
  • renovate/django-simple-history-3.x
  • renovate/django-split-settings-1.x
  • renovate/django-timezone-field-5.x
100 results
Show changes

Commits on Source 945

845 additional commits have been omitted to prevent performance issues.
629 files
+ 91719
− 65933
Compare changes
  • Side-by-side
  • Inline

Files

.docker/entrypoint.sh

0 → 100644
+46 −0
Original line number Diff line number Diff line 
#!/bin/sh



function wait_for_db()

{

  while ! ./manage.py sqlflush > /dev/null 2>&1 ;do

    echo "Waiting for the db to be ready."

    sleep 1

  done

}



if [ "$SECRET_KEY" == "" ] ;then

  echo "Need the environment variable SECRET_KEY."

  exit 1

fi



echo "" > ./AKPlanning/settings_secrets.py # Reset file in case we ran before

echo "SECRET_KEY = '$SECRET_KEY'" >> ./AKPlanning/settings_secrets.py

echo "HOSTS = $HOSTS" >> ./AKPlanning/settings_secrets.py

echo "DB_NAME = '$DB_NAME'" >> ./AKPlanning/settings_secrets.py

echo "DB_USER = '$DB_USER'" >> ./AKPlanning/settings_secrets.py

echo "DB_PASSWORD = '$DB_PASSWORD'" >> ./AKPlanning/settings_secrets.py

echo "DB_HOST = '$DB_HOST'" >> ./AKPlanning/settings_secrets.py



if [ "$AUTO_MIGRATE_DB" == "true" ] ;then

  wait_for_db

  echo "Applying DB migrations"

  ./manage.py migrate

fi



if [ "$DJANGO_SUPERUSER_PASSWORD" != "" ] ;then

  wait_for_db

  echo "Trying to create superuser."

  ./manage.py createsuperuser --noinput

fi



env | while IFS= read -r line; do

    value=${line#*=}

    name=${line%%=*}

    case $name in EXTRA_DJANGO_SETTING*)

      echo -e "$value" > "./AKPlanning/settings/$name.py"

    esac

done



./manage.py collectstatic --noinput

./manage.py compilemessages -l de_DE

uwsgi --ini .docker/uwsgi.ini

.docker/uwsgi.ini

0 → 100644
+6 −0
Original line number Diff line number Diff line 
[uwsgi]

socket = 0.0.0.0:3035

wsgi-file = AKPlanning/wsgi.py

env = DJANGO_SETTINGS_MODULE=AKPlanning.settings_production

processes = 4

threads = 2

.dockerignore

0 → 100644
+11 −0
Original line number Diff line number Diff line 
apache-akplanning.conf

CODE_OF_CONDUCT.md

CONTRIBUTING.md

CONTRIBUTORS.md

.git

.gitignore

.gitlab-ci.yml

INSTALL.md

LICENSE.md

README.md

uwsgi-akplanning.ini

.gitlab-ci.yml

0 → 100644
+93 −0
Original line number Diff line number Diff line 
image: python:3.11



services:

  - mysql



variables:

  MYSQL_DATABASE: "test"

  MYSQL_ROOT_PASSWORD: "mysql"

  MYSQL_USER: "django"

  MYSQL_PASSWORD: "mysql"

  MYSQL_HOST: "mysql"



cache:

  paths:

    - ~/.cache/pip/



.before_script_template:

  before_script:

    - python -V  # Print out python version for debugging

    - apt-get -qq update

    - apt-get -qq install -y python3-virtualenv python3 python3-dev python3-pip gettext default-mysql-client default-libmysqlclient-dev

    - ./Utils/setup.sh --ci

    - mkdir -p public/badges public/lint

    - echo undefined > public/badges/$CI_JOB_NAME.score

    - source venv/bin/activate

    - pip install pylint-gitlab pylint-django

    - mysql --version



migrations:

  extends: .before_script_template

  script:

    - source venv/bin/activate

    - ./manage.py makemigrations --dry-run --check



test:

  extends: .before_script_template

  script:

    - source venv/bin/activate

    - echo "GRANT ALL on *.* to '${MYSQL_USER}';"| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql

    - pip install pytest-cov

    - coverage run --source='.' manage.py test --settings AKPlanning.settings_ci

  after_script:

    - source venv/bin/activate

    - coverage report

    - coverage xml

  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'

  artifacts:

    reports:

      coverage_report:

        coverage_format: cobertura

        path: coverage.xml

      junit: unit.xml



lint:

  extends: .before_script_template

  stage: test

  script:

    - pylint --load-plugins pylint_django --django-settings-module=AKPlanning.settings_ci --rcfile pylintrc --exit-zero --output-format=text AK* | tee /tmp/pylint.txt

    - sed -n 's/^Your code has been rated at \([-0-9.]*\)\/.*/\1/p' /tmp/pylint.txt > public/badges/$CI_JOB_NAME.score

    - pylint --load-plugins pylint_django --django-settings-module=AKPlanning.settings_ci --rcfile pylintrc --exit-zero --output-format=pylint_gitlab.GitlabCodeClimateReporter AK* > codeclimate.json

    - pylint --load-plugins pylint_django --django-settings-module=AKPlanning.settings_ci --rcfile pylintrc --exit-zero --output-format=pylint_gitlab.GitlabPagesHtmlReporter AK* > public/lint/index.html

  after_script:

   - |

      echo "Linting score: $(cat public/badges/$CI_JOB_NAME.score)"

  artifacts:

    paths:

      - public

    reports:

      codequality: codeclimate.json

    when: always



doc:

  extends: .before_script_template

  stage: test

  script:

    - cd docs

    - make html

    - cd ..

  artifacts:

    paths:

      - docs/_build/html



pages:

  stage: deploy

  image: alpine:latest

  script:

    - echo

  artifacts:

    paths:

      - public

  only:

    refs:

      - main

AKDashboard/admin.py

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ from AKDashboard.models import DashboardButton 


@admin.register(DashboardButton)

class DashboardButtonAdmin(admin.ModelAdmin):

    """

    Admin interface for dashboard buttons

    """

    list_display = ['text', 'url', 'event']

    list_filter = ['event']

    search_fields = ['text', 'url']

AKDashboard/apps.py

+3 −0
Original line number Diff line number Diff line
@@ -2,4 +2,7 @@ from django.apps import AppConfig 




class AkdashboardConfig(AppConfig):

    """

    App configuration for dashboard (default)

    """

    name = 'AKDashboard'

AKDashboard/fixtures/dashboard.json

0 → 100644
+13 −0
Original line number Diff line number Diff line 
[

{

    "model": "AKDashboard.dashboardbutton",

    "pk": 1,

    "fields": {

        "text": "Wiki",

        "url": "http://wiki.kif.rocks",

        "icon": "fab,wikipedia-w",

        "color": 2,

        "event": 2

    }

}

]

AKDashboard/locale/de_DE/LC_MESSAGES/django.po

+67 −26
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ msgid "" 
msgstr ""

"Project-Id-Version: PACKAGE VERSION\n"

"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2020-05-12 22:53+0000\n"

"POT-Creation-Date: 2025-06-21 18:09+0000\n"

"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,81 +17,122 @@ msgstr "" 
"Content-Type: text/plain; charset=UTF-8\n"

"Content-Transfer-Encoding: 8bit\n"



#: AKDashboard/models.py:10

#: AKDashboard/models.py:21

msgid "Dashboard Button"

msgstr "Dashboard-Button"



#: AKDashboard/models.py:11

#: AKDashboard/models.py:22

msgid "Dashboard Buttons"

msgstr "Dashboard-Buttons"



#: AKDashboard/models.py:21

#: AKDashboard/models.py:32

msgid "Text"

msgstr "Text"



#: AKDashboard/models.py:22

#: AKDashboard/models.py:33

msgid "Text that will be shown on the button"

msgstr "Text, der auf dem Button angezeigt wird"



#: AKDashboard/models.py:23

#: AKDashboard/models.py:34

msgid "Link URL"

msgstr "Link URL"

msgstr "Link-URL"



#: AKDashboard/models.py:23

#: AKDashboard/models.py:34

msgid "URL this button links to"

msgstr "URL auf die der Button verweist"



#: AKDashboard/models.py:24

#: AKDashboard/models.py:35

msgid "Icon"

msgstr "Symbol"



#: AKDashboard/models.py:26

#: AKDashboard/models.py:37

msgid "Button Style"

msgstr "Stil des Buttons"



#: AKDashboard/models.py:26

#: AKDashboard/models.py:37

msgid "Style (Color) of this button (bootstrap class)"

msgstr "Stiel (Farbe) des Buttons (Bootstrap-Klasse)"



#: AKDashboard/models.py:28

#: AKDashboard/models.py:39

msgid "Event"

msgstr "Veranstaltung"



#: AKDashboard/models.py:28

#: AKDashboard/models.py:39

msgid "Event this button belongs to"

msgstr "Veranstaltung, zu der dieser Button gehört"



#: AKDashboard/templates/AKDashboard/dashboard.html:19

#: AKDashboard/templates/AKDashboard/dashboard_event.html:30

#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:53

msgid "Write to organizers of this event for questions and comments"

msgstr ""

"Kontaktiere die Organisator*innen des Events bei Fragen oder Kommentaren"



#: AKDashboard/templates/AKDashboard/dashboard.html:25

msgid "Old events"

msgstr "Frühere Veranstaltungen"



#: AKDashboard/templates/AKDashboard/dashboard.html:35

msgid "Currently, there are no Events!"

msgstr "Aktuell gibt es keine Events!"



#: AKDashboard/templates/AKDashboard/dashboard.html:28

#: AKDashboard/templates/AKDashboard/dashboard.html:38

msgid "Please contact an administrator if you want to use AKPlanning."

msgstr ""

"Bitte kontaktiere eine*n Administrator*in, falls du AKPlanning verwenden "

"möchtest."



#: AKDashboard/templates/AKDashboard/dashboard_row.html:13

#: AKDashboard/templates/AKDashboard/dashboard_event.html:20

msgid "Recent"

msgstr "Kürzlich"



#: AKDashboard/templates/AKDashboard/dashboard_row.html:18

#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:20

msgid "AK List"

msgstr "AK Liste"

msgstr "AK-Liste"



#: AKDashboard/templates/AKDashboard/dashboard_row.html:23

#: AKDashboard/templates/AKDashboard/dashboard_row.html:29

msgid "Current AKs"

msgstr "Aktuelle AKs"



#: AKDashboard/templates/AKDashboard/dashboard_row.html:30

#: AKDashboard/templates/AKDashboard/dashboard_row.html:36

msgid "AK Wall"

msgstr "AK-Wall"



#: AKDashboard/templates/AKDashboard/dashboard_row.html:38

#: AKDashboard/templates/AKDashboard/dashboard_row.html:44

#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:30

msgid "Schedule"

msgstr "AK-Plan"



#: AKDashboard/templates/AKDashboard/dashboard_row.html:48

#: AKDashboard/templates/AKDashboard/dashboard_row.html:55

msgid "AK Submission"

msgstr "AK-Submission"



#: AKDashboard/templates/AKDashboard/dashboard_row.html:64

msgid "Write to organizers of this event for questions and comments"

msgstr ""

"Kontaktiere die Organisator*innen des Events bei Fragen oder Kommentaren"
 
msgstr "AK-Einreichung"



#: AKDashboard/templates/AKDashboard/dashboard_row.html:63

#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:39

msgid "AK History"

msgstr "AK-Verlauf"



#: AKDashboard/templates/AKDashboard/dashboard_row.html:72

msgid "AK Preferences"

msgstr "AK-Präferenzen"



#: AKDashboard/views.py:70

#, python-format

msgid "New AK: %(ak)s."

msgstr "Neuer AK: %(ak)s."



#: AKDashboard/views.py:73

#, python-format

msgid "AK \"%(ak)s\" edited."

msgstr "AK \"%(ak)s\" bearbeitet."



#: AKDashboard/views.py:76

#, python-format

msgid "AK \"%(ak)s\" deleted."

msgstr "AK \"%(ak)s\" gelöscht."



#: AKDashboard/views.py:91

#, python-format

msgid "AK \"%(ak)s\" (re-)scheduled."

msgstr "AK \"%(ak)s\" (um-)geplant."

AKDashboard/migrations/0001_initial.py

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


from django.db import migrations, models

import django.db.models.deletion

import fontawesome_5.fields

import fontawesome_6.fields





class Migration(migrations.Migration):
@@ -20,7 +20,7 @@ class Migration(migrations.Migration): 
                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),

                ('text', models.CharField(help_text='Text that will be shown on the button', max_length=50, verbose_name='Text')),

                ('url', models.URLField(help_text='URL this button links to', verbose_name='Link URL')),

                ('icon', fontawesome_5.fields.IconField(blank=True, default='external-link-alt', help_text='Symbol represeting this button.', max_length=60, verbose_name='Icon')),

                ('icon', fontawesome_6.fields.IconField(blank=True, default='external-link-alt', help_text='Symbol represeting this button.', max_length=60, verbose_name='Icon')),

                ('color', models.PositiveSmallIntegerField(choices=[(0, 'primary'), (1, 'success'), (2, 'info'), (3, 'warning'), (4, 'danger')], default=0, help_text='Style (Color) of this button (bootstrap class)', verbose_name='Button Style')),

                ('event', models.ForeignKey(help_text='Event this button belongs to', on_delete=django.db.models.deletion.CASCADE, to='AKModel.Event', verbose_name='Event')),

            ],

AKDashboard/migrations/0002_update_fa.py

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# Generated by Django 3.2.16 on 2023-01-03 16:50



from django.db import migrations

import fontawesome_6.fields





class Migration(migrations.Migration):



    dependencies = [

        ('AKDashboard', '0001_initial'),

    ]



    operations = [

        migrations.AlterField(

            model_name='dashboardbutton',

            name='icon',

            field=fontawesome_6.fields.IconField(blank=True, default='external-link-alt', help_text='Symbol represeting this button.', max_length=60, verbose_name='Icon'),

        ),

    ]

AKDashboard/models.py

+12 −1
Original line number Diff line number Diff line 
from django.db import models

from django.utils.translation import gettext_lazy as _

from fontawesome_5.fields import IconField

from fontawesome_6.fields import IconField



from AKModel.models import Event





class DashboardButton(models.Model):

    """

    Model for a single dashboard button



    Allows to specify

    * a text (currently without possibility to translate),

    * a color (based on predefined design colors)

    * a url the button should point to (internal or external)

    * an icon (from the collection of fontawesome)



    Each button is associated with a single event and will be deleted when the event is deleted.

    """

    class Meta:

        verbose_name = _("Dashboard Button")

        verbose_name_plural = _("Dashboard Buttons")

AKDashboard/static/AKDashboard/style.css

+21 −1
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
    margin-bottom: 5em;

}



.dashboard-row-small {

    margin-bottom: 3em;

}



.dashboard-row > .row {

    margin-left: 0;

    padding-bottom: 1em;
@@ -18,7 +22,6 @@ 
}



.dashboard-box {

    display: block;

    padding: 2em;

    margin-right: 1em;

    min-width: 15em;
@@ -29,3 +32,20 @@ 
    display: inline;

    padding: 0;

}



#recent-changes-list {

    list-style-type:none;

    padding-left: 0;

    line-height: 220%;

}



#recent-changes-list li {

    font-size: 120%;

    font-family:monospace;

}



#recent-changes-list a {

    text-decoration: none;

    color: #555555;

    font-weight: bold;

}

AKDashboard/templates/AKDashboard/dashboard.html

+23 −13
Original line number Diff line number Diff line 
{% extends 'base.html' %}



{% load fontawesome_5 %}

{% load fontawesome_6 %}

{% load i18n %}

{% load static %}



{% block imports %}



    {{ block.super }}



    <link rel="stylesheet" href="{% static 'AKDashboard/style.css' %}">



{% endblock %}



{% block breadcrumbs %}

    <li class="breadcrumb-item">AKPlanning</li>

{% endblock %}



{% block content %}

    {% for event in events %}

    {% include "messages.html" %}

    {% if total_event_count > 0 %}

        {% for event in active_and_current_events %}

            <div class="dashboard-row">

                {% include "AKDashboard/dashboard_row.html" %}

    {% empty %}

                {% if event.contact_email %}

                    <p>

                        <a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>

                    </p>

                {% endif %}

            </div>

        {% endfor %}

        {% if old_event_count > 0 %}

            <h2 class="mb-3">{% trans "Old events" %}</h2>

            {% for event in old_events %}

                <div class="dashboard-row-small">

                    {% include "AKDashboard/dashboard_row_old_event.html" %}

                </div>

            {% endfor %}

        {% endif %}

    {% else %}

        <div class="jumbotron">

            <h2 class="display-4">

                {% trans 'Currently, there are no Events!' %}
@@ -28,5 +38,5 @@ 
                {% trans 'Please contact an administrator if you want to use AKPlanning.' %}

            </p>

        </div>

    {% endfor %}

    {% endif %}

{% endblock %}

AKDashboard/templates/AKDashboard/dashboard_event.html

+21 −10
Original line number Diff line number Diff line 
{% extends 'base.html' %}



{% load fontawesome_5 %}

{% load fontawesome_6 %}

{% load i18n %}

{% load static %}

{% load tags_AKModel %}



{% block imports %}



    {{ block.super }}



    <link rel="stylesheet" href="{% static 'AKDashboard/style.css' %}">



{% endblock %}

{% load tz %}



{% block breadcrumbs %}

    <li class="breadcrumb-item"><a href="{% url 'dashboard:dashboard' %}">AKPlanning</a></li>
@@ -19,5 +12,23 @@ 
{% endblock %}



{% block content %}

    {% include "messages.html" %}

    <div class="dashboard-row">

        {% include "AKDashboard/dashboard_row.html" %}



        {% if recent_changes|length > 0 %}

            <h3 class="mt-1" id="history">{% trans "Recent" %}:</h3>

            <ul id="recent-changes-list">

                {% for recent in recent_changes %}

                    <li><a href="{{ recent.link }}">{% fa6_icon recent.icon.0 recent.icon.1 %} {{ recent.text }}</a> <span style="color: #999999;">{{ recent.timestamp | timezone:event.timezone | date:"d.m. H:i" }}</span></li>

                {% endfor %}

            </ul>

        {% endif %}



        {% if event.contact_email %}

            <p>

                <a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>

            </p>

        {% endif %}

    </div>

{% endblock %}

AKDashboard/templates/AKDashboard/dashboard_row.html

+51 −32
Original line number Diff line number Diff line 
{% load i18n %}

{% load tags_AKModel %}

{% load fontawesome_5 %}

{% load fontawesome_6 %}



<div class="dashboard-row">

    <h2> {{ event.name }} </h2>

    <div class="row">

<h2><a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event.name }}</a></h2>

<h4 class="text-muted">

    {% if event.place %}

        <b>{{ event.place }} &middot;</b>

    {% endif %}

    {{ event | event_month_year }}

</h4>

<div class="mt-2">

    {% if 'AKSubmission'|check_app_installed %}

        <a class="dashboard-box btn btn-primary"

           href="{% url 'submit:ak_list' event_slug=event.slug %}">
@@ -15,6 +20,7 @@ 
        </a>

    {% endif %}

    {% if 'AKPlan'|check_app_installed %}

        {% if not event.plan_hidden or user.is_staff %}

            {% if event.active %}

                <a class="dashboard-box btn btn-primary"

                   href="{% url 'plan:plan_overview' event_slug=event.slug %}">
@@ -40,6 +46,7 @@ 
                </a>

            {% endif %}

        {% endif %}

    {% endif %}

    {% if 'AKSubmission'|check_app_installed and event.active %}

        <a class="dashboard-box btn btn-primary"

           href="{% url 'submit:submission_overview' event_slug=event.slug %}">
@@ -49,6 +56,24 @@ 
            </div>

        </a>

    {% endif %}

    <a class="dashboard-box btn btn-primary"

       href="{% url 'dashboard:dashboard_event' slug=event.slug %}#history">

        <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">

            <span class="fa fa-history"></span>

            <span class='text'>{% trans 'AK History' %}</span>

        </div>

    </a>

    {% if 'AKPreference'|check_app_installed and event.active %}

        {% if not event.poll_hidden or user.is_staff %}

            <a class="dashboard-box btn btn-primary"

            href="{% url 'poll:poll' event_slug=event.slug %}">

                <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">

                    <span class="fa fa-poll"></span>

                    <span class='text'>{% trans 'AK Preferences' %}</span>

                </div>

            </a>

        {% endif %}

    {% endif %}

    {% for button in event.dashboardbutton_set.all %}

        <a class="dashboard-box btn btn-{{ button.get_color_display }}"

           href="{{ button.url }}">
@@ -59,9 +84,3 @@ 
        </a>

    {% endfor %}

</div>
 
    {% if event.contact_email %}

        <p>

            <a href="mailto:{{ event.contact_email }}">{% fa5_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>

        </p>

    {% endif %}

</div>

AKDashboard/templates/AKDashboard/dashboard_row_old_event.html

0 → 100644
+56 −0
Original line number Diff line number Diff line 
{% load i18n %}

{% load tags_AKModel %}

{% load fontawesome_6 %}



<h3><a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event.name }}</a>

    <span class="text-muted">

        &middot;

        {% if event.place %}

            {{ event.place }} &middot;

        {% endif %}

        {{ event | event_month_year }}

    </span>

</h3>

<div class="mt-2">

    {% if 'AKSubmission'|check_app_installed %}

        <a class="btn btn-primary"

           href="{% url 'submit:ak_list' event_slug=event.slug %}">

            <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">

                <span class="fa fa-list-ul"></span>

                <span class='text'>{% trans 'AK List' %}</span>

            </div>

        </a>

    {% endif %}

    {% if 'AKPlan'|check_app_installed %}

        {% if not event.plan_hidden or user.is_staff %}

            <a class="btn btn-primary"

               href="{% url 'plan:plan_overview' event_slug=event.slug %}">

                <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">

                    <span class="fa fa-calendar-alt"></span>

                    <span class='text'>{% trans 'Schedule' %}</span>

                </div>

            </a>

        {% endif %}

    {% endif %}

    <a class="btn btn-primary"

       href="{% url 'dashboard:dashboard_event' slug=event.slug %}#history">

        <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">

            <span class="fa fa-history"></span>

            <span class='text'>{% trans 'AK History' %}</span>

        </div>

    </a>

    {% for button in event.dashboardbutton_set.all %}

        <a class="btn btn-{{ button.get_color_display }}"

           href="{{ button.url }}">

            <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">

                {% if button.icon %}<span class="fa">{{ button.icon.as_html }}</span>{% endif %}

                <span class='text'>{{ button.text }}</span>

            </div>

        </a>

    {% endfor %}

    <a class="btn btn-info"

       href=mailto:{{ event.contact_email }}"

       title="{% trans 'Write to organizers of this event for questions and comments' %}">

            {% fa6_icon "envelope" "fas" %}

    </a>

</div>

AKDashboard/tests.py

+199 −1
Original line number Diff line number Diff line 
# Create your tests here.
 
import zoneinfo



from django.apps import apps

from django.test import override_settings, TestCase

from django.urls import reverse

from django.utils.timezone import now



from AKDashboard.models import DashboardButton

from AKModel.models import AK, AKCategory, Event

from AKModel.tests.test_views import BasicViewTests





class DashboardTests(TestCase):

    """

    Specific Dashboard Tests

    """



    @classmethod

    def setUpTestData(cls):

        """

        Initialize Test database

        """

        super().setUpTestData()

        cls.event = Event.objects.create(

                name="Dashboard Test Event",

                slug="dashboardtest",

                timezone=zoneinfo.ZoneInfo("Europe/Berlin"),

                start=now(),

                end=now(),

                active=True,

                plan_hidden=False,

                poll_hidden=False,

        )

        cls.default_category = AKCategory.objects.create(

                name="Test Category",

                event=cls.event,

        )



    def test_dashboard_view(self):

        """

        Check that the main dashboard is reachable

        (would also be covered by generic view testcase below)

        """

        url = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})

        response = self.client.get(url)

        self.assertEqual(response.status_code, 200)



    def test_nonexistent_dashboard_view(self):

        """

        Make sure there is no dashboard for an non-existing event

        """

        url = reverse('dashboard:dashboard_event', kwargs={"slug": "nonexistent-event"})

        response = self.client.get(url)

        self.assertEqual(response.status_code, 404)



    @override_settings(DASHBOARD_SHOW_RECENT=True)

    def test_history(self):

        """

        Test displaying of history



        For the sake of that test, the setting to show recent events in dashboard is enforced to be true

        regardless of the default configuration currently in place

        """

        url = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})



        # History should be empty

        response = self.client.get(url)

        self.assertQuerySetEqual(response.context["recent_changes"], [])



        AK.objects.create(

                name="Test AK",

                category=self.default_category,

                event=self.event,

        )



        # History should now contain one AK (Test AK)

        response = self.client.get(url)

        self.assertEqual(len(response.context["recent_changes"]), 1)

        self.assertEqual(response.context["recent_changes"][0]['text'], "New AK: Test AK.")



    def test_public(self):

        """

        Test handling of public and private events

        (only public events should be part of the standard dashboard,

        but there should be an individual dashboard for both public and private events)

        """

        url_dashboard_index = reverse('dashboard:dashboard')

        url_event_dashboard = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})



        # Non-Public event (should not be part of the global dashboard

        # but should have an individual dashboard page for those knowing the url)

        self.event.public = False

        self.event.save()

        response = self.client.get(url_dashboard_index)

        self.assertEqual(response.status_code, 200)

        self.assertFalse(self.event in response.context["active_and_current_events"])

        self.assertFalse(self.event in response.context["old_events"])

        response = self.client.get(url_event_dashboard)

        self.assertEqual(response.status_code, 200)

        self.assertEqual(response.context["event"], self.event)



        # Public event -- should be part of the global dashboard

        self.event.public = True

        self.event.save()

        response = self.client.get(url_dashboard_index)

        self.assertEqual(response.status_code, 200)

        self.assertTrue(self.event in response.context["active_and_current_events"])



    def test_active(self):

        """

        Test existence of buttons with regard to activity status of the given event

        """

        url_event_dashboard = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})



        if apps.is_installed('AKSubmission'):

            # Non-active event -> No submission

            self.event.active = False

            self.event.save()

            response = self.client.get(url_event_dashboard)

            self.assertNotContains(response, "AK Submission")



            # Active event -> Submission should be open

            self.event.active = True

            self.event.save()

            response = self.client.get(url_event_dashboard)

            self.assertContains(response, "AK Submission")



    def test_plan_hidden(self):

        """

        Test visibility of plan buttons with regard to plan visibility status for a given event

        """

        url_event_dashboard = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})



        if apps.is_installed('AKPlan'):

            # Plan hidden? No buttons should show up

            self.event.plan_hidden = True

            self.event.save()

            response = self.client.get(url_event_dashboard)

            self.assertNotContains(response, "Current AKs")

            self.assertNotContains(response, "AK Wall")



            # Plan not hidden?

            # Buttons for current AKs and AK Wall should be on the page

            self.event.plan_hidden = False

            self.event.save()

            response = self.client.get(url_event_dashboard)

            self.assertContains(response, "Current AKs")

            self.assertContains(response, "AK Wall")



    def test_poll_hidden(self):

        """

        Test visibility of poll buttons with regard to poll visibility status for a given event

        """

        url_event_dashboard = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})



        if apps.is_installed('AKPreference'):

            # Poll hidden? No buttons should show up

            self.event.poll_hidden = True

            self.event.save()

            response = self.client.get(url_event_dashboard)

            self.assertNotContains(response, "AK Preferences")



            # Poll not hidden?

            # Buttons to preference poll should be on the page

            self.event.poll_hidden = False

            self.event.save()

            response = self.client.get(url_event_dashboard)

            self.assertContains(response, "AK Preferences")



    def test_dashboard_buttons(self):

        """

        Make sure manually added buttons are displayed correctly

        """

        url_event_dashboard = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})



        response = self.client.get(url_event_dashboard)

        self.assertNotContains(response, "Dashboard Button Test")



        DashboardButton.objects.create(

                text="Dashboard Button Test",

                event=self.event

        )



        response = self.client.get(url_event_dashboard)

        self.assertContains(response, "Dashboard Button Test")





class DashboardViewTests(BasicViewTests, TestCase):

    """

    Generic view tests, based on :class:`AKModel.BasicViewTests` as specified in this class in VIEWS

    """

    fixtures = ['model.json', 'dashboard.json']



    APP_NAME = 'dashboard'



    VIEWS = [

        ('dashboard', {}),

        ('dashboard_event', {'slug': 'kif42'}),

    ]

AKDashboard/views.py

+81 −2
Original line number Diff line number Diff line 
from django.apps import apps

from django.utils.decorators import method_decorator

from django.views.decorators.csrf import ensure_csrf_cookie

from django.views.generic import TemplateView, DetailView

from django.utils.translation import gettext_lazy as _



from AKModel.models import Event

from AKModel.models import Event, AK, AKSlot

from AKPlanning import settings





class DashboardView(TemplateView):

    """

    Index view of dashboard and therefore the main entry point for AKPlanning



    Displays information and buttons for all public events

    """

    template_name = 'AKDashboard/dashboard.html'



    @method_decorator(ensure_csrf_cookie)
@@ -14,10 +22,81 @@ class DashboardView(TemplateView): 


    def get_context_data(self, **kwargs):

        context = super().get_context_data(**kwargs)

        context['events'] = Event.objects.all()

        # Load events and split between active and current/featured events and those that should show smaller below

        context["active_and_current_events"] = []

        context["old_events"] = []

        events = Event.objects.filter(public=True).order_by("-active", "-pk").prefetch_related('dashboardbutton_set')

        for event in events:

            if event.active or len(context["active_and_current_events"]) < settings.DASHBOARD_MAX_FEATURED_EVENTS:

                context["active_and_current_events"].append(event)

            else:

                context["old_events"].append(event)

        context["active_event_count"] = len(context["active_and_current_events"])

        context["old_event_count"] = len(context["old_events"])

        context["total_event_count"] = context["active_event_count"] + context["old_event_count"]

        return context





class DashboardEventView(DetailView):

    """

    Dashboard view for a single event



    In addition to the basic information and the buttons,

    an overview over recent events (new and changed AKs, moved AKSlots) for the given event is shown.



    The event dashboard also exists for non-public events (one only needs to know the URL/slug of the event).

    """

    template_name = 'AKDashboard/dashboard_event.html'

    context_object_name = 'event'

    model = Event



    def get_context_data(self, **kwargs):

        context = super().get_context_data(**kwargs)



        # Show feed of recent changes (if activated)

        if settings.DASHBOARD_SHOW_RECENT:

            # Create a list of chronically sorted events (both AK and plan changes):

            recent_changes = []



            # Newest AKs (if AKSubmission is used)

            if apps.is_installed("AKSubmission"):

                # Get the latest x changes (if there are that many),

                # where x corresponds to the entry threshold configured in the settings

                # (such that the list will be completely filled even if there are no (newer) plan changes)

                submission_changes = AK.history.filter(event=context['event'])[:int(settings.DASHBOARD_RECENT_MAX)] # pylint: disable=no-member, line-too-long

                # Create textual representation including icons

                for s in submission_changes:

                    if s.history_type == '+':

                        text = _('New AK: %(ak)s.') % {'ak': s.name}

                        icon = ('plus-square', 'far')

                    elif s.history_type == '~':

                        text = _('AK "%(ak)s" edited.') % {'ak': s.name}

                        icon = ('pen-square', 'fas')

                    else:

                        text = _('AK "%(ak)s" deleted.') % {'ak': s.name}

                        icon = ('times', 'fas')



                    # Store representation in change list (still unsorted)

                    recent_changes.append(

                        {'icon': icon, 'text': text, 'link': s.instance.detail_url, 'timestamp': s.history_date}

                    )



            # Changes in plan (if AKPlan is used and plan is publicly visible)

            if apps.is_installed("AKPlan") and not context['event'].plan_hidden:

                # Get the latest plan changes (again using a threshold, see above)

                last_changed_slots = AKSlot.objects.select_related('ak').filter(event=context['event'], start__isnull=False).order_by('-updated')[:int(settings.DASHBOARD_RECENT_MAX)] #pylint: disable=line-too-long

                for changed_slot in last_changed_slots:

                    # Create textual representation including icons and links and store in list (still unsorted)

                    recent_changes.append({'icon': ('clock', 'far'),

                                           'text': _('AK "%(ak)s" (re-)scheduled.') % {'ak': changed_slot.ak.name},

                                           'link': changed_slot.ak.detail_url,

                                           'timestamp': changed_slot.updated})



            # Sort by change date...

            recent_changes.sort(key=lambda x: x['timestamp'], reverse=True)

            # ... and restrict to the latest 25 changes

            context['recent_changes'] = recent_changes[:int(settings.DASHBOARD_RECENT_MAX)]

        else:

            context['recent_changes'] = []



        return context

AKModel/admin.py

+579 −99

File changed.

Preview size limit exceeded, changes collapsed.

AKModel/apps.py

+7 −0
Original line number Diff line number Diff line
@@ -3,8 +3,15 @@ from django.contrib.admin.apps import AdminConfig 




class AkmodelConfig(AppConfig):

    """

    App configuration (default, only specifies name of the app)

    """

    name = 'AKModel'





class AKAdminConfig(AdminConfig):

    """

    App configuration for admin

    Loading a custom version here allows to add additional contex and further adapt the behavior of the admin interface

    """

    default_site = 'AKModel.site.AKAdminSite'

AKModel/availability/forms.py

+78 −29
Original line number Diff line number Diff line 
# This part of the code was adapted from pretalx (https://github.com/pretalx/pretalx)

# Copyright 2017-2019, Tobias Kunze

# Original Copyrights licensed under the Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0

# Changes are marked in the code

# Documentation was mainly added by us, other changes are marked in the code

import datetime

import json



from django import forms

from django.db import transaction

from django.db.models.signals import post_save

from django.utils.dateparse import parse_datetime

from django.utils.translation import gettext_lazy as _



from AKModel.availability.models import Availability

from AKModel.availability.serializers import AvailabilitySerializer

from AKModel.availability.serializers import AvailabilityFormSerializer

from AKModel.models import Event





class AvailabilitiesFormMixin(forms.Form):

    """

    Mixin for forms to add availabilities functionality to it

    Will handle the rendering and population of an availabilities field

    """

    availabilities = forms.CharField(

        label=_('Availability'),

        help_text=_(

            'Please click and drag to mark the availability during the event.'

            'Click and drag to mark the availability during the event, double-click to delete. '

            'Or use the start and end inputs to add entries to the calendar view.'  # Adapted help text

        ),

        widget=forms.TextInput(attrs={'class': 'availabilities-editor-data'}),

        required=False,

    )



    def _serialize(self, event, instance):

        """

        Serialize relevant availabilities into a JSON format to populate the text field in the form



        :param event: event the availabilities belong to (relevant for start and end times)

        :param instance: the entity availabilities in this form should belong to (e.g., an AK, or a Room)

        :return: JSON serializiation of the relevant availabilities

        :rtype: str

        """

        if instance:

            availabilities = AvailabilitySerializer(

                instance.availabilities.all(), many=True

            ).data

            availabilities = instance.availabilities.all()

        else:

            availabilities = []



        return json.dumps(

            {

                'availabilities': availabilities,

                'event': {

                    # 'timezone': event.timezone,

                    'date_from': str(event.start),

                    'date_to': str(event.end),

                },

            }

        )

        return json.dumps(AvailabilityFormSerializer((availabilities, event)).data)



    def __init__(self, *args, **kwargs):

        super().__init__(*args, **kwargs)

        # Load event information and populate availabilities text field

        self.event = self.initial.get('event')

        if isinstance(self.event, int):

            self.event = Event.objects.get(pk=self.event)

        initial = kwargs.pop('initial', dict())

        initial['availabilities'] = self._serialize(self.event, kwargs['instance'])

        initial = kwargs.pop('initial', {})

        if 'availabilities' not in initial:

            initial['availabilities'] = self._serialize(self.event, kwargs.get('instance'))

        if not isinstance(self, forms.BaseModelForm):

            kwargs.pop('instance')

            kwargs.pop('instance', None)

        kwargs['initial'] = initial



    def _parse_availabilities_json(self, jsonavailabilities):

        """

        Turn raw JSON availabilities into a list of model instances



        :param jsonavailabilities: raw json input

        :return: a list of availability objects corresponding to the raw input

        :rtype: List[Availability]

        """

        try:

            rawdata = json.loads(jsonavailabilities)

        except ValueError:

            raise forms.ValidationError("Submitted availabilities are not valid json.")

        except ValueError as exc:

            raise forms.ValidationError("Submitted availabilities are not valid json.") from exc

        if not isinstance(rawdata, dict):

            raise forms.ValidationError(

                "Submitted json does not comply with expected format, should be object."
@@ -72,17 +84,32 @@ class AvailabilitiesFormMixin(forms.Form): 
        return availabilities



    def _parse_datetime(self, strdate):

        """

        Parse input date string

        This will try to correct timezone information if needed



        :param strdate: string representing a timestamp

        :return: a timestamp object

        """

        tz = self.event.timezone  # adapt to our event model



        obj = parse_datetime(strdate)

        if not obj:

            raise TypeError

        if obj.tzinfo is None:

            obj = tz.localize(obj)

            # Adapt to new python timezone interface

            obj = obj.replace(tzinfo=tz)



        return obj



    def _validate_availability(self, rawavail):

        """

        Validate a raw availability instance input by making sure the relevant fields are present and can be parsed

        The cleaned up values that are produced to test the validity of the input are stored in-place in the input

        object for later usage in cleaning/parsing to availability objects



        :param rawavail: object to validate/clean

        """

        message = _("The submitted availability does not comply with the required format.")

        if not isinstance(rawavail, dict):

            raise forms.ValidationError(message)
@@ -94,12 +121,11 @@ class AvailabilitiesFormMixin(forms.Form): 
        try:

            rawavail['start'] = self._parse_datetime(rawavail['start'])

            rawavail['end'] = self._parse_datetime(rawavail['end'])

        except (TypeError, ValueError):

        # Adapt: Better error handling

        except (TypeError, ValueError) as exc:

            raise forms.ValidationError(

                _("The submitted availability contains an invalid date.")

            )



        tz = self.event.timezone  # adapt to our event model

            ) from exc



        timeframe_start = self.event.start  # adapt to our event model

        if rawavail['start'] < timeframe_start:
@@ -113,6 +139,10 @@ class AvailabilitiesFormMixin(forms.Form): 
            rawavail['end'] = timeframe_end



    def clean_availabilities(self):

        """

        Turn raw availabilities into real availability objects

        :return:

        """

        data = self.cleaned_data.get('availabilities')

        required = (

                'availabilities' in self.fields and self.fields['availabilities'].required
@@ -133,7 +163,8 @@ class AvailabilitiesFormMixin(forms.Form): 
        return availabilities



    def _set_foreignkeys(self, instance, availabilities):

        """Set the reference to `instance` in each given availability.

        """

        Set the reference to `instance` in each given availability.

        For example, set the availabilitiy.room_id to instance.id, in

        case instance of type Room.

        """
@@ -142,13 +173,31 @@ class AvailabilitiesFormMixin(forms.Form): 
        for avail in availabilities:

            setattr(avail, reference_name, instance.id)



    def _replace_availabilities(self, instance, availabilities):

    def _replace_availabilities(self, instance, availabilities: list[Availability]):

        """

        Replace the existing list of availabilities belonging to an entity with a new, updated one



        This will trigger a post_save signal for usage in constraint violation checking



        :param instance: entity the availabilities belong to

        :param availabilities: list of new availabilities

        """

        with transaction.atomic():

            # TODO: do not recreate objects unnecessarily, give the client the IDs, so we can track modifications and leave unchanged objects alone

            # TODO: do not recreate objects unnecessarily, give the client the IDs, so we can track modifications and

            #  leave unchanged objects alone

            instance.availabilities.all().delete()

            Availability.objects.bulk_create(availabilities)

            # Adaption:

            # Trigger post save signal manually to make sure constraints are updated accordingly

            # Doing this one time is sufficient, since this will nevertheless update all availability constraint

            # violations of the corresponding AK

            if len(availabilities) > 0:

                post_save.send(Availability, instance=availabilities[0], created=True)



    def save(self, *args, **kwargs):

        """

        Override the saving method of the (model) form

        """

        instance = super().save(*args, **kwargs)

        availabilities = self.cleaned_data.get('availabilities')

AKModel/availability/models.py

+113 −8
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ from django.utils.functional import cached_property 
from django.utils.translation import gettext_lazy as _



from AKModel.models import Event, AKOwner, Room, AK, AKCategory

# TODO: Decouple from AKPreference app

from AKPreference.models import EventParticipant



zero_time = datetime.time(0, 0)
@@ -21,8 +23,12 @@ zero_time = datetime.time(0, 0) 
# remove serialization as requirements are not covered

# add translation

# add meta class

# enable availabilites for AKs and AKCategories

# enable availabilities for AKs and AKCategories

# add verbose names and help texts to model attributes

# adapt or extemd documentation

# add participants





class Availability(models.Model):

    """The Availability class models when people or rooms are available for.
@@ -31,6 +37,8 @@ class Availability(models.Model): 
    span multiple days, but due to our choice of input widget, it will

    usually only span a single day at most.

    """

    # pylint: disable=broad-exception-raised



    event = models.ForeignKey(

        to=Event,

        related_name='availabilities',
@@ -74,20 +82,48 @@ class Availability(models.Model): 
        verbose_name=_('AK Category'),

        help_text=_('AK Category whose availability this is'),

    )

    participant = models.ForeignKey(

        to=EventParticipant,

        related_name='availabilities',

        on_delete=models.CASCADE,

        null=True,

        blank=True,

        verbose_name=_('Participant'),

        help_text=_('Participant whose availability this is'),

    )

    start = models.DateTimeField()

    end = models.DateTimeField()



    def __str__(self) -> str:

        person = self.person.name if self.person else None

        participant = str(self.participant) if self.participant else None

        room = getattr(self.room, 'name', None)

        event = getattr(getattr(self, 'event', None), 'name', None)

        ak = getattr(self.ak, 'name', None)

        ak_category = getattr(self.ak_category, 'name', None)

        return f'Availability(event={event}, person={person}, room={room}, ak={ak}, ak category={ak_category})'

        arg_list = [

            f"event={event}",

            f"person={person}",

            f"room={room}",

            f"ak={ak}",

            f"ak category={ak_category}",

            f"participant={participant}",

        ]

        return f'Availability({", ".join(arg_list)})'



    def __hash__(self):

        return hash(

            (getattr(self, 'event', None), self.person, self.room, self.ak, self.ak_category, self.start, self.end))

            (

                getattr(self, 'event', None),

                self.person,

                self.room,

                self.ak,

                self.ak_category,

                self.participant,

                self.start,

                self.end,

            )

        )



    def __eq__(self, other: 'Availability') -> bool:

        """Comparisons like ``availability1 == availability2``.
@@ -96,10 +132,10 @@ class Availability(models.Model): 
        are the same.

        """

        return all(

            [

            (

                getattr(self, attribute, None) == getattr(other, attribute, None)

                for attribute in ['event', 'person', 'room', 'ak', 'ak_category', 'start', 'end']

            ]

                for attribute in ['event', 'person', 'room', 'ak', 'ak_category', 'participant', 'start', 'end']

            )

        )



    @cached_property
@@ -146,9 +182,12 @@ class Availability(models.Model): 
        if not other.overlaps(self, strict=False):

            raise Exception('Only overlapping Availabilities can be merged.')



        return Availability(

        avail = Availability(

            start=min(self.start, other.start), end=max(self.end, other.end)

        )

        if self.event == other.event:

            avail.event = self.event

        return avail



    def __or__(self, other: 'Availability') -> 'Availability':

        """Performs the merge operation: ``availability1 | availability2``"""
@@ -163,9 +202,12 @@ class Availability(models.Model): 
        if not other.overlaps(self, False):

            raise Exception('Only overlapping Availabilities can be intersected.')



        return Availability(

        avail = Availability(

            start=max(self.start, other.start), end=min(self.end, other.end)

        )

        if self.event == other.event:

            avail.event = self.event

        return avail



    def __and__(self, other: 'Availability') -> 'Availability':

        """Performs the intersect operation: ``availability1 &
@@ -231,6 +273,69 @@ class Availability(models.Model): 
            result = cls._pair_intersection(result, availset)

        return result



    @property

    def simplified(self):

        """

        Get a simplified (only Weekday, hour and minute) string representation of an availability

        :return: simplified string version

        :rtype: str

        """

        return (f'{self.start.astimezone(self.event.timezone).strftime("%a %H:%M")}-'

                f'{self.end.astimezone(self.event.timezone).strftime("%a %H:%M")}')



    @classmethod

    def with_event_length(

        cls,

        event: Event,

        person: AKOwner | None = None,

        room: Room | None = None,

        ak: AK | None = None,

        ak_category: AKCategory | None = None,

        participant: EventParticipant | None = None,

    ) -> "Availability":

        """

        Create an availability covering exactly the time between event start and event end.

        Can e.g., be used to create default availabilities.



        :param event: relevant event

        :param person: person, if availability should be connected to a person

        :param room: room, if availability should be connected to a room

        :param ak: ak, if availability should be connected to a ak

        :param ak_category: ak_category, if availability should be connected to a ak_category

        :return: availability associated to the entity oder entities selected

        :rtype: Availability

        """

        timeframe_start = event.start  # adapt to our event model

        # add 1 day, not 24 hours, https://stackoverflow.com/a/25427822/2486196

        timeframe_end = event.end  # adapt to our event model

        timeframe_end = timeframe_end + datetime.timedelta(days=1)

        return Availability(start=timeframe_start, end=timeframe_end, event=event, person=person,

                                    room=room, ak=ak, ak_category=ak_category, participant=participant)



    def is_covered(self, availabilities: List['Availability']):

        """Check if list of availibilities cover this object.



        :param availabilities: availabilities to check.

        :return: whether the availabilities cover full event.

        :rtype: bool

        """

        avail_union = Availability.union(availabilities)

        return any(avail.contains(self) for avail in avail_union)



    @classmethod

    def is_event_covered(cls, event: Event, availabilities: List['Availability']) -> bool:

        """Check if list of availibilities cover whole event.



        :param event: event to check.

        :param availabilities: availabilities to check.

        :return: whether the availabilities cover full event.

        :rtype: bool

        """

        # NOTE: Cannot use `Availability.with_event_length` as its end is the

        #       event end + 1 day

        full_event = Availability(event=event, start=event.start, end=event.end)

        return full_event.is_covered(availabilities)



    class Meta:

        verbose_name = _('Availability')

        verbose_name_plural = _('Availabilities')

AKModel/availability/serializers.py

+56 −3
Original line number Diff line number Diff line 
# This part of the code was adapted from pretalx (https://github.com/pretalx/pretalx)

# Copyright 2017-2019, Tobias Kunze

# Original Copyrights licensed under the Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0

# Changes are marked in the code

# Documentation was mainly added by us, other changes are marked in the code

from django.utils import timezone

from rest_framework.fields import SerializerMethodField

from rest_framework.serializers import ModelSerializer

from rest_framework.serializers import BaseSerializer, ModelSerializer



from AKModel.availability.models import Availability

from AKModel.models import Event





class AvailabilitySerializer(ModelSerializer):

    """

    REST Framework Serializer for Availability

    """

    allDay = SerializerMethodField()

    start = SerializerMethodField()

    end = SerializerMethodField()



    def get_allDay(self, obj):

    def get_allDay(self, obj):  # pylint: disable=invalid-name

        """

        Bridge between naming conventions of python and fullcalendar by providing the all_day field as allDay, too

        """

        return obj.all_day



    def get_start(self, obj):

        """

        Get start timestamp



        Use already localized strings in serialized field

        (default would be UTC, but that would require heavy timezone calculation on client side)

        """

        return timezone.localtime(obj.start, obj.event.timezone).strftime("%Y-%m-%dT%H:%M:%S")



    def get_end(self, obj):

        """

        Get end timestamp



        Use already localized strings in serialized field

        (default would be UTC, but that would require heavy timezone calculation on client side)

        """

        return timezone.localtime(obj.end, obj.event.timezone).strftime("%Y-%m-%dT%H:%M:%S")



    class Meta:

        model = Availability

        fields = ('id', 'start', 'end', 'allDay')





class AvailabilityFormSerializer(BaseSerializer):

    """Serializer to configure an availability form."""



    def create(self, validated_data):

        raise ValueError("`AvailabilityFormSerializer` is read-only.")



    def to_internal_value(self, data):

        raise ValueError("`AvailabilityFormSerializer` is read-only.")



    def update(self, instance, validated_data):

        raise ValueError("`AvailabilityFormSerializer` is read-only.")



    def to_representation(self, instance: tuple[Availability, Event], **kwargs):

        availabilities, event = instance



        return {

            'availabilities': AvailabilitySerializer(availabilities, many=True).data,

            'event': {

                # 'timezone': event.timezone,

                'date_from': str(event.start),

                'date_to': str(event.end),

            },

        }

AKModel/environment.py

0 → 100644
+35 −0
Original line number Diff line number Diff line 
"""

Environment definitions

Needed for tex compilation

"""

import re



from django_tex.environment import environment



# Used to filter all very special UTF-8 chars that are probably not contained in the LaTeX fonts

# and would hence cause compilation errors

utf8_replace_pattern = re.compile('[^\u0000-\u206F]', re.UNICODE)





def latex_escape_utf8(value):

    """

    Escape latex special chars and remove invalid utf-8 values



    :param value: string to escape

    :type value: str

    :return: escaped string

    :rtype: str

    """

    return (utf8_replace_pattern.sub('', value).replace('&', r'\&').replace('_', r'\_').replace('#', r'\#').

            replace('$', r'\$').replace('%', r'\%').replace('{', r'\{').replace('}', r'\}'))





def improved_tex_environment(**options):

    """

    Encapsulate our improved latex environment for usage

    """

    env = environment(**options)

    env.filters.update({

        'latex_escape_utf8': latex_escape_utf8,

    })

    return env

AKModel/fixtures/model.json

0 → 100644
+871 −0
Original line number Diff line number Diff line 
[

{

    "model": "AKModel.event",

    "pk": 1,

    "fields": {

        "name": "KIF 23",

        "slug": "kif23",

        "place": "Neuland",

        "timezone": "Europe/Berlin",

        "start": "2020-10-01T17:41:22Z",

        "end": "2020-10-04T17:41:30Z",

        "reso_deadline": "2020-10-03T10:00:00Z",

        "interest_start": null,

        "interest_end": null,

        "public": true,

        "active": false,

        "plan_hidden": true,

        "plan_published_at": null,

        "base_url": "",

        "wiki_export_template_name": "",

        "default_slot": "2.00",

        "contact_email": "dummy@eyample.org"

    }

},

{

    "model": "AKModel.event",

    "pk": 2,

    "fields": {

        "name": "KIF 42",

        "slug": "kif42",

        "place": "Neuland noch neuer",

        "timezone": "Europe/Berlin",

        "start": "2020-11-06T17:51:26Z",

        "end": "2020-11-10T17:51:27Z",

        "reso_deadline": "2020-11-08T17:51:42Z",

        "interest_start": null,

        "interest_end": null,

        "public": true,

        "active": true,

        "plan_hidden": false,

        "plan_published_at": "2022-12-01T21:50:01Z",

        "base_url": "",

        "wiki_export_template_name": "",

        "default_slot": "2.00",

        "contact_email": "dummy@example.org"

    }

},

{

    "model": "AKModel.akowner",

    "pk": 1,

    "fields": {

        "name": "a",

        "slug": "a",

        "institution": "Uni X",

        "link": "",

        "event": 2

    }

},

{

    "model": "AKModel.akowner",

    "pk": 2,

    "fields": {

        "name": "b",

        "slug": "b",

        "institution": "Hochschule Y",

        "link": "",

        "event": 2

    }

},

{

    "model": "AKModel.akowner",

    "pk": 3,

    "fields": {

        "name": "c",

        "slug": "c",

        "institution": "",

        "link": "",

        "event": 1

    }

},

{

    "model": "AKModel.akowner",

    "pk": 4,

    "fields": {

        "name": "d",

        "slug": "d",

        "institution": "",

        "link": "",

        "event": 1

    }

},

{

    "model": "AKModel.akcategory",

    "pk": 1,

    "fields": {

        "name": "Spaß",

        "color": "275246",

        "description": "",

        "present_by_default": true,

        "event": 1

    }

},

{

    "model": "AKModel.akcategory",

    "pk": 2,

    "fields": {

        "name": "Ernst",

        "color": "234567",

        "description": "",

        "present_by_default": true,

        "event": 1

    }

},

{

    "model": "AKModel.akcategory",

    "pk": 3,

    "fields": {

        "name": "Spaß/Kultur",

        "color": "333333",

        "description": "",

        "present_by_default": true,

        "event": 2

    }

},

{

    "model": "AKModel.akcategory",

    "pk": 4,

    "fields": {

        "name": "Inhalt",

        "color": "456789",

        "description": "",

        "present_by_default": true,

        "event": 2

    }

},

{

    "model": "AKModel.akcategory",

    "pk": 5,

    "fields": {

        "name": "Meta",

        "color": "111111",

        "description": "",

        "present_by_default": true,

        "event": 2

    }

},

{

    "model": "AKModel.aktrack",

    "pk": 1,

    "fields": {

        "name": "Track 1",

        "color": "",

        "event": 2

    }

},

{

    "model": "AKModel.akrequirement",

    "pk": 1,

    "fields": {

        "name": "Beamer",

        "event": 1

    }

},

{

    "model": "AKModel.akrequirement",

    "pk": 2,

    "fields": {

        "name": "Internet",

        "event": 1

    }

},

{

    "model": "AKModel.akrequirement",

    "pk": 3,

    "fields": {

        "name": "BBB",

        "event": 2

    }

},

{

    "model": "AKModel.akrequirement",

    "pk": 4,

    "fields": {

        "name": "Mumble",

        "event": 2

    }

},

{

    "model": "AKModel.akrequirement",

    "pk": 5,

    "fields": {

        "name": "Matrix",

        "event": 2

    }

},

{

    "model": "AKModel.aktype",

    "pk": 1,

    "fields": {

        "name": "Input",

        "event": 2,

        "slug": "input"

    }

},

{

    "model": "AKModel.historicalak",

    "pk": 1,

    "fields": {

        "id": 1,

        "name": "Test AK Inhalt",

        "short_name": "test1",

        "description": "",

        "link": "",

        "protocol_link": "",

        "reso": false,

        "present": true,

        "notes": "",

        "category": 4,

        "track": null,

        "event": 2,

        "history_date": "2021-05-04T10:28:59.265Z",

        "history_change_reason": null,

        "history_type": "+",

        "history_user": null

    }

},

{

    "model": "AKModel.historicalak",

    "pk": 2,

    "fields": {

        "id": 1,

        "name": "Test AK Inhalt",

        "short_name": "test1",

        "description": "",

        "link": "",

        "protocol_link": "",

        "reso": false,

        "present": true,

        "notes": "",

        "category": 4,

        "track": null,

        "event": 2,

        "history_date": "2021-05-04T10:28:59.305Z",

        "history_change_reason": null,

        "history_type": "~",

        "history_user": null

    }

},

{

    "model": "AKModel.historicalak",

    "pk": 3,

    "fields": {

        "id": 2,

        "name": "Test AK Meta",

        "short_name": "test2",

        "description": "",

        "link": "",

        "protocol_link": "",

        "reso": false,

        "present": null,

        "notes": "",

        "category": 5,

        "track": null,

        "event": 2,

        "history_date": "2021-05-04T10:29:40.296Z",

        "history_change_reason": null,

        "history_type": "+",

        "history_user": null

    }

},

{

    "model": "AKModel.historicalak",

    "pk": 4,

    "fields": {

        "id": 2,

        "name": "Test AK Meta",

        "short_name": "test2",

        "description": "",

        "link": "",

        "protocol_link": "",

        "reso": false,

        "present": null,

        "notes": "",

        "category": 5,

        "track": null,

        "event": 2,

        "history_date": "2021-05-04T10:29:40.355Z",

        "history_change_reason": null,

        "history_type": "~",

        "history_user": null

    }

},

{

    "model": "AKModel.historicalak",

    "pk": 5,

    "fields": {

        "id": 3,

        "name": "AK Wish",

        "short_name": "wish1",

        "description": "Description of my Wish",

        "link": "",

        "protocol_link": "",

        "reso": false,

        "present": null,

        "notes": "We need to find a volunteer first...",

        "category": 3,

        "track": null,

        "event": 2,

        "history_date": "2021-05-04T10:30:59.469Z",

        "history_change_reason": null,

        "history_type": "+",

        "history_user": null

    }

},

{

    "model": "AKModel.historicalak",

    "pk": 6,

    "fields": {

        "id": 3,

        "name": "AK Wish",

        "short_name": "wish1",

        "description": "Description of my Wish",

        "link": "",

        "protocol_link": "",

        "reso": false,

        "present": null,

        "notes": "We need to find a volunteer first...",

        "category": 3,

        "track": null,

        "event": 2,

        "history_date": "2021-05-04T10:30:59.509Z",

        "history_change_reason": null,

        "history_type": "~",

        "history_user": null

    }

},

{

    "model": "AKModel.historicalak",

    "pk": 7,

    "fields": {

        "id": 2,

        "name": "Test AK Meta",

        "short_name": "test2",

        "description": "",

        "link": "",

        "protocol_link": "",

        "reso": false,

        "present": null,

        "notes": "",

        "category": 5,

        "track": 1,

        "event": 2,

        "history_date": "2022-12-02T12:27:14.277Z",

        "history_change_reason": null,

        "history_type": "~",

        "history_user": null

    }

},

{

    "model": "AKModel.ak",

    "pk": 1,

    "fields": {

        "name": "Test AK Inhalt",

        "short_name": "test1",

        "description": "-",

        "goal": "-",

        "info": "",

        "link": "",

        "protocol_link": "",

        "category": 4,

        "track": null,

        "reso": false,

        "present": true,

        "notes": "",

        "interest": -1,

        "interest_counter": 0,

        "include_in_export": false,

        "event": 2,

        "owners": [

            1

        ],

        "requirements": [

            3

        ],

        "conflicts": [],

        "prerequisites": []

    }

},

{

    "model": "AKModel.ak",

    "pk": 2,

    "fields": {

        "name": "Test AK Meta",

        "short_name": "test2",

        "description": "-",

        "goal": "-",

        "info": "",

        "link": "",

        "protocol_link": "",

        "category": 5,

        "track": 1,

        "reso": false,

        "present": null,

        "notes": "",

        "interest": -1,

        "interest_counter": 0,

        "event": 2,

        "owners": [

            2

        ],

        "requirements": [],

        "conflicts": [],

        "prerequisites": []

    }

},

{

    "model": "AKModel.ak",

    "pk": 3,

    "fields": {

        "name": "AK Wish",

        "short_name": "wish1",

        "description": "Description of my Wish",

        "goal": "-",

        "info": "",

        "link": "",

        "protocol_link": "",

        "category": 3,

        "track": null,

        "reso": false,

        "present": null,

        "notes": "We need to find a volunteer first...",

        "interest": -1,

        "interest_counter": 0,

        "event": 2,

        "owners": [],

        "requirements": [

            4

        ],

        "conflicts": [

            1

        ],

        "prerequisites": [

            2

        ]

    }

},

{

    "model": "AKModel.ak",

    "pk": 4,

    "fields": {

        "name": "Test AK fixed slots",

        "short_name": "testfixed",

        "description": "-",

        "goal": "-",

        "info": "",

        "link": "",

        "protocol_link": "",

        "category": 4,

        "track": null,

        "reso": false,

        "present": true,

        "notes": "",

        "interest": -1,

        "interest_counter": 0,

        "include_in_export": false,

        "event": 2,

        "owners": [

            1

        ],

        "requirements": [

            3

        ],

        "conflicts": [],

        "prerequisites": []

    }

},

{

    "model": "AKModel.ak",

    "pk": 5,

    "fields": {

        "name": "Test AK Ernst",

        "short_name": "testernst",

        "description": "-",

        "goal": "-",

        "info": "",

        "link": "",

        "protocol_link": "",

        "category": 2,

        "track": null,

        "reso": false,

        "present": true,

        "notes": "",

        "interest": -1,

        "interest_counter": 0,

        "include_in_export": false,

        "event": 1,

        "owners": [

            3

        ],

        "requirements": [

            2

        ],

        "conflicts": [],

        "prerequisites": []

    }

},

{

    "model": "AKModel.room",

    "pk": 1,

    "fields": {

        "name": "Testraum",

        "location": "BBB",

        "capacity": -1,

        "event": 2,

        "properties": [

            3

        ]

    }

},

{

    "model": "AKModel.room",

    "pk": 2,

    "fields": {

        "name": "Testraum 2",

        "location": "",

        "capacity": 30,

        "event": 2,

        "properties": []

    }

},

{

    "model": "AKModel.room",

    "pk": 3,

    "fields": {

        "name": "BBB Session 1",

        "location": "",

        "capacity": -1,

        "event": 1,

        "properties": [

            2

        ]

    }

},

{

    "model": "AKModel.akslot",

    "pk": 1,

    "fields": {

        "ak": 1,

        "room": 2,

        "start": "2020-11-06T18:30:00Z",

        "duration": "2.00",

        "fixed": false,

        "event": 2,

        "updated": "2022-12-02T12:23:11.856Z"

    }

},

{

    "model": "AKModel.akslot",

    "pk": 2,

    "fields": {

        "ak": 2,

        "room": 1,

        "start": "2020-11-08T12:30:00Z",

        "duration": "2.00",

        "fixed": false,

        "event": 2,

        "updated": "2022-12-02T12:23:18.279Z"

    }

},

{

    "model": "AKModel.akslot",

    "pk": 3,

    "fields": {

        "ak": 3,

        "room": null,

        "start": null,

        "duration": "1.50",

        "fixed": false,

        "event": 2,

        "updated": "2021-05-04T10:30:59.523Z"

    }

},

{

    "model": "AKModel.akslot",

    "pk": 4,

    "fields": {

        "ak": 3,

        "room": null,

        "start": null,

        "duration": "3.00",

        "fixed": false,

        "event": 2,

        "updated": "2021-05-04T10:30:59.528Z"

    }

},

{

    "model": "AKModel.akslot",

    "pk": 5,

    "fields": {

        "ak": 1,

        "room": null,

        "start": null,

        "duration": "2.00",

        "fixed": false,

        "event": 2,

        "updated": "2022-12-02T12:23:11.856Z"

    }

},

{

    "model": "AKModel.akslot",

    "pk": 6,

    "fields": {

        "ak": 4,

        "room": null,

        "start": "2020-11-08T18:30:00Z",

        "duration": "2.00",

        "fixed": true,

        "event": 2,

        "updated": "2022-12-02T12:23:11.856Z"

    }

},

{

    "model": "AKModel.akslot",

    "pk": 7,

    "fields": {

        "ak": 4,

        "room": 2,

        "start": null,

        "duration": "2.00",

        "fixed": true,

        "event": 2,

        "updated": "2022-12-02T12:23:11.856Z"

    }

},

{

    "model": "AKModel.akslot",

    "pk": 8,

    "fields": {

        "ak": 4,

        "room": 2,

        "start": "2020-11-07T16:00:00Z",

        "duration": "2.00",

        "fixed": true,

        "event": 2,

        "updated": "2022-12-02T12:23:11.856Z"

    }

},

{

    "model": "AKModel.akslot",

    "pk": 9,

    "fields": {

        "ak": 5,

        "room": null,

        "start": null,

        "duration": "2.00",

        "fixed": false,

        "event": 1,

        "updated": "2022-12-02T12:23:11.856Z"

    }

},

{

    "model": "AKModel.constraintviolation",

    "pk": 1,

    "fields": {

        "type": "soa",

        "level": 10,

        "event": 2,

        "ak_owner": null,

        "room": null,

        "requirement": null,

        "category": null,

        "comment": "",

        "timestamp": "2022-12-02T12:23:11.875Z",

        "manually_resolved": false,

        "aks": [

            1

        ],

        "ak_slots": [

            1

        ]

    }

},

{

    "model": "AKModel.constraintviolation",

    "pk": 2,

    "fields": {

        "type": "rng",

        "level": 10,

        "event": 2,

        "ak_owner": null,

        "room": 2,

        "requirement": 3,

        "category": null,

        "comment": "",

        "timestamp": "2022-12-02T12:23:11.890Z",

        "manually_resolved": false,

        "aks": [

            1

        ],

        "ak_slots": [

            1

        ]

    }

},

{

    "model": "AKModel.constraintviolation",

    "pk": 3,

    "fields": {

        "type": "soa",

        "level": 10,

        "event": 2,

        "ak_owner": null,

        "room": null,

        "requirement": null,

        "category": null,

        "comment": "",

        "timestamp": "2022-12-02T12:23:18.301Z",

        "manually_resolved": false,

        "aks": [

            2

        ],

        "ak_slots": [

            2

        ]

    }

},

{

    "model": "AKModel.availability",

    "pk": 1,

    "fields": {

        "event": 2,

        "person": null,

        "room": null,

        "ak": 1,

        "ak_category": null,

        "start": "2020-11-07T08:00:00Z",

        "end": "2020-11-07T18:00:00Z"

    }

},

{

    "model": "AKModel.availability",

    "pk": 2,

    "fields": {

        "event": 2,

        "person": null,

        "room": null,

        "ak": 1,

        "ak_category": null,

        "start": "2020-11-09T10:00:00Z",

        "end": "2020-11-09T16:30:00Z"

    }

},

{

    "model": "AKModel.availability",

    "pk": 3,

    "fields": {

        "event": 2,

        "person": null,

        "room": 1,

        "ak": null,

        "ak_category": null,

        "start": "2020-11-06T17:51:26Z",

        "end": "2020-11-10T23:00:00Z"

    }

},

{

    "model": "AKModel.availability",

    "pk": 4,

    "fields": {

        "event": 2,

        "person": null,

        "room": 2,

        "ak": null,

        "ak_category": null,

        "start": "2020-11-06T17:51:26Z",

        "end": "2020-11-06T21:00:00Z"

    }

},

{

    "model": "AKModel.availability",

    "pk": 5,

    "fields": {

        "event": 2,

        "person": null,

        "room": 2,

        "ak": null,

        "ak_category": null,

        "start": "2020-11-08T15:30:00Z",

        "end": "2020-11-08T19:30:00Z"

    }

},

{

    "model": "AKModel.availability",

    "pk": 6,

    "fields": {

        "event": 2,

        "person": null,

        "room": 2,

        "ak": null,

        "ak_category": null,

        "start": "2020-11-07T18:30:00Z",

        "end": "2020-11-07T21:30:00Z"

    }

},

{

    "model": "AKModel.availability",

    "pk": 7,

    "fields": {

        "event": 1,

        "person": null,

        "room": null,

        "ak": 5,

        "ak_category": null,

        "start": "2020-10-01T17:41:22Z",

        "end": "2020-10-04T17:41:30Z"

    }

},

{

    "model": "AKModel.availability",

    "pk": 8,

    "fields": {

        "event": 1,

        "person": null,

        "room": 3,

        "ak": null,

        "ak_category": null,

        "start": "2020-10-01T17:41:22Z",

        "end": "2020-10-04T17:41:30Z"

    }

},

{

    "model": "AKModel.defaultslot",

    "pk": 1,

    "fields": {

        "event": 2,

        "start": "2020-11-07T08:00:00Z",

        "end": "2020-11-07T12:00:00Z",

        "primary_categories": [5]

    }

},

{

    "model": "AKModel.defaultslot",

    "pk": 2,

    "fields": {

        "event": 2,

        "start": "2020-11-07T14:00:00Z",

        "end": "2020-11-07T17:00:00Z",

        "primary_categories": [4]

    }

},

{

    "model": "AKModel.defaultslot",

    "pk": 3,

    "fields": {

        "event": 2,

        "start": "2020-11-08T08:00:00Z",

        "end": "2020-11-08T19:00:00Z",

        "primary_categories": [4, 5]

    }

},

{

    "model": "AKModel.defaultslot",

    "pk": 4,

    "fields": {

        "event": 2,

        "start": "2020-11-09T17:00:00Z",

        "end": "2020-11-10T01:00:00Z",

        "primary_categories": [4, 5, 3]

    }

}

]

AKModel/forms.py

0 → 100644
+297 −0
Original line number Diff line number Diff line 
"""

Central and admin forms

"""



import csv

import io



from django import forms

from django.forms.utils import ErrorList

from django.utils.translation import gettext_lazy as _



from AKModel.availability.forms import AvailabilitiesFormMixin

from AKModel.models import Event, AKCategory, AKRequirement, Room, AKType





class DateTimeInput(forms.DateInput):

    """

    Simple widget for datetime input fields using the HTML5 datetime-local input type

    """

    input_type = 'datetime-local'





class NewEventWizardStartForm(forms.ModelForm):

    """

    Initial view of new event wizard



    This form is a model form for Event, but only with a subset of the required fields.

    It is therefore not possible to really create an event using this form, but only to enter

    information, in particular the timezone, that is needed to correctly handle/parse the user

    inputs for further required fields like start and end of the event.



    The form will be used for this partial input, the input of the remaining required fields

    will then be handled by :class:`NewEventWizardSettingsForm` (see below).

    """

    class Meta:

        model = Event

        fields = ['name', 'slug', 'timezone', 'plan_hidden', 'poll_hidden']

        widgets = {

            'plan_hidden': forms.HiddenInput(),

            'poll_hidden': forms.HiddenInput(),

        }



    # Special hidden field for wizard state handling

    is_init = forms.BooleanField(initial=True, widget=forms.HiddenInput)





class NewEventWizardSettingsForm(forms.ModelForm):

    """

    Form for second view of the event creation wizard.



    Will handle the input of the remaining required as well as some optional fields.

    See also :class:`NewEventWizardStartForm`.

    """

    class Meta:

        model = Event

        fields = "__all__"

        exclude = ['plan_published_at', 'poll_published_at']

        widgets = {

            'name': forms.HiddenInput(),

            'slug': forms.HiddenInput(),

            'timezone': forms.HiddenInput(),

            'active': forms.HiddenInput(),

            'start': DateTimeInput(),

            'end': DateTimeInput(),

            'interest_start': DateTimeInput(),

            'interest_end': DateTimeInput(),

            'reso_deadline': DateTimeInput(),

            'plan_hidden': forms.HiddenInput(),

            'poll_hidden': forms.HiddenInput(),

        }





class NewEventWizardPrepareImportForm(forms.Form):

    """

    Wizard form for choosing an event to import/copy elements (requirements, categories, etc) from.

    Is used to restrict the list of elements to choose from in the next step (see :class:`NewEventWizardImportForm`).

    """

    import_event = forms.ModelChoiceField(

        queryset=Event.objects.all(),

        label=_("Copy ak requirements and ak categories of existing event"),

        help_text=_("You can choose what to copy in the next step")

    )





class NewEventWizardImportForm(forms.Form):

    """

    Wizard form for excaclty choosing which elemments to copy/import for the newly created event.

    Possible elements are categories, requirements, and dashboard buttons if AKDashboard is active.

    The lists are restricted to elements from the event selected in the previous step

    (see :class:`NewEventWizardPrepareImportForm`).

    """

    import_categories = forms.ModelMultipleChoiceField(

        queryset=AKCategory.objects.all(),

        widget=forms.CheckboxSelectMultiple,

        label=_("Copy ak categories"),

        required=False,

    )



    import_requirements = forms.ModelMultipleChoiceField(

        queryset=AKRequirement.objects.all(),

        widget=forms.CheckboxSelectMultiple,

        label=_("Copy ak requirements"),

        required=False,

    )



    import_types = forms.ModelMultipleChoiceField(

        queryset=AKType.objects.all(),

        widget=forms.CheckboxSelectMultiple,

        label=_("Copy types"),

        required=False,

    )



    # pylint: disable=too-many-arguments

    def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, initial=None, error_class=ErrorList,

                 label_suffix=None, empty_permitted=False, field_order=None, use_required_attribute=None,

                 renderer=None):

        super().__init__(data, files, auto_id, prefix, initial, error_class, label_suffix, empty_permitted, field_order,

                         use_required_attribute, renderer)

        self.fields["import_categories"].queryset = self.fields["import_categories"].queryset.filter(

            event=self.initial["import_event"])

        self.fields["import_requirements"].queryset = self.fields["import_requirements"].queryset.filter(

            event=self.initial["import_event"])

        self.fields["import_types"].queryset = self.fields["import_types"].queryset.filter(

            event=self.initial["import_event"])



        # pylint: disable=import-outside-toplevel

        # Local imports used to prevent cyclic imports and to only import when AKDashboard is available

        from django.apps import apps

        if apps.is_installed("AKDashboard"):

            # If AKDashboard is active, allow to copy dashboard buttons, too

            from AKDashboard.models import DashboardButton

            self.fields["import_buttons"] = forms.ModelMultipleChoiceField(

                queryset=DashboardButton.objects.filter(event=self.initial["import_event"]),

                widget=forms.CheckboxSelectMultiple,

                label=_("Copy dashboard buttons"),

                required=False,

            )





class NewEventWizardActivateForm(forms.ModelForm):

    """

    Wizard form to activate the newly created event

    """

    class Meta:

        fields = ["active"]

        model = Event





class AdminIntermediateForm(forms.Form):

    """

    Base form for admin intermediate views (forms used there should inherit from this,

    by default, the form is empty since it is only needed for the confirmation button)

    """





class AdminIntermediateActionForm(AdminIntermediateForm):

    """

    Form for Admin Action Confirmation views -- has a pks field needed to handle the serialization/deserialization of

    the IDs of the entities the user selected for the admin action to be performed on

    """

    pks = forms.CharField(widget=forms.HiddenInput)





class SlideExportForm(AdminIntermediateForm):

    """

    Form to control the slides generated from the AK list of an event



    The user can select how many upcoming AKs are displayed at the footer to inform people that it is their turn soon,

    whether the AK list should be restricted to those AKs that where marked for presentation, and whether ther should

    be a symbol and empty space to take notes on for wishes

    """

    num_next = forms.IntegerField(

        min_value=0,

        max_value=6,

        initial=3,

        label=_("# next AKs"),

        help_text=_("How many next AKs should be shown on a slide?"))

    types = forms.MultipleChoiceField(

        label=_("AK Types"),

        help_text=_("Which AK types should be included in the slides?"),

        widget=forms.CheckboxSelectMultiple,

        choices=[],

        required=False)

    types_all_selected_only = forms.BooleanField(

        initial=False,

        label=_("Only show AKs with all selected types?"),

        help_text=_("If checked, only AKs that have all selected types will be shown in the slides. "

                    "If unchecked, AKs with at least one of the selected types will be shown."),

        required=False)

    presentation_mode = forms.TypedChoiceField(

        initial=False,

        label=_("Presentation only?"),

        widget=forms.RadioSelect,

        choices=((True, _('Yes')), (False, _('No'))),

        coerce=lambda x: x == "True",

        help_text=_("Restrict AKs to those that asked for chance to be presented?"))

    wish_notes = forms.TypedChoiceField(

        initial=False,

        label=_("Space for notes in wishes?"),

        widget=forms.RadioSelect,

        choices=((True, _('Yes')), (False, _('No'))),

        coerce=lambda x: x == "True",

        help_text=_("Create symbols indicating space to note down owners and timeslots for wishes, e.g., to be filled "

                    "out on a touch screen while presenting?"))





class DefaultSlotEditorForm(AdminIntermediateForm):

    """

    Form for default slot editor

    """

    availabilities = forms.CharField(

        label=_('Default Slots'),

        help_text=_(

            'Click and drag to add default slots, double-click to delete. '

            'Or use the start and end inputs to add entries to the calendar view.'

        ),

        widget=forms.TextInput(attrs={'class': 'availabilities-editor-data'}),

        required=True,

    )





class RoomBatchCreationForm(AdminIntermediateForm):

    """

    Form for room batch creation



    Allows to input a list of room details and choose whether default availabilities should be generated for these

    rooms. Will check that the input follows a CSV format with at least a name column present.

    """

    rooms = forms.CharField(

        label=_('New rooms'),

        help_text=_('Enter room details in CSV format. Required colum is "name", optional colums are "location", '

                    '"capacity", and "url" for online/hybrid rooms. Delimiter: Semicolon'),

        widget=forms.Textarea,

        required=True,

    )

    create_default_availabilities = forms.BooleanField(

        label=_('Default availabilities?'),

        help_text=_('Create default availabilities for all rooms?'),

        required=False

    )



    def clean_rooms(self):

        """

        Validate and transform the input for the rooms textfield

        Treat the input as CSV and turn it into a dict containing the relevant information.



        :return: a dict containing the raw room information

        :rtype: dict[str, str]

        """

        rooms_raw_text = self.cleaned_data["rooms"]

        rooms_raw_dict = csv.DictReader(io.StringIO(rooms_raw_text), delimiter=";")



        if "name" not in rooms_raw_dict.fieldnames:

            raise forms.ValidationError(_("CSV must contain a name column"))



        return rooms_raw_dict





class RoomForm(forms.ModelForm):

    """

    Room (creation) form (basic), will be extended for handling of availabilities

    (see :class:`RoomFormWithAvailabilities`) and also for creating hybrid rooms in AKOnline (if active)

    """

    class Meta:

        model = Room

        fields = ['name',

                  'location',

                  'capacity',

                  'event',

                  ]





class RoomFormWithAvailabilities(AvailabilitiesFormMixin, RoomForm):

    """

    Room (update) form including handling of availabilities, extends :class:`RoomForm`

    """

    class Meta:

        model = Room

        fields = ['name',

                  'location',

                  'capacity',

                  'properties',

                  'event',

                  ]



        widgets = {

            'properties': forms.CheckboxSelectMultiple,

        }



    def __init__(self, *args, **kwargs):

        # Init availability mixin

        kwargs['initial'] = {}

        super().__init__(*args, **kwargs)

        self.initial = {**self.initial, **kwargs['initial']}

        # Filter possible values for m2m when event is specified

        if hasattr(self.instance, "event") and self.instance.event is not None:

            self.fields["properties"].queryset = AKRequirement.objects.filter(event=self.instance.event)

AKModel/management/commands/makemessages.py

0 → 100644
+43 −0
Original line number Diff line number Diff line 
import os



from django.core.management.commands.makemessages import Command as MakeMessagesCommand





class Command(MakeMessagesCommand):

    """

    Adapted version of the :class:`MakeMessagesCommand`

    Ensure PO files are generated using forward slashes in the location comments on all operating systems

    """

    def find_files(self, root):

        # Replace backward slashes with forward slashes if necessary in file list

        all_files = super().find_files(root)

        if os.sep != "\\":

            return all_files



        for file_entry in all_files:

            if file_entry.dirpath == ".":

                file_entry.dirpath = ""

            elif file_entry.dirpath.startswith(".\\"):

                file_entry.dirpath = file_entry.dirpath[2:].replace("\\", "/")



        return all_files



    def build_potfiles(self):

        # Replace backward slashes with forward slashes if necessary in the files itself

        pot_files = super().build_potfiles()

        if os.sep != "\\":

            return pot_files



        for filename in pot_files:

            with open(filename, "r", encoding="utf-8") as f:

                lines = f.readlines()

                fixed_lines = []

                for line in lines:

                    if line.startswith("#: "):

                        line = line.replace("\\", "/")

                    fixed_lines.append(line)



            with open(filename, "w", encoding="utf-8") as f:

                f.writelines(fixed_lines)



        return pot_files

AKModel/metaviews/__init__.py

0 → 100644
+5 −0
Original line number Diff line number Diff line 
from AKModel.metaviews.status import StatusManager



# create on instance of the :class:`AKModel.metaviews.status.StatusManager`

# that can then be accessed everywhere (singleton pattern)

status_manager = StatusManager()

AKModel/metaviews/admin.py

0 → 100644
+255 −0
Original line number Diff line number Diff line 
from abc import ABC, abstractmethod



from django.contrib import admin, messages

from django.shortcuts import get_object_or_404

from django.urls import reverse

from django.utils.translation import gettext_lazy as _

from django.views.generic import FormView



from AKModel.forms import AdminIntermediateForm, AdminIntermediateActionForm

from AKModel.models import Event





class EventSlugMixin:

    """

    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



    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

        if self.event is None:

            self.event = get_object_or_404(Event, slug=self.kwargs.get("event_slug", None))



    def get(self, request, *args, **kwargs):

        """

        Override GET request handling to perform loading event first

        """

        self._load_event()

        return super().get(request, *args, **kwargs)



    def post(self, request, *args, **kwargs):

        """

        Override POST request handling to perform loading event first

        """

        self._load_event()

        return super().post(request, *args, **kwargs)



    def list(self, request, *args, **kwargs):

        """

        Override list view request handling to perform loading event first

        """

        self._load_event()

        return super().list(request, *args, **kwargs)



    def create(self, request, *args, **kwargs):

        """

        Override create view request handling to perform loading event first

        """

        self._load_event()

        return super().create(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:

            self._load_event()

        return super().dispatch(request, *args, **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)

        # Add event to context (to make it accessible in templates)

        context["event"] = self.event

        return context





class FilterByEventSlugMixin(EventSlugMixin):

    """

    Mixin to filter different querysets based on a event slug from the request url

    """



    def get_queryset(self):

        """

        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)





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 = ''

    title = ''



    def get_context_data(self, **kwargs):

        """

        Extend context

        """

        extra = admin.site.each_context(self.request)

        extra.update(super().get_context_data(**kwargs))



        if self.site_url != '':

            extra["site_url"] = self.site_url

        if self.title != '':

            extra["title"] = self.title



        return extra





class IntermediateAdminView(AdminViewMixin, FormView):

    """

    Metaview: Handle typical "action but with preview and confirmation step before" workflow

    """

    template_name = "admin/AKModel/action_intermediate.html"

    form_class = AdminIntermediateForm



    def get_preview(self):

        """

        Render a preview of the action to be performed.

        Default is empty

        :return: preview (html)

        :rtype: str

        """

        return ""



    def get_context_data(self, **kwargs):

        context = super().get_context_data(**kwargs)

        context["title"] = self.title

        context["preview"] = self.get_preview()

        return context





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):

        """

        Extend context

        """

        context = super().get_context_data(**kwargs)

        context["wizard_step"] = self.wizard_step

        context["wizard_steps"] = [

            _("Start"),

            _("Settings"),

            _("Event created, Prepare Import"),

            _("Import categories & requirements"),

            _("Activate?"),

            _("Finish")

        ]

        context["wizard_step_text"] = context["wizard_steps"][self.wizard_step - 1]

        context["wizard_steps_total"] = len(context["wizard_steps"])

        return context





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

    entities = None



    def get_queryset(self, pks=None):

        """

        Get the queryset of objects to perform the action on

        """

        if pks is None:

            pks = self.request.GET['pks']

        return self.model.objects.filter(pk__in=pks.split(","))



    def get_initial(self):

        initial = super().get_initial()

        initial['pks'] = self.request.GET['pks']

        return initial



    def get_preview(self):

        self.entities = self.get_queryset()

        joined_entities = '\n'.join(str(e) for e in self.entities)

        return f"{self.confirmation_message}:\n\n {joined_entities}"



    def get_success_url(self):

        return reverse(f"admin:{self.model._meta.app_label}_{self.model._meta.model_name}_changelist")



    @abstractmethod

    def action(self, form):

        """

        The real action to perform

        :param form: form holding the data probably needed for the action

        """



    def form_valid(self, form):

        self.entities = self.get_queryset(pks=form.cleaned_data['pks'])

        self.action(form)

        messages.add_message(self.request, messages.SUCCESS, self.success_message)

        return super().form_valid(form)





class LoopActionMixin(ABC):

    """

    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()

        for entity in self.entities:

            self.perform_action(entity)

            entity.save()

        self.post_action()



    @abstractmethod

    def perform_action(self, entity):

        """

        Action to perform on each entity



        :param entity: entity to perform the action on

        """



    def pre_action(self):

        """

        Callback for custom action before loop starts

        """



    def post_action(self):

        """

        Callback for custom action after loop finished

        """

AKModel/metaviews/status.py

0 → 100644
+175 −0
Original line number Diff line number Diff line 
from abc import ABC, abstractmethod

from collections import defaultdict



from django.template import loader

from django.views.generic import TemplateView



from AKModel.metaviews.admin import AdminViewMixin





class StatusWidget(ABC):

    """

    Abstract parent for status page widgets

    """

    title = "Status Widget"

    actions = []

    status = "primary"



    @property

    @abstractmethod

    def required_context_type(self) -> str:

        """

        Which model/context is needed to render this widget?

        """



    def get_context_data(self, context) -> dict:

        """

        Allow to manipulate the context

        :return: context (with or without changes)

        """

        return context



    def render(self, context: {}, request) -> dict:

        """

        Render widget based on context



        :param context: Context for rendering

        :param request: HTTP request, needed for rendering

        :return: Dictionary containing the rendered/prepared information

        """

        context = self.get_context_data(context)

        return {

            "body": self.render_body(context, request),

            "title": self.render_title(context),

            "actions": self.render_actions(context),

            "status": self.render_status(context),

        }



    def render_title(self, context: {}) -> str:  # pylint: disable=unused-argument

        """

        Render title for widget based on context



        By default, the title attribute is used without modification

        :param context: Context for rendering

        :return: Rendered title

        """

        return self.title



    def render_status(self, context: {}) -> str:  # pylint: disable=unused-argument

        """

        Render status for widget based on context



        By default, the status attribute is used without modification

        :param context: Context for rendering

        :return: Rendered title

        """

        return self.status



    @abstractmethod

    def render_body(self, context: {}, request) -> str:  # pylint: disable=unused-argument

        """

        Render body for widget based on context



        :param context: Context for rendering

        :param request: HTTP request (needed for rendering)

        :return: Rendered widget body (HTML)

        """



    def render_actions(self, context: {}) -> list[dict]:  # pylint: disable=unused-argument

        """

        Render actions for widget based on context



        By default, all actions specified for this widget are returned without modification



        :param context: Context for rendering

        :return: List of actions

        """

        return self.actions





class TemplateStatusWidget(StatusWidget):

    """

    A :class:`StatusWidget` that produces its content by rendering a given html template

    """

    @property

    @abstractmethod

    def template_name(self) -> str:

        """

        Configure the template to use

        :return: name of the template to use

        """



    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)

        return template.render(context, request)





class StatusManager:

    """

    Registry for all status widgets



    Allows to register status widgets using the `@status_manager.register(name="xyz")` decorator

    """

    widgets = {}

    widgets_by_context_type = defaultdict(list)



    def register(self, name: str):

        """

        Call this as

        @status_manager.register(name="xyz")

        to register a status widget



        :param name: name of this widget (only used internally). Has to be unique.

        """

        def _register(widget_class):

            w = widget_class()

            self.widgets[name] = w

            self.widgets_by_context_type[w.required_context_type].append(w)

            return widget_class



        return _register



    def get_by_context_type(self, context_type: str):

        """

        Filter widgets for ones suitable for provided context



        :param context_type: name of the model provided as context

        :return: a list of all matching widgets

        """

        if context_type in self.widgets_by_context_type.keys():

            return self.widgets_by_context_type[context_type]

        return []





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"



    @property

    @abstractmethod

    def provided_context_type(self) -> str:

        """

        Which model/context is provided by this status view?

        """



    def get(self, request, *args, **kwargs):

        context = self.get_context_data(**kwargs)



        # Load status manager (local import to prevent cyclic import)

        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)

AKModel/migrations/0017_owner_slug.py

+3 −4
Original line number Diff line number Diff line
@@ -33,9 +33,8 @@ class Migration(migrations.Migration): 
            migrate_data_forward,

            migrations.RunPython.noop,

        ),

        migrations.AlterField(

            model_name='akowner',

            name='slug',

            field=models.SlugField(blank=True, help_text='Slug for URL generation', unique=True, max_length=64, verbose_name='Slug')

        migrations.AlterUniqueTogether(

            name='akowner',

            unique_together={('event', 'name', 'institution'), ('event', 'slug')},

        )

    ]

AKModel/migrations/0024_event_dependencies.py

+2 −2
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ from AKModel.models import AKCategory, Event, AKTrack 




def migrate_data_forward(apps, schema_editor):

    for instance in AKCategory.objects.all():

    for instance in AKCategory.objects.only('event').all():

        if not instance.event:

            instance.event = Event.objects.filter(active=True).last()

        instance.save()



    for instance in AKTrack.objects.all():

    for instance in AKTrack.objects.only('event').all():

        if not instance.event:

            instance.event = Event.objects.filter(active=True).last()

        instance.save()

AKModel/migrations/0028_unique_constraints.py

+0 −4
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ class Migration(migrations.Migration): 
            name='akcategory',

            unique_together={('event', 'name')},

        ),

        migrations.AlterUniqueTogether(

            name='akowner',

            unique_together={('event', 'name', 'institution'), ('event', 'slug')},

        ),

        migrations.AlterUniqueTogether(

            name='akrequirement',

            unique_together={('event', 'name')},

AKModel/migrations/0033_AKOnline.py

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-05-17 20:02



from django.db import migrations





class Migration(migrations.Migration):

    dependencies = [

        ('AKModel', '0032_AK_history'),

    ]



    operations = [

        migrations.RenameField(

            model_name='room',

            old_name='building',

            new_name='location',

        ),

    ]

AKModel/migrations/0034_room_rename_field.py

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-05-19 18:48



from django.db import migrations, models





class Migration(migrations.Migration):

    dependencies = [

        ('AKModel', '0033_AKOnline'),

    ]



    operations = [

        migrations.AlterModelOptions(

            name='room',

            options={'ordering': ['location', 'name'], 'verbose_name': 'Room', 'verbose_name_plural': 'Rooms'},

        ),

        migrations.AlterField(

            model_name='room',

            name='location',

            field=models.CharField(blank=True, help_text='Name or number of the location', max_length=256,

                                   verbose_name='Location'),

        ),

    ]

AKModel/migrations/0035_event_plan_hidden.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-05-19 20:08



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0034_room_rename_field'),

    ]



    operations = [

        migrations.AddField(

            model_name='event',

            name='plan_hidden',

            field=models.BooleanField(default=True, help_text='Hides plan for non-staff users', verbose_name='Plan Hidden'),

        ),

    ]

AKModel/migrations/0036_protocol_link.py

0 → 100644
+23 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-05-21 05:24



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0035_event_plan_hidden'),

    ]



    operations = [

        migrations.AddField(

            model_name='ak',

            name='protocol_link',

            field=models.URLField(blank=True, help_text='Link to protocol', verbose_name='Protocol Link'),

        ),

        migrations.AddField(

            model_name='historicalak',

            name='protocol_link',

            field=models.URLField(blank=True, help_text='Link to protocol', verbose_name='Protocol Link'),

        ),

    ]

AKModel/migrations/0037_event_public.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-07-12 15:54



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0036_protocol_link'),

    ]



    operations = [

        migrations.AddField(

            model_name='event',

            name='public',

            field=models.BooleanField(default=True, help_text='Show this event on overview page.', verbose_name='Public event'),

        ),

    ]

AKModel/migrations/0038_akorgamessage.py

0 → 100644
+28 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-09-28 21:52



from django.db import migrations, models

import django.db.models.deletion





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0037_event_public'),

    ]



    operations = [

        migrations.CreateModel(

            name='AKOrgaMessage',

            fields=[

                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),

                ('text', models.TextField(help_text='Message to the organizers. This is not publicly visible.', verbose_name='Message text')),

                ('timestamp', models.DateTimeField(auto_now_add=True)),

                ('ak', models.ForeignKey(help_text='AK this message belongs to', on_delete=django.db.models.deletion.CASCADE, to='AKModel.AK', verbose_name='AK')),

            ],

            options={

                'verbose_name': 'AK Orga Message',

                'verbose_name_plural': 'AK Orga Messages',

                'ordering': ['-timestamp'],

            },

        ),

    ]

AKModel/migrations/0039_event_wiki_template_name.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-09-29 22:16



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0038_akorgamessage'),

    ]



    operations = [

        migrations.AddField(

            model_name='event',

            name='wiki_export_template_name',

            field=models.CharField(blank=True, max_length=50, verbose_name='Wiki Export Template Name'),

        ),

    ]

AKModel/migrations/0040_event_reso_deadline.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-11-03 18:57



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0039_event_wiki_template_name'),

    ]



    operations = [

        migrations.AddField(

            model_name='event',

            name='reso_deadline',

            field=models.DateTimeField(blank=True, help_text='When should AKs with intention to submit a resolution be done?', null=True, verbose_name='Resolution Deadline'),

        ),

    ]

AKModel/migrations/0041_constraint_violation.py

0 → 100644
+37 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-11-03 23:27



from django.db import migrations, models

import django.db.models.deletion





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0040_event_reso_deadline'),

    ]



    operations = [

        migrations.CreateModel(

            name='ConstraintViolation',

            fields=[

                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),

                ('type', models.CharField(choices=[('ots', 'Owner has two parallel slots'), ('soa', "AK Slot was scheduled outside the AK's availabilities"), ('rts', 'Room has two AK slots scheduled at the same time'), ('rng', 'Room does not satisfy the requirement of the scheduled AK'), ('acc', 'AK Slot is scheduled at the same time as an AK listed as a conflict'), ('abp', 'AK Slot is scheduled before an AK listed as a prerequisite'), ('aar', 'AK Slot for AK with intention to submit a resolution is scheduled after resolution deadline'), ('acm', 'AK Slot in a category is outside that categories availabilities'), ('asc', 'Two AK Slots for the same AK scheduled at the same time'), ('rce', 'AK Slot is scheduled in a room with less space than interest'), ('soe', "AK Slot is scheduled outside the event's availabilities")], help_text='Type of violation, i.e. what kind of constraint was violated', max_length=3, verbose_name='Type')),

                ('level', models.PositiveSmallIntegerField(choices=[(1, 'Warning'), (10, 'Violation')], help_text='Severity level of the violation', verbose_name='Level')),

                ('comment', models.TextField(blank=True, help_text='Comment or further details for this violation', verbose_name='Comment')),

                ('timestamp', models.DateTimeField(auto_now_add=True, help_text='Time of creation', verbose_name='Timestamp')),

                ('manually_resolved', models.BooleanField(default=False, help_text='Mark this violation manually as resolved', verbose_name='Manually Resolved')),

                ('ak_owner', models.ForeignKey(blank=True, help_text='AK Owner belonging to this constraint', null=True, on_delete=django.db.models.deletion.CASCADE, to='AKModel.AKOwner', verbose_name='AK Owner')),

                ('ak_slots', models.ManyToManyField(blank=True, help_text='AK Slot(s) belonging to this constraint', to='AKModel.AKSlot', verbose_name='AK Slots')),

                ('aks', models.ManyToManyField(blank=True, help_text='AK(s) belonging to this constraint', to='AKModel.AK', verbose_name='AKs')),

                ('category', models.ForeignKey(blank=True, help_text='AK Category belonging to this constraint', null=True, on_delete=django.db.models.deletion.CASCADE, to='AKModel.AKCategory', verbose_name='AK Category')),

                ('event', models.ForeignKey(help_text='Associated event', on_delete=django.db.models.deletion.CASCADE, to='AKModel.Event', verbose_name='Event')),

                ('requirement', models.ForeignKey(blank=True, help_text='AK Requirement belonging to this constraint', null=True, on_delete=django.db.models.deletion.CASCADE, to='AKModel.AKRequirement', verbose_name='AK Requirement')),

                ('room', models.ForeignKey(blank=True, help_text='Room belonging to this constraint', null=True, on_delete=django.db.models.deletion.CASCADE, to='AKModel.Room', verbose_name='Room')),

            ],

            options={

                'verbose_name': 'Constraint Violation',

                'verbose_name_plural': 'Constraint Violations',

                'ordering': ['-timestamp'],

            },

        ),

    ]

AKModel/migrations/0042_akslot_fixed.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.0.6 on 2020-11-04 23:31



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0041_constraint_violation'),

    ]



    operations = [

        migrations.AddField(

            model_name='akslot',

            name='fixed',

            field=models.BooleanField(default=False, help_text='Length and time of this AK should not be changed', verbose_name='Scheduling Fixed'),

        ),

    ]

AKModel/migrations/0043_akslot_fixed_improve_verbose_name.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.1.5 on 2021-01-29 15:43



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0042_akslot_fixed'),

    ]



    operations = [

        migrations.AlterField(

            model_name='akslot',

            name='fixed',

            field=models.BooleanField(default=False, help_text='Length and time of this AK should not be changed', verbose_name='Scheduling fixed'),

        ),

    ]

AKModel/migrations/0044_ak_history_remove_interest_counter.py

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# Generated by Django 3.1.5 on 2021-01-29 15:44



from django.db import migrations





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0043_akslot_fixed_improve_verbose_name'),

    ]



    operations = [

        migrations.RemoveField(

            model_name='historicalak',

            name='interest_counter',

        ),

    ]

AKModel/migrations/0046_present_by_default.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.1.8 on 2021-05-15 14:07



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0045_event_tz_pytz_update'),

    ]



    operations = [

        migrations.AddField(

            model_name='akcategory',

            name='present_by_default',

            field=models.BooleanField(blank=True, default=True, help_text='Present AKs of this category by default if AK owner did not specify whether this AK should be presented?', verbose_name='Present by default'),

        ),

    ]

AKModel/migrations/0047_room_capacity_help.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.1.8 on 2021-10-28 16:34



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0046_present_by_default'),

    ]



    operations = [

        migrations.AlterField(

            model_name='room',

            name='capacity',

            field=models.IntegerField(help_text='Maximum number of people (-1 for unlimited).', verbose_name='Capacity'),

        ),

    ]

AKModel/migrations/0048_constraint_violation_text.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.1.8 on 2021-10-28 20:47



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0047_room_capacity_help'),

    ]



    operations = [

        migrations.AlterField(

            model_name='constraintviolation',

            name='type',

            field=models.CharField(choices=[('ots', 'Owner has two parallel slots'), ('soa', "AK Slot was scheduled outside the AK's availabilities"), ('rts', 'Room has two AK slots scheduled at the same time'), ('rng', 'Room does not satisfy the requirement of the scheduled AK'), ('acc', 'AK Slot is scheduled at the same time as an AK listed as a conflict'), ('abp', 'AK Slot is scheduled before an AK listed as a prerequisite'), ('aar', 'AK Slot for AK with intention to submit a resolution is scheduled after resolution deadline'), ('acm', 'AK Slot in a category is outside that categories availabilities'), ('asc', 'Two AK Slots for the same AK scheduled at the same time'), ('rce', 'Room does not have enough space for interest in scheduled AK Slot'), ('soe', "AK Slot is scheduled outside the event's availabilities")], help_text='Type of violation, i.e. what kind of constraint was violated', max_length=3, verbose_name='Type'),

        ),

    ]

AKModel/migrations/0049_interest_window.py

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# Generated by Django 3.1.8 on 2021-10-29 10:01



from django.db import migrations, models





class Migration(migrations.Migration):

    dependencies = [

        ('AKModel', '0048_constraint_violation_text'),

    ]



    operations = [

        migrations.AddField(

            model_name='event',

            name='interest_end',

            field=models.DateTimeField(blank=True, help_text='Closing time for expression of interest.', null=True,

                                       verbose_name='Interest Window End'),

        ),

        migrations.AddField(

            model_name='event',

            name='interest_start',

            field=models.DateTimeField(blank=True, help_text='Opening time for expression of interest.', null=True,

                                       verbose_name='Interest Window Start'),

        ),

    ]

AKModel/migrations/0050_message_event_reference.py

0 → 100644
+41 −0
Original line number Diff line number Diff line 
# Generated by Django 3.1.8 on 2022-05-12 16:57



from django.db import migrations, models

import django.db.models.deletion





def forwards_func(apps, schema_editor):

    # Set event to the corresponding even (from the AK) each

    AKOrgaMessage = apps.get_model("AKModel", "AKOrgaMessage")

    for message in AKOrgaMessage.objects.all():

        message.event = message.ak.event

        message.save()





def reverse_func(apps, schema_editor):

    # No need to do something here, field will be deleted anyway

    pass





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0049_interest_window'),

    ]



    operations = [

        migrations.AddField(

            model_name='akorgamessage',

            name='event',

            field=models.ForeignKey(blank=True, help_text='Associated event', null=True,

                                    on_delete=django.db.models.deletion.CASCADE, to='AKModel.event',

                                    verbose_name='Event'),

        ),

        migrations.RunPython(forwards_func, reverse_func),

        migrations.AlterField(

            model_name='akorgamessage',

            name='event',

            field=models.ForeignKey(help_text='Associated event', on_delete=django.db.models.deletion.CASCADE,

                                    to='AKModel.event', verbose_name='Event'),

        ),

    ]

AKModel/migrations/0051_ak_notes_help_text.py

0 → 100644
+23 −0
Original line number Diff line number Diff line 
# Generated by Django 3.1.8 on 2022-08-17 17:41



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0050_message_event_reference'),

    ]



    operations = [

        migrations.AlterField(

            model_name='ak',

            name='notes',

            field=models.TextField(blank=True, help_text='Notes to organizers. These are public. For private notes, please use the button for private messages on the detail page of this AK (after creation/editing).', verbose_name='Organizational Notes'),

        ),

        migrations.AlterField(

            model_name='historicalak',

            name='notes',

            field=models.TextField(blank=True, help_text='Notes to organizers. These are public. For private notes, please use the button for private messages on the detail page of this AK (after creation/editing).', verbose_name='Organizational Notes'),

        ),

    ]

AKModel/migrations/0053_plan_published_at.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.2.16 on 2022-10-15 10:18



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0052_history_upgrade'),

    ]



    operations = [

        migrations.AddField(

            model_name='event',

            name='plan_published_at',

            field=models.DateTimeField(blank=True, help_text='Timestamp at which the plan was published', null=True, verbose_name='Plan published at'),

        ),

    ]

AKModel/migrations/0054_default_slots.py

0 → 100644
+29 −0
Original line number Diff line number Diff line 
# Generated by Django 3.2.16 on 2022-10-22 12:18



from django.db import migrations, models

import django.db.models.deletion





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0053_plan_published_at'),

    ]



    operations = [

        migrations.CreateModel(

            name='DefaultSlot',

            fields=[

                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),

                ('start', models.DateTimeField(help_text='Time and date the slot begins', verbose_name='Slot Begin')),

                ('end', models.DateTimeField(help_text='Time and date the slot ends', verbose_name='Slot End')),

                ('event', models.ForeignKey(help_text='Associated event', on_delete=django.db.models.deletion.CASCADE, to='AKModel.event', verbose_name='Event')),

                ('primary_categories', models.ManyToManyField(blank=True, help_text='Categories that should be assigned to this slot primarily', to='AKModel.AKCategory', verbose_name='Primary categories')),

            ],

            options={

                'verbose_name': 'Default Slot',

                'verbose_name_plural': 'Default Slots',

                'ordering': ['-start'],

            },

        ),

    ]

AKModel/migrations/0055_ak_export.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# Generated by Django 3.2.16 on 2022-12-26 22:38



from django.db import migrations, models





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0054_default_slots'),

    ]



    operations = [

        migrations.AddField(

            model_name='ak',

            name='include_in_export',

            field=models.BooleanField(default=True, help_text='Include AK in wiki export?', verbose_name='Export?'),

        ),

    ]

AKModel/migrations/0056_remove_tags.py

0 → 100644
+20 −0
Original line number Diff line number Diff line 
# Generated by Django 3.2.16 on 2023-01-01 18:47



from django.db import migrations





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0055_ak_export'),

    ]



    operations = [

        migrations.RemoveField(

            model_name='ak',

            name='tags',

        ),

        migrations.DeleteModel(

            name='AKTag',

        ),

    ]

AKModel/migrations/0057_upgrades.py

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# Generated by Django 4.1.5 on 2023-01-03 17:04



from django.db import migrations

import timezone_field.fields





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0056_remove_tags'),

    ]



    operations = [

        migrations.AlterField(

            model_name='event',

            name='timezone',

            field=timezone_field.fields.TimeZoneField(choices_display='WITH_GMT_OFFSET', default='Europe/Berlin', help_text='Time Zone where this event takes place in', verbose_name='Time Zone'),

        ),

    ]

AKModel/migrations/0058_alter_ak_options.py

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# Generated by Django 4.1.9 on 2023-05-15 18:47



from django.db import migrations





class Migration(migrations.Migration):



    dependencies = [

        ('AKModel', '0057_upgrades'),

    ]



    operations = [

        migrations.AlterModelOptions(

            name='ak',

            options={'ordering': ['pk'], 'verbose_name': 'AK', 'verbose_name_plural': 'AKs'},

        ),

    ]

AKModel/migrations/0059_interest_default.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# 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'),

        ),

    ]

AKModel/migrations/0060_orga_message_resolved.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# 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'),

        ),

    ]

AKModel/migrations/0061_types.py

0 → 100644
+33 −0
Original line number Diff line number Diff line 
# 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'),

        ),

    ]

AKModel/migrations/0062_interest_no_history.py

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# 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',

        ),

    ]

AKModel/migrations/0063_field_validators.py

0 → 100644
+39 −0
Original line number Diff line number Diff line 
# 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'),

        ),

    ]