Skip to content
Snippets Groups Projects

Resolve "Make Alsijil work with current core"

Merged Resolve "Make Alsijil work with current core"
60-make-alsijil-work-with-current-core into master
Merged Tom Teichler requested to merge 60-make-alsijil-work-with-current-core into master
Viewing commit 3d1904c1
Prev Next
Show latest version
2 files
+ 54
− 165
Compare changes
  • Side-by-side
  • Inline
Files
2
aleksis/apps/alsijil/migrations/0001_initial.py
+ 54
− 99
# Generated by Django 2.2.5 on 2019-09-03 18:30
# Generated by Django 3.0.6 on 2020-05-11 13:19
import django.db.models.deletion
import aleksis.apps.alsijil.models
 
import django.contrib.postgres.fields.jsonb
 
import django.contrib.sites.managers
from django.db import migrations, models
from django.db import migrations, models
import django.db.models.deletion
import aleksis.core.util.core_helpers
class Migration(migrations.Migration):
class Migration(migrations.Migration):
@@ -11,114 +12,68 @@ class Migration(migrations.Migration):
@@ -11,114 +12,68 @@ class Migration(migrations.Migration):
initial = True
initial = True
dependencies = [
dependencies = [
("chronos", "0001_initial"),
('chronos', '0001_initial'),
("core", "0001_initial"),
('sites', '0002_alter_domain_unique'),
 
('core', '0001_initial'),
]
]
operations = [
operations = [
migrations.CreateModel(
migrations.CreateModel(
name="PersonalNote",
name='PersonalNoteFilter',
 
fields=[
 
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
 
('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
 
('identifier', models.CharField(max_length=30, unique=True, validators=[aleksis.apps.alsijil.models.isidentifier], verbose_name='Identifier')),
 
('description', models.CharField(blank=True, max_length=60, unique=True, verbose_name='Description')),
 
('regex', models.CharField(max_length=100, unique=True, verbose_name='Match expression')),
 
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
 
],
 
options={
 
'ordering': ['identifier'],
 
},
 
managers=[
 
('objects', django.contrib.sites.managers.CurrentSiteManager()),
 
],
 
),
 
migrations.CreateModel(
 
name='PersonalNote',
fields=[
fields=[
(
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id",
('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
models.AutoField(
('week', models.IntegerField()),
auto_created=True,
('absent', models.BooleanField(default=False)),
primary_key=True,
('late', models.IntegerField(default=0)),
serialize=False,
('excused', models.BooleanField(default=False)),
verbose_name="ID",
('remarks', models.CharField(blank=True, max_length=200)),
),
('lesson_period', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='personal_notes', to='chronos.LessonPeriod')),
),
('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='personal_notes', to='core.Person')),
("week", models.IntegerField()),
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
("absent", models.BooleanField(default=False)),
("late", models.IntegerField(default=0)),
("excused", models.BooleanField(default=False)),
("remarks", models.CharField(blank=True, max_length=200)),
(
"lesson_period",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="chronos.LessonPeriod",
),
),
(
"person",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="personal_notes",
to="core.Person",
),
),
(
"school",
models.ForeignKey(
default=1,
on_delete=django.db.models.deletion.CASCADE,
to="core.School",
),
),
],
],
options={
options={
"ordering": [
'ordering': ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday', 'lesson_period__period__period', 'person__last_name', 'person__first_name'],
"lesson_period__lesson__date_start",
'unique_together': {('lesson_period', 'week', 'person')},
"week",
"lesson_period__period__weekday",
"lesson_period__period__period",
"person__last_name",
"person__first_name",
],
"unique_together": {("school", "lesson_period", "week", "person")},
},
},
 
managers=[
 
('objects', django.contrib.sites.managers.CurrentSiteManager()),
 
],
),
),
migrations.CreateModel(
migrations.CreateModel(
name="LessonDocumentation",
name='LessonDocumentation',
fields=[
fields=[
(
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id",
('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
models.AutoField(
('week', models.IntegerField()),
auto_created=True,
('topic', models.CharField(blank=True, max_length=200, verbose_name='Lesson topic')),
primary_key=True,
('homework', models.CharField(blank=True, max_length=200, verbose_name='Homework')),
serialize=False,
('lesson_period', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documentations', to='chronos.LessonPeriod')),
verbose_name="ID",
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
),
),
("week", models.IntegerField()),
(
"topic",
models.CharField(
blank=True, max_length=200, verbose_name="Lesson topic"
),
),
(
"homework",
models.CharField(
blank=True, max_length=200, verbose_name="Homework"
),
),
(
"lesson_period",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="documentations",
to="chronos.LessonPeriod",
),
),
(
"school",
models.ForeignKey(
default=1,
on_delete=django.db.models.deletion.CASCADE,
to="core.School",
),
),
],
],
options={
options={
"ordering": [
'ordering': ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday', 'lesson_period__period__period'],
"lesson_period__lesson__date_start",
'unique_together': {('lesson_period', 'week')},
"week",
"lesson_period__period__weekday",
"lesson_period__period__period",
],
"unique_together": {("school", "lesson_period", "week")},
},
},
 
managers=[
 
('objects', django.contrib.sites.managers.CurrentSiteManager()),
 
],
),
),
]
]