Skip to content
Snippets Groups Projects

Draft: Resolve "Instructions can be linked to a document as remarks by the group"

Open Draft: Resolve "Instructions can be linked to a document as remarks by the group"
174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group into master
10 unresolved threads
Open Jonathan Weth requested to merge 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group into master
10 unresolved threads

Closes #174

Edited by Jonathan Weth

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
aleksis/apps/alsijil/admin.py 0 → 100644
1 from django.contrib import admin
2
3 from .models import Instruction
4
5 admin.site.register(Instruction)
  • Nik | Klampfradler
    Nik | Klampfradler @nik started a thread on the diff
    • aleksis/apps/alsijil/filters.py
    45 45 "excuse_type": ["exact"],
    46 46 "extra_marks": ["exact"],
    47 47 }
    48
    49
    50 class InstructionFilter(FilterSet):
  • Nik | Klampfradler
    Nik | Klampfradler @nik started a thread on the diff
    • aleksis/apps/alsijil/forms.py
    31 31 ExtraMark,
    32 32 GroupRole,
    33 33 GroupRoleAssignment,
    34 Instruction,
    34 35 LessonDocumentation,
    35 36 PersonalNote,
    36 37 )
    37 38
    38 39
    39 40 class LessonDocumentationForm(forms.ModelForm):
  • Nik | Klampfradler
    Nik | Klampfradler @nik started a thread on the diff
    • aleksis/apps/alsijil/forms.py
    406 409 """Action form for managing register objects for use with ``RegisterObjectTable``."""
    407 410
    408 411 actions = [send_request_to_check_entry]
    412
    413
    414 class InstructionForm(forms.ModelForm):
  • Nik | Klampfradler
    Nik | Klampfradler @nik started a thread on the diff
    • aleksis/apps/alsijil/models.py
    345 350 homework = models.CharField(verbose_name=_("Homework"), max_length=200, blank=True)
    346 351 group_note = models.CharField(verbose_name=_("Group note"), max_length=200, blank=True)
    347 352
    353 done_instructions = models.ManyToManyField(
    354 "Instruction",
    355 blank=True,
    356 null=True,
    357 related_name="documentations",
    358 verbose_name=_("Done instructions"),
    359 )
  • Nik | Klampfradler
    Nik | Klampfradler @nik started a thread on the diff
    • aleksis/apps/alsijil/models.py
    512 525 verbose_name_plural = _("Group role assignments")
    513 526
    514 527
    528 class Instruction(SchoolTermRelatedExtensibleModel):
  • Nik | Klampfradler
    Nik | Klampfradler @nik started a thread on the diff
    • aleksis/apps/alsijil/models.py
    512 525 verbose_name_plural = _("Group role assignments")
    513 526
    514 527
    528 class Instruction(SchoolTermRelatedExtensibleModel):
    529 name = models.CharField(max_length=255, verbose_name=_("Name"))
    530 icon = models.CharField(max_length=50, blank=True, choices=ICONS, verbose_name=_("Icon"))
    531 pdf_file = models.FileField(
    532 upload_to="instructions/",
    533 verbose_name=_("PDF file"),
    534 validators=[FileExtensionValidator(["pdf"])],
    535 )
    • Nik | Klampfradler
      Nik | Klampfradler @nik ·
      Owner

      Something to consider:

      We have a long-standing feature request in Core to introduce agreements: AlekSIS-Core#157

      I think that we should maybe combine this, and therefore move the "instruction" model to the core as "agreement".

      Rationale: An agreement is an agreement, independent of the formal procedure of agreement. An agreement can be displayed on registration, or before being allowed to perform a specific action, or it can be given as an instruction. In the end, it is still an agreement that is tracked.

      Example of where this overlaps:

      • A privacy policy must be displayed when self-registering (e.g. for parents), and it also needs to be given as an instruction when students join the school (because they probably got their accoutns fully provisioned, and they need more personal counseling to understand it than parents)
    • Nik | Klampfradler
      Nik | Klampfradler @nik ·
      Owner

      @hansegucker open for discussion

    • Jonathan Weth
      Jonathan Weth @hansegucker ·
      Author Owner

      The main difference seems to be a formal one: Instructions are something students and/or parents are not free to agree or disagree with, they are just instructed about a certain formal procedure or law.

    • Jonathan Weth
      Jonathan Weth @hansegucker ·
      Author Owner

      But this hasn't to be a larger technical difference.

    • Nik | Klampfradler
      Nik | Klampfradler @nik ·
      Owner

      The main difference seems to be a formal one: Instructions are something students and/or parents are not free to agree or disagree with, they are just instructed about a certain formal procedure or law.

      Of course they are. If they don't, they cannot use the features guarded by the instruction, e.g. take part in a chemistry class. There will probably be consequences, like expulsion from school, but ultimately, that is no different from disagreeing with a privacy statement and thus being exempt from using a website.

    • Please register or sign in to reply
  • Jonathan Weth added 23 commits

    added 23 commits

    • 9ebacf89...40c6c049 - 22 commits from branch master
    • bc8fcb2e - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

    Compare with previous version

  • Jonathan Weth marked this merge request as draft

    marked this merge request as draft

  • Jonathan Weth added 7 commits

    added 7 commits

    • bc8fcb2e...702a110d - 6 commits from branch master
    • 002fa18c - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

    Compare with previous version

  • Jonathan Weth added 11 commits

    added 11 commits

    • 002fa18c...1d7b1976 - 10 commits from branch master
    • 16842af6 - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

    Compare with previous version

    • Hangzhi Yu
      Hangzhi Yu @yuha ·
      Developer

      What is the current state of this MR? Is there a reason that the unresolved threads were not resolved so far?

    • Jonathan Weth
      Jonathan Weth @hansegucker ·
      Author Owner

      Yes, there is one. We agreed to (re)structure the whole system of agreements and instructions from bottom up and in AlekSIS-Core.

    • Please register or sign in to reply
  • Jonathan Weth added 63 commits

    added 63 commits

    • 16842af6...60df77b5 - 62 commits from branch master
    • 46670c45 - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • 40d9344c - Make instruction frontend compatible with new Vue frontend

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    Compare with previous version

    • Please register or sign in to reply