From 355ea34e03945c2e8648332fe878dff532227b01 Mon Sep 17 00:00:00 2001 From: Ulf Wagner Date: Wed, 13 Mar 2024 16:27:54 +0100 Subject: [PATCH] 3 Eingabefelder vorhanden --- UGSdjangoProject/UGSdjangoProject/settings.py | 6 +- UGSdjangoProject/db.sqlite3 | Bin 0 -> 176128 bytes UGSdjangoProject/ugssim/form.py | 33 +++++++- .../ugssim/migrations/0001_initial.py | 43 ++++++++++- .../ugssim/migrations/0001_initial.py.org | 26 +++++++ ...eatype_summary_companydata_and_more.py.org | 50 ++++++++++++ ...s_postleitzahl_alter_address_street.py.org | 23 ++++++ UGSdjangoProject/ugssim/models.py | 14 ++-- .../planungsparameter/companydata.html | 4 +- .../planungsparameter/mandantendaten.html | 15 +++- .../planungsparameter/planungsparameter.html | 71 +++++++++--------- .../templates/planungsparameter/summary.html | 2 +- .../ugssim/templates/ugssim/home.html | 39 +--------- .../ugssim/templates/ugssim/navigation.html | 3 - UGSdjangoProject/ugssim/views.py | 48 ++++++------ 15 files changed, 259 insertions(+), 118 deletions(-) create mode 100644 UGSdjangoProject/ugssim/migrations/0001_initial.py.org create mode 100644 UGSdjangoProject/ugssim/migrations/0002_salesarea_salesareatype_summary_companydata_and_more.py.org create mode 100644 UGSdjangoProject/ugssim/migrations/0003_alter_address_postleitzahl_alter_address_street.py.org diff --git a/UGSdjangoProject/UGSdjangoProject/settings.py b/UGSdjangoProject/UGSdjangoProject/settings.py index 909cc0e..373a11b 100644 --- a/UGSdjangoProject/UGSdjangoProject/settings.py +++ b/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' @@ -124,4 +124,6 @@ STATIC_URL = 'static/' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] \ No newline at end of file +STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] + +#DATE_INPUT_FORMATS = ['%d-%m-%Y'] \ No newline at end of file diff --git a/UGSdjangoProject/db.sqlite3 b/UGSdjangoProject/db.sqlite3 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8288c1fb1581e2325df410db1a934006880373c7 100644 GIT binary patch literal 176128 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 literal 0 HcmV?d00001 diff --git a/UGSdjangoProject/ugssim/form.py b/UGSdjangoProject/ugssim/form.py index b735fc6..d754a5e 100644 --- a/UGSdjangoProject/ugssim/form.py +++ b/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): diff --git a/UGSdjangoProject/ugssim/migrations/0001_initial.py b/UGSdjangoProject/ugssim/migrations/0001_initial.py index 84d29ce..b90ecdc 100644 --- a/UGSdjangoProject/ugssim/migrations/0001_initial.py +++ b/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'), + ), ] diff --git a/UGSdjangoProject/ugssim/migrations/0001_initial.py.org b/UGSdjangoProject/ugssim/migrations/0001_initial.py.org new file mode 100644 index 0000000..84d29ce --- /dev/null +++ b/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()), + ], + ), + ] diff --git a/UGSdjangoProject/ugssim/migrations/0002_salesarea_salesareatype_summary_companydata_and_more.py.org b/UGSdjangoProject/ugssim/migrations/0002_salesarea_salesareatype_summary_companydata_and_more.py.org new file mode 100644 index 0000000..a6cc1c0 --- /dev/null +++ b/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'), + ), + ] diff --git a/UGSdjangoProject/ugssim/migrations/0003_alter_address_postleitzahl_alter_address_street.py.org b/UGSdjangoProject/ugssim/migrations/0003_alter_address_postleitzahl_alter_address_street.py.org new file mode 100644 index 0000000..c386746 --- /dev/null +++ b/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), + ), + ] diff --git a/UGSdjangoProject/ugssim/models.py b/UGSdjangoProject/ugssim/models.py index db7f433..3ca2d1f 100644 --- a/UGSdjangoProject/ugssim/models.py +++ b/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() - street = models.CharField(max_length=255) + geburtstag: date = models.DateField() + 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='+') diff --git a/UGSdjangoProject/ugssim/templates/planungsparameter/companydata.html b/UGSdjangoProject/ugssim/templates/planungsparameter/companydata.html index 8d31767..ec850a3 100644 --- a/UGSdjangoProject/ugssim/templates/planungsparameter/companydata.html +++ b/UGSdjangoProject/ugssim/templates/planungsparameter/companydata.html @@ -1,5 +1,4 @@
-
{% csrf_token %} {% for field in companyDataForm %}
@@ -7,6 +6,5 @@
{% endfor %} - -
+
\ No newline at end of file diff --git a/UGSdjangoProject/ugssim/templates/planungsparameter/mandantendaten.html b/UGSdjangoProject/ugssim/templates/planungsparameter/mandantendaten.html index 1bbe4b3..0efd116 100644 --- a/UGSdjangoProject/ugssim/templates/planungsparameter/mandantendaten.html +++ b/UGSdjangoProject/ugssim/templates/planungsparameter/mandantendaten.html @@ -1,12 +1,19 @@
-
+ + {% csrf_token %} {% for field in addressForm %}
- +
{% endfor %} - -
+ + +
\ No newline at end of file diff --git a/UGSdjangoProject/ugssim/templates/planungsparameter/planungsparameter.html b/UGSdjangoProject/ugssim/templates/planungsparameter/planungsparameter.html index d817292..d938e24 100644 --- a/UGSdjangoProject/ugssim/templates/planungsparameter/planungsparameter.html +++ b/UGSdjangoProject/ugssim/templates/planungsparameter/planungsparameter.html @@ -1,48 +1,51 @@ {% extends 'ugssim/ugssim.html' %} {% block content %} -
-
-

- -

-
-
- {% include 'planungsparameter/mandantendaten.html' %} +
+
+
+

+ +

+
+
+ {% include 'planungsparameter/mandantendaten.html' %} +
-
-
-

- -

+
+

+ +

-
-
- {% include 'planungsparameter/summary.html' %} +
+
+ {% include 'planungsparameter/summary.html' %} +
-
-
-

- -

-
-
- {% include 'planungsparameter/companydata.html' %} +
+

+ +

+
+
+ {% include 'planungsparameter/companydata.html' %} +
-
+ {% endblock content %}
\ No newline at end of file diff --git a/UGSdjangoProject/ugssim/templates/planungsparameter/summary.html b/UGSdjangoProject/ugssim/templates/planungsparameter/summary.html index 46d35ea..c78a4b9 100644 --- a/UGSdjangoProject/ugssim/templates/planungsparameter/summary.html +++ b/UGSdjangoProject/ugssim/templates/planungsparameter/summary.html @@ -7,6 +7,6 @@
{% endfor %} - +
\ No newline at end of file diff --git a/UGSdjangoProject/ugssim/templates/ugssim/home.html b/UGSdjangoProject/ugssim/templates/ugssim/home.html index f15e0c5..c5ba623 100644 --- a/UGSdjangoProject/ugssim/templates/ugssim/home.html +++ b/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.

-
-
-

- -

-
-
- This is the first item's accordion body. 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 .accordion-body, though the transition does limit overflow. -
-
-
-
-

- -

-
-
- This is the second item's accordion body. 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 .accordion-body, though the transition does limit overflow. -
-
-
-
-

- -

-
-
- This is the third item's accordion body. 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 .accordion-body, though the transition does limit overflow. -
-
-
-
+ diff --git a/UGSdjangoProject/ugssim/templates/ugssim/navigation.html b/UGSdjangoProject/ugssim/templates/ugssim/navigation.html index eeb5e39..3c6d4d0 100644 --- a/UGSdjangoProject/ugssim/templates/ugssim/navigation.html +++ b/UGSdjangoProject/ugssim/templates/ugssim/navigation.html @@ -10,9 +10,6 @@
  • Home
    • -
  • - Erfassung -
  • Planungsparameter
    • diff --git a/UGSdjangoProject/ugssim/views.py b/UGSdjangoProject/ugssim/views.py index afb5ca0..bd1ce35 100644 --- a/UGSdjangoProject/ugssim/views.py +++ b/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(request.POST) - if addressForm.is_valid(): - addressForm.save() + 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() + elif 'summaryButton' in rp: + summaryForm = SummaryForm(request.POST) + if summaryForm.is_valid(): + Summary.objects.update(**summaryForm.cleaned_data) + elif 'companyDataButton' in rp: + companyDataForm = CompanyDataForm(request.POST) + if companyDataForm.is_valid(): + CompanyData.objects.update(**companyDataForm.cleaned_data) else: - addressForm = AddressForm() + initial = model_to_dict(Address.objects.filter(id=1).first()) + addressForm = AddressForm(initial=initial) - if request.method == 'POST': - summaryForm = SummaryForm(request.POST) - if summaryForm.is_valid(): - summaryForm.save() - else: - summaryForm = SummaryForm() - - context = { - 'addressForm': addressForm, - 'summaryForm': summaryForm - } - - if request.method == 'POST': - companyDataForm = CompanyDataForm(request.POST) - if companyDataForm.is_valid(): - companyDataForm.save() - else: - companyDataForm = CompanyDataForm() context = { 'addressForm': addressForm, 'summaryForm': summaryForm, - 'companyDataForm': companyDataForm + 'companyDataForm': companyDataForm + } return render(request, 'planungsparameter/planungsparameter.html', context)