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

Draft
hansegucker wants to merge 24 commits from 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group into master
hansegucker commented 2021-07-30 17:50:42 +02:00 (Migrated from edugit.org)

Closes #174

Closes #174
hansegucker commented 2021-07-30 17:50:48 +02:00 (Migrated from edugit.org)

assigned to @hansegucker

assigned to @hansegucker
hansegucker commented 2021-07-30 18:12:15 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>b4f8fb24 - Add instruction model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=10854&start_sha=cb80b334a0ccae2da8ba901c50e04ccac3844968)
hansegucker commented 2021-08-01 11:56:11 +02:00 (Migrated from edugit.org)

added 1 commit

  • 6846cec1 - Add views for listing instructions

Compare with previous version

added 1 commit <ul><li>6846cec1 - Add views for listing instructions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=10865&start_sha=b4f8fb24f34c16e469598c4f594e0041a94614ff)
hansegucker commented 2021-08-01 17:06:05 +02:00 (Migrated from edugit.org)

added 7 commits

  • 6846cec1...5a84fa83 - 6 commits from branch master
  • 721c03d3 - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

Compare with previous version

added 7 commits <ul><li>6846cec1...5a84fa83 - 6 commits from branch <code>master</code></li><li>721c03d3 - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=10923&start_sha=6846cec19a39f429c374ce148ae9af507f78f477)
hansegucker commented 2021-08-01 18:01:13 +02:00 (Migrated from edugit.org)

added 2 commits

  • 28ea2aec - Update translation files
  • f8ef8c6f - Update translations

Compare with previous version

added 2 commits <ul><li>28ea2aec - Update translation files</li><li>f8ef8c6f - Update translations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=10937&start_sha=721c03d3109af43555174cf54cc1ecf1ed22c6d8)
hansegucker commented 2021-11-02 10:52:37 +01:00 (Migrated from edugit.org)

added 36 commits

  • 721c03d3...564895ee - 35 commits from branch master
  • ca376d51 - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

Compare with previous version

added 36 commits <ul><li>721c03d3...564895ee - 35 commits from branch <code>master</code></li><li>ca376d51 - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=12877&start_sha=721c03d3109af43555174cf54cc1ecf1ed22c6d8)
hansegucker commented 2022-06-05 16:34:42 +02:00 (Migrated from edugit.org)

added 150 commits

  • ca376d51...b2e79686 - 149 commits from branch master
  • a55279d4 - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

Compare with previous version

added 150 commits <ul><li>ca376d51...b2e79686 - 149 commits from branch <code>master</code></li><li>a55279d4 - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=21816&start_sha=ca376d51649a3a2e563e547989b5558c68fdb0ab)
hansegucker commented 2022-06-05 17:59:05 +02:00 (Migrated from edugit.org)

added 1 commit

  • 72775aa9 - Add views for managing instructions

Compare with previous version

added 1 commit <ul><li>72775aa9 - Add views for managing instructions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=21846&start_sha=a55279d4410ed9780a903b7c8b739bac1f17e1dc)
hansegucker commented 2022-06-14 15:25:49 +02:00 (Migrated from edugit.org)

added 3 commits

  • 72775aa9...0552868d - 2 commits from branch master
  • 282a206f - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

Compare with previous version

added 3 commits <ul><li>72775aa9...0552868d - 2 commits from branch <code>master</code></li><li>282a206f - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=22069&start_sha=72775aa9617d0dc018989602c0ad7bccff8f1271)
hansegucker commented 2022-06-14 21:52:39 +02:00 (Migrated from edugit.org)

added 4 commits

  • e2a9ac59 - Adjust permissions for instructions
  • b0dd660b - Make school term a required field for instructions
  • 8666add0 - Add option to mark instructions as done in lesson documentation
  • f32dba55 - Show done instructions also in read-only mode

Compare with previous version

added 4 commits <ul><li>e2a9ac59 - Adjust permissions for instructions</li><li>b0dd660b - Make school term a required field for instructions</li><li>8666add0 - Add option to mark instructions as done in lesson documentation</li><li>f32dba55 - Show done instructions also in read-only mode</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=22083&start_sha=282a206f30b0f9aa515a6cae095e505b349b8145)
hansegucker commented 2022-06-15 21:10:40 +02:00 (Migrated from edugit.org)

added 1 commit

  • c0a45082 - Add filter for instructions and redesign instructons list view

Compare with previous version

added 1 commit <ul><li>c0a45082 - Add filter for instructions and redesign instructons list view</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=22116&start_sha=f32dba55a1ca1278b97e769f25ba186e76839d54)
hansegucker commented 2022-06-18 11:27:10 +02:00 (Migrated from edugit.org)

Screenshot_2022-06-18_at_11-25-33_Instructions___AlekSIS

Screenshot_2022-06-18_at_11-25-18_Instructions___AlekSIS

Screenshot_2022-06-18_at_11-26-23_Lesson___AlekSIS

![Screenshot_2022-06-18_at_11-25-33_Instructions___AlekSIS](/uploads/81e1897fdfbc67b0e29d97fe8c48954c/Screenshot_2022-06-18_at_11-25-33_Instructions___AlekSIS.png) ![Screenshot_2022-06-18_at_11-25-18_Instructions___AlekSIS](/uploads/803d19e4c4f8bc0f97fc3ca39fff16d3/Screenshot_2022-06-18_at_11-25-18_Instructions___AlekSIS.png) ![Screenshot_2022-06-18_at_11-26-23_Lesson___AlekSIS](/uploads/ef814ce9e737131ce2267f2bf4e60df3/Screenshot_2022-06-18_at_11-26-23_Lesson___AlekSIS.png)
hansegucker commented 2022-06-18 11:32:03 +02:00 (Migrated from edugit.org)

added 1 commit

  • 82fb5a14 - Add view for evaluating done instructions

Compare with previous version

added 1 commit <ul><li>82fb5a14 - Add view for evaluating done instructions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=22146&start_sha=c0a45082ef5d74e82a2eca07e4d28bebcd999946)
hansegucker commented 2022-06-18 11:34:02 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>ea972e84 - Update changelog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=22148&start_sha=82fb5a14d69fbc08b5e126aa8b0320a34dde3428)
hansegucker commented 2022-06-18 11:34:05 +02:00 (Migrated from edugit.org)

marked this merge request as ready

marked this merge request as **ready**
hansegucker commented 2022-06-18 11:34:07 +02:00 (Migrated from edugit.org)

assigned to @nik and unassigned @hansegucker

assigned to @nik and unassigned @hansegucker
hansegucker commented 2022-06-18 11:34:16 +02:00 (Migrated from edugit.org)

requested review from @fph

requested review from @fph
hansegucker commented 2022-08-15 10:19:44 +02:00 (Migrated from edugit.org)

added 36 commits

  • ea972e84...346bd83a - 35 commits from branch master
  • 6a53d555 - Merge branch 'master' into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group

Compare with previous version

added 36 commits <ul><li>ea972e84...346bd83a - 35 commits from branch <code>master</code></li><li>6a53d555 - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=23646&start_sha=ea972e841c290b66a9437a9c2fc3410a739902ec)
hansegucker commented 2022-08-15 10:29:02 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>6f993e86 - Update translations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=23648&start_sha=6a53d555ed0c92efc23b2b519eb29628ec96f2e5)
hansegucker commented 2022-08-15 10:41:49 +02:00 (Migrated from edugit.org)

added 1 commit

  • 3266de21 - Use Iconify icons for instructions

Compare with previous version

added 1 commit <ul><li>3266de21 - Use Iconify icons for instructions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=23650&start_sha=6f993e866af018ffadab2f560d4ccedd629570a0)
hansegucker commented 2022-08-15 10:56:49 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>9ebacf89 - Update changelog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=23652&start_sha=3266de2170093980eb4d2a51b93a6f884771b2d1)
nik commented 2022-08-15 11:46:36 +02:00 (Migrated from edugit.org)

I think this MR is missing some important parts of this feature:

  • Documentation in the register printout for archival
  • Display in the summary views for teachers/students/whatever
  • (Maybe) "Which students have received which instructions", independent of the lesson where it was received
I think this MR is missing some important parts of this feature: * Documentation in the register printout for archival * Display in the summary views for teachers/students/whatever * (Maybe) "Which students have received which instructions", independent of the lesson where it was received
nik commented 2022-08-15 11:58:15 +02:00 (Migrated from edugit.org)

Two options:

  • Do not introduce django-admin
  • Introduce django-admin for all models
Two options: * Do not introduce django-admin * Introduce django-admin for all models
nik commented 2022-08-15 11:58:16 +02:00 (Migrated from edugit.org)

Mising doc string

Mising doc string
nik commented 2022-08-15 11:58:16 +02:00 (Migrated from edugit.org)

Misisng doc string

Misisng doc string
nik commented 2022-08-15 11:58:16 +02:00 (Migrated from edugit.org)

Missing doc string

Missing doc string
nik commented 2022-08-15 11:58:16 +02:00 (Migrated from edugit.org)

The word "done" does not seem correct here. "given", maybe?

The word "done" does not seem correct here. "given", maybe?
nik commented 2022-08-15 11:58:17 +02:00 (Migrated from edugit.org)

Missing doc string

Missing doc string
nik commented 2022-08-15 11:58:17 +02:00 (Migrated from edugit.org)

Is it necessary to limit this to PDFs?

Is it necessary to limit this to PDFs?
nik commented 2022-08-15 11:58:17 +02:00 (Migrated from edugit.org)

Something to consider:

We have a long-standing feature request in Core to introduce agreements: AlekSIS/official/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)
Something to consider: We have a long-standing feature request in Core to introduce agreements: AlekSIS/official/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 commented 2022-08-15 11:58:45 +02:00 (Migrated from edugit.org)

@hansegucker open for discussion

@hansegucker open for discussion
nik commented 2022-08-15 11:59:08 +02:00 (Migrated from edugit.org)

@hansegucker open for discussion

@hansegucker open for discussion
hansegucker commented 2022-09-01 17:20:10 +02:00 (Migrated from edugit.org)

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

added 23 commits <ul><li>9ebacf89...40c6c049 - 22 commits from branch <code>master</code></li><li>bc8fcb2e - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=24032&start_sha=9ebacf89988175988eeb0e09cf4fba57b425d49b)
hansegucker commented 2022-09-04 12:06:16 +02:00 (Migrated from edugit.org)

marked this merge request as draft

marked this merge request as **draft**
hansegucker commented 2022-09-06 20:14:04 +02:00 (Migrated from edugit.org)

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

added 7 commits <ul><li>bc8fcb2e...702a110d - 6 commits from branch <code>master</code></li><li>002fa18c - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=24184&start_sha=bc8fcb2effd99009cebd15858dc596193f4ae1d0)
hansegucker commented 2022-10-07 16:25:57 +02:00 (Migrated from edugit.org)

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.

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.
hansegucker commented 2022-10-07 16:26:19 +02:00 (Migrated from edugit.org)

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

But this hasn't to be a larger technical difference.
nik commented 2022-10-07 17:00:51 +02:00 (Migrated from edugit.org)

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.

> 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.
hansegucker commented 2022-11-05 13:55:51 +01:00 (Migrated from edugit.org)

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

added 11 commits <ul><li>002fa18c...1d7b1976 - 10 commits from branch <code>master</code></li><li>16842af6 - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=25210&start_sha=002fa18c96796da2cfb7222be90b1b27c0629c12)
yuha commented 2023-05-31 19:21:37 +02:00 (Migrated from edugit.org)

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

What is the current state of this MR? Is there a reason that the unresolved threads were not resolved so far?
hansegucker commented 2023-06-01 16:19:44 +02:00 (Migrated from edugit.org)

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

Yes, there is one. We agreed to (re)structure the whole system of agreements and instructions from bottom up and in AlekSIS-Core.
hansegucker commented 2023-08-27 22:36:16 +02:00 (Migrated from edugit.org)

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

added 63 commits <ul><li>16842af6...60df77b5 - 62 commits from branch <code>master</code></li><li>46670c45 - Merge branch &#39;master&#39; into 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=33985&start_sha=16842af6399948a25754c66b4a2f71702d934856)
hansegucker commented 2023-08-28 23:50:47 +02:00 (Migrated from edugit.org)

added 1 commit

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

Compare with previous version

added 1 commit <ul><li>40d9344c - Make instruction frontend compatible with new Vue frontend</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=33999&start_sha=46670c458f8dc3dacbfd1a2eaf17860ef2609bc6)
hansegucker commented 2023-08-30 15:13:07 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>b0cf65fa - Update translation files</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/215/diffs?diff_id=34010&start_sha=40d9344c8887579b0393043b70c50ecd1b55eecd)
This pull request has changes conflicting with the target branch.
  • aleksis/apps/alsijil/filters.py
  • aleksis/apps/alsijil/forms.py
  • aleksis/apps/alsijil/frontend/index.js
  • aleksis/apps/alsijil/frontend/messages/de.json
  • aleksis/apps/alsijil/frontend/messages/en.json
  • aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
  • aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
  • aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
  • aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
  • aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
  • aleksis/apps/alsijil/locale/ru/LC_MESSAGES/django.po
  • aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
  • aleksis/apps/alsijil/locale/uk/LC_MESSAGES/django.po
  • aleksis/apps/alsijil/models.py
  • aleksis/apps/alsijil/rules.py
  • aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/documentation.html
  • aleksis/apps/alsijil/urls.py
  • aleksis/apps/alsijil/util/predicates.py
  • aleksis/apps/alsijil/views.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 174-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
git switch 174-instructions-can-be-linked-to-a-document-as-remarks-by-the-group
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS-App-Alsijil!605
No description provided.