3 Eingabefelder vorhanden

UGSdjangoProject/UGSdjangoProject/settings.py

@@ -105,7 +105,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/5.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'de-de'
 
 TIME_ZONE = 'UTC'
 
@@ -125,3 +125,5 @@ STATIC_URL = 'static/'
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
+
+#DATE_INPUT_FORMATS = ['%d-%m-%Y']

UGSdjangoProject/ugssim/form.py

@@ -1,17 +1,48 @@
 from django import forms
+from django.forms import DateInput
+
 from .models import *
 
+from django import forms
+
+''''
+class AddressForm(forms.Form):
+    vorname = forms.CharField(max_length=255)
+    nachname = forms.CharField(max_length=255)
+    geburtstag = forms.DateField(widget=forms.SelectDateWidget)
+    street = forms.CharField(max_length=255)
+    hausnummer = forms.CharField(max_length=10)
+    postleitzahl = forms.CharField(max_length=5)
+    
+'''
+
 
 class AddressForm(forms.ModelForm):
     class Meta:
         model = Address
-        fields = ['vorname', 'nachname', 'geburtstag', 'street', 'hausnummer', 'postleitzahl']
+        fields = '__all__'
+        # noinspection PyRedundantParentheses
+        widgets = {
+            'geburtstag': forms.DateInput(
+                format=('%Y-%m-%d'),
+                attrs={'class': 'form-control',
+                       'placeholder': 'Wähle ein Datum',
+                       'type': 'date'
+                       }
+            )
+        }
+
+    def is_valid(self):
+        return True
 
 
 class SummaryForm(forms.ModelForm):
     class Meta:
         model = Summary
         fields = '__all__'
+        widgets = {
+            'text': forms.Textarea(attrs={'rows': 10, 'cols': 30})
+        }
 
 
 class SalesAreaTypeForm(forms.ModelForm):

UGSdjangoProject/ugssim/migrations/0001_initial.py

@@ -1,5 +1,6 @@
-# Generated by Django 5.0.1 on 2024-03-06 10:00
+# Generated by Django 5.0.1 on 2024-03-13 12:59
 
+import django.db.models.deletion
 from django.db import migrations, models
 
 
@@ -18,9 +19,45 @@ class Migration(migrations.Migration):
                 ('vorname', models.CharField(max_length=255)),
                 ('nachname', models.CharField(max_length=255)),
                 ('geburtstag', models.DateField()),
-                ('street', models.CharField(max_length=255)),
+                ('street', models.CharField(max_length=10)),
                 ('hausnummer', models.CharField(max_length=255)),
-                ('postleitzahl', models.PositiveIntegerField()),
+                ('postleitzahl', models.CharField(max_length=5)),
             ],
         ),
+        migrations.CreateModel(
+            name='SalesArea',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='SalesAreaType',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Summary',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField(max_length=2000)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CompanyData',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('website', models.URLField()),
+                ('startDate', models.DateField()),
+                ('salesArea', models.ManyToManyField(related_name='+', to='ugssim.salesarea')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='salesarea',
+            name='type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to='ugssim.salesareatype'),
+        ),
     ]

UGSdjangoProject/ugssim/migrations/0001_initial.py.org

@@ -0,0 +1,26 @@
+# Generated by Django 5.0.1 on 2024-03-06 10:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Address',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('vorname', models.CharField(max_length=255)),
+                ('nachname', models.CharField(max_length=255)),
+                ('geburtstag', models.DateField()),
+                ('street', models.CharField(max_length=255)),
+                ('hausnummer', models.CharField(max_length=255)),
+                ('postleitzahl', models.PositiveIntegerField()),
+            ],
+        ),
+    ]

UGSdjangoProject/ugssim/migrations/0002_salesarea_salesareatype_summary_companydata_and_more.py.org

@@ -0,0 +1,50 @@
+# Generated by Django 5.0.1 on 2024-03-12 16:10
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ugssim', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SalesArea',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='SalesAreaType',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Summary',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField(max_length=2000)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CompanyData',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('website', models.URLField()),
+                ('startDate', models.DateField()),
+                ('salesArea', models.ManyToManyField(related_name='+', to='ugssim.salesarea')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='salesarea',
+            name='type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to='ugssim.salesareatype'),
+        ),
+    ]

UGSdjangoProject/ugssim/migrations/0003_alter_address_postleitzahl_alter_address_street.py.org

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.1 on 2024-03-13 10:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ugssim', '0002_salesarea_salesareatype_summary_companydata_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='address',
+            name='postleitzahl',
+            field=models.CharField(max_length=5),
+        ),
+        migrations.AlterField(
+            model_name='address',
+            name='street',
+            field=models.CharField(max_length=10),
+        ),
+    ]

UGSdjangoProject/ugssim/models.py

@@ -1,24 +1,29 @@
+from datetime import date
+
 from django import forms
 from django.db import models
 
+
 # Create your models here.
 class Address(models.Model):
     vorname = models.CharField(max_length=255)
     nachname = models.CharField(max_length=255)
-    geburtstag = models.DateField()
+    geburtstag: date = models.DateField()
-    street = models.CharField(max_length=255)
+    street = models.CharField(max_length=10)
     hausnummer = models.CharField(max_length=255)
-    postleitzahl = models.PositiveIntegerField()
+    postleitzahl = models.CharField(max_length=5)
 
     def __str__(self):
         return f'{self.vorname} {self.nachname} lives at {self.street} {self.hausnummer}, {self.postleitzahl}'
 
+
 class Summary(models.Model):
     text = models.TextField(max_length=2000)
 
     def __str__(self):
         return self.text
 
+
 class SalesAreaType(models.Model):
     title = models.CharField(max_length=255)
 
@@ -32,5 +37,4 @@ class CompanyData(models.Model):
     title = models.CharField(max_length=255)
     website = models.URLField(max_length=200)
     startDate = models.DateField()
-    salesArea = models.ManyToManyField(SalesArea, related_name='+')
+    #salesArea = models.ManyToManyField(SalesArea, related_name='+')
-

UGSdjangoProject/ugssim/templates/planungsparameter/companydata.html

@@ -1,5 +1,4 @@
     <div class="container">
-        <form method="post" class="form-group">
             {% csrf_token %}
             {% for field in companyDataForm %}
             <div class="form-group">
@@ -7,6 +6,5 @@
                 <input class="form-control" type="{{ field.field.widget.input_type }}" name="{{ field.html_name }}" id="{{ field.auto_id }}" value="{{ field.value|default_if_none:"" }}" >
             </div>
             {% endfor %}
-            <button type="submit" class="btn btn-primary">Submit</button>
+            <button type="submit" class="btn btn-primary" name="companyDataButton">Submit</button>
-        </form>
     </div>

UGSdjangoProject/ugssim/templates/planungsparameter/mandantendaten.html

@@ -1,12 +1,19 @@
     <div class="container">
-        <form method="post" class="form-group">
+
+       <!-- <form method="post" class="form-group">-->
             {% csrf_token %}
             {% for field in addressForm %}
             <div class="form-group">
                 <label for="{{ field.id_for_label }}">{{ field.label }}</label>
-                <input class="form-control" type="{{ field.field.widget.input_type }}" name="{{ field.html_name }}" id="{{ field.auto_id }}" value="{{ field.value|default_if_none:"" }}" >
+                <input class="form-control" 
+                       type="{{ field.field.widget.input_type }}" 
+                       name="{{ field.html_name }}" 
+                       id="{{ field.auto_id }}" 
+                       value="{{ field.value|default_if_none:"" }}"
+                >
             </div>
             {% endfor %}
-            <button type="submit" class="btn btn-primary">Submit</button>
+           
-        </form>
+            <button type="submit" class="btn btn-primary" name="addressButton">Submit</button>
+       <!--</form> -->
     </div>

UGSdjangoProject/ugssim/templates/planungsparameter/planungsparameter.html

@@ -1,14 +1,16 @@
 {% extends 'ugssim/ugssim.html' %}
 {% block content %}
-    <div class="accordion" id="accordionExample">
+    <form method="post" class="form-group">
+        <div class="accordion" id="accordionPlanning">
             <div class="accordion-item">
                 <h2 class="accordion-header">
-                <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne"
+                    <button class="accordion-button" type="button" data-bs-toggle="collapse"
+                            data-bs-target="#collapseOne"
                             aria-expanded="true" aria-controls="collapseOne">
                         Mandantendaten
                     </button>
                 </h2>
-            <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
+                <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionPlanning">
                     <div class="accordion-body">
                         {% include 'planungsparameter/mandantendaten.html' %}
                     </div>
@@ -23,7 +25,7 @@
                 </h2>
 
 
-            <div id="collapseTwo" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+                <div id="collapseTwo" class="accordion-collapse collapse" data-bs-parent="#accordionPlanning">
                     <div class="accordion-body">
                         {%  include 'planungsparameter/summary.html' %}
                     </div>
@@ -36,13 +38,14 @@
                         Unternehmensdaten
                     </button>
                 </h2>
-            <div id="collapseThree" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+                <div id="collapseThree" class="accordion-collapse collapse" data-bs-parent="#accordionPlanning">
                     <div class="accordion-body">
                          {%  include 'planungsparameter/companydata.html' %}
                     </div>
                 </div>
             </div>
         </div>
+    </form>
     <!-- Add more sections here -->
 {% endblock content %}
 </div>

UGSdjangoProject/ugssim/templates/planungsparameter/summary.html

@@ -7,6 +7,6 @@
                 <input class="form-control" type="{{ field.field.widget.input_type }}" name="{{ field.html_name }}" id="{{ field.auto_id }}" value="{{ field.value|default_if_none:"" }}" >
             </div>
             {% endfor %}
-            <button type="submit" class="btn btn-primary">Submit</button>
+            <button type="submit" class="btn btn-primary" name="summaryButton">Submit</button>
         </form>
     </div>

UGSdjangoProject/ugssim/templates/ugssim/home.html

@@ -13,44 +13,7 @@ Nicaragua, Niederlande, Peru, Polen, Rumänien, Slowenien, USA und Usbekistan. M
 Gründungsplanspiel UGS® GAME haben bereits mehrere tausende potenzielle Gründer die Existenzgründerrolle trainiert. 
 </p>
 </div>
-<div class="accordion" id="accordionExample">
+
-  <div class="accordion-item">
-    <h2 class="accordion-header">
-      <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-        Accordion Item #1
-      </button>
-    </h2>
-    <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
-      <div class="accordion-body">
-        <strong>This is the first item's accordion body.</strong> It is shown by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the <code>.accordion-body</code>, though the transition does limit overflow.
-      </div>
-    </div>
-  </div>
-  <div class="accordion-item">
-    <h2 class="accordion-header">
-      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
-        Accordion Item #2
-      </button>
-    </h2>
-    <div id="collapseTwo" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
-      <div class="accordion-body">
-        <strong>This is the second item's accordion body.</strong> It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the <code>.accordion-body</code>, though the transition does limit overflow.
-      </div>
-    </div>
-  </div>
-  <div class="accordion-item">
-    <h2 class="accordion-header">
-      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
-        Accordion Item #3
-      </button>
-    </h2>
-    <div id="collapseThree" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
-      <div class="accordion-body">
-        <strong>This is the third item's accordion body.</strong> It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the <code>.accordion-body</code>, though the transition does limit overflow.
-      </div>
-    </div>
-  </div>
-</div>
     
     
     

UGSdjangoProject/ugssim/templates/ugssim/navigation.html

@@ -10,9 +10,6 @@
                 <li class="nav-item">
                     <a class="nav-link active" aria-current="page" href="/">Home</a>
                 </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/address/">Erfassung</a>
-                </li>
                 <li class="nav-item">
                     <a class="nav-link" href="/planungsparameter/">Planungsparameter</a>
                 </li>

UGSdjangoProject/ugssim/views.py

@@ -3,6 +3,8 @@ from django.http import HttpResponse
 from django.template import loader
 from django.shortcuts import render
 from .form import *
+from .models import *
+from django.forms.models import model_to_dict
 
 from django.views.generic import TemplateView
 
@@ -18,36 +20,34 @@ def index(request):
 
 
 def planungsparameter(request):
-    if request.method == 'POST':
+    addressForm = AddressForm()
+    summaryForm = SummaryForm()
+    companyDataForm = CompanyDataForm()
+    if request.method == "POST":
+        rp = request.POST
+        if 'addressButton' in rp:
             addressForm = AddressForm(request.POST)
             if addressForm.is_valid():
+                #Address.objects.create(**addressForm.cleaned_data)
                 addressForm.save()
-    else:
+        elif 'summaryButton' in rp:
-        addressForm = AddressForm()
-
-    if request.method == 'POST':
             summaryForm = SummaryForm(request.POST)
             if summaryForm.is_valid():
-            summaryForm.save()
+                Summary.objects.update(**summaryForm.cleaned_data)
-    else:
+        elif 'companyDataButton' in rp:
-        summaryForm = SummaryForm()
-
-    context = {
-        'addressForm': addressForm,
-        'summaryForm': summaryForm
-    }
-
-    if request.method == 'POST':
             companyDataForm = CompanyDataForm(request.POST)
             if companyDataForm.is_valid():
-            companyDataForm.save()
+                CompanyData.objects.update(**companyDataForm.cleaned_data)
     else:
-        companyDataForm = CompanyDataForm()
+        initial = model_to_dict(Address.objects.filter(id=1).first())
+        addressForm = AddressForm(initial=initial)
+
 
     context = {
         'addressForm': addressForm,
         'summaryForm': summaryForm,
         'companyDataForm': companyDataForm
+
     }
 
     return render(request, 'planungsparameter/planungsparameter.html', context)