Skip to content
Snippets Groups Projects
Commit 8ef4cf27 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Work a lot at materializement of markdown editor

parent 5e39fac8
No related branches found
No related tags found
No related merge requests found
from django.forms import ModelForm
from material import Layout, Fieldset, Row
from timetable.models import Hint
class HintForm(ModelForm):
layout = Layout(Fieldset('Zeitraum',
Row('from_date', 'to_date'),
),
Fieldset('Hinweistext',
"text",
),
Fieldset('Klassen',
'classes'),
)
class Meta:
model = Hint
fields = ("from_date", "to_date", "text", "classes")
{% include 'partials/header.html' %}
{% load material_form %}
{% load martortags %}
{% load static %}
<main>
<h4>Neuen Hinweis erstellen</h4>
<form method="post">
{% csrf_token %}
{{ form }}
<button type="submit" class="waves-effect waves-light btn green">
<i class="material-icons left">add</i> Hinweis erstellen und veröffentlichen
</button>
</form>
<script type="text/javascript" src="{% static 'plugins/js/ace.js' %}"></script>
{# <script type="text/javascript" src="{% static 'plugins/js/semantic.min.js' %}"></script>#}
{# <script type="text/javascript" src="{% static 'semantic/dropdown.min.js' %}"></script>#}
{# <script type="text/javascript" src="{% static 'semantic/tab.min.js' %}"></script>#}
<script type="text/javascript" src="{% static 'plugins/js/mode-markdown.js' %}"></script>
<script type="text/javascript" src="{% static 'plugins/js/ext-language_tools.js' %}"></script>
<script type="text/javascript" src="{% static 'plugins/js/theme-github.js' %}"></script>
<script type="text/javascript" src="{% static 'plugins/js/highlight.min.js' %}"></script>
<script type="text/javascript" src="{% static 'plugins/js/resizable.min.js' %}"></script>
<script type="text/javascript" src="{% static 'plugins/js/emojis.min.js' %}"></script>
<script type="text/javascript" src="{% static 'martor/js/martor.min.js' %}"></script>
</main>
{% include 'partials/footer.html' %}
{% include 'partials/header.html' %}
<main>
<h4>Hinweise</h4>
<a href="{% url 'timetable_add_hint' %}" class="waves-effect waves-light btn green">
<i class="material-icons left">add</i>
Neuen Hinweis erstellen
</a>
{# <form method="GET">#}
{# {{ filter.form.as_p }}#}
{# <button type="submit" class="waves-effect waves-light btn">#}
{# <i class="material-icons left">refresh</i> Filter aktualisieren#}
{# </button>#}
{# </form>#}
<ul class="collection">
{% for aub in filter.qs %}
<li class="collection-item">
<div class="row">
<div class="col s12 m4">
<p class="title">
<span class="item-text">
<i class="material-icons">access_time</i>
{{ aub.from_date }}, {{ aub.from_time }} Uhr &mdash; {{ aub.to_date }}, {{ aub.to_time }} Uhr
</span>
</p>
<p><a href="{% url 'aub_details' aub.id %}">{{ aub.description }}</a></p>
</div>
<div class="col s12 m6">
<p>
<span class="item-text">
<i class="material-icons">person</i>
{{ aub.created_by }}
</span>
</p>
</div>
<div class="col s12 m4">
<p>
{% csrf_token %}
<button type="submit" name="allow"
class="waves-effect waves-light btn-flat btn-flat-large" title="Annehmen">
<i class="material-icons center green-text">check_circle</i>
</button>
<button type="submit" name="deny"
class="waves-effect waves-light btn-flat btn-flat-large" title="Ablehnen">
<i class="material-icons center red-text">not_interested</i>
</button>
</p>
</div
<div class="col s12 m2">
<p>
<span class="badge new {{ aub.status.style_classes }}">{{ aub.status.name }}</span>
</p>
</div>
</div>
</li>
{% endfor %}
</ul>
</main>
{% include 'partials/footer.html' %}
......@@ -13,5 +13,7 @@ urlpatterns = [
name='timetable_smart_plan_week'),
path('substitutions/', views.substitutions, name='timetable_substitutions'),
path('substitutions/<int:year>/<int:month>/<int:day>/', views.substitutions, name='timetable_substitutions_date'),
path('class.pdf', views.sub_pdf, name="timetable_substitutions_pdf")
path('class.pdf', views.sub_pdf, name="timetable_substitutions_pdf"),
path('hints', views.hints, name="timetable_hints"),
path('hints/add', views.add_hint, name="timetable_add_hint"),
]
......@@ -8,6 +8,7 @@ from django.shortcuts import render, redirect
from django.utils import timezone
from schoolapps.settings import WEEK_DAYS
from timetable.forms import HintForm
from timetable.pdf import generate_class_tex, generate_pdf
from untisconnect.plan import get_plan, TYPE_TEACHER, TYPE_CLASS, TYPE_ROOM, parse_lesson_times
......@@ -18,6 +19,8 @@ from userinformation import UserInformation
from schoolapps.settings import BASE_DIR
from .models import Hint
def get_all_context():
teachers = get_all_teachers()
classes = get_all_classes()
......@@ -205,7 +208,7 @@ def sub_pdf(request):
subs = get_substitutions_by_date(date)
sub_table = generate_sub_table(subs)
header_info = get_header_information(subs, date)
# Generate LaTeX
tex = generate_class_tex(sub_table, date, header_info)
......@@ -250,3 +253,23 @@ def substitutions(request, year=None, day=None, month=None):
}
return render(request, 'timetable/substitution.html', context)
@login_required
@permission_required("timetable.can_view_hint")
def hints(request):
return render(request, "timetable/hints.html")
@login_required
@permission_required('timetable.can_add_hint')
def add_hint(request):
if request.method == 'POST':
form = HintForm(request.POST)
if form.is_valid():
return redirect('aub_applied_for')
else:
form = HintForm()
return render(request, 'timetable/addhint.html', {'form': form, "martor": True})
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