fixed lint errors

karaman56 · Apr 7, 2021 · d990857 · d990857
1 parent 4d2a40f
commit d990857
Show file tree

Hide file tree

Showing 11 changed files with 228 additions and 139 deletions.
diff --git a/datacenter/migrations/0001_initial.py b/datacenter/migrations/0001_initial.py
@@ -2,12 +2,11 @@
 # Generated by Django 1.11.2 on 2019-06-26 17:28
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -17,15 +16,17 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Commendation',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                                        serialize=False, verbose_name='ID')),
                 ('text', models.TextField()),
                 ('date', models.DateField()),
             ],
         ),
         migrations.CreateModel(
             name='Lesson',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                                        serialize=False, verbose_name='ID')),
                 ('title', models.CharField(max_length=200)),
                 ('year_of_study', models.IntegerField()),
                 ('year_of_study_group', models.CharField(max_length=1)),
@@ -37,7 +38,8 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Mark',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                                        serialize=False, verbose_name='ID')),
                 ('points', models.IntegerField()),
                 ('teacher_note', models.TextField()),
                 ('date', models.DateField()),
@@ -46,79 +48,111 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Schoolkid',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                                        serialize=False, verbose_name='ID')),
                 ('full_name', models.CharField(max_length=200)),
                 ('birthday', models.DateField(null=True)),
                 ('year_started_education', models.IntegerField(null=True)),
                 ('year_of_study', models.IntegerField(null=True)),
-                ('year_of_study_group', models.CharField(max_length=1, null=True)),
+                ('year_of_study_group',
+                 models.CharField(max_length=1, blank=True)),
             ],
         ),
         migrations.CreateModel(
             name='Subject',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                                        serialize=False, verbose_name='ID')),
                 ('title', models.CharField(max_length=200)),
                 ('year_of_study', models.IntegerField(null=True)),
             ],
         ),
         migrations.CreateModel(
             name='Teacher',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                                        serialize=False, verbose_name='ID')),
                 ('full_name', models.CharField(max_length=200)),
                 ('birthday', models.DateField(blank=True, null=True)),
             ],
         ),
         migrations.CreateModel(
             name='Сhastisement',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True, primary_key=True,
+                                        serialize=False, verbose_name='ID')),
                 ('text', models.TextField()),
                 ('date', models.DateField()),
-                ('schoolkid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Schoolkid')),
-                ('subject', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='datacenter.Subject')),
-                ('teacher', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Teacher')),
+                (
+                    'schoolkid', models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to='datacenter.Schoolkid')),
+                ('subject',
+                 models.ForeignKey(
+                     null=True,
+                     on_delete=django.db.models.deletion.CASCADE,
+                     to='datacenter.Subject')),
+                ('teacher',
+                 models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                                   to='datacenter.Teacher')),
             ],
         ),
         migrations.AddField(
             model_name='mark',
             name='schoolkid',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Schoolkid'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Schoolkid'),
         ),
         migrations.AddField(
             model_name='mark',
             name='subject',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Subject'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Subject'),
         ),
         migrations.AddField(
             model_name='mark',
             name='teacher',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Teacher'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Teacher'),
         ),
         migrations.AddField(
             model_name='lesson',
             name='subject',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='datacenter.Subject'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Subject'),
         ),
         migrations.AddField(
             model_name='lesson',
             name='teacher',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='datacenter.Teacher'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Teacher'),
         ),
         migrations.AddField(
             model_name='commendation',
             name='schoolkid',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Schoolkid'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Schoolkid'),
         ),
         migrations.AddField(
             model_name='commendation',
             name='subject',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Subject'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Subject'),
         ),
         migrations.AddField(
             model_name='commendation',
             name='teacher',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Teacher'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Teacher'),
         ),
     ]
diff --git a/datacenter/migrations/0003_auto_20190627_1739.py b/datacenter/migrations/0003_auto_20190627_1739.py
@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='mark',
             name='teacher_note',
-            field=models.TextField(null=True),
+            field=models.TextField(blank=True),
         ),
     ]
diff --git a/datacenter/migrations/0004_auto_20190702_1200.py b/datacenter/migrations/0004_auto_20190702_1200.py
@@ -1,9 +1,6 @@
 # Generated by Django 2.2.3 on 2019-07-02 12:00
 
-import django.db.models.deletion
-
 from django.db import migrations
-from django.db import models
 
 
 class Migration(migrations.Migration):

diff --git a/datacenter/migrations/0005_auto_20190702_1210.py b/datacenter/migrations/0005_auto_20190702_1210.py
@@ -1,11 +1,10 @@
 # Generated by Django 2.2.3 on 2019-07-02 12:10
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('datacenter', '0004_auto_20190702_1200'),
     ]
@@ -19,17 +18,25 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='commendation',
             name='schoolkid',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Schoolkid', verbose_name='ученик'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Schoolkid', verbose_name='ученик'),
         ),
         migrations.AlterField(
             model_name='commendation',
             name='subject',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='datacenter.Subject', verbose_name='предмет'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to='datacenter.Subject',
+                verbose_name='предмет'),
         ),
         migrations.AlterField(
             model_name='commendation',
             name='teacher',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Teacher', verbose_name='учитель'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Teacher', verbose_name='учитель'),
         ),
         migrations.AlterField(
             model_name='commendation',
@@ -44,27 +51,41 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='lesson',
             name='group_letter',
-            field=models.CharField(db_index=True, max_length=1, verbose_name='литера класса'),
+            field=models.CharField(db_index=True, max_length=1,
+                                   verbose_name='литера класса'),
         ),
         migrations.AlterField(
             model_name='lesson',
             name='room',
-            field=models.CharField(db_index=True, help_text='Класс где проходят занятия.', max_length=50, verbose_name='класс'),
+            field=models.CharField(db_index=True,
+                                   help_text='Класс где проходят занятия.',
+                                   max_length=50, verbose_name='класс'),
         ),
         migrations.AlterField(
             model_name='lesson',
             name='subject',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='datacenter.Subject', verbose_name='предмет'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Subject',
+                verbose_name='предмет'),
         ),
         migrations.AlterField(
             model_name='lesson',
             name='teacher',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='datacenter.Teacher', verbose_name='учитель'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Teacher',
+                verbose_name='учитель'),
         ),
         migrations.AlterField(
             model_name='lesson',
             name='timeslot',
-            field=models.IntegerField(db_index=True, help_text='Номер слота в расписании уроков на этот день.', verbose_name='слот'),
+            field=models.IntegerField(
+                db_index=True,
+                help_text='Номер слота в расписании уроков на этот день.',
+                verbose_name='слот'),
         ),
         migrations.AlterField(
             model_name='lesson',
@@ -84,22 +105,28 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='mark',
             name='schoolkid',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Schoolkid', verbose_name='ученик'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Schoolkid', verbose_name='ученик'),
         ),
         migrations.AlterField(
             model_name='mark',
             name='subject',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Subject', verbose_name='предмет'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Subject', verbose_name='предмет'),
         ),
         migrations.AlterField(
             model_name='mark',
             name='teacher',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Teacher', verbose_name='учитель'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Teacher', verbose_name='учитель'),
         ),
         migrations.AlterField(
             model_name='mark',
             name='teacher_note',
-            field=models.TextField(null=True, verbose_name='комментарий'),
+            field=models.TextField(blank=True, verbose_name='комментарий'),
         ),
         migrations.AlterField(
             model_name='schoolkid',
@@ -109,7 +136,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='schoolkid',
             name='entry_year',
-            field=models.IntegerField(null=True, verbose_name='год начала обучения'),
+            field=models.IntegerField(null=True,
+                                      verbose_name='год начала обучения'),
         ),
         migrations.AlterField(
             model_name='schoolkid',
@@ -119,7 +147,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='schoolkid',
             name='group_letter',
-            field=models.CharField(max_length=1, null=True, verbose_name='литера класса'),
+            field=models.CharField(max_length=1, blank=True,
+                                   verbose_name='литера класса'),
         ),
         migrations.AlterField(
             model_name='schoolkid',
@@ -134,7 +163,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='subject',
             name='year_of_study',
-            field=models.IntegerField(db_index=True, null=True, verbose_name='год обучения'),
+            field=models.IntegerField(db_index=True, null=True,
+                                      verbose_name='год обучения'),
         ),
         migrations.AlterField(
             model_name='teacher',
@@ -154,17 +184,25 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='сhastisement',
             name='schoolkid',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Schoolkid', verbose_name='ученик'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Schoolkid', verbose_name='ученик'),
         ),
         migrations.AlterField(
             model_name='сhastisement',
             name='subject',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='datacenter.Subject', verbose_name='предмет'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to='datacenter.Subject',
+                verbose_name='предмет'),
         ),
         migrations.AlterField(
             model_name='сhastisement',
             name='teacher',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='datacenter.Teacher', verbose_name='учитель'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='datacenter.Teacher', verbose_name='учитель'),
         ),
         migrations.AlterField(
             model_name='сhastisement',

diff --git a/datacenter/migrations/0007_auto_20190720_1004.py b/datacenter/migrations/0007_auto_20190720_1004.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.2.3 on 2019-07-20 07:04
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):