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 e69de29..8288c1f 100644 Binary files a/UGSdjangoProject/db.sqlite3 and b/UGSdjangoProject/db.sqlite3 differ 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)