-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat/qg-146: реализовано отображение модального окна с инфой об упраж…
…нении на странице создания программы (#223) Co-authored-by: Dmitriy <golenko_dmitriy@mail.ru>
- Loading branch information
1 parent
93f540c
commit b240a14
Showing
10 changed files
with
248 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
...in/kotlin/pro/qyoga/app/therapist/therapy/exercises/compenents/ExerciseModalController.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package pro.qyoga.app.therapist.therapy.exercises.compenents | ||
|
|
||
| import org.springframework.stereotype.Controller | ||
| import org.springframework.web.bind.annotation.GetMapping | ||
| import org.springframework.web.bind.annotation.PathVariable | ||
| import org.springframework.web.bind.annotation.RequestMapping | ||
| import org.springframework.web.servlet.ModelAndView | ||
| import pro.azhidkov.platform.spring.mvc.modelAndView | ||
| import pro.qyoga.app.platform.notFound | ||
| import pro.qyoga.app.therapist.therapy.exercises.compenents.ExerciseModalController.Companion.PATH | ||
| import pro.qyoga.core.therapy.exercises.ExercisesService | ||
|
|
||
|
|
||
| @Controller | ||
| @RequestMapping(PATH) | ||
| class ExerciseModalController( | ||
| private val exercisesService: ExercisesService | ||
| ) { | ||
|
|
||
| @GetMapping | ||
| fun getEditExerciseModal(@PathVariable exerciseId: Long): ModelAndView { | ||
| val exercise = exercisesService.findById(exerciseId) | ||
| ?: return notFound | ||
|
|
||
| return modelAndView("therapist/therapy/exercises/exercise-modal") { | ||
| "exercise" bindTo exercise | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| const val PATH = "/therapist/exercises/{exerciseId}/modal" | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
app/src/main/resources/templates/therapist/therapy/exercises/exercise-modal.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <!DOCTYPE html> | ||
| <div class="modal-content" id="exercise-modal"> | ||
| <div class="modal-header"> | ||
| <h3 class="modal-title me-2" id="exercise-title" th:text="${exercise?.title}"></h3> | ||
| <button aria-label="Закрыть" class="btn-close" data-bs-dismiss="modal" type="button"></button> | ||
| </div> | ||
| <div class="modal-body" id="modal-body"> | ||
| <section class="container px-2"> | ||
|
|
||
| <div class="row"> | ||
|
|
||
| <div class="col-6 mb-3 col-sm-5" id="exercise-type" th:text="${exercise.exerciseType.label}"> | ||
| </div> | ||
|
|
||
| <div class="col-6 mb-3 col-sm-2" | ||
| th:text="${T(pro.azhidkov.platform.java.time.DurationExtKt).toDecimalMinutes(exercise?.duration) + ' мин.'}" | ||
| > | ||
| </div> | ||
| </div> | ||
|
|
||
| <div th:if="${exercise.description != null && exercise.description.length> 0}"> | ||
| <div class="row mb-5"> | ||
| <div class="col" id="exercise-description" th:text="${exercise.description ?: ''}"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <h4>Шаги</h4> | ||
| </div> | ||
|
|
||
| <div class="row step-row" th:each="step, iterStat : ${exercise.steps}"> | ||
| <div class="row align-items-center px-3 mb-3"> | ||
| <div class="col-sm-2 mb-3 text-center mx-auto" th:if="${step.imageId != null}"> | ||
| <img class="mw-100 d-block" | ||
| th:src="${'/therapist/exercises/' + exercise.id + '/step-images/' +iterStat.index}"> | ||
| </div> | ||
| <div class="col-sm-10 step-description"> | ||
| <strong class="step-description" th:text="'Шаг ' + ${iterStat.index + 1} + ': '"></strong>[[${step.description}]] | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </section> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...oga/tests/cases/app/therapist/therapy/exercises/components/ExerciseModalControllerTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package pro.qyoga.tests.cases.app.therapist.therapy.exercises.components | ||
|
|
||
| import org.junit.jupiter.api.DisplayName | ||
| import org.junit.jupiter.api.Test | ||
| import org.springframework.http.HttpStatus | ||
| import pro.qyoga.tests.assertions.shouldBe | ||
| import pro.qyoga.tests.assertions.shouldBePage | ||
| import pro.qyoga.tests.clients.TherapistClient | ||
| import pro.qyoga.tests.fixture.object_mothers.therapy.exercises.ExercisesObjectMother.createExerciseRequests | ||
| import pro.qyoga.tests.infra.web.QYogaAppIntegrationBaseTest | ||
| import pro.qyoga.tests.pages.publc.NotFoundErrorPage | ||
| import pro.qyoga.tests.pages.therapist.therapy.exercises.ExerciseModal | ||
|
|
||
|
|
||
| @DisplayName("Диалоговое окно просмотра упражнения") | ||
| class ExerciseModalControllerTest : QYogaAppIntegrationBaseTest() { | ||
|
|
||
| @Test | ||
| fun `должно отображаться корректно`() { | ||
| // Дано | ||
| val exercise = backgrounds.exercises.createExercises(createExerciseRequests(1)).single() | ||
| val therapist = TherapistClient.loginAsTheTherapist() | ||
|
|
||
| // Когда | ||
| val document = therapist.exercises.getExerciseModal(exercise.id) | ||
|
|
||
| // Тогда | ||
| document shouldBe ExerciseModal.forExercise(exercise) | ||
| } | ||
|
|
||
| @Test | ||
| fun `должно возвращать страницу ошибки 404 при запросе несуществующего упражнения`() { | ||
| // Дано | ||
| val therapist = TherapistClient.loginAsTheTherapist() | ||
|
|
||
| // Когда | ||
| val document = therapist.exercises.getExerciseModal(404, expectedStatus = HttpStatus.NOT_FOUND) | ||
|
|
||
| // Тогда | ||
| document shouldBePage NotFoundErrorPage | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...rc/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/therapy/exercises/ExerciseModal.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package pro.qyoga.tests.pages.therapist.therapy.exercises | ||
|
|
||
| import io.kotest.matchers.collections.shouldBeSameSizeAs | ||
| import pro.qyoga.app.therapist.therapy.exercises.compenents.ExerciseModalController | ||
| import pro.qyoga.core.therapy.exercises.model.Exercise | ||
| import pro.qyoga.tests.assertions.PageMatcher | ||
| import pro.qyoga.tests.assertions.shouldHaveComponent | ||
| import pro.qyoga.tests.platform.html.div | ||
| import pro.qyoga.tests.platform.html.h3 | ||
|
|
||
|
|
||
| object ExerciseModal { | ||
|
|
||
| const val PATH = ExerciseModalController.PATH | ||
|
|
||
| fun selector(): String = "#exercise-modal" | ||
|
|
||
| fun forExercise(exercise: Exercise): PageMatcher = PageMatcher { element -> | ||
| element shouldHaveComponent h3("exercise-title", exercise.title) | ||
| element shouldHaveComponent div("exercise-type", text = exercise.exerciseType.label) | ||
| element shouldHaveComponent div("exercise-description", text = exercise.description) | ||
|
|
||
| val stepElements = element.getElementsByClass("step-row") | ||
| stepElements shouldBeSameSizeAs exercise.steps | ||
| stepElements.zip(exercise.steps).forEachIndexed { idx, (stepElement, step) -> | ||
| stepElement shouldHaveComponent div( | ||
| clazz = "step-description", | ||
| text = "Шаг ${idx + 1}: ${step.description}" | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| } |
22 changes: 22 additions & 0 deletions
22
app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/Selectors.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package pro.qyoga.tests.platform.html | ||
|
|
||
|
|
||
| fun selector( | ||
| id: String?, | ||
| clazz: String?, | ||
| tag: String? | ||
| ): String { | ||
| val selector = buildString { | ||
| if (tag != null) { | ||
| append(tag) | ||
| } | ||
| if (id != null) { | ||
| append("#$id") | ||
| } | ||
| if (clazz != null) { | ||
| append(".$clazz") | ||
| } | ||
| } | ||
| check(selector.isNotBlank()) { "Selector must not be blank" } | ||
| return selector | ||
| } |
36 changes: 36 additions & 0 deletions
36
app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/TextElement.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package pro.qyoga.tests.platform.html | ||
|
|
||
| import io.kotest.matchers.Matcher | ||
| import org.jsoup.nodes.Element | ||
| import pro.qyoga.tests.assertions.haveText | ||
| import pro.qyoga.tests.assertions.isTag | ||
| import pro.qyoga.tests.platform.kotest.buildAllOfMatcher | ||
|
|
||
| fun h3(id: String, text: String) = TextElement( | ||
| "h3", | ||
| "#$id", | ||
| haveText(text) | ||
| ) | ||
|
|
||
| fun div(id: String? = null, clazz: String? = null, text: String) = TextElement( | ||
| "div", | ||
| selector(id, clazz, "div"), | ||
| haveText(text) | ||
| ) | ||
|
|
||
| data class TextElement( | ||
| val tag: String, | ||
| val selector: String, | ||
| val textMatcher: Matcher<Element>? | ||
| ) : Component { | ||
|
|
||
| override fun selector() = selector | ||
|
|
||
| override fun matcher(): Matcher<Element> = buildAllOfMatcher { | ||
| add(isTag(tag)) | ||
| if (textMatcher != null) { | ||
| add(textMatcher) | ||
| } | ||
| } | ||
|
|
||
| } |