From 45d3cafea9c0232e43d35f34478ad824a6f86741 Mon Sep 17 00:00:00 2001 From: yaemiku Date: Fri, 3 Sep 2021 01:13:49 +0200 Subject: [PATCH] Clear up migrations --- app/migrations/0001_initial.py | 18 +++++++++---- app/migrations/0002_auto_20210809_2211.py | 23 ---------------- app/migrations/0003_auto_20210809_2311.py | 28 ------------------- app/migrations/0004_auto_20210809_2330.py | 33 ----------------------- app/migrations/0005_auto_20210810_0041.py | 28 ------------------- app/migrations/0006_auto_20210810_0141.py | 23 ---------------- 6 files changed, 13 insertions(+), 140 deletions(-) delete mode 100644 app/migrations/0002_auto_20210809_2211.py delete mode 100644 app/migrations/0003_auto_20210809_2311.py delete mode 100644 app/migrations/0004_auto_20210809_2330.py delete mode 100644 app/migrations/0005_auto_20210810_0041.py delete mode 100644 app/migrations/0006_auto_20210810_0141.py diff --git a/app/migrations/0001_initial.py b/app/migrations/0001_initial.py index 20200df..977aff9 100644 --- a/app/migrations/0001_initial.py +++ b/app/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.6 on 2021-08-09 19:35 +# Generated by Django 3.2.6 on 2021-09-02 23:13 import app.models from django.db import migrations, models @@ -34,8 +34,14 @@ class Migration(migrations.Migration): ('roman', models.CharField(max_length=25, verbose_name='Nr. edycji')), ('active', models.BooleanField(default=False, verbose_name='Aktualna')), ('submissions', models.BooleanField(default=False, verbose_name='Możliwość zgłoszenia drużyny')), - ('first_test', models.FileField(blank=True, upload_to='', verbose_name='Zadania eliminacyjne')), - ('second_test', models.FileField(blank=True, upload_to='', verbose_name='Zadania finałowe')), + ('scores_available', models.BooleanField(default=False, verbose_name='Wyniki dostępne')), + ('scores_eliminations', models.BooleanField(default=False, verbose_name='Wyniki z eliminacji dostępne dla nauczycieli')), + ('entry_threshold', models.IntegerField(default=0, verbose_name='Próg punkowy - wejście do finału')), + ('award_threshold', models.IntegerField(default=0, verbose_name='Próg punktowy - wyróżnienie')), + ('laureate_threshold', models.IntegerField(default=0, verbose_name='Próg punktowy - tytuł laureata')), + ('scores', models.FileField(blank=True, help_text='Uwaga! Wyniki muszą być zawarte w pliku .csv. Kolumny po kolei to odpowiednio: identyfikator ucznia, wynik z eliminacji, wynik z finału.', upload_to='wyniki', verbose_name='Wyniki eliminacji')), + ('first_test', models.FileField(blank=True, upload_to='eliminacje', verbose_name='Zadania eliminacyjne')), + ('second_test', models.FileField(blank=True, upload_to='finaly', verbose_name='Zadania finałowe')), ], options={ 'verbose_name': 'Edycja', @@ -46,12 +52,15 @@ class Migration(migrations.Migration): name='Student', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('identifier', models.CharField(blank=True, editable=False, max_length=100, verbose_name='Identyfikator')), ('name', models.CharField(max_length=50, verbose_name='Imię')), ('surname', models.CharField(max_length=50, verbose_name='Nazwisko')), ('grade', models.PositiveIntegerField(choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8)], verbose_name='Klasa')), ('score_first', models.IntegerField(default=0, verbose_name='Wynik z eliminacji')), ('score_second', models.IntegerField(default=0, verbose_name='Wynik z finału')), + ('school_name', models.CharField(blank=True, max_length=100, verbose_name='Nazwa szkoły')), + ('school_town', models.CharField(blank=True, max_length=100, verbose_name='Miejscowość')), + ('school_address', models.CharField(blank=True, max_length=100, verbose_name='Adres')), + ('identifier', models.CharField(blank=True, help_text='UWAGA - tej wartości należy nie zmieniać', max_length=100, verbose_name='Identyfikator')), ], options={ 'verbose_name': 'Uczeń', @@ -75,7 +84,6 @@ class Migration(migrations.Migration): ('request_notifications', models.BooleanField(default=False, verbose_name='Powiadomienia przy wysłaniu zgłoszenia')), ('email_notifications', models.BooleanField(default=False, verbose_name='Powiadomienia przy wysłaniu wiadomości email')), ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), - ('team', models.ManyToManyField(to='app.Student', verbose_name='Drużyna')), ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), ], options={ diff --git a/app/migrations/0002_auto_20210809_2211.py b/app/migrations/0002_auto_20210809_2211.py deleted file mode 100644 index ca3f4cb..0000000 --- a/app/migrations/0002_auto_20210809_2211.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.6 on 2021-08-09 20:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('app', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='edition', - name='scores', - field=models.FileField(blank=True, upload_to='', verbose_name='Wyniki eliminacji'), - ), - migrations.AddField( - model_name='edition', - name='scores_available', - field=models.BooleanField(default=False, verbose_name='Dokładne wyniki z eliminacji widoczne'), - ), - ] diff --git a/app/migrations/0003_auto_20210809_2311.py b/app/migrations/0003_auto_20210809_2311.py deleted file mode 100644 index 9e6096f..0000000 --- a/app/migrations/0003_auto_20210809_2311.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.2.6 on 2021-08-09 21:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('app', '0002_auto_20210809_2211'), - ] - - operations = [ - migrations.AlterField( - model_name='edition', - name='first_test', - field=models.FileField(blank=True, upload_to='eliminacje', verbose_name='Zadania eliminacyjne'), - ), - migrations.AlterField( - model_name='edition', - name='scores', - field=models.FileField(blank=True, upload_to='wyniki', verbose_name='Wyniki eliminacji'), - ), - migrations.AlterField( - model_name='edition', - name='second_test', - field=models.FileField(blank=True, upload_to='finaly', verbose_name='Zadania finałowe'), - ), - ] diff --git a/app/migrations/0004_auto_20210809_2330.py b/app/migrations/0004_auto_20210809_2330.py deleted file mode 100644 index da5309d..0000000 --- a/app/migrations/0004_auto_20210809_2330.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.2.6 on 2021-08-09 21:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('app', '0003_auto_20210809_2311'), - ] - - operations = [ - migrations.AddField( - model_name='student', - name='school_address', - field=models.CharField(blank=True, editable=False, max_length=100, verbose_name='Adres'), - ), - migrations.AddField( - model_name='student', - name='school_name', - field=models.CharField(blank=True, editable=False, max_length=100, verbose_name='Nazwa szkoły'), - ), - migrations.AddField( - model_name='student', - name='school_town', - field=models.CharField(blank=True, editable=False, max_length=100, verbose_name='Miejscowość'), - ), - migrations.AlterField( - model_name='edition', - name='scores', - field=models.FileField(blank=True, help_text='Uwaga! Wyniki muszą być zawarte w pliku .csv. Kolumny po kolei to odpowiednio: identyfikator ucznia, wynik z eliminacji, wynik z finału.', upload_to='wyniki', verbose_name='Wyniki eliminacji'), - ), - ] diff --git a/app/migrations/0005_auto_20210810_0041.py b/app/migrations/0005_auto_20210810_0041.py deleted file mode 100644 index b4e828f..0000000 --- a/app/migrations/0005_auto_20210810_0041.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.2.6 on 2021-08-09 22:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('app', '0004_auto_20210809_2330'), - ] - - operations = [ - migrations.AddField( - model_name='edition', - name='award_threshold', - field=models.IntegerField(default=0, verbose_name='Próg punktowy - wyróżnienie'), - ), - migrations.AddField( - model_name='edition', - name='entry_threshold', - field=models.IntegerField(default=0, verbose_name='Próg punkowy - wejście do finału'), - ), - migrations.AddField( - model_name='edition', - name='laureate_threshold', - field=models.IntegerField(default=0, verbose_name='Próg punktowy - tytuł laureata'), - ), - ] diff --git a/app/migrations/0006_auto_20210810_0141.py b/app/migrations/0006_auto_20210810_0141.py deleted file mode 100644 index 65bf5f6..0000000 --- a/app/migrations/0006_auto_20210810_0141.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.6 on 2021-08-09 23:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('app', '0005_auto_20210810_0041'), - ] - - operations = [ - migrations.AddField( - model_name='edition', - name='scores_eliminations', - field=models.BooleanField(default=False, verbose_name='Wyniki z eliminacji dostępne dla nauczycieli'), - ), - migrations.AlterField( - model_name='edition', - name='scores_available', - field=models.BooleanField(default=False, verbose_name='Wyniki dostępne'), - ), - ]