Show substitution lessons in teacher timetable #17

New issue

Closed

opened 2019-08-21 18:21:21 +02:00 by nik · 8 comments

nik commented 2019-08-21 18:21:21 +02:00

Owner

Copy link

Line 49 in views.py needs to be adjusted so it also catches the selected teacher in substitutions, not only in lesson, but only for substitutions that have week=wanted_week. Substitutions override regular lessons, so the substitutions part needs to go into the first part of the disjunction.

Line 49 in `views.py` needs to be adjusted so it also catches the selected teacher in `substitutions`, not only in `lesson`, but only for substitutions that have `week=wanted_week`. Substitutions override regular lessons, so the substitutions part needs to go into the first part of the disjunction.

nik commented 2019-08-21 18:21:21 +02:00

Author

Owner

Copy link

changed milestone to %"1.0a1"

changed milestone to %"1.0a1"

nik commented 2019-08-22 14:38:05 +02:00

Author

Owner

Copy link

changed milestone to %"1.0a0"

changed milestone to %"1.0a0"

nik commented 2019-08-31 21:58:53 +02:00

Author

Owner

Copy link

changed milestone to %"1.0a1"

changed milestone to %"1.0a1"

nik commented 2019-09-07 14:02:42 +02:00

Author

Owner

Copy link

assigned to @mirabilos and unassigned @nik

assigned to @mirabilos and unassigned @nik

nik commented 2019-09-07 14:04:25 +02:00

Author

Owner

Copy link

changed the description

changed the description

mirabilos commented 2019-09-07 20:18:47 +02:00 (Migrated from edugit.org)

Copy link

Nik beim Denken geholfen, reassigned back.

Nik beim Denken geholfen, reassigned back.

mirabilos commented 2019-09-07 20:18:52 +02:00 (Migrated from edugit.org)

Copy link

assigned to @nik and unassigned @mirabilos

assigned to @nik and unassigned @mirabilos

nik commented 2019-09-07 21:46:38 +02:00

Author

Owner

Copy link

closed via commit 8591295bb3

closed via commit 8591295bb3ff1fba4d8860907f7590794f60982b

Sign in to join this conversation.

No Branch/Tag specified

Branches Tags

master

797-add-getobjectsforperson

weblate-frontend

weblate

304-adapt-to-core-changes-of-calendaralarm-inheritance-structure

299-automated-substitution-list-doesn-t-correctly-consider-kolego-absences-with-start-end-dates

check/update-builddeps-package-json

check/update-eslint-rc-js

check/update-tox-ini

247-use-lessonevent-feed-for-aggregated-availability-feed

292-adapt-to-places

stable/4.0.0

281-add-argument-to-lesson-events-get_objects-method-that-bypasses-the-filtering-done-if-own-false

release/4.0.0.dev9

release/4.0.0.dev7

fss-test-substitutions

221-show-course-name-of-lessons-in-the-timetable

241-substitution-planning-cancelled-checkbox-does-not-have-false-as-value-when-unchecked-actively

242-add-query-for-groups-of-which-the-current-user-can-see-the-respective-timetable

234-add-links-to-different-timetables-in-timetable-details-cards

migration-for-legacy

228-drop-legacy-model-and-form-extensions

engs-4.0

211-implement-vue-substitution-frontend-2

204-graphql-schema-for-subject

engs

197-adaptations-for-spa-operation

175-graphql-schemas

rename-ugettext

feature/vuetify

i10n-ru-ua

161-manage-basic-data-in-frontend

40-personal-timetable-as-ics

add-docs

core-284-unify-permission-names

162-extend-the-reference-to-the-next-lesson

160-ignore-subject-color-in-timetable-if-fg-bg

trademark-hint

update/tox-makemessages

create-timeperiods

backup-signals

140-show-abbreviations-in-the-substitution-plan-only-once

144-preference-section-is-called-chronos

update/poetry-4

130-show-print-timetable-button-on-mobile-devices

update-poetry-lock

117-use-django-guardian-s-prefetch-mechanism-for-object-permissions

trigger-dist-pipeline

2.0a4

update-lockfile-core

gettext-lazy

update-tox2

update-tox

feature/use-entrypoints

core-317-separate-core-and-default-distribution

update-lock-file

fix-docker-build

fix/fix-import

update-poetry-lockfile

core-158-documentation-needed-for-first-release

87-make-chronos-work-with-current-core

group-subject

bugfix/affected-teachers-in-header-box-shown-multiple-times

licence-information

day-names

merge

file-refs

school-apps

core-116-migrate-to-material-design-icons

36-room-management

issue34

94-use-btn-dark-everywhere

sqloptimise

issue12

lessons_day

issue19

6.1.0

6.0.0

5.0.1

5.0.0

5.0.0b0

4.0.1

4.0.0

4.0.0.dev10

4.0.0.dev9

4.0.0.dev8

4.0.0.dev7

4.0.0.dev6

4.0.0.dev5

4.0.0.dev4

4.0.0.dev3

4.0.0.dev2

4.0.0.dev0

3.0.2

3.0.1

3.0

3.0b0

3.0.dev1

2.5

2.4.2

2.4.1

3.0.dev0

2.4

2.3

2.2.1

2.2

2.1

2.1dev3

2.1.dev2

2.1.dev1

2.1.dev0

2.0

2.0rc3

2.0rc2

2.0rc1

2.0b2

2.0b1

2.0b0

2.0a3

2.0a2

delete-tag

2.0a1

1.0a3

1.0a2

1.0a1

1.0a0

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

Subscribe

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#17

No description provided.