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

Solve cache problem (bad solution) | Some design changes

parent 7d7572fc
No related branches found
No related tags found
No related merge requests found
from datetime import date
from django.db import models
from django.db.models.signals import post_save
from django.dispatch import receiver
from martor.models import MartorField
from timetable.m2l import convert_markdown_2_latex
......@@ -64,6 +66,9 @@ class Hint(models.Model):
# Convert LaTeX already when saving as cache because then is no need to do it later > performance savings
self.text_as_latex = convert_markdown_2_latex(self.text)
super(Hint, self).save(force_insert=force_insert, force_update=force_update, using=using,
update_fields=update_fields)
# Format classes already > cache, too
self.classes_formatted = format_classes(self.classes.all())
......
......@@ -3,6 +3,8 @@
{% load martortags %}
<main>
<h4>Hinweise</h4>
{% if msg %}
<div class="alert success">
<p>
......@@ -12,23 +14,27 @@
</p>
</div>
{% endif %}
<h4>Hinweise</h4>
<div class="card">
<form method="GET" class="card-content">
<a href="{% url 'timetable_add_hint' %}" class="waves-effect waves-light btn green">
<i class="material-icons left">add</i>
Neuen Hinweis erstellen
</a>
<div class="row no-margin">
<div class="col s12 m4">
<a href="{% url 'timetable_add_hint' %}" class="waves-effect waves-light btn green">
<i class="material-icons left">add</i>
Neuen Hinweis erstellen
</a>
</div>
<div class="col s12 m8 right-align">
<button type="submit" class="waves-effect waves-green btn-flat">
<i class="material-icons left">refresh</i> Filter aktualisieren
</button>
<a class="waves-effect waves-red btn-flat " href="{% url "timetable_hints" %}">
<i class="material-icons left">clear</i> Filter entfernen
</a>
</div>
</div>
{% form form=f.form %}
{% endform %}
<button type="submit" class="waves-effect waves-light btn">
<i class="material-icons left">refresh</i> Filter aktualisieren
</button>
<a class="waves-effect waves-light btn red" href="{% url "timetable_hints" %}">
<i class="material-icons left">clear</i> Filter entfernen
</a>
</form>
</div>
......@@ -40,14 +46,10 @@
<div class="col s10">
<strong>{{ hint.from_date }} &mdash; {{ hint.to_date }}</strong> für
<strong>
{% for class in hint.classes.all %}
{{ class }},
{% endfor %}
{{ hint.classes_formatted }}
</strong>
{% if hint.teachers %}
<span class="badge new green no-float no-margin">Lehrkräfte</span>
{% else %}
<span class="badge new red no-float no-margin">Lehrkräfte</span>
{% endif %}
</div>
<div class="col s2">
......@@ -78,13 +80,6 @@
</li>
{% endfor %}
</ul>
<p>
<span class="badge new green no-float no-margin">Lehrkräfte</span>
Lehrkräfte sehen den Hinweis &nbsp;&nbsp;
<span class="badge new red no-float no-margin">Lehrkräfte</span>
Lehrkräfte sehen den Hinweis
<strong>nicht</strong>
</p>
</main>
{% include 'partials/footer.html' %}
......@@ -10,6 +10,7 @@
\usepackage{fancyhdr}
\usepackage{graphicx}
\usepackage{longtable}
\usepackage{booktabs}
\usepackage{multirow}
\usepackage{color, colortbl}
\usepackage[colorlinks, linkcolor = black, citecolor = black, filecolor = black, urlcolor = black]{hyperref}
......
......@@ -372,7 +372,8 @@ def add_hint(request):
form = HintForm(request.POST)
if form.is_valid():
form.save()
i = form.save()
i.save()
# return redirect('timetable_add_hint')
form = HintForm()
msg = "success"
......@@ -390,7 +391,8 @@ def edit_hint(request, id):
form = HintForm(request.POST, instance=hint)
if form.is_valid():
form.save()
i = form.save()
i.save()
request.session["msg"] = "success_edit"
return redirect('timetable_hints')
else:
......
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