Skip to content
Snippets Groups Projects
Verified Commit d7dbf458 authored by Tom Teichler's avatar Tom Teichler :beers: Committed by Jonathan Weth
Browse files

Drop School stuff

parent 813fb34d
No related branches found
No related tags found
1 merge request!217Migrate from constance to dynamic-preferences
......@@ -12,7 +12,7 @@ from django_select2.forms import ModelSelect2MultipleWidget, Select2Widget
from material import Layout, Fieldset, Row
from .mixins import ExtensibleForm
from .models import Group, Person, School, SchoolTerm, Announcement, AnnouncementRecipient
from .models import Group, Person, Announcement, AnnouncementRecipient
class PersonAccountForm(forms.ModelForm):
......@@ -155,25 +155,6 @@ class EditGroupForm(ExtensibleForm):
}
class EditSchoolForm(ExtensibleForm):
layout = Layout(
Fieldset(_("School name"), "name", "name_official"),
Fieldset(_("School logo"), Row("logo", "logo_cropping")),
)
class Meta:
model = School
fields = ["name", "name_official", "logo", "logo_cropping"]
class EditTermForm(ExtensibleForm):
layout = Layout("caption", Row("date_start", "date_end"))
class Meta:
model = SchoolTerm
fields = ["caption", "date_start", "date_end"]
class AnnouncementForm(ExtensibleForm):
valid_from = forms.DateTimeField(required=False)
valid_until = forms.DateTimeField(required=False)
......
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% load material_form i18n %}
{% block browser_title %}{% blocktrans %}Edit school{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans %}Edit school{% endblocktrans %}{% endblock %}
{% block content %}
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
{% form form=edit_school_form %}{% endform %}
{% include "core/save_button.html" %}
</form>
{% endblock %}
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% load material_form i18n %}
{% block browser_title %}{% blocktrans %}Edit school term{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans %}Edit school term{% endblocktrans %}{% endblock %}
{% block content %}
<form method="post">
{% csrf_token %}
{% form form=edit_term_form %}{% endform %}
{% include "core/save_button.html" %}
</form>
{% endblock %}
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% load i18n menu_generator %}
{% block browser_title %}{% blocktrans %}School management{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans %}School management{% endblocktrans %}{% endblock %}
{% block content %}
{% get_menu "SCHOOL_MANAGEMENT_MENU" as menu %}
{% include "core/on_page_menu.html" %}
{% endblock %}
......@@ -165,9 +165,8 @@ def path_and_rename(instance, filename: str, upload_to: str = "files") -> str:
def custom_information_processor(request: HttpRequest) -> dict:
""" Provides custom information in all templates """
from ..models import School, CustomMenu
from ..models import CustomMenu
return {
"SCHOOL": School.get_default,
"FOOTER_MENU": CustomMenu.get_default("footer"),
}
......
......@@ -20,13 +20,11 @@ from .filters import GroupFilter
from .forms import (
EditGroupForm,
EditPersonForm,
EditSchoolForm,
EditTermForm,
PersonsAccountsFormSet,
AnnouncementForm,
ChildGroupsForm,
)
from .models import Activity, Group, Notification, Person, School, DashboardWidget, Announcement
from .models import Activity, Group, Notification, Person, DashboardWidget, Announcement
from .tables import GroupsTable, PersonsTable
from .util import messages
from .util.apps import AppConfig
......@@ -284,52 +282,6 @@ def system_status(request: HttpRequest) -> HttpResponse:
return render(request, "core/system_status.html", context)
@permission_required("core.manage_school")
def school_management(request: HttpRequest) -> HttpResponse:
context = {}
return render(request, "core/school_management.html", context)
@permission_required("core.edit_school_information")
def edit_school(request: HttpRequest) -> HttpResponse:
context = {}
school = School.objects.first()
edit_school_form = EditSchoolForm(request.POST or None, request.FILES or None, instance=school)
context["school"] = school
if request.method == "POST":
if edit_school_form.is_valid():
edit_school_form.save(commit=True)
messages.success(request, _("The school has been saved."))
return redirect("index")
context["edit_school_form"] = edit_school_form
return render(request, "core/edit_school.html", context)
@permission_required("core.edit_schoolterm")
def edit_schoolterm(request: HttpRequest) -> HttpResponse:
context = {}
term = School.objects.first().current_term
edit_term_form = EditTermForm(request.POST or None, instance=term)
if request.method == "POST":
if edit_term_form.is_valid():
edit_term_form.save(commit=True)
messages.success(request, _("The term has been saved."))
return redirect("index")
context["edit_term_form"] = edit_term_form
return render(request, "core/edit_schoolterm.html", context)
def notification_mark_read(request: HttpRequest, id_: int) -> HttpResponse:
context = {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment