Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#6667] swiper phases #4759

Merged
merged 3 commits into from
Dec 28, 2022
Merged

[#6667] swiper phases #4759

merged 3 commits into from
Dec 28, 2022

Conversation

khamui
Copy link
Contributor

@khamui khamui commented Dec 13, 2022

No description provided.

@khamui khamui force-pushed the kt-2022-12-swiper-phases branch 3 times, most recently from 6c3e976 to 8f4e9fb Compare December 15, 2022 13:27
@khamui khamui changed the title WIP: swiper phases swiper phases Dec 15, 2022
@khamui khamui force-pushed the kt-2022-12-swiper-phases branch from 8f4e9fb to a164e42 Compare December 15, 2022 13:28
@fuzzylogic2000 fuzzylogic2000 changed the title swiper phases DO NOT MERGE (before release) - swiper phases Dec 15, 2022
@khamui khamui marked this pull request as draft December 15, 2022 13:33
@fuzzylogic2000 fuzzylogic2000 changed the title DO NOT MERGE (before release) - swiper phases swiper phases Dec 15, 2022
@fuzzylogic2000 fuzzylogic2000 marked this pull request as ready for review December 15, 2022 14:26
@philli-m philli-m self-assigned this Dec 19, 2022
@philli-m philli-m changed the title swiper phases [#6667] swiper phases Dec 19, 2022
philli-m
philli-m reviewed Dec 19, 2022
View reviewed changes
Copy link
Contributor

@philli-m philli-m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's working for multi phases and looking good :) just few questions

meinberlin/templates/a4modules/includes/module_detail_phase.html Outdated Show resolved Hide resolved
meinberlin/assets/js/app.js Outdated Show resolved Hide resolved
@philli-m philli-m removed their assignment Dec 20, 2022
@khamui khamui changed the title [#6667] swiper phases WIP [#6667] swiper phases Dec 21, 2022
@khamui khamui force-pushed the kt-2022-12-swiper-phases branch 2 times, most recently from 95fd045 to 69c6b71 Compare December 21, 2022 16:07
@khamui khamui requested a review from philli-m December 21, 2022 16:08
@khamui khamui changed the title WIP [#6667] swiper phases [#6667] swiper phases Dec 21, 2022
fuzzylogic2000
fuzzylogic2000 requested changes Dec 27, 2022
View reviewed changes
Copy link
Contributor

@fuzzylogic2000 fuzzylogic2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When there are multiple modules (in timeline and parallel module view), I get none - none as phase start and end dates. And for the other ones, all phases are still shown on the same swiper tile, but that could be my cache somehow?

@khamui khamui force-pushed the kt-2022-12-swiper-phases branch from 69c6b71 to 4b50f02 Compare December 28, 2022 14:02
Kha added 2 commits December 28, 2022 15:09
project/module/module_detail_phase.html: using swiper to show phases …
fcbc33f 
…- states (upcoming/finish) added and set initially - styling (incl. mobile)

project/module/module_detail_phase.html: remove sentence

extra_js/swiper: move to its own file and use entry point
templates/module_detail_phase_*.html: reword trans to translate
21c496d
@khamui khamui force-pushed the kt-2022-12-swiper-phases branch from 4b50f02 to 21c496d Compare December 28, 2022 14:09
@khamui
Copy link
Contributor Author

khamui commented Dec 28, 2022

When there are multiple modules (in timeline and parallel module view), I get none - none as phase start and end dates. And for the other ones, all phases are still shown on the same swiper tile, but that could be my cache somehow?

@fuzzylogic2000 indeed both bugs were real bugs, so no caching issues. In case of only one phase I am passing phase now and to make swiper appear correctly for multiple phases, the styling files have to be loaded before. That should work now.

@fuzzylogic2000 fuzzylogic2000 self-assigned this Dec 28, 2022
fuzzylogic2000
fuzzylogic2000 approved these changes Dec 28, 2022
View reviewed changes
Copy link
Contributor

@fuzzylogic2000 fuzzylogic2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! It always works now!

@fuzzylogic2000 fuzzylogic2000 merged commit 8a10006 into main Dec 28, 2022
@fuzzylogic2000 fuzzylogic2000 deleted the kt-2022-12-swiper-phases branch December 28, 2022 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fuzzylogic2000 fuzzylogic2000 fuzzylogic2000 approved these changes

@goapunk goapunk Awaiting requested review from goapunk

@Rineee Rineee Awaiting requested review from Rineee

@philli-m philli-m Awaiting requested review from philli-m

Assignees

@fuzzylogic2000 fuzzylogic2000

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@khamui @philli-m @fuzzylogic2000