diff --git a/faerun_calendar/admin.py b/faerun_calendar/admin.py index ef21617..1463ca1 100644 --- a/faerun_calendar/admin.py +++ b/faerun_calendar/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from .models import YearData from .models import MonthData from .models import Event @@ -8,3 +9,4 @@ admin.site.register(YearData) admin.site.register(MonthData) admin.site.register(Event) admin.site.register(CalendarData) + diff --git a/faerun_calendar/migrations/0001_initial.py b/faerun_calendar/migrations/0001_initial.py index 683dd25..4474c6e 100644 --- a/faerun_calendar/migrations/0001_initial.py +++ b/faerun_calendar/migrations/0001_initial.py @@ -1,6 +1,8 @@ -# Generated by Django 3.2.12 on 2022-07-13 08:12 +# Generated by Django 4.0.5 on 2022-11-02 19:43 +import django.core.validators from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): @@ -12,21 +14,43 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='CalendarData', + name='MonthData', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('current_year', models.SmallIntegerField(verbose_name='CurrentYear')), - ('current_month', models.SmallIntegerField(verbose_name='CurrentMonth')), - ('current_day', models.SmallIntegerField(verbose_name='CurrentDay')), + ('number', models.SmallIntegerField(unique=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(18)], verbose_name='Number')), + ('name', models.CharField(max_length=64, unique=True, verbose_name='Name')), + ('folkname', models.CharField(blank=True, max_length=64, verbose_name='Folkname')), + ('is_oneday', models.BooleanField(verbose_name='IsOneday')), + ('is_leap_month', models.BooleanField(verbose_name='IsLeapMonth')), + ], + ), + migrations.CreateModel( + name='YearData', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('number', models.SmallIntegerField(validators=[django.core.validators.RegexValidator('^-?[1-9]\\d{0,3}$', 'Year must be not zero and between -9999 and 9999')], verbose_name='Number')), ], ), migrations.CreateModel( name='Event', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('year', models.SmallIntegerField(verbose_name='Year')), - ('month', models.SmallIntegerField(verbose_name='Month')), - ('day', models.SmallIntegerField(verbose_name='Day')), + ('day', models.SmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)], verbose_name='Number')), + ('time', models.TimeField(verbose_name='Time')), + ('title', models.CharField(max_length=250, verbose_name='Title')), + ('is_suggested', models.BooleanField(verbose_name='IsSuggested')), + ('is_only_for_gm', models.BooleanField(verbose_name='IsOnlyForGm')), + ('month', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata')), + ('year', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.yeardata')), + ], + ), + migrations.CreateModel( + name='CalendarData', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('current_day', models.SmallIntegerField(unique=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)], verbose_name='Number')), + ('current_month', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata')), + ('current_year', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.yeardata')), ], ), ] diff --git a/faerun_calendar/migrations/0002_event_description.py b/faerun_calendar/migrations/0002_event_description.py new file mode 100644 index 0000000..6d86ade --- /dev/null +++ b/faerun_calendar/migrations/0002_event_description.py @@ -0,0 +1,19 @@ +# Generated by Django 4.0.5 on 2022-11-02 19:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('faerun_calendar', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='description', + field=models.TextField(default='', max_length=2500, verbose_name='Description'), + preserve_default=False, + ), + ] diff --git a/faerun_calendar/migrations/0002_monthdata.py b/faerun_calendar/migrations/0002_monthdata.py deleted file mode 100644 index 2fced27..0000000 --- a/faerun_calendar/migrations/0002_monthdata.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='MonthData', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('number', models.SmallIntegerField(unique=True, verbose_name='Number')), - ('name', models.CharField(max_length=64, unique=True, verbose_name='Name')), - ('folkname', models.CharField(max_length=64, unique=True, verbose_name='Folkname')), - ], - ), - ] diff --git a/faerun_calendar/migrations/0003_auto_20220713_1117.py b/faerun_calendar/migrations/0003_auto_20220713_1117.py deleted file mode 100644 index e356ccf..0000000 --- a/faerun_calendar/migrations/0003_auto_20220713_1117.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0002_monthdata'), - ] - - operations = [ - migrations.AddField( - model_name='event', - name='description', - field=models.TextField(default=0, max_length=2500, verbose_name='Description'), - preserve_default=False, - ), - migrations.AddField( - model_name='event', - name='time', - field=models.TimeField(default=0, verbose_name='Time'), - preserve_default=False, - ), - migrations.AddField( - model_name='event', - name='title', - field=models.CharField(default=0, max_length=250, verbose_name='Title'), - preserve_default=False, - ), - ] diff --git a/faerun_calendar/migrations/0003_remove_event_description.py b/faerun_calendar/migrations/0003_remove_event_description.py new file mode 100644 index 0000000..44f8aa2 --- /dev/null +++ b/faerun_calendar/migrations/0003_remove_event_description.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0.5 on 2022-11-02 19:46 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('faerun_calendar', '0002_event_description'), + ] + + operations = [ + migrations.RemoveField( + model_name='event', + name='description', + ), + ] diff --git a/faerun_calendar/migrations/0004_auto_20220713_1123.py b/faerun_calendar/migrations/0004_auto_20220713_1123.py deleted file mode 100644 index 69eee4e..0000000 --- a/faerun_calendar/migrations/0004_auto_20220713_1123.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:23 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0003_auto_20220713_1117'), - ] - - operations = [ - migrations.DeleteModel( - name='CalendarData', - ), - migrations.DeleteModel( - name='Event', - ), - migrations.DeleteModel( - name='MonthData', - ), - ] diff --git a/faerun_calendar/migrations/0004_event_description.py b/faerun_calendar/migrations/0004_event_description.py new file mode 100644 index 0000000..878d894 --- /dev/null +++ b/faerun_calendar/migrations/0004_event_description.py @@ -0,0 +1,19 @@ +# Generated by Django 4.0.5 on 2022-11-02 19:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('faerun_calendar', '0003_remove_event_description'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='description', + field=models.TextField(default='', max_length=2500, verbose_name='Description'), + preserve_default=False, + ), + ] diff --git a/faerun_calendar/migrations/0005_calendardata_event_monthdata.py b/faerun_calendar/migrations/0005_calendardata_event_monthdata.py deleted file mode 100644 index 714bd1c..0000000 --- a/faerun_calendar/migrations/0005_calendardata_event_monthdata.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:23 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('faerun_calendar', '0004_auto_20220713_1123'), - ] - - operations = [ - migrations.CreateModel( - name='CalendarData', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('current_year', models.SmallIntegerField(verbose_name='CurrentYear')), - ('current_month', models.SmallIntegerField(verbose_name='CurrentMonth')), - ('current_day', models.SmallIntegerField(verbose_name='CurrentDay')), - ], - ), - migrations.CreateModel( - name='Event', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('year', models.SmallIntegerField(verbose_name='Year')), - ('month', models.SmallIntegerField(verbose_name='Month')), - ('day', models.SmallIntegerField(verbose_name='Day')), - ('time', models.TimeField(verbose_name='Time')), - ('title', models.CharField(max_length=250, verbose_name='Title')), - ('description', models.TextField(max_length=2500, verbose_name='Description')), - ], - ), - migrations.CreateModel( - name='MonthData', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('number', models.SmallIntegerField(unique=True, verbose_name='Number')), - ('name', models.CharField(max_length=64, unique=True, verbose_name='Name')), - ('folkname', models.CharField(max_length=64, unique=True, verbose_name='Folkname')), - ], - ), - ] diff --git a/faerun_calendar/migrations/0015_auto_20220714_0906.py b/faerun_calendar/migrations/0005_remove_event_month_remove_event_year_and_more.py similarity index 65% rename from faerun_calendar/migrations/0015_auto_20220714_0906.py rename to faerun_calendar/migrations/0005_remove_event_month_remove_event_year_and_more.py index a4204ae..0d1aad1 100644 --- a/faerun_calendar/migrations/0015_auto_20220714_0906.py +++ b/faerun_calendar/migrations/0005_remove_event_month_remove_event_year_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.12 on 2022-07-14 09:06 +# Generated by Django 4.0.5 on 2022-11-02 20:29 from django.db import migrations @@ -6,28 +6,21 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('faerun_calendar', '0014_auto_20220714_0840'), + ('faerun_calendar', '0004_event_description'), ] operations = [ migrations.RemoveField( - model_name='daydata', + model_name='event', name='month', ), - migrations.RemoveField( - model_name='daydata', - name='year', - ), migrations.RemoveField( model_name='event', - name='day', + name='year', ), migrations.DeleteModel( name='CalendarData', ), - migrations.DeleteModel( - name='DayData', - ), migrations.DeleteModel( name='Event', ), diff --git a/faerun_calendar/migrations/0006_auto_20220713_1126.py b/faerun_calendar/migrations/0006_auto_20220713_1126.py deleted file mode 100644 index e46d333..0000000 --- a/faerun_calendar/migrations/0006_auto_20220713_1126.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:26 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0005_calendardata_event_monthdata'), - ] - - operations = [ - migrations.DeleteModel( - name='CalendarData', - ), - migrations.DeleteModel( - name='Event', - ), - migrations.DeleteModel( - name='MonthData', - ), - ] diff --git a/faerun_calendar/migrations/0016_initial.py b/faerun_calendar/migrations/0006_initial.py similarity index 53% rename from faerun_calendar/migrations/0016_initial.py rename to faerun_calendar/migrations/0006_initial.py index 9747c33..4cfaf72 100644 --- a/faerun_calendar/migrations/0016_initial.py +++ b/faerun_calendar/migrations/0006_initial.py @@ -1,5 +1,6 @@ -# Generated by Django 3.2.12 on 2022-07-14 09:07 +# Generated by Django 4.0.5 on 2022-11-02 20:35 +import django.core.validators from django.db import migrations, models import django.db.models.deletion @@ -9,22 +10,15 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('faerun_calendar', '0015_auto_20220714_0906'), + ('faerun_calendar', '0005_remove_event_month_remove_event_year_and_more'), ] operations = [ - migrations.CreateModel( - name='DayData', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('number', models.SmallIntegerField(unique=True, verbose_name='Number')), - ], - ), migrations.CreateModel( name='MonthData', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('number', models.SmallIntegerField(unique=True, verbose_name='Number')), + ('number', models.SmallIntegerField(unique=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(18)], verbose_name='Number')), ('name', models.CharField(max_length=64, unique=True, verbose_name='Name')), ('folkname', models.CharField(blank=True, max_length=64, verbose_name='Folkname')), ('is_oneday', models.BooleanField(verbose_name='IsOneday')), @@ -35,34 +29,30 @@ class Migration(migrations.Migration): name='YearData', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('year', models.SmallIntegerField(verbose_name='Year')), + ('number', models.SmallIntegerField(validators=[django.core.validators.RegexValidator('^-?[1-9]\\d{0,3}$', 'Year must be not zero and between -9999 and 9999')], verbose_name='Number')), ], ), migrations.CreateModel( name='Event', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('day', models.SmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)], verbose_name='Number')), ('time', models.TimeField(verbose_name='Time')), ('title', models.CharField(max_length=250, verbose_name='Title')), ('description', models.TextField(max_length=2500, verbose_name='Description')), - ('day', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.daydata')), + ('is_suggested', models.BooleanField(verbose_name='IsSuggested')), + ('is_only_for_gm', models.BooleanField(verbose_name='IsOnlyForGm')), + ('month', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata')), + ('year', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.yeardata')), ], ), - migrations.AddField( - model_name='daydata', - name='month', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata'), - ), - migrations.AddField( - model_name='daydata', - name='year', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.yeardata'), - ), migrations.CreateModel( name='CalendarData', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('current_day', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.daydata')), + ('current_day', models.SmallIntegerField(unique=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)], verbose_name='Number')), + ('current_month', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata')), + ('current_year', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.yeardata')), ], ), ] diff --git a/faerun_calendar/migrations/0007_calendardata_event_monthdata.py b/faerun_calendar/migrations/0007_calendardata_event_monthdata.py deleted file mode 100644 index e397179..0000000 --- a/faerun_calendar/migrations/0007_calendardata_event_monthdata.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('faerun_calendar', '0006_auto_20220713_1126'), - ] - - operations = [ - migrations.CreateModel( - name='CalendarData', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('current_year', models.SmallIntegerField(verbose_name='CurrentYear')), - ('current_month', models.SmallIntegerField(verbose_name='CurrentMonth')), - ('current_day', models.SmallIntegerField(verbose_name='CurrentDay')), - ], - ), - migrations.CreateModel( - name='Event', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('year', models.SmallIntegerField(verbose_name='Year')), - ('month', models.SmallIntegerField(verbose_name='Month')), - ('day', models.SmallIntegerField(verbose_name='Day')), - ('time', models.TimeField(verbose_name='Time')), - ('title', models.CharField(max_length=250, verbose_name='Title')), - ('description', models.TextField(max_length=2500, verbose_name='Description')), - ], - ), - migrations.CreateModel( - name='MonthData', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('number', models.SmallIntegerField(unique=True, verbose_name='Number')), - ('name', models.CharField(max_length=64, unique=True, verbose_name='Name')), - ('folkname', models.CharField(max_length=64, unique=True, verbose_name='Folkname')), - ], - ), - ] diff --git a/faerun_calendar/migrations/0008_alter_monthdata_folkname.py b/faerun_calendar/migrations/0008_alter_monthdata_folkname.py deleted file mode 100644 index 3d0bf0e..0000000 --- a/faerun_calendar/migrations/0008_alter_monthdata_folkname.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:45 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0007_calendardata_event_monthdata'), - ] - - operations = [ - migrations.AlterField( - model_name='monthdata', - name='folkname', - field=models.CharField(max_length=64, verbose_name='Folkname'), - ), - ] diff --git a/faerun_calendar/migrations/0009_alter_monthdata_folkname.py b/faerun_calendar/migrations/0009_alter_monthdata_folkname.py deleted file mode 100644 index a58e52f..0000000 --- a/faerun_calendar/migrations/0009_alter_monthdata_folkname.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:49 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0008_alter_monthdata_folkname'), - ] - - operations = [ - migrations.AlterField( - model_name='monthdata', - name='folkname', - field=models.CharField(blank=True, max_length=64, unique=True, verbose_name='Folkname'), - ), - ] diff --git a/faerun_calendar/migrations/0010_alter_monthdata_folkname.py b/faerun_calendar/migrations/0010_alter_monthdata_folkname.py deleted file mode 100644 index fb2542d..0000000 --- a/faerun_calendar/migrations/0010_alter_monthdata_folkname.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 11:50 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0009_alter_monthdata_folkname'), - ] - - operations = [ - migrations.AlterField( - model_name='monthdata', - name='folkname', - field=models.CharField(blank=True, max_length=64, verbose_name='Folkname'), - ), - ] diff --git a/faerun_calendar/migrations/0011_monthdata_is_oneday.py b/faerun_calendar/migrations/0011_monthdata_is_oneday.py deleted file mode 100644 index 0d8f363..0000000 --- a/faerun_calendar/migrations/0011_monthdata_is_oneday.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 12:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0010_alter_monthdata_folkname'), - ] - - operations = [ - migrations.AddField( - model_name='monthdata', - name='is_oneday', - field=models.BooleanField(default=0, verbose_name='IsOneday'), - preserve_default=False, - ), - ] diff --git a/faerun_calendar/migrations/0012_calendardata_leap_month.py b/faerun_calendar/migrations/0012_calendardata_leap_month.py deleted file mode 100644 index 985a9dd..0000000 --- a/faerun_calendar/migrations/0012_calendardata_leap_month.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-13 12:35 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0011_monthdata_is_oneday'), - ] - - operations = [ - migrations.AddField( - model_name='calendardata', - name='leap_month', - field=models.SmallIntegerField(default=11, verbose_name='LeapMonth'), - preserve_default=False, - ), - ] diff --git a/faerun_calendar/migrations/0013_alter_calendardata_current_month.py b/faerun_calendar/migrations/0013_alter_calendardata_current_month.py deleted file mode 100644 index 995ea20..0000000 --- a/faerun_calendar/migrations/0013_alter_calendardata_current_month.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-14 07:31 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0012_calendardata_leap_month'), - ] - - operations = [ - migrations.AlterField( - model_name='calendardata', - name='current_month', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata'), - ), - ] diff --git a/faerun_calendar/migrations/0014_auto_20220714_0840.py b/faerun_calendar/migrations/0014_auto_20220714_0840.py deleted file mode 100644 index 443e087..0000000 --- a/faerun_calendar/migrations/0014_auto_20220714_0840.py +++ /dev/null @@ -1,66 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-14 08:40 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0013_alter_calendardata_current_month'), - ] - - operations = [ - migrations.CreateModel( - name='YearData', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('year', models.SmallIntegerField(verbose_name='Year')), - ], - ), - migrations.RemoveField( - model_name='calendardata', - name='current_month', - ), - migrations.RemoveField( - model_name='calendardata', - name='current_year', - ), - migrations.RemoveField( - model_name='calendardata', - name='leap_month', - ), - migrations.RemoveField( - model_name='event', - name='month', - ), - migrations.RemoveField( - model_name='event', - name='year', - ), - migrations.AddField( - model_name='monthdata', - name='is_leap_month', - field=models.BooleanField(default=0, verbose_name='IsLeapMonth'), - preserve_default=False, - ), - migrations.CreateModel( - name='DayData', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('number', models.SmallIntegerField(unique=True, verbose_name='Number')), - ('month', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata')), - ('year', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.yeardata')), - ], - ), - migrations.AlterField( - model_name='calendardata', - name='current_day', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.daydata'), - ), - migrations.AlterField( - model_name='event', - name='day', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.daydata'), - ), - ] diff --git a/faerun_calendar/migrations/0017_auto_20220714_1136.py b/faerun_calendar/migrations/0017_auto_20220714_1136.py deleted file mode 100644 index afc3283..0000000 --- a/faerun_calendar/migrations/0017_auto_20220714_1136.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-14 11:36 - -import django.core.validators -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0016_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='yeardata', - name='year', - ), - migrations.AddField( - model_name='yeardata', - name='number', - field=models.SmallIntegerField(default=1, validators=[django.core.validators.RegexValidator('^-?[1-9]\\d{0,3}$', 'Year must be not zero and between -9999 and 9999')], verbose_name='Number'), - preserve_default=False, - ), - migrations.AlterField( - model_name='daydata', - name='number', - field=models.SmallIntegerField(unique=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)], verbose_name='Number'), - ), - migrations.AlterField( - model_name='monthdata', - name='number', - field=models.SmallIntegerField(unique=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(18)], verbose_name='Number'), - ), - ] diff --git a/faerun_calendar/migrations/0018_auto_20220714_1305.py b/faerun_calendar/migrations/0018_auto_20220714_1305.py deleted file mode 100644 index 86fd39d..0000000 --- a/faerun_calendar/migrations/0018_auto_20220714_1305.py +++ /dev/null @@ -1,52 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-14 13:05 - -import django.core.validators -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0017_auto_20220714_1136'), - ] - - operations = [ - migrations.AddField( - model_name='calendardata', - name='current_month', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata'), - preserve_default=False, - ), - migrations.AddField( - model_name='calendardata', - name='current_year', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.yeardata'), - preserve_default=False, - ), - migrations.AddField( - model_name='event', - name='current_month', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.monthdata'), - preserve_default=False, - ), - migrations.AddField( - model_name='event', - name='current_year', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='faerun_calendar.yeardata'), - preserve_default=False, - ), - migrations.AlterField( - model_name='calendardata', - name='current_day', - field=models.SmallIntegerField(unique=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)], verbose_name='Number'), - ), - migrations.AlterField( - model_name='event', - name='day', - field=models.SmallIntegerField(unique=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)], verbose_name='Number'), - ), - migrations.DeleteModel( - name='DayData', - ), - ] diff --git a/faerun_calendar/migrations/0019_auto_20220714_1312.py b/faerun_calendar/migrations/0019_auto_20220714_1312.py deleted file mode 100644 index 0954fc4..0000000 --- a/faerun_calendar/migrations/0019_auto_20220714_1312.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-14 13:12 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0018_auto_20220714_1305'), - ] - - operations = [ - migrations.RenameField( - model_name='event', - old_name='current_month', - new_name='month', - ), - migrations.RenameField( - model_name='event', - old_name='current_year', - new_name='year', - ), - ] diff --git a/faerun_calendar/migrations/0020_alter_event_day.py b/faerun_calendar/migrations/0020_alter_event_day.py deleted file mode 100644 index 3178eb3..0000000 --- a/faerun_calendar/migrations/0020_alter_event_day.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.12 on 2022-11-01 13:52 - -import django.core.validators -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0019_auto_20220714_1312'), - ] - - operations = [ - migrations.AlterField( - model_name='event', - name='day', - field=models.SmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(30)], verbose_name='Number'), - ), - ] diff --git a/faerun_calendar/migrations/0021_auto_20221102_0649.py b/faerun_calendar/migrations/0021_auto_20221102_0649.py deleted file mode 100644 index 1250101..0000000 --- a/faerun_calendar/migrations/0021_auto_20221102_0649.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.2.12 on 2022-11-02 06:49 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('faerun_calendar', '0020_alter_event_day'), - ] - - operations = [ - migrations.AddField( - model_name='event', - name='is_only_for_gm', - field=models.BooleanField(default=False, verbose_name='IsOnlyForGm'), - preserve_default=False, - ), - migrations.AddField( - model_name='event', - name='is_suggested', - field=models.BooleanField(default=False, verbose_name='IsSuggested'), - preserve_default=False, - ), - ] diff --git a/faerun_calendar/models.py b/faerun_calendar/models.py index 090a3ea..1136c0f 100644 --- a/faerun_calendar/models.py +++ b/faerun_calendar/models.py @@ -66,3 +66,4 @@ class Event(models.Model): def __str__(self): return f'({self.day}, {self.time}, {self.title})' + diff --git a/faerun_calendar/views.py b/faerun_calendar/views.py index 723087d..80f94bb 100644 --- a/faerun_calendar/views.py +++ b/faerun_calendar/views.py @@ -109,3 +109,4 @@ def index(request): current_year = 0 return year_page(request, current_year) + diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py index e9d62ce..6d158bb 100644 --- a/links/migrations/0001_initial.py +++ b/links/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.12 on 2022-07-12 13:01 +# Generated by Django 4.0.5 on 2022-11-02 19:43 from django.db import migrations, models @@ -15,6 +15,7 @@ class Migration(migrations.Migration): name='Link', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('order', models.SmallIntegerField(verbose_name='Order')), ('url', models.CharField(max_length=250, verbose_name='URL')), ('text', models.CharField(max_length=250, verbose_name='Text')), ], diff --git a/links/migrations/0002_link_order.py b/links/migrations/0002_link_order.py deleted file mode 100644 index e41e603..0000000 --- a/links/migrations/0002_link_order.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-12 13:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('links', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='link', - name='order', - field=models.SmallIntegerField(default=1, verbose_name='Order'), - preserve_default=False, - ), - ]