From a80f0c2d34a27fb05c89ba882ec01845f695d74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Turinsk=C3=BD?= Date: Tue, 13 Oct 2020 21:24:05 +0200 Subject: [PATCH 1/2] Fix mamweb/migr/0001 --- mamweb/migrations/0001_initial.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mamweb/migrations/0001_initial.py b/mamweb/migrations/0001_initial.py index e96cb262..b1944e28 100644 --- a/mamweb/migrations/0001_initial.py +++ b/mamweb/migrations/0001_initial.py @@ -8,7 +8,7 @@ from shutil import copytree def zkopiruj_fotky(apps, schema_editor): - copytree("mamweb/static/images/header/", "media/header/", dirs_exist_ok=True) + copytree("mamweb/static/images/header/", "media/header/") # FIXME: bylo tu dirs_exists_ok=True, nekompatibilní s Py 3.7 class Migration(migrations.Migration): From 5065d75cc00f920be0818037ad688f3dbf5645be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Turinsk=C3=BD?= Date: Tue, 13 Oct 2020 22:08:29 +0200 Subject: [PATCH 2/2] =?UTF-8?q?P=C5=99id=C3=A1n=20field=20s=20p=C5=99eddea?= =?UTF-8?q?dlinem=20=C4=8D=C3=ADsla?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0089_cislo_datum_preddeadline.py | 18 ++++++++++++++++++ seminar/models.py | 3 +++ 2 files changed, 21 insertions(+) create mode 100644 seminar/migrations/0089_cislo_datum_preddeadline.py diff --git a/seminar/migrations/0089_cislo_datum_preddeadline.py b/seminar/migrations/0089_cislo_datum_preddeadline.py new file mode 100644 index 00000000..0771991b --- /dev/null +++ b/seminar/migrations/0089_cislo_datum_preddeadline.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.16 on 2020-10-13 19:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('seminar', '0088_perm_org_a_ucastnik'), + ] + + operations = [ + migrations.AddField( + model_name='cislo', + name='datum_preddeadline', + field=models.DateField(blank=True, help_text='Datum pro příjem řešení, která se otisknou v dalším čísle', null=True, verbose_name='datum předdeadline'), + ), + ] diff --git a/seminar/models.py b/seminar/models.py index d706db0d..372a4927 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -443,6 +443,9 @@ class Cislo(SeminarModelBase): datum_deadline = models.DateField('datum deadline', blank=True, null=True, help_text='Datum pro příjem řešení úloh zadaných v tomto čísle') + datum_preddeadline = models.DateField('datum předdeadline', blank=True, null=True, + help_text='Datum pro příjem řešení, která se otisknou v dalším čísle') + datum_deadline_soustredeni = models.DateField( 'datum deadline soustředění', blank=True, null=True,