From 12cf174f8b547d3ef5892cb73d74ba69a53f6ba3 Mon Sep 17 00:00:00 2001 From: Jonas Havelka Date: Tue, 4 May 2021 19:42:05 +0200 Subject: [PATCH 1/4] Revert "PoMat -> PoMaturite" This reverts commit 19a566d6 --- seminar/forms.py | 2 +- seminar/templates/seminar/profil/edit.html | 2 +- seminar/views/views_all.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/seminar/forms.py b/seminar/forms.py index 7aaa78b4..4db77c18 100644 --- a/seminar/forms.py +++ b/seminar/forms.py @@ -143,7 +143,7 @@ class PrihlaskaForm(forms.Form): self.add_error('skola_adresa',forms.ValidationError('Je nutné vyplnit adresu školy')) # Editační formulář bez řešitele. -class ProfileEditFormPoMaturite(forms.Form): +class ProfileEditFormPoMat(forms.Form): username = forms.CharField(label='Přihlašovací jméno', max_length=256, required=True) diff --git a/seminar/templates/seminar/profil/edit.html b/seminar/templates/seminar/profil/edit.html index a5aacd0e..89ad6b8c 100644 --- a/seminar/templates/seminar/profil/edit.html +++ b/seminar/templates/seminar/profil/edit.html @@ -61,7 +61,7 @@ {% include "seminar/profil/prihlaska_field.html" with field=form.stat_text id="id_li_stat_text"%} -{% if not po_maturite %} {# Vysloužilým účastníkům skrýt editaci školy apod. #} +{% if not PoMat %} {# Vysloužilým účastníkům skrýt editaci školy apod. #}

diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 461eca80..3cfbd21d 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -26,7 +26,7 @@ import seminar.models as m from seminar.models import Problem, Cislo, Reseni, Nastaveni, Rocnik, Soustredeni, Organizator, Resitel, Novinky, Soustredeni_Ucastnici, Pohadka, Tema, Clanek, Osoba, Skola # Tohle je stare a chceme se toho zbavit. Pouzivejte s.ToCoChci #from .models import VysledkyZaCislo, VysledkyKCisluZaRocnik, VysledkyKCisluOdjakziva from seminar import utils, treelib -from seminar.forms import PrihlaskaForm, LoginForm, ProfileEditForm, ProfileEditFormPoMaturite +from seminar.forms import PrihlaskaForm, LoginForm, ProfileEditForm, ProfileEditFormPoMat import seminar.forms as f import seminar.templatetags.treenodes as tnltt import seminar.views.views_rest as vr @@ -1103,13 +1103,13 @@ def resitelEditView(request): if 'datum_narozeni' in prefill_1: prefill_1['datum_narozeni'] = str(prefill_1['datum_narozeni']) if resitel_edit and resitel_edit.rok_maturity < date.today().year: - form = ProfileEditFormPoMaturite(initial=prefill_1) + form = ProfileEditFormPoMat(initial=prefill_1) else: form = ProfileEditForm(initial=prefill_1) ## Změna údajů a jejich uložení if request.method == 'POST': if resitel_edit and resitel_edit.rok_maturity < date.today().year: - form = ProfileEditFormPoMaturite(request.POST) + form = ProfileEditFormPoMat(request.POST) else: form = ProfileEditForm(request.POST) if form.is_valid(): @@ -1149,7 +1149,7 @@ def resitelEditView(request): return formularOKView(request) else: ## Stránka před odeslaním formuláře = předvyplněný formulář - return render(request, 'seminar/profil/edit.html', {'form': form, 'po_maturite': resitel_edit and resitel_edit.rok_maturity < date.today().year}) + return render(request, 'seminar/profil/edit.html', {'form': form, 'PoMat': resitel_edit and resitel_edit.rok_maturity < date.today().year}) def prihlaskaView(request): generic_logger = logging.getLogger('seminar.prihlaska') From c5ac57f8e5951888c8116c823553b39b1b774e50 Mon Sep 17 00:00:00 2001 From: Jonas Havelka Date: Tue, 4 May 2021 19:49:01 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"Vyslou=C5=BEil=C3=BDm=20=C3=BA?= =?UTF-8?q?=C4=8Dastn=C3=ADk=C5=AFm=20zkrouhnout=20zm=C4=9Bnu=20=C3=BAdaj?= =?UTF-8?q?=C5=AF."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit aa8bb6dd --- seminar/forms.py | 24 +--------------------- seminar/templates/seminar/profil/edit.html | 2 -- seminar/views/views_all.py | 18 ++++++---------- 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/seminar/forms.py b/seminar/forms.py index 4db77c18..8f6950fa 100644 --- a/seminar/forms.py +++ b/seminar/forms.py @@ -142,28 +142,6 @@ class PrihlaskaForm(forms.Form): elif data.get('skola_adresa')=='': self.add_error('skola_adresa',forms.ValidationError('Je nutné vyplnit adresu školy')) -# Editační formulář bez řešitele. -class ProfileEditFormPoMat(forms.Form): - username = forms.CharField(label='Přihlašovací jméno', - max_length=256, - required=True) - - jmeno = forms.CharField(label='Jméno', max_length=256, required=True) - prijmeni = forms.CharField(label='Příjmení', max_length=256, required=True) - pohlavi_muz = forms.ChoiceField(label='Pohlaví', - choices = ((True,'muž'),(False,'žena')), required=True) - email = forms.EmailField(label='E-mail',max_length=256, required=True) - telefon = forms.CharField(widget=TelInput(),label='Telefon',max_length=256, required=False) - datum_narozeni = forms.DateField(widget=DateInput(),label='Datum narození', required=False) - ulice = forms.CharField(label='Ulice', max_length=256, required=False) - mesto = forms.CharField(label='Město', max_length=256, required=False) - psc = forms.CharField(label='PSČ', max_length=32, required=False) - stat = forms.ChoiceField(label='Stát', - choices = (('CZ', 'Česká Republika'), - ('SK', 'Slovenská Republika'), - ('other', 'Jiné')), - required=False) - stat_text = forms.CharField(label='Stát', max_length=256, required=False) class ProfileEditForm(forms.Form): username = forms.CharField(label='Přihlašovací jméno', @@ -203,7 +181,7 @@ class ProfileEditForm(forms.Form): rok_maturity = forms.IntegerField( label='Rok maturity', - min_value=date.today().year, + min_value=date.today().year, max_value=date.today().year+8, required=True) zasilat = forms.ChoiceField(label='Kam zasílat čísla a řešení',choices = Resitel.ZASILAT_CHOICES, required=True) diff --git a/seminar/templates/seminar/profil/edit.html b/seminar/templates/seminar/profil/edit.html index 89ad6b8c..9f94090e 100644 --- a/seminar/templates/seminar/profil/edit.html +++ b/seminar/templates/seminar/profil/edit.html @@ -61,7 +61,6 @@ {% include "seminar/profil/prihlaska_field.html" with field=form.stat_text id="id_li_stat_text"%} -{% if not PoMat %} {# Vysloužilým účastníkům skrýt editaci školy apod. #}

@@ -96,7 +95,6 @@
-{% endif %} diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 3cfbd21d..c57148bb 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -26,7 +26,7 @@ import seminar.models as m from seminar.models import Problem, Cislo, Reseni, Nastaveni, Rocnik, Soustredeni, Organizator, Resitel, Novinky, Soustredeni_Ucastnici, Pohadka, Tema, Clanek, Osoba, Skola # Tohle je stare a chceme se toho zbavit. Pouzivejte s.ToCoChci #from .models import VysledkyZaCislo, VysledkyKCisluZaRocnik, VysledkyKCisluOdjakziva from seminar import utils, treelib -from seminar.forms import PrihlaskaForm, LoginForm, ProfileEditForm, ProfileEditFormPoMat +from seminar.forms import PrihlaskaForm, LoginForm, ProfileEditForm import seminar.forms as f import seminar.templatetags.treenodes as tnltt import seminar.views.views_rest as vr @@ -1095,23 +1095,17 @@ def resitelEditView(request): user_edit = osoba_edit.user ## Vytvoření slovníku, kterým předvyplním formulář prefill_1=model_to_dict(user_edit) - if resitel_edit and resitel_edit.rok_maturity >= date.today().year: + if resitel_edit: prefill_2=model_to_dict(resitel_edit) prefill_1.update(prefill_2) prefill_3=model_to_dict(osoba_edit) prefill_1.update(prefill_3) if 'datum_narozeni' in prefill_1: prefill_1['datum_narozeni'] = str(prefill_1['datum_narozeni']) - if resitel_edit and resitel_edit.rok_maturity < date.today().year: - form = ProfileEditFormPoMat(initial=prefill_1) - else: - form = ProfileEditForm(initial=prefill_1) + form = ProfileEditForm(initial=prefill_1) ## Změna údajů a jejich uložení if request.method == 'POST': - if resitel_edit and resitel_edit.rok_maturity < date.today().year: - form = ProfileEditFormPoMat(request.POST) - else: - form = ProfileEditForm(request.POST) + form = ProfileEditForm(request.POST) if form.is_valid(): ## Změny v osobě fcd = form.cleaned_data @@ -1133,7 +1127,7 @@ def resitelEditView(request): ## Neznámá země msg = "Unknown country {}".format(fcd['stat_text']) - if resitel_edit and resitel_edit.rok_maturity >= date.today().year: + if resitel_edit: ## Změny v řešiteli resitel_edit.skola = fcd['skola'] resitel_edit.rok_maturity = fcd['rok_maturity'] @@ -1149,7 +1143,7 @@ def resitelEditView(request): return formularOKView(request) else: ## Stránka před odeslaním formuláře = předvyplněný formulář - return render(request, 'seminar/profil/edit.html', {'form': form, 'PoMat': resitel_edit and resitel_edit.rok_maturity < date.today().year}) + return render(request, 'seminar/profil/edit.html', {'form': form}) def prihlaskaView(request): generic_logger = logging.getLogger('seminar.prihlaska') From c645074122e334fbe5c0e1a3d7bd1b8f4c38c185 Mon Sep 17 00:00:00 2001 From: Jonas Havelka Date: Tue, 4 May 2021 20:34:15 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Vyslou=C5=BEil=C3=BDm=20=C3=BA=C4=8Dastn?= =?UTF-8?q?=C3=ADk=C5=AFm=20povolit=20zm=C4=9Bnu=20=C3=BAdaj=C5=AF=20bez?= =?UTF-8?q?=20zm=C4=9Bny=20maturity.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/forms.py | 5 +++++ seminar/views/views_all.py | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/seminar/forms.py b/seminar/forms.py index 8f6950fa..44fae680 100644 --- a/seminar/forms.py +++ b/seminar/forms.py @@ -233,6 +233,11 @@ class ProfileEditForm(forms.Form): # elif data.get('skola_adresa')=='': # self.add_error('skola_adresa',forms.ValidationError('Je nutné vyplnit adresu školy')) +class PoMaturiteProfileEditForm(ProfileEditForm): + rok_maturity = forms.IntegerField( + label='Rok maturity', + required=True) + class VlozReseniForm(forms.Form): #FIXME jen podproblémy daného problému problem = forms.ModelChoiceField(label='Problém',queryset=m.Problem.objects.all()) diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index c57148bb..604adb62 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -20,13 +20,14 @@ from django.db import transaction from django.core import serializers from django.core.exceptions import PermissionDenied from django.forms.models import model_to_dict +from django import forms import seminar.models as s import seminar.models as m from seminar.models import Problem, Cislo, Reseni, Nastaveni, Rocnik, Soustredeni, Organizator, Resitel, Novinky, Soustredeni_Ucastnici, Pohadka, Tema, Clanek, Osoba, Skola # Tohle je stare a chceme se toho zbavit. Pouzivejte s.ToCoChci #from .models import VysledkyZaCislo, VysledkyKCisluZaRocnik, VysledkyKCisluOdjakziva from seminar import utils, treelib -from seminar.forms import PrihlaskaForm, LoginForm, ProfileEditForm +from seminar.forms import PrihlaskaForm, LoginForm, ProfileEditForm, PoMaturiteProfileEditForm import seminar.forms as f import seminar.templatetags.treenodes as tnltt import seminar.views.views_rest as vr @@ -1102,10 +1103,16 @@ def resitelEditView(request): prefill_1.update(prefill_3) if 'datum_narozeni' in prefill_1: prefill_1['datum_narozeni'] = str(prefill_1['datum_narozeni']) - form = ProfileEditForm(initial=prefill_1) + if 'rok_maturity' not in prefill_1 or prefill_1['rok_maturity'] < date.today().year: + form = PoMaturiteProfileEditForm(initial=prefill_1) + else: + form = ProfileEditForm(initial=prefill_1) ## Změna údajů a jejich uložení if request.method == 'POST': - form = ProfileEditForm(request.POST) + if 'rok_maturity' not in prefill_1 or prefill_1['rok_maturity'] < date.today().year: + form = PoMaturiteProfileEditForm(request.POST) + else: + form = ProfileEditForm(request.POST) if form.is_valid(): ## Změny v osobě fcd = form.cleaned_data From 9283c175bb2dfab6a53daa5bcb93412c07b0d633 Mon Sep 17 00:00:00 2001 From: Jonas Havelka Date: Tue, 4 May 2021 20:39:08 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Jo,=20to=20forms=20jsem=20tam=20hodn=C4=9B?= =?UTF-8?q?=20pot=C5=99eboval.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/views/views_all.py | 1 - 1 file changed, 1 deletion(-) diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 604adb62..c074f4b6 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -20,7 +20,6 @@ from django.db import transaction from django.core import serializers from django.core.exceptions import PermissionDenied from django.forms.models import model_to_dict -from django import forms import seminar.models as s import seminar.models as m