aleksis/AlekSIS-App-Alsijil
8
0
Fork 0
Code Issues 51 Pull requests 10 Projects Releases 3 Packages Activity Actions

Resolve "Adapt to active school term" #819

Merged
magicfelix merged 7 commits from 319-adapt-to-active-school-term into master 2024-11-27 20:19:18 +01:00
Conversation 32 Commits 7 Files changed 11 +119 -67
magicfelix commented 2024-11-04 13:36:09 +01:00 (Migrated from edugit.org)
Copy link

Closes #319

Closes #319
magicfelix commented 2024-11-05 20:36:48 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 76cdc4ce - Adapt to active school term

Compare with previous version

added 1 commit <ul><li>76cdc4ce - Adapt to active school term</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=49917&start_sha=db06b8afbd6934a71c123f565fe0bad391d9ad51)
magicfelix commented 2024-11-07 15:35:21 +01:00 (Migrated from edugit.org)
Copy link

@ZugBahnHof The warning (You are currently viewing data from a different school term …) is not visible in the coursebook

@ZugBahnHof The warning (`You are currently viewing data from a different school term …`) is not visible in the coursebook
hansegucker commented 2024-11-12 10:27:10 +01:00 (Migrated from edugit.org)
Copy link

@magicfelix Please solve merge conflicts.

@magicfelix Please solve merge conflicts.
hansegucker commented 2024-11-12 10:28:37 +01:00 (Migrated from edugit.org)
Copy link

This is now an AND. Shouldn't be lesson events included of one of the both conditions is true?

This is now an AND. Shouldn't be lesson events included of one of the both conditions is true?
magicfelix commented 2024-11-12 11:22:27 +01:00 (Migrated from edugit.org)
Copy link

added 13 commits

  • 76cdc4ce...76e65406 - 12 commits from branch master
  • 60440798 - Adapt to active school term

Compare with previous version

added 13 commits <ul><li>76cdc4ce...76e65406 - 12 commits from branch <code>master</code></li><li>60440798 - Adapt to active school term</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50281&start_sha=76cdc4cea5185c036a354c6abc30982ab499d56c)
magicfelix commented 2024-11-12 11:24:36 +01:00 (Migrated from edugit.org)
Copy link

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50283&start_sha=60440798f305acd56baaba14fede0df47d780a16#acb756e1ce1439ae6aa9d011bd14baf6919c5311_140_140)
magicfelix commented 2024-11-12 11:24:37 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 537f8eed - Adapt to active school term

Compare with previous version

added 1 commit <ul><li>537f8eed - Adapt to active school term</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50283&start_sha=60440798f305acd56baaba14fede0df47d780a16)
hansegucker commented 2024-11-12 11:42:16 +01:00 (Migrated from edugit.org)
Copy link
        q = Q(pk__in=LessonEvent.objects.filter(groups__school_term=school_term).values_list("id", flat=True).union(LessonEvent.objects.filter(course__groups__school_term=school_term).values_list("id", flat=True)))
```suggestion:-0+0 q = Q(pk__in=LessonEvent.objects.filter(groups__school_term=school_term).values_list("id", flat=True).union(LessonEvent.objects.filter(course__groups__school_term=school_term).values_list("id", flat=True))) ```
magicfelix commented 2024-11-12 12:15:54 +01:00 (Migrated from edugit.org)
Copy link

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50287&start_sha=537f8eedeb466875c2eb4ad068931ad086a0447d#acb756e1ce1439ae6aa9d011bd14baf6919c5311_140_140)
magicfelix commented 2024-11-12 12:15:55 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 4c86a311 - Adapt to active school term

Compare with previous version

added 1 commit <ul><li>4c86a311 - Adapt to active school term</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50287&start_sha=537f8eedeb466875c2eb4ad068931ad086a0447d)
magicfelix commented 2024-11-12 12:20:06 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 62a1f106 - Adapt to active school term

Compare with previous version

added 1 commit <ul><li>62a1f106 - Adapt to active school term</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50289&start_sha=4c86a311540022e254e49ccedcb0ab4273dd0623)
magicfelix commented 2024-11-13 21:01:31 +01:00 (Migrated from edugit.org)
Copy link

marked this merge request as ready

marked this merge request as **ready**
magicfelix commented 2024-11-15 13:46:36 +01:00 (Migrated from edugit.org)
Copy link

added 132 commits

  • 62a1f106...43588ac5 - 131 commits from branch master
  • 9ed1926c - Adapt to active school term

Compare with previous version

added 132 commits <ul><li>62a1f106...43588ac5 - 131 commits from branch <code>master</code></li><li>9ed1926c - Adapt to active school term</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50403&start_sha=62a1f106e6ad808b238d83827c211ef99dbc5a72)
magicfelix commented 2024-11-19 15:44:08 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • bee74fd0 - Use graphene-django-optimizer and drop get_queryset usage

Compare with previous version

added 1 commit <ul><li>bee74fd0 - Use graphene-django-optimizer and drop get_queryset usage</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50575&start_sha=9ed1926cbc5e6362a7a34f05968d76d3cdf344e7)
magicfelix commented 2024-11-19 15:51:10 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • d614411e - Use graphene-django-optimizer and drop get_queryset usage

Compare with previous version

added 1 commit <ul><li>d614411e - Use graphene-django-optimizer and drop get_queryset usage</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50577&start_sha=bee74fd0e797195206058bf2ef8bb0f06d75cf41)
hansegucker commented 2024-11-22 12:24:10 +01:00 (Migrated from edugit.org)
Copy link
        date_start = date_start if date_start > school_term.date_start else school_term.date_start
        date_end = date_end if date_end < school_term.date_end else school_term.date_end
```suggestion:-9+0 date_start = date_start if date_start > school_term.date_start else school_term.date_start date_end = date_end if date_end < school_term.date_end else school_term.date_end ```
hansegucker commented 2024-11-22 12:25:08 +01:00 (Migrated from edugit.org)
Copy link

Drop query if not used

Drop query if not used
hansegucker commented 2024-11-22 12:25:46 +01:00 (Migrated from edugit.org)
Copy link

Wrap docs with optimizer in get_documentations_for_events (optional)

Wrap `docs` with optimizer in `get_documentations_for_events` (optional)
hansegucker commented 2024-11-22 12:28:55 +01:00 (Migrated from edugit.org)
Copy link

Tested? There is a first.

Tested? There is a first.
magicfelix commented 2024-11-22 14:09:40 +01:00 (Migrated from edugit.org)
Copy link

changed this line in version 9 of the diff

changed this line in [version 9 of the diff](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50701&start_sha=d614411e12d721a4f3078929b4f157daf62368b2#acb756e1ce1439ae6aa9d011bd14baf6919c5311_185_162)
magicfelix commented 2024-11-22 14:09:40 +01:00 (Migrated from edugit.org)
Copy link

changed this line in version 9 of the diff

changed this line in [version 9 of the diff](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50701&start_sha=d614411e12d721a4f3078929b4f157daf62368b2#acb756e1ce1439ae6aa9d011bd14baf6919c5311_105_103)
magicfelix commented 2024-11-22 14:09:41 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • ac108b78 - Optimize and drop unnecessary coursebook queries

Compare with previous version

added 1 commit <ul><li>ac108b78 - Optimize and drop unnecessary coursebook queries</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50701&start_sha=d614411e12d721a4f3078929b4f157daf62368b2)
magicfelix commented 2024-11-22 14:11:16 +01:00 (Migrated from edugit.org)
Copy link

See models.py

Follow-up: When I added amends to select_related an error occured, saying CalendarEvent has no attribute cancelled.

See models.py Follow-up: When I added `amends` to `select_related` an error occured, saying `CalendarEvent` has no attribute `cancelled`.
magicfelix commented 2024-11-22 14:12:50 +01:00 (Migrated from edugit.org)
Copy link

Yes, works. I see my tardiness statistics on the person page. The two boxes above are empty, but I think that's due to me not having entered much data in the coursbook …

Yes, works. I see my tardiness statistics on the person page. The two boxes above are empty, but I think that's due to me not having entered much data in the coursbook …
magicfelix commented 2024-11-22 14:14:44 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 78986282 - Optimize and drop unnecessary coursebook queries

Compare with previous version

added 1 commit <ul><li>78986282 - Optimize and drop unnecessary coursebook queries</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50703&start_sha=ac108b7823c0580477126351c6e0d8c3e5dce3e1)
hansegucker commented 2024-11-22 15:06:56 +01:00 (Migrated from edugit.org)
Copy link

added 11 commits

  • 78986282...a81f3354 - 7 commits from branch master
  • c519d85a - Adapt to active school term
  • dd2685c6 - Use graphene-django-optimizer and drop get_queryset usage
  • f24a99fa - Optimize and drop unnecessary coursebook queries
  • 8d501e18 - Use prefetched amends and prevent resolving by optimizer

Compare with previous version

added 11 commits <ul><li>78986282...a81f3354 - 7 commits from branch <code>master</code></li><li>c519d85a - Adapt to active school term</li><li>dd2685c6 - Use graphene-django-optimizer and drop get_queryset usage</li><li>f24a99fa - Optimize and drop unnecessary coursebook queries</li><li>8d501e18 - Use prefetched amends and prevent resolving by optimizer</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50705&start_sha=789862821910a94a5e33fc3986a0a97119d1b8be)
hansegucker commented 2024-11-22 15:14:47 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 324fad70 - Prevent double loading of some data in coursebook

Compare with previous version

added 1 commit <ul><li>324fad70 - Prevent double loading of some data in coursebook</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50707&start_sha=8d501e18e6aa0799090a279f0f00ec65738e0364)
hansegucker commented 2024-11-22 21:13:06 +01:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • f99e4518 - Prefetch personal notes to avoid additional queries
  • abadf508 - Further optimize queries

Compare with previous version

added 2 commits <ul><li>f99e4518 - Prefetch personal notes to avoid additional queries</li><li>abadf508 - Further optimize queries</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Alsijil/-/merge_requests/429/diffs?diff_id=50719&start_sha=324fad702035c87c9e11f1b66fd54c31caf7ed3e)
yuha commented 2024-11-27 20:19:07 +01:00 (Migrated from edugit.org)
Copy link

created #337 to continue this discussion

created #337 to continue this discussion
yuha commented 2024-11-27 20:19:07 +01:00 (Migrated from edugit.org)
Copy link

resolved all threads

resolved all threads
yuha commented 2024-11-27 20:19:08 +01:00 (Migrated from edugit.org)
Copy link

mentioned in issue #337

mentioned in issue #337
hansegucker commented 2024-11-27 20:19:18 +01:00 (Migrated from edugit.org)
Copy link

mentioned in commit 23d03426e1

mentioned in commit 23d03426e17802870174fa139d397ea4fd4071fb
hansegucker (Migrated from edugit.org) merged commit 23d03426e1 into master 2024-11-27 20:19:19 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

No labels
Security
TeX
auto-update
board
done
board
ready
board
todo
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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!819
No description provided.