From e45df0d8f842984840770c44f2f58fb1907c54bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@cs.tu-darmstadt.de>
Date: Thu, 17 Oct 2019 16:23:45 +0200
Subject: [PATCH] Create submission overview page and improve ak model access
Create html template
Add translation
Add property for easy access to list of AK owners to AK model
---
AKModel/models.py | 4 ++
.../locale/de_DE/LC_MESSAGES/django.po | 43 ++++++++++++++++++
.../AKSubmission/submission_overview.html | 45 +++++++++++++++++++
3 files changed, 92 insertions(+)
create mode 100644 AKSubmission/locale/de_DE/LC_MESSAGES/django.po
create mode 100644 AKSubmission/templates/AKSubmission/submission_overview.html
diff --git a/AKModel/models.py b/AKModel/models.py
index 6936fc0d..69478325 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -153,6 +153,10 @@ class AK(models.Model):
return self.short_name
return self.name
+ @property
+ def owners_list(self):
+ return ", ".join(str(owner) for owner in self.owners.all())
+
class Room(models.Model):
""" A room describes where an AK can be held.
diff --git a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
new file mode 100644
index 00000000..1a7d279c
--- /dev/null
+++ b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-10-17 14:14+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/AKSubmission/submission_overview.html:9
+#: templates/AKSubmission/submission_overview.html:13
+msgid "AK Submission"
+msgstr "AK-Eintragung"
+
+#: templates/AKSubmission/submission_overview.html:18
+msgid "Submit"
+msgstr "Eintragen"
+
+#: templates/AKSubmission/submission_overview.html:24
+msgid "Current AKs"
+msgstr "Aktuelle AKs"
+
+#: templates/AKSubmission/submission_overview.html:27
+msgid "Name"
+msgstr "Name"
+
+#: templates/AKSubmission/submission_overview.html:27
+msgid "Who?"
+msgstr "Wer?"
+
+#: templates/AKSubmission/submission_overview.html:27
+msgid "Tags"
+msgstr "Tags"
diff --git a/AKSubmission/templates/AKSubmission/submission_overview.html b/AKSubmission/templates/AKSubmission/submission_overview.html
new file mode 100644
index 00000000..ca28640c
--- /dev/null
+++ b/AKSubmission/templates/AKSubmission/submission_overview.html
@@ -0,0 +1,45 @@
+{% extends 'base.html' %}
+
+{% load i18n %}
+{% load fontawesome %}
+
+{% block breadcrumbs %}
+ <li class="breadcrumb-item"><a href="#">AKPlanning</a></li>
+ <li class="breadcrumb-item"><a href="#">{{ event.slug }}</a></li>
+ <li class="breadcrumb-item active">{% trans "AK Submission" %}</li>
+{% endblock %}
+
+{% block content %}
+ <h1>{{ event.name }}: {% trans "AK Submission" %}</h1>
+
+ Lorem ipsum...
+
+ <div class="jumbotron" style="margin-top:20px;">
+ <h2>{% trans "Submit" %}</h2>
+ <a href="#" class="btn btn-primary">Neuer AK</a>
+ <a href="#" class="btn btn-info">Neuer AK-Wunsch</a>
+ </div>
+
+
+ <h2>{% trans "Current AKs" %}</h2>
+
+ <table class="table table-striped">
+ <tr><th>{% trans "Name" %}</th><th>{% trans "Who?" %}</th><th>{% trans "Tags" %}</th><th></th></tr>
+
+ {% for ak in AKs %}
+ <tr>
+ <td>{{ ak.name }}</td>
+ <td>{{ ak.owners_list }}</td>
+ <td>
+ {% for tag in ak.tags.all %}
+ <span class="badge badge-info">{{ tag }}</span>
+ {% endfor %}
+ </td>
+ <td>
+ <a href="#" class="btn btn-primary">{% fontawesome_icon 'info' %}</a>
+ <a href="#" class="btn btn-success">{% fontawesome_icon 'edit' %}</a>
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+{% endblock %}
--
GitLab