Skip to content
Snippets Groups Projects
Commit a56d911b authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

fix unnecessarily required attributes 

place in event not required
track in AK not required
building and properties in room not required
parent abd6476b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
AKModel/locale/de_DE/LC_MESSAGES/django.po
+ 81
− 81
View file @ a56d911b
...@@ -2,7 +2,7 @@ msgid "" ...@@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-12 14:29+0000\n" "POT-Creation-Date: 2019-10-12 14:47+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -11,13 +11,13 @@ msgstr "" ...@@ -11,13 +11,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: availability.py:38 models.py:18 models.py:31 models.py:81 models.py:122 #: availability.py:38 models.py:19 models.py:32 models.py:82 models.py:123
#: models.py:139 models.py:159 #: models.py:141 models.py:161
msgid "Event" msgid "Event"
msgstr "Event" msgstr "Event"
#: availability.py:39 models.py:32 models.py:82 models.py:123 models.py:140 #: availability.py:39 models.py:33 models.py:83 models.py:124 models.py:142
#: models.py:160 #: models.py:162
msgid "Associated event" msgid "Associated event"
msgstr "Zugehöriges Event" msgstr "Zugehöriges Event"
...@@ -29,7 +29,7 @@ msgstr "Person" ...@@ -29,7 +29,7 @@ msgstr "Person"
msgid "Person whose availability this is" msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird" msgstr "Person deren Verfügbarkeit hier abgebildet wird"
#: availability.py:56 models.py:143 models.py:153 #: availability.py:56 models.py:145 models.py:155
msgid "Room" msgid "Room"
msgstr "Raum" msgstr "Raum"
...@@ -37,7 +37,7 @@ msgstr "Raum" ...@@ -37,7 +37,7 @@ msgstr "Raum"
msgid "Room whose availability this is" msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird" msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
#: availability.py:65 models.py:126 models.py:152 #: availability.py:65 models.py:127 models.py:154
msgid "AK" msgid "AK"
msgstr "AK" msgstr "AK"
...@@ -47,7 +47,7 @@ msgstr "AK" ...@@ -47,7 +47,7 @@ msgstr "AK"
msgid "AK whose availability this is" msgid "AK whose availability this is"
msgstr "Verfügbarkeiten" msgstr "Verfügbarkeiten"
#: availability.py:74 models.py:48 #: availability.py:74 models.py:49
msgid "AK Type" msgid "AK Type"
msgstr "AK Typ" msgstr "AK Typ"
...@@ -63,8 +63,8 @@ msgstr "Verfügbarkeit" ...@@ -63,8 +63,8 @@ msgstr "Verfügbarkeit"
msgid "Availabilities" msgid "Availabilities"
msgstr "Verfügbarkeiten" msgstr "Verfügbarkeiten"
#: models.py:10 models.py:44 models.py:56 models.py:68 models.py:79 #: models.py:10 models.py:45 models.py:57 models.py:69 models.py:80
#: models.py:93 models.py:133 #: models.py:94 models.py:134
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
...@@ -92,282 +92,282 @@ msgstr "Zeit zu der das Event endet" ...@@ -92,282 +92,282 @@ msgstr "Zeit zu der das Event endet"
msgid "Place" msgid "Place"
msgstr "Ort" msgstr "Ort"
#: models.py:14 #: models.py:15
msgid "City etc. the event takes place in" msgid "City etc. the event takes place in"
msgstr "Stadt o.ä. in der das Event stattfindet" msgstr "Stadt o.ä. in der das Event stattfindet"
#: models.py:15 #: models.py:16
msgid "Active State" msgid "Active State"
msgstr "Aktiver Status" msgstr "Aktiver Status"
#: models.py:15 #: models.py:16
msgid "Marks currently active events" msgid "Marks currently active events"
msgstr "Markiert aktuell aktive Events" msgstr "Markiert aktuell aktive Events"
#: models.py:19 #: models.py:20
msgid "Events" msgid "Events"
msgstr "Events" msgstr "Events"
#: models.py:26 #: models.py:27
msgid "Nickname" msgid "Nickname"
msgstr "Spitzname" msgstr "Spitzname"
#: models.py:26 #: models.py:27
msgid "Name to identify an AK owner by" msgid "Name to identify an AK owner by"
msgstr "Name durch den eine AK Leitung identifiziert wird" msgstr "Name durch den eine AK Leitung identifiziert wird"
#: models.py:27 #: models.py:28
msgid "E-Mail Address" msgid "E-Mail Address"
msgstr "E-Mail Adresse" msgstr "E-Mail Adresse"
#: models.py:27 #: models.py:28
msgid "Contact mail" msgid "Contact mail"
msgstr "Kontakt E-Mail" msgstr "Kontakt E-Mail"
#: models.py:28 #: models.py:29
msgid "Institution" msgid "Institution"
msgstr "Instutution" msgstr "Instutution"
#: models.py:28 #: models.py:29
msgid "Uni etc." msgid "Uni etc."
msgstr "Universität o.ä." msgstr "Universität o.ä."
#: models.py:29 models.py:101 #: models.py:30 models.py:102
msgid "Web Link" msgid "Web Link"
msgstr "Internet Link" msgstr "Internet Link"
#: models.py:29 #: models.py:30
msgid "Link to Homepage" msgid "Link to Homepage"
msgstr "Link zu Homepage oder Webseite" msgstr "Link zu Homepage oder Webseite"
#: models.py:35 #: models.py:36
msgid "AK Owner" msgid "AK Owner"
msgstr "AK Leitung" msgstr "AK Leitung"
#: models.py:36 #: models.py:37
msgid "AK Owners" msgid "AK Owners"
msgstr "AK Leitungen" msgstr "AK Leitungen"
#: models.py:44 #: models.py:45
msgid "Name of the AK Type" msgid "Name of the AK Type"
msgstr "Name des AK Typs" msgstr "Name des AK Typs"
#: models.py:45 models.py:57 #: models.py:46 models.py:58
msgid "Color" msgid "Color"
msgstr "Farbe" msgstr "Farbe"
#: models.py:45 models.py:57 #: models.py:46 models.py:58
msgid "Color for displaying" msgid "Color for displaying"
msgstr "Farbe für die Anzeige" msgstr "Farbe für die Anzeige"
#: models.py:49 #: models.py:50
msgid "AK Types" msgid "AK Types"
msgstr "AK Typen" msgstr "AK Typen"
#: models.py:56 #: models.py:57
msgid "Name of the AK Track" msgid "Name of the AK Track"
msgstr "Name des AK Tracks" msgstr "Name des AK Tracks"
#: models.py:60 #: models.py:61
msgid "AK Track" msgid "AK Track"
msgstr "AK Track" msgstr "AK Track"
#: models.py:61 #: models.py:62
msgid "AK Tracks" msgid "AK Tracks"
msgstr "AK Tracks" msgstr "AK Tracks"
#: models.py:68 #: models.py:69
msgid "Name of the AK Tag" msgid "Name of the AK Tag"
msgstr "Name das AK Tags" msgstr "Name das AK Tags"
#: models.py:71 #: models.py:72
msgid "AK Tag" msgid "AK Tag"
msgstr "AK Tag" msgstr "AK Tag"
#: models.py:72 #: models.py:73
msgid "AK Tags" msgid "AK Tags"
msgstr "AK Tags" msgstr "AK Tags"
#: models.py:79 #: models.py:80
msgid "Name of the Requirement" msgid "Name of the Requirement"
msgstr "Name der Anforderung" msgstr "Name der Anforderung"
#: models.py:85 #: models.py:86
msgid "AK Requirement" msgid "AK Requirement"
msgstr "AK Anforderung" msgstr "AK Anforderung"
#: models.py:86 #: models.py:87
msgid "AK Requirements" msgid "AK Requirements"
msgstr "AK Anforderungen" msgstr "AK Anforderungen"
#: models.py:93 #: models.py:94
msgid "Name of the AK" msgid "Name of the AK"
msgstr "Name des AKs" msgstr "Name des AKs"
#: models.py:94 #: models.py:95
msgid "Short Name" msgid "Short Name"
msgstr "Kurzer Name" msgstr "Kurzer Name"
#: models.py:95 #: models.py:96
msgid "Name displayed in the schedule" msgid "Name displayed in the schedule"
msgstr "Name zur Anzeige im AK Plan" msgstr "Name zur Anzeige im AK Plan"
#: models.py:96 #: models.py:97
msgid "Description" msgid "Description"
msgstr "Beschreibung" msgstr "Beschreibung"
#: models.py:96 #: models.py:97
msgid "Description of the AK" msgid "Description of the AK"
msgstr "Beschreibung des AKs" msgstr "Beschreibung des AKs"
#: models.py:98 #: models.py:99
msgid "Owners" msgid "Owners"
msgstr "Leitungen" msgstr "Leitungen"
#: models.py:98 #: models.py:99
msgid "Those organizing the AK" msgid "Those organizing the AK"
msgstr "Menschen, die den AK organisieren und halten" msgstr "Menschen, die den AK organisieren und halten"
#: models.py:101 #: models.py:102
msgid "Link to wiki page" msgid "Link to wiki page"
msgstr "Link zur Wiki Seite" msgstr "Link zur Wiki Seite"
#: models.py:103 #: models.py:104
msgid "Type" msgid "Type"
msgstr "Typ" msgstr "Typ"
#: models.py:103 #: models.py:104
msgid "Type of the AK" msgid "Type of the AK"
msgstr "Typ des AKs" msgstr "Typ des AKs"
#: models.py:104 #: models.py:105
msgid "Tags" msgid "Tags"
msgstr "Tags" msgstr "Tags"
#: models.py:104 #: models.py:105
msgid "Tags provided by owners" msgid "Tags provided by owners"
msgstr "Tags, die durch die AK Leitung vergeben wurden" msgstr "Tags, die durch die AK Leitung vergeben wurden"
#: models.py:105 #: models.py:106
msgid "Track" msgid "Track"
msgstr "Track" msgstr "Track"
#: models.py:106 #: models.py:107
msgid "Track the AK belongs to" msgid "Track the AK belongs to"
msgstr "Track zu dem der AK gehört" msgstr "Track zu dem der AK gehört"
#: models.py:108 #: models.py:109
msgid "Resolution Intention" msgid "Resolution Intention"
msgstr "Resolutionsabsicht" msgstr "Resolutionsabsicht"
#: models.py:109 #: models.py:110
msgid "Intends to submit a resolution" msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen" msgstr "Beabsichtigt eine Resolution einzureichen"
#: models.py:110 #: models.py:111
msgid "Requirements" msgid "Requirements"
msgstr "Anforderungen" msgstr "Anforderungen"
#: models.py:111 #: models.py:112
msgid "AK's Requirements" msgid "AK's Requirements"
msgstr "Anforderungen des AKs" msgstr "Anforderungen des AKs"
#: models.py:113 #: models.py:114
msgid "Conflicting AKs" msgid "Conflicting AKs"
msgstr "AK Konflikte" msgstr "AK Konflikte"
#: models.py:114 #: models.py:115
msgid "AKs that conflict and thus must not take place at the same time" msgid "AKs that conflict and thus must not take place at the same time"
msgstr "AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen" msgstr "AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
#: models.py:115 #: models.py:116
msgid "Prerequisite AKs" msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs" msgstr "Vorausgesetzte AKs"
#: models.py:116 #: models.py:117
msgid "AKs that should precede this AK in the schedule" msgid "AKs that should precede this AK in the schedule"
msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen" msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen"
#: models.py:118 #: models.py:119
msgid "Internal Notes" msgid "Internal Notes"
msgstr "Interne Notizen" msgstr "Interne Notizen"
#: models.py:118 #: models.py:119
msgid "Notes to organizers" msgid "Notes to organizers"
msgstr "Notizen an die Organisator*innen" msgstr "Notizen an die Organisator*innen"
#: models.py:120 #: models.py:121
msgid "Interest" msgid "Interest"
msgstr "Interesse" msgstr "Interesse"
#: models.py:120 #: models.py:121
msgid "Expected number of people" msgid "Expected number of people"
msgstr "Erwartete Personenzahl" msgstr "Erwartete Personenzahl"
#: models.py:127 #: models.py:128
msgid "AKs" msgid "AKs"
msgstr "AKs" msgstr "AKs"
#: models.py:133 #: models.py:134
msgid "Name or number of the room" msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums" msgstr "Name oder Nummer des Raums"
#: models.py:134 #: models.py:135
msgid "Building" msgid "Building"
msgstr "Gebäude" msgstr "Gebäude"
#: models.py:134 #: models.py:136
msgid "Name/number of the building" msgid "Name or number of the building"
msgstr "Name oder Nummer des Gebäudes" msgstr "Name oder Nummer des Gebäudes"
#: models.py:135 #: models.py:137
msgid "Capacity" msgid "Capacity"
msgstr "Kapazität" msgstr "Kapazität"
#: models.py:135 #: models.py:137
msgid "Maximum number of people" msgid "Maximum number of people"
msgstr "Maximale Personenzahl" msgstr "Maximale Personenzahl"
#: models.py:136 #: models.py:138
msgid "Properties" msgid "Properties"
msgstr "Eigenschaften" msgstr "Eigenschaften"
#: models.py:137 #: models.py:139
msgid "AK requirements fulfilled by the room" msgid "AK requirements fulfilled by the room"
msgstr "AK Anforderungen, die dieser Raum erfüllt" msgstr "AK Anforderungen, die dieser Raum erfüllt"
#: models.py:144 #: models.py:146
msgid "Rooms" msgid "Rooms"
msgstr "Räume" msgstr "Räume"
#: models.py:152 #: models.py:154
msgid "AK being mapped" msgid "AK being mapped"
msgstr "AK, der zugeordnet wird" msgstr "AK, der zugeordnet wird"
#: models.py:154 #: models.py:156
msgid "Room the AK will take place in" msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet" msgstr "Raum in dem der AK stattfindet"
#: models.py:155 #: models.py:157
msgid "Slot Begin" msgid "Slot Begin"
msgstr "Beginn des Slots" msgstr "Beginn des Slots"
#: models.py:155 #: models.py:157
msgid "Time and date the slot begins" msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt" msgstr "Zeit und Datum zu der der AK beginnt"
#: models.py:156 #: models.py:158
msgid "Duration" msgid "Duration"
msgstr "Dauer" msgstr "Dauer"
#: models.py:157 #: models.py:159
msgid "Length in hours" msgid "Length in hours"
msgstr "Länge in Stunden" msgstr "Länge in Stunden"
#: models.py:163 #: models.py:165
msgid "AK Slot" msgid "AK Slot"
msgstr "AK Slot" msgstr "AK Slot"
#: models.py:164 #: models.py:166
msgid "AK Slots" msgid "AK Slots"
msgstr "AK Slot" msgstr "AK Slot"
AKModel/migrations/0008_akmodel_reuired_attributes.py 0 → 100644
+ 38
− 0
View file @ a56d911b
# Generated by Django 2.2.6 on 2019-10-12 14:50
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0007_availability'),
]
operations = [
migrations.AlterField(
model_name='ak',
name='track',
field=models.ForeignKey(blank=True, help_text='Track the AK belongs to', null=True,
on_delete=django.db.models.deletion.SET_NULL, to='AKModel.AKTrack',
verbose_name='Track'),
),
migrations.AlterField(
model_name='event',
name='place',
field=models.CharField(blank=True, help_text='City etc. the event takes place in', max_length=128,
verbose_name='Place'),
),
migrations.AlterField(
model_name='room',
name='building',
field=models.CharField(blank=True, help_text='Name or number of the building', max_length=256,
verbose_name='Building'),
),
migrations.AlterField(
model_name='room',
name='properties',
field=models.ManyToManyField(blank=True, help_text='AK requirements fulfilled by the room',
to='AKModel.AKRequirement', verbose_name='Properties'),
),
]
AKModel/models.py
+ 6
− 4
View file @ a56d911b
...@@ -11,7 +11,8 @@ class Event(models.Model): ...@@ -11,7 +11,8 @@ class Event(models.Model):
help_text=_('Name or iteration of the event')) help_text=_('Name or iteration of the event'))
start = models.DateTimeField(verbose_name=_('Start'), help_text=_('Time the event begins')) start = models.DateTimeField(verbose_name=_('Start'), help_text=_('Time the event begins'))
end = models.DateTimeField(verbose_name=_('End'), help_text=_('Time the event ends')) end = models.DateTimeField(verbose_name=_('End'), help_text=_('Time the event ends'))
place = models.CharField(max_length=128, verbose_name=_('Place'), help_text=_('City etc. the event takes place in')) place = models.CharField(max_length=128, blank=True, verbose_name=_('Place'),
help_text=_('City etc. the event takes place in'))
active = models.BooleanField(verbose_name=_('Active State'), help_text=_('Marks currently active events')) active = models.BooleanField(verbose_name=_('Active State'), help_text=_('Marks currently active events'))
class Meta: class Meta:
...@@ -102,7 +103,7 @@ class AK(models.Model): ...@@ -102,7 +103,7 @@ class AK(models.Model):
type = models.ForeignKey(to=AKType, on_delete=models.PROTECT, verbose_name=_('Type'), help_text=_('Type of the AK')) type = models.ForeignKey(to=AKType, on_delete=models.PROTECT, verbose_name=_('Type'), help_text=_('Type of the AK'))
tags = models.ManyToManyField(to=AKTag, blank=True, verbose_name=_('Tags'), help_text=_('Tags provided by owners')) tags = models.ManyToManyField(to=AKTag, blank=True, verbose_name=_('Tags'), help_text=_('Tags provided by owners'))
track = models.ForeignKey(to=AKTrack, on_delete=models.SET_NULL, null=True, verbose_name=_('Track'), track = models.ForeignKey(to=AKTrack, blank=True, on_delete=models.SET_NULL, null=True, verbose_name=_('Track'),
help_text=_('Track the AK belongs to')) help_text=_('Track the AK belongs to'))
reso = models.BooleanField(verbose_name=_('Resolution Intention'), default=False, reso = models.BooleanField(verbose_name=_('Resolution Intention'), default=False,
...@@ -131,9 +132,10 @@ class Room(models.Model): ...@@ -131,9 +132,10 @@ class Room(models.Model):
""" A room describes where an AK can be held. """ A room describes where an AK can be held.
""" """
name = models.CharField(max_length=64, verbose_name=_('Name'), help_text=_('Name or number of the room')) name = models.CharField(max_length=64, verbose_name=_('Name'), help_text=_('Name or number of the room'))
building = models.CharField(max_length=256, verbose_name=_('Building'), help_text=_('Name/number of the building')) building = models.CharField(max_length=256, blank=True, verbose_name=_('Building'),
help_text=_('Name or number of the building'))
capacity = models.IntegerField(verbose_name=_('Capacity'), help_text=_('Maximum number of people')) capacity = models.IntegerField(verbose_name=_('Capacity'), help_text=_('Maximum number of people'))
properties = models.ManyToManyField(to=AKRequirement, verbose_name=_('Properties'), properties = models.ManyToManyField(to=AKRequirement, blank=True, verbose_name=_('Properties'),
help_text=_('AK requirements fulfilled by the room')) help_text=_('AK requirements fulfilled by the room'))
event = models.ForeignKey(to=Event, on_delete=models.CASCADE, verbose_name=_('Event'), event = models.ForeignKey(to=Event, on_delete=models.CASCADE, verbose_name=_('Event'),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment