nabujena/FallenBirdyForm
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

gender email phone

Browse source
This commit is contained in:
gnuter3000 2023-06-26 18:39:32 +02:00
parent aeff66af6c
commit f073961e35
11 changed files with 20 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bird/migrations/0001_initial.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.2.2 on 2023-06-22 15:25
# Generated by Django 4.2.2 on 2023-06-26 15:48
from django.conf import settings
from django.db import migrations, models
@ -11,8 +11,8 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
("rescuer", "0001_initial"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("rescuer", "0001_initial"),
]
operations = [

2
bird/templates/bird/bird_all.html
View file

@ -48,9 +48,9 @@
<label for="rescuer" class="form-label mt-3">Wählen Sie einen <strong>bereits angelegten</strong>
Retter aus oder legen Sie einen <strong>neuen</strong> Retter an:</label>
<select id="rescuer" class="form-select" name="rescuer_id">
{% for rescuer in rescuer_modal %}
<option value="new_rescuer"><strong>neuen
Retter anlegen</strong></option>
{% for rescuer in rescuer_modal %}
<option value={{rescuer.id}}>
{{rescuer.first_name}} {{rescuer.last_name}},
{{rescuer.street}} {{rescuer.street_number}},

1
fixtures/data.json
View file

File diff suppressed because one or more lines are too long

3
rescuer/admin.py
View file

@ -12,6 +12,7 @@ class CustomerAdmin(admin.ModelAdmin):
"street",
"street_number",
"city",
"state",
"email",
"phone",
"user",
]

9
rescuer/forms.py
View file

@ -10,29 +10,24 @@ class DateInput(forms.DateInput):
class RescuerForm(forms.ModelForm):
class Meta:
widgets = {"date_of_birth": DateInput(format="%Y-%m-%d")}
model = Rescuer
fields = [
"gender",
"first_name",
"last_name",
"street",
"street_number",
"zip_code",
"city",
"state",
"date_of_birth",
"email",
"phone",
]
labels = {
"gender": _("Geschlecht"),
"first_name": _("Vorname"),
"last_name": _("Nachname"),
"date_of_birth": _("Geburtstag"),
"street": _("Straße"),
"street_number": _("Hausnummer"),
"zip_code": _("Postleitzahl"),
"city": _("Stadt"),
"state": _("Land"),
"email": _("Email"),
"phone": _("Telefon"),
}

21
rescuer/migrations/0001_initial.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.2.2 on 2023-06-22 15:25
# Generated by Django 4.2.2 on 2023-06-26 15:48
from django.conf import settings
from django.db import migrations, models
@ -27,31 +27,14 @@ class Migration(migrations.Migration):
serialize=False,
),
),
(
"gender",
models.CharField(
choices=[
("Frau", "Frau"),
("Herr", "Herr"),
("Divers", "Divers"),
],
max_length=10,
),
),
("first_name", models.CharField(max_length=200)),
("last_name", models.CharField(max_length=200)),
("street", models.CharField(max_length=200)),
("street_number", models.CharField(max_length=20)),
("city", models.CharField(max_length=200)),
("zip_code", models.CharField(max_length=200)),
(
"state",
models.CharField(
choices=[("Deutschland", "Deutschland")], max_length=200
),
),
("date_of_birth", models.DateField()),
("email", models.EmailField(max_length=200)),
("phone", models.EmailField(max_length=200)),
(
"user",
models.ForeignKey(

10
rescuer/models.py
View file

@ -4,25 +4,17 @@ from uuid import uuid4
from django.conf import settings
from django.db import models
STATE_CHOICES = [
("Deutschland", "Deutschland"),
]
GENDER_CHOICES = [("Frau", "Frau"), ("Herr", "Herr"), ("Divers", "Divers")]
class Rescuer(models.Model):
id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
gender = models.CharField(max_length=10, choices=GENDER_CHOICES)
first_name = models.CharField(max_length=200)
last_name = models.CharField(max_length=200)
street = models.CharField(max_length=200)
street_number = models.CharField(max_length=20)
city = models.CharField(max_length=200)
zip_code = models.CharField(max_length=200)
state = models.CharField(max_length=200, choices=STATE_CHOICES)
date_of_birth = models.DateField()
email = models.EmailField(max_length=200)
phone = models.CharField(max_length=200)
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
def __str__(self) -> str:

4
rescuer/templates/rescuer/rescuer_all.html
View file

@ -48,6 +48,8 @@
<th>Straße</th>
<th>PLZ</th>
<th>Ort</th>
<th>Email</th>
<th>Phone</th>
</tr>
</thead>
<tbody>
@ -60,6 +62,8 @@
<td>{{ rescuer.street }} {{ rescuer.street_number }}</td>
<td>{{ rescuer.zip_code }}</td>
<td>{{ rescuer.city }}</td>
<td>{{ rescuer.email }}</td>
<td>{{ rescuer.phone }}</td>
</tr>
{% endfor %}
</tbody>

6
rescuer/templates/rescuer/rescuer_create.html
View file

@ -7,16 +7,14 @@
<form method="post" class="form-horizontal">
{% csrf_token %}
<div class="row">
<div class="col-md-12 col-lg-12">{{ form.gender|as_crispy_field }}</div>
<div class="col-md-12 col-lg-6">{{ form.first_name|as_crispy_field }}</div>
<div class="col-md-12 col-lg-6">{{ form.last_name|as_crispy_field }}</div>
<div class="col-md-12 col-lg-8">{{ form.email|as_crispy_field }}</div>
<div class="col-md-12 col-lg-4">{{ form.date_of_birth|as_crispy_field }}</div>
<div class="col-md-12 col-lg-8">{{ form.street|as_crispy_field }}</div>
<div class="col-md-12 col-lg-4">{{ form.street_number|as_crispy_field }}</div>
<div class="col-md-12 col-lg-8">{{ form.city|as_crispy_field }}</div>
<div class="col-md-12 col-lg-4">{{ form.zip_code|as_crispy_field }}</div>
<div class="col-md-12 col-lg-12">{{ form.state|as_crispy_field }}</div>
<div class="col-md-12 col-lg-6">{{ form.email|as_crispy_field }}</div>
<div class="col-md-12 col-lg-6">{{ form.phone|as_crispy_field }}</div>
</div>
<a href="{% url 'bird_all' %}" class="btn btn-danger">Abbruch</a>
<button class="btn btn-primary" type="submit">Speichern</button>

6
rescuer/templates/rescuer/rescuer_edit.html
View file

@ -8,21 +8,19 @@
<fieldset>
{% csrf_token %}
<div class="row">
<div class="col-12">{{ form.gender|as_crispy_field }}</div>
<div class="col-6">{{ form.first_name|as_crispy_field }}</div>
<div class="col-6">{{ form.last_name|as_crispy_field }}</div>
<div class="col-8">{{ form.email|as_crispy_field }}</div>
<div class="col-4">{{ form.date_of_birth|as_crispy_field }}</div>
<div class="col-8">{{ form.phone|as_crispy_field }}</div>
<div class="col-8">{{ form.street|as_crispy_field }}</div>
<div class="col-4">{{ form.street_number|as_crispy_field }}</div>
<div class="col-8">{{ form.city|as_crispy_field }}</div>
<div class="col-4">{{ form.zip_code|as_crispy_field }}</div>
<div class="col-12">{{ form.state|as_crispy_field }}</div>
</div>
<a href="{% url 'rescuer_all' %}" class="btn btn-secondary">Abbruch</a>
<button class="btn btn-primary" type="submit">Speichern</button>
</fieldset>
</form
</form>
</div>
</div>

3
rescuer/templates/rescuer/rescuer_single.html
View file

@ -12,7 +12,8 @@
<p class="card-text">
{{rescuer.city}} {{rescuer.street}}<br>
{{rescuer.zip_code}}<br>
{{rescuer.state}}<br>
{{rescuer.email}}<br>
{{rescuer.phone}}<br>
</p>
</div>
</div>