E-Mail Finder/Retter entfernen #14

aviary/migrations/0002_alter_aviary_condition.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.2 on 2023-07-08 20:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("aviary", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="aviary",
+            name="condition",
+            field=models.CharField(
+                choices=[
+                    ("Offen", "Offen"),
+                    ("Geschlossen", "Geschlossen"),
+                    ("Gesperrt", "Geshlossem"),
+                ],
+                max_length=256,
+                verbose_name="Zustand",
+            ),
+        ),
+    ]

bird/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-07-07 10:41
+# Generated by Django 4.2.2 on 2023-07-08 20:30
 
 from django.conf import settings
 from django.db import migrations, models
@@ -11,9 +11,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("aviary", "0001_initial"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("rescuer", "0001_initial"),
+        ("aviary", "0002_alter_aviary_condition"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -32,7 +32,7 @@ class Migration(migrations.Migration):
                 ("name", models.CharField(max_length=256, unique=True)),
                 (
                     "description",
-                    models.CharField(max_length=512, verbose_name="Hilfetext"),
+                    models.CharField(max_length=4096, verbose_name="Hilfetext"),
                 ),
             ],
             options={

rescuer/admin.py

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

rescuer/forms.py

@@ -18,7 +18,6 @@ class RescuerForm(forms.ModelForm):
             "street_number",
             "zip_code",
             "city",
-            "email",
             "phone",
         ]
         labels = {
@@ -28,6 +27,5 @@ class RescuerForm(forms.ModelForm):
             "street_number": _("Hausnummer"),
             "zip_code": _("Postleitzahl"),
             "city": _("Stadt"),
-            "email": _("Email"),
             "phone": _("Telefon"),
         }

rescuer/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-07-04 16:19
+# Generated by Django 4.2.2 on 2023-07-08 20:30
 
 from django.conf import settings
 from django.db import migrations, models
@@ -33,7 +33,6 @@ class Migration(migrations.Migration):
                 ("street_number", models.CharField(max_length=20)),
                 ("city", models.CharField(max_length=200)),
                 ("zip_code", models.CharField(max_length=200)),
-                ("email", models.EmailField(max_length=200)),
                 ("phone", models.CharField(max_length=200)),
                 (
                     "user",

rescuer/models.py

@@ -13,7 +13,6 @@ class Rescuer(models.Model):
     street_number = models.CharField(max_length=20)
     city = models.CharField(max_length=200)
     zip_code = models.CharField(max_length=200)
-    email = models.EmailField(max_length=200)
     phone = models.CharField(max_length=200)
     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
 

rescuer/templates/rescuer/rescuer_all.html

@@ -48,7 +48,6 @@
         <th>Straße</th>
         <th>PLZ</th>
         <th>Ort</th>
-        <th>Email</th>
         <th>Phone</th>
       </tr>
     </thead>
@@ -62,7 +61,6 @@
         <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 %}

rescuer/templates/rescuer/rescuer_create.html

@@ -13,7 +13,6 @@
                 <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-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>

rescuer/templates/rescuer/rescuer_edit.html

@@ -10,7 +10,6 @@
         <div class="row">
           <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-6">{{ form.email|as_crispy_field }}</div>
           <div class="col-6">{{ 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>

rescuer/templates/rescuer/rescuer_single.html

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