Skip to content
Snippets Groups Projects
Verified Commit 1928e6ea authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 82-do-not-count-cancelled-lessons

parents 068a0cd2 f58a00cf
No related branches found
No related tags found
1 merge request!61Resolve "Do not allow to add personal notes for cancelled lessons"
Pipeline #3212 passed
...@@ -6,13 +6,15 @@ from django.db import migrations, models ...@@ -6,13 +6,15 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('alsijil', '0003_extra_mark'), ("alsijil", "0003_extra_mark"),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='lessondocumentation', model_name="lessondocumentation",
name='group_note', name="group_note",
field=models.CharField(blank=True, max_length=200, verbose_name='Group note'), field=models.CharField(
blank=True, max_length=200, verbose_name="Group note"
),
), ),
] ]
...@@ -98,7 +98,9 @@ class LessonDocumentation(ExtensibleModel): ...@@ -98,7 +98,9 @@ class LessonDocumentation(ExtensibleModel):
topic = models.CharField(verbose_name=_("Lesson topic"), max_length=200, blank=True) topic = models.CharField(verbose_name=_("Lesson topic"), max_length=200, blank=True)
homework = models.CharField(verbose_name=_("Homework"), max_length=200, blank=True) homework = models.CharField(verbose_name=_("Homework"), max_length=200, blank=True)
group_note = models.CharField(verbose_name=_("Group note"), max_length=200, blank=True) group_note = models.CharField(
verbose_name=_("Group note"), max_length=200, blank=True
)
class Meta: class Meta:
verbose_name = _("Lesson documentation") verbose_name = _("Lesson documentation")
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment