aleksis/AlekSIS-App-Chronos
Watch
10
0
Fork
You've already forked AlekSIS-App-Chronos
 0
Code Issues 49 Pull requests 4 Projects Releases 4 Packages 1 Activity Actions

Resolve "Substitutions PDF for new data model" #619

Merged
hansegucker merged 13 commits from 215-substitutions-pdf-for-new-data-model into master 2024-08-14 12:45:28 +02:00
Conversation 25 Commits 13 Files changed 42 +277 -910
magicfelix commented 2023-10-30 20:16:16 +01:00
Member
Copy link

Closes #215

Closes #215
magicfelix commented 2023-10-30 20:17:43 +01:00
Author
Member
Copy link

added 77 commits

  • f91702f1...c8e10b49 - 67 earlier commits
  • 03c9b5f0 - Merge branch 'new-model-based-on-calendar' into 211-implement-vue-substitution-frontend
  • 8be93719 - Set cancel substitution confirm dialog title
  • a36cfade - Move amend lesson (substitution ui) to own component
  • c40d3243 - Remove amendEvent namespace in now standalone AmendEvent component
  • 10b5781b - Use existing permissions
  • 48d59b6a - Merge branch 'new-model-based-on-calendar' into 211-implement-vue-substitution-frontend
  • 907762cb - Avoid using reserved names
  • 97da5398 - Fix issues caused by separating AmendLesson component
  • 87873a96 - Bump dev version
  • 40190cac - WIP: Adapt substitution PDF to new data model

Compare with previous version

added 77 commits <ul><li>f91702f1...c8e10b49 - 67 earlier commits</li><li>03c9b5f0 - Merge branch &#39;new-model-based-on-calendar&#39; into 211-implement-vue-substitution-frontend</li><li>8be93719 - Set cancel substitution confirm dialog title</li><li>a36cfade - Move amend lesson (substitution ui) to own component</li><li>c40d3243 - Remove amendEvent namespace in now standalone AmendEvent component</li><li>10b5781b - Use existing permissions</li><li>48d59b6a - Merge branch &#39;new-model-based-on-calendar&#39; into 211-implement-vue-substitution-frontend</li><li>907762cb - Avoid using reserved names</li><li>97da5398 - Fix issues caused by separating AmendLesson component</li><li>87873a96 - Bump dev version</li><li>40190cac - WIP: Adapt substitution PDF to new data model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=35349&start_sha=f91702f13c592b5309163250f6c39d92d3ae739c)
magicfelix commented 2023-10-30 20:54:21 +01:00
Author
Member
Copy link

added 1 commit

  • 80d2f96c - WIP: Adapt substitution PDF to new data model

Compare with previous version

added 1 commit <ul><li>80d2f96c - WIP: Adapt substitution PDF to new data model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=35350&start_sha=40190cac04d3c3663b48acc8be819416bf47ba1b)
magicfelix commented 2023-11-04 21:52:18 +01:00
Author
Member
Copy link

added 1 commit

  • be82c760 - Adapt substitution PDF to new data model

Compare with previous version

added 1 commit <ul><li>be82c760 - Adapt substitution PDF to new data model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=35377&start_sha=80d2f96cde5f2f0942cceee2d9f67bcb7dfa1060)
hansegucker commented 2024-07-31 20:26:58 +02:00
Owner
Copy link

Has to use get_single_events

Has to use get_single_events
hansegucker commented 2024-07-31 20:27:08 +02:00
Owner
Copy link

No longer necessary

No longer necessary
hansegucker commented 2024-07-31 20:28:18 +02:00
Owner
Copy link

Should use slot numbers if set

Should use slot numbers if set
hansegucker commented 2024-08-07 20:03:40 +02:00
Owner
Copy link

added 139 commits

  • be82c760...24e0a5e7 - 138 commits from branch master
  • 92a25fff - Adapt substitution PDF to new data model

Compare with previous version

added 139 commits <ul><li>be82c760...24e0a5e7 - 138 commits from branch <code>master</code></li><li>92a25fff - Adapt substitution PDF to new data model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=46408&start_sha=be82c760dfb93267799350ea13371c2afd74df37)
hansegucker commented 2024-08-11 15:12:26 +02:00
Owner
Copy link

TODO: Supervision substitutions

TODO: Supervision substitutions
hansegucker commented 2024-08-11 15:12:35 +02:00
Owner
Copy link

.

.
hansegucker commented 2024-08-11 15:12:43 +02:00
Owner
Copy link

TODO: Get next relevant day

TODO: Get next relevant day
hansegucker commented 2024-08-11 15:21:24 +02:00
Owner
Copy link

TODO: Change tracking for automatic plan

TODO: Change tracking for automatic plan
hansegucker commented 2024-08-11 16:34:02 +02:00
Owner
Copy link

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=46628&start_sha=92a25fff3404891ecbac5d7c355a498786a373bd#d58b8999596bd29be6df8701225d8a3c7f494f27_391_386)
hansegucker commented 2024-08-11 16:34:04 +02:00
Owner
Copy link

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=46628&start_sha=92a25fff3404891ecbac5d7c355a498786a373bd#d58b8999596bd29be6df8701225d8a3c7f494f27_398_396)
hansegucker commented 2024-08-11 16:34:06 +02:00
Owner
Copy link

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=46628&start_sha=92a25fff3404891ecbac5d7c355a498786a373bd#b1fa1ac15204550c3743763af99143c68cdccbd7_3_3)
hansegucker commented 2024-08-11 16:34:07 +02:00
Owner
Copy link

added 4 commits

  • 469612cf - Fix URLs and view for substitutions print
  • 52b9ef8c - Fix and improve build of substitutions list
  • d017403d - Update substitutions print templates for calendar
  • 11e9b15d - Delete old template files

Compare with previous version

added 4 commits <ul><li>469612cf - Fix URLs and view for substitutions print</li><li>52b9ef8c - Fix and improve build of substitutions list</li><li>d017403d - Update substitutions print templates for calendar</li><li>11e9b15d - Delete old template files</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=46628&start_sha=92a25fff3404891ecbac5d7c355a498786a373bd)
hansegucker commented 2024-08-11 17:23:19 +02:00
Owner
Copy link

added 11 commits

  • 11e9b15d...3c2a4aa0 - 4 commits from branch master
  • d77a165f - Set correct base mutations for amend mutations
  • a5df2c07 - Update AutomaticPlan to work with new models
  • c9a56bb2 - Adapt substitution PDF to new data model
  • f138d585 - Fix URLs and view for substitutions print
  • 7f59fc60 - Fix and improve build of substitutions list
  • f9e06f5a - Update substitutions print templates for calendar
  • 811abe64 - Delete old template files

Compare with previous version

added 11 commits <ul><li>11e9b15d...3c2a4aa0 - 4 commits from branch <code>master</code></li><li>d77a165f - Set correct base mutations for amend mutations</li><li>a5df2c07 - Update AutomaticPlan to work with new models</li><li>c9a56bb2 - Adapt substitution PDF to new data model</li><li>f138d585 - Fix URLs and view for substitutions print</li><li>7f59fc60 - Fix and improve build of substitutions list</li><li>f9e06f5a - Update substitutions print templates for calendar</li><li>811abe64 - Delete old template files</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=46631&start_sha=11e9b15d2e64a54c2a6c46ca7391074ee35a152a)
hansegucker commented 2024-08-11 19:05:58 +02:00
Owner
Copy link

added 3 commits

  • 8c6aa254 - Show only relevant days in substitutions print
  • 0179d302 - Reformat
  • f88dcb6a - Fix spacing in substitutions print

Compare with previous version

added 3 commits <ul><li>8c6aa254 - Show only relevant days in substitutions print</li><li>0179d302 - Reformat</li><li>f88dcb6a - Fix spacing in substitutions print</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=46637&start_sha=811abe64320c1504fed79ef22c9190b4f038ad98)
hansegucker commented 2024-08-11 19:45:58 +02:00
Owner
Copy link

added 3 commits

  • 02bc9300 - Show supervision substitutions in substitutions print
  • b4dd65f4 - Fix end time in substitutions print
  • 2aa7a0e9 - Fix querying of supervisions

Compare with previous version

added 3 commits <ul><li>02bc9300 - Show supervision substitutions in substitutions print</li><li>b4dd65f4 - Fix end time in substitutions print</li><li>2aa7a0e9 - Fix querying of supervisions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/315/diffs?diff_id=46639&start_sha=f88dcb6ae6e186386ca3006f108e4d35aff52b0a)
hansegucker commented 2024-08-11 19:46:14 +02:00
Owner
Copy link

resolved all threads

resolved all threads
hansegucker commented 2024-08-11 19:46:19 +02:00
Owner
Copy link

marked this merge request as ready

marked this merge request as **ready**
hansegucker commented 2024-08-11 19:46:24 +02:00
Owner
Copy link

assigned to @nik

assigned to @nik
hansegucker commented 2024-08-11 19:46:27 +02:00
Owner
Copy link

requested review from @magicfelix

requested review from @magicfelix
hansegucker commented 2024-08-11 19:47:36 +02:00
Owner
Copy link

grafik

![grafik](/uploads/9c9c8d9a9ab8f3f87a4c3d4dab471722/grafik.png)
hansegucker commented 2024-08-14 12:45:29 +02:00
Owner
Copy link

mentioned in commit 3211fca8cc

mentioned in commit 3211fca8cc463a692ef22f97c7f7e97bd0f67fb2
hansegucker commented 2024-10-02 16:31:58 +02:00
Owner
Copy link

mentioned in issue #239

mentioned in issue #239
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

  
source::aleksolotl
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
source::aleksolotl
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
nik
2 participants
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-Chronos!619
No description provided.