aleksis/AlekSIS-App-Chronos
8
0
Fork 0
Code Issues 51 Pull requests 5 Projects Releases 4 Packages Activity Actions

Resolve "Optimize rendering of substituted lessons/supervisions on daily lessons/supervisions page" #586

Merged
yuha merged 2 commits from 187-optimize-rendering-of-substituted-lessons-supervisions-on-daily-lessons-supervisions-page into master 2022-12-14 19:24:48 +01:00
Conversation 14 Commits 2 Files changed 2 +51 -12
yuha commented 2022-11-14 20:50:18 +01:00 (Migrated from edugit.org)
Copy link

Closes #187

Closes #187
yuha commented 2022-11-14 20:50:25 +01:00 (Migrated from edugit.org)
Copy link

assigned to @yuha

assigned to @yuha
yuha commented 2022-11-14 21:19:23 +01:00 (Migrated from edugit.org)
Copy link

added 2 commits

  • 427212da - Re-add pre-filtering and week annotation of LessonPeriods on daily lessons page
  • 98e0a70c - Improve rendering of substituted or cancelled items on daily lessons/supervisions pages

Compare with previous version

added 2 commits <ul><li>427212da - Re-add pre-filtering and week annotation of LessonPeriods on daily lessons page</li><li>98e0a70c - Improve rendering of substituted or cancelled items on daily lessons/supervisions pages</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/282/diffs?diff_id=25359&start_sha=eab492661cd90ced6744ffd8ea036dba7f6b4fa1)
yuha commented 2022-11-14 21:19:23 +01:00 (Migrated from edugit.org)
Copy link

marked this merge request as ready

marked this merge request as **ready**
nik commented 2022-11-16 19:21:39 +01:00 (Migrated from edugit.org)
Copy link

assigned to @hansegucker and unassigned @yuha

assigned to @hansegucker and unassigned @yuha
nik commented 2022-11-23 19:32:23 +01:00 (Migrated from edugit.org)
Copy link

marked this merge request as draft

marked this merge request as **draft**
hansegucker commented 2022-11-24 16:22:10 +01:00 (Migrated from edugit.org)
Copy link

For the moment, we should keep green as color for cancelled lessons as everywhere in Chronos. But additionally, it would be great if there would be another (visible) indicator for substitutions/cancellations than a color mark.

For the moment, we should keep green as color for cancelled lessons as everywhere in Chronos. But additionally, it would be great if there would be another (visible) indicator for substitutions/cancellations than a color mark.
yuha commented 2022-12-02 14:40:10 +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-Chronos/-/merge_requests/282/diffs?diff_id=25781&start_sha=98e0a70c7d15bb840eb0efcc1302e4bfdc6f934a#a1d9d04de6857f6dc9129c97b503f58cb18d1189_21_14)
yuha commented 2022-12-02 14:40:12 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • bd6d3ffb - Use badges instead of coloring the entire row to show lesson/supervision status

Compare with previous version

added 1 commit <ul><li>bd6d3ffb - Use badges instead of coloring the entire row to show lesson/supervision status</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/282/diffs?diff_id=25781&start_sha=98e0a70c7d15bb840eb0efcc1302e4bfdc6f934a)
yuha commented 2022-12-02 14:41:05 +01:00 (Migrated from edugit.org)
Copy link

resolved all threads

resolved all threads
yuha commented 2022-12-02 15:33:08 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • c96e0174 - Use badges instead of coloring the entire row to show lesson/supervision status

Compare with previous version

added 1 commit <ul><li>c96e0174 - Use badges instead of coloring the entire row to show lesson/supervision status</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/282/diffs?diff_id=25787&start_sha=bd6d3ffbdf9cfa8e1414bf3feb794404b7ec5372)
hansegucker commented 2022-12-02 19:34:01 +01:00 (Migrated from edugit.org)
Copy link

marked this merge request as ready

marked this merge request as **ready**
hansegucker commented 2022-12-02 19:34:27 +01:00 (Migrated from edugit.org)
Copy link

approved this merge request

approved this merge request
nik (Migrated from edugit.org) merged commit f82d4be0e0 into master 2022-12-14 19:24:48 +01:00
nik commented 2022-12-14 19:24:50 +01:00 (Migrated from edugit.org)
Copy link

mentioned in commit f82d4be0e0

mentioned in commit f82d4be0e0e8d68e8f0ef7908ddb5797a7500657
hansegucker (Migrated from edugit.org) approved these changes 2026-07-14 17:31:11 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
hansegucker
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-Chronos!586
No description provided.