feat/qg-274: поле ввода терапевтической задачи переведено на компонент комбобокса

d-r-q · d-r-q · commit 78a32a0b2892 · 2025-05-25T12:47:00.000+07:00
Помимо приведения UI/UX к актуальному гайдлайну, это решило проблему с потерей данных после поиска ТЗ
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/clients/journal/edit_entry/create/CreateJournalEntryOp.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/clients/journal/edit_entry/create/CreateJournalEntryOp.kt
@@ -30,7 +30,7 @@ class CreateJournalEntryOp(
         checkNotNull(client) { "Client for journal entry not found by id=$clientId" }
 
         val therapeuticTask = therapeuticTasksRepo.getOrCreate(
-            TherapeuticTask(principal.id, editJournalEntryRq.therapeuticTaskName)
+            TherapeuticTask(principal.id, editJournalEntryRq.therapeuticTaskTitle)
         )
         val newEntry = JournalEntry(
             client.ref(),
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/clients/journal/edit_entry/create/CreateJournalEntryPageModel.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/clients/journal/edit_entry/create/CreateJournalEntryPageModel.kt
@@ -21,6 +21,7 @@ data class CreateJournalEntryPageModel(
     ModelAndView(
         viewId(JOURNAL_ENTRY_VIEW_NAME, fragment), mapOf(
             "client" to client,
+            "entry" to null,
             "entryDate" to entryDate,
             "duplicatedDate" to duplicatedDate,
             "formAction" to createFormAction(client.ref())
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/clients/journal/edit_entry/edit/EditJournalEntryOp.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/clients/journal/edit_entry/edit/EditJournalEntryOp.kt
@@ -26,7 +26,7 @@ class EditJournalEntryOp(
         principal: QyogaUserDetails,
     ): JournalEntry? {
         val therapeuticTask = therapeuticTasksRepo.getOrCreate(
-            TherapeuticTask(principal.id, editJournalEntryRq.therapeuticTaskName)
+            TherapeuticTask(principal.id, editJournalEntryRq.therapeuticTaskTitle)
         )
 
         val query = query {
diff --git a/app/src/main/kotlin/pro/qyoga/app/therapist/therapy/therapeutic_tasks/components/SearchTherapeuticTasksController.kt b/app/src/main/kotlin/pro/qyoga/app/therapist/therapy/therapeutic_tasks/components/SearchTherapeuticTasksController.kt
@@ -19,7 +19,7 @@ class SearchTherapeuticTasksController(
 
     @GetMapping
     fun search(
-        @RequestParam("therapeuticTaskName") searchKey: String,
+        @RequestParam(SEARCH_KEY_PARAM_NAME) searchKey: String,
         @AuthenticationPrincipal therapist: QyogaUserDetails,
     ): ModelAndView {
         val tasks =
@@ -35,4 +35,8 @@ class SearchTherapeuticTasksController(
         )
     }
 
+    companion object {
+        const val SEARCH_KEY_PARAM_NAME = "therapeuticTaskName"
+    }
+
 }
diff --git a/app/src/main/kotlin/pro/qyoga/core/clients/journals/dtos/EditJournalEntryRq.kt b/app/src/main/kotlin/pro/qyoga/core/clients/journals/dtos/EditJournalEntryRq.kt
@@ -1,24 +1,22 @@
 package pro.qyoga.core.clients.journals.dtos
 
-import com.fasterxml.jackson.annotation.JsonFormat
-import org.springframework.format.annotation.DateTimeFormat
 import pro.azhidkov.platform.spring.sdj.ergo.hydration.resolveOrThrow
 import pro.qyoga.core.clients.journals.model.JournalEntry
-import pro.qyoga.l10n.RUSSIAN_DATE_FORMAT_PATTERN
+import pro.qyoga.core.therapy.therapeutic_tasks.model.TherapeuticTaskRef
 import java.time.LocalDate
 
 
 data class EditJournalEntryRq(
-    @DateTimeFormat(pattern = RUSSIAN_DATE_FORMAT_PATTERN)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = RUSSIAN_DATE_FORMAT_PATTERN)
     val date: LocalDate,
-    val therapeuticTaskName: String,
+    val therapeuticTask: TherapeuticTaskRef?,
+    val therapeuticTaskTitle: String,
     val journalEntryText: String,
     val version: Long
 ) {
 
     constructor(journalEntry: JournalEntry) : this(
         journalEntry.date,
+        journalEntry.therapeuticTask,
         journalEntry.therapeuticTask.resolveOrThrow().name,
         journalEntry.entryText,
         journalEntry.version
diff --git a/app/src/main/resources/templates/therapist/clients/client-add_journal_entry-fragment.html b/app/src/main/resources/templates/therapist/clients/client-add_journal_entry-fragment.html
@@ -22,7 +22,7 @@
           th:fragment="journalEntryForm"
           th:hx-post="${formAction}"
           x-data="entryData()"
-          x-init="$watch('form', (form) => saveLocalState(form))">
+          x-init="$watch('form', (form) => saveLocalState(form), {deep: true})">
 
         <script id="formDraft" th:inline="javascript">
             let serverState = /*[[${entry}]]*/ null;
@@ -36,7 +36,7 @@
 
             let formData;
             if (serverState == null) {
-                formData = localState || {version: 0, date: entryDate};
+                formData = localState || {version: 0, date: entryDate, therapeuticTask: {id: null}};
             } else if (serverState.version === localState?.version) {
                 formData = localState
             } else {
@@ -49,7 +49,11 @@
                 return {
                     form: formData,
                     serverState: serverState,
-                    hasUnsavedChanges: hasUnsavedEdits || newCardWasntSaved
+                    hasUnsavedChanges: hasUnsavedEdits || newCardWasntSaved,
+                    therapeuticTaskSelected(event) {
+                        this.form.therapeuticTask = {id: event.detail.itemId};
+                        this.form.therapeuticTaskTitle = event.detail.itemTitle;
+                    }
                 }
             }
 
@@ -101,27 +105,34 @@
                            min="2000-01-01"
                            name="date"
                            required
-                       th:classappend="${duplicatedDate} ? 'is-invalid' : ''"
+                           th:classappend="${duplicatedDate} ? 'is-invalid' : ''"
                            th:value="${entry?.date ?: entryDate}"
                            type="date">
                     <label for="date">Дата <span class="text-danger">*</span></label>
-                <div class="invalid-feedback" id="duplicatedDateMessage">
-                    Запись за эту дату уже существует
+                    <div class="invalid-feedback" id="duplicatedDateMessage">
+                        Запись за эту дату уже существует
+                    </div>
                 </div>
             </div>
-            <div class="mb-3 col">
-                <label class="form-label" for="task-input">Терапевтическая задача</label>
-                <input class="form-control"
-                       hx-get="/therapist/therapeutic-tasks/autocomplete-search"
-                       id="task-input" minlength="3" name="therapeuticTaskName" required
-                       hx-swap="outerHTML"
-                       hx-target="#therapeuticTasks"
-                       hx-trigger="input[inputType != 'insertReplacementText' && target.value.length > 2] delay:0.3s"
-                       list="therapeuticTasks"
-                       th:value="${entry?.therapeuticTaskName ?: ''}"
-                       type="text"
+
+            <div @itemSelected="therapeuticTaskSelected($event)" class="mb-3 col">
+                <combo-box-fragment id="therapeuticTask"
+                                    th:replace="~{components/combo-box.html :: comboBox(
+                                                    name='therapeuticTask',
+                                                    fetchUrl='/therapist/therapeutic-tasks/autocomplete-search-combo-box',
+                                                    value=${entry?.therapeuticTask?.id},
+                                                    valueName=${entry?.therapeuticTaskTitle},
+                                                    placeholderView=~{:: #therapeuticTaskPlaceholder},
+                                                    itemSelected='therapeuticTaskSelected($event)',
+                                                    minlength=2,
+                                                    maxlength=50,
+                                                    required=true,
+                                                    selectOnly=false)}"
                 >
-                <datalist id="therapeuticTasks"></datalist>
+                    <label id="therapeuticTaskPlaceholder">Терапевтическая задача <span
+                            class="text-danger">*</span></label>
+                </combo-box-fragment>
+                <div class="form-text">Начните вводить название для поиска</div>
             </div>
         </div>
             <div class="mb-3 col">
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/clients/journal/CreateJournalEntryFragmentTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/clients/journal/CreateJournalEntryFragmentTest.kt
@@ -75,7 +75,7 @@ class CreateJournalEntryFragmentTest : QYogaAppIntegrationBaseTest() {
         // Проверка
         document.select("body form").single() shouldBeComponent CreateJournalEntryForm
         CreateJournalEntryForm.dateInput.value(document) shouldBe LocalDate.now().toString()
-        CreateJournalEntryForm.therapeuticTaskNameInput.value(document) shouldBe createJournalEntryRequest.therapeuticTaskName
+        CreateJournalEntryForm.therapeuticTaskComboBox.title(document) shouldBe createJournalEntryRequest.therapeuticTaskTitle
         CreateJournalEntryForm.entryTextInput.value(document) shouldBe createJournalEntryRequest.journalEntryText
         document shouldHaveElement JournalEntryForm.DUPLICATED_DATE_MESSAGE
     }
diff --git a/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/clients/journal/EditJournalEntryPageTest.kt b/app/src/test/kotlin/pro/qyoga/tests/cases/app/therapist/clients/journal/EditJournalEntryPageTest.kt
@@ -84,7 +84,7 @@ class EditJournalEntryPageTest : QYogaAppIntegrationBaseTest() {
         // Проверка
         document.select("body form").single() shouldBeComponent EditJournalEntryForm
         EditJournalEntryForm.dateInput.value(document) shouldBe firstEntryDate.toString()
-        EditJournalEntryForm.therapeuticTaskNameInput.value(document) shouldBe editJournalEntryRequest.therapeuticTaskName
+        EditJournalEntryForm.therapeuticTaskComboBox.title(document) shouldBe editJournalEntryRequest.therapeuticTaskTitle
         EditJournalEntryForm.entryTextInput.value(document) shouldBe editJournalEntryRequest.journalEntryText
         document shouldHaveElement JournalEntryForm.DUPLICATED_DATE_MESSAGE
     }
diff --git a/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistClientJournalApi.kt b/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistClientJournalApi.kt
@@ -116,8 +116,12 @@ class TherapistClientJournalApi(override val authCookie: Cookie) : AuthorizedApi
         formParam(CreateJournalEntryForm.version.name, journalEntry.version)
         formParam(CreateJournalEntryForm.dateInput.name, journalEntry.date.toString())
         formParam(
-            CreateJournalEntryForm.therapeuticTaskNameInput.name,
-            journalEntry.therapeuticTaskName
+            CreateJournalEntryForm.therapeuticTaskComboBox.name,
+            ""
+        )
+        formParam(
+            CreateJournalEntryForm.therapeuticTaskComboBox.titleInputId,
+            journalEntry.therapeuticTaskTitle
         )
         formParam(CreateJournalEntryForm.entryTextInput.name, journalEntry.journalEntryText)
         pathParam("clientId", clientId)
@@ -160,8 +164,12 @@ class TherapistClientJournalApi(override val authCookie: Cookie) : AuthorizedApi
         formParam(CreateJournalEntryForm.version.name, journalEntry.version)
         formParam(CreateJournalEntryForm.dateInput.name, journalEntry.date.toString())
         formParam(
-            CreateJournalEntryForm.therapeuticTaskNameInput.name,
-            journalEntry.therapeuticTaskName
+            CreateJournalEntryForm.therapeuticTaskComboBox.name,
+            ""
+        )
+        formParam(
+            CreateJournalEntryForm.therapeuticTaskComboBox.titleInputId,
+            journalEntry.therapeuticTaskTitle
         )
         formParam(CreateJournalEntryForm.entryTextInput.name, journalEntry.journalEntryText)
         pathParam("clientId", clientId)
diff --git a/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistTherapeuticTasksApi.kt b/app/src/test/kotlin/pro/qyoga/tests/clients/api/TherapistTherapeuticTasksApi.kt
@@ -10,8 +10,8 @@ import org.jsoup.nodes.Document
 import org.springframework.http.HttpStatus
 import pro.qyoga.app.therapist.therapy.therapeutic_tasks.components.TherapeuticTasksComboBoxController
 import pro.qyoga.core.therapy.therapeutic_tasks.model.TherapeuticTask
-import pro.qyoga.tests.pages.therapist.clients.journal.entry.CreateJournalEntryForm
 import pro.qyoga.tests.pages.therapist.clients.journal.entry.TherapeuticTasksSearchResult
+import pro.qyoga.tests.pages.therapist.therapy.programs.EditProgramForm
 import pro.qyoga.tests.pages.therapist.therapy.therapeutic_tasks.TherapeuticTasksListPage
 
 class TherapistTherapeuticTasksApi(override val authCookie: Cookie) : AuthorizedApi {
@@ -32,7 +32,7 @@ class TherapistTherapeuticTasksApi(override val authCookie: Cookie) : Authorized
     fun autocompleteSearch(searchKey: String): Document {
         return Given {
             authorized()
-            queryParams(CreateJournalEntryForm.therapeuticTaskNameInput.name, searchKey)
+            queryParams(EditProgramForm.therapeuticTaskInput.name, searchKey)
         } When {
             get(TherapeuticTasksSearchResult.PATH)
         } Then {
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/JournalEntryMatchers.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/JournalEntryMatchers.kt
@@ -8,12 +8,12 @@ import pro.qyoga.core.clients.journals.model.JournalEntry
 
 infix fun JournalEntry.shouldMatch(editJournalEntryRq: EditJournalEntryRq) {
     date shouldBe editJournalEntryRq.date
-    therapeuticTask.resolveOrThrow().name shouldBe editJournalEntryRq.therapeuticTaskName
+    therapeuticTask.resolveOrThrow().name shouldBe editJournalEntryRq.therapeuticTaskTitle
     entryText shouldBe editJournalEntryRq.journalEntryText
 }
 
 infix fun EditJournalEntryRq.shouldMatch(journalEntry: JournalEntry) {
     date shouldBe journalEntry.date
-    therapeuticTaskName shouldBe journalEntry.therapeuticTask.resolveOrThrow().name
+    therapeuticTaskTitle shouldBe journalEntry.therapeuticTask.resolveOrThrow().name
     journalEntryText shouldBe journalEntryText
 }
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/clients/JournalEntriesObjectMother.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/fixture/object_mothers/clients/JournalEntriesObjectMother.kt
@@ -12,7 +12,7 @@ object JournalEntriesObjectMother {
         date: LocalDate = randomRecentLocalDate(),
         therapeuticTaskName: String = randomSentence(1, 3),
         text: String = randomSentence(1, 100)
-    ) = EditJournalEntryRq(date, therapeuticTaskName, text, 1)
+    ) = EditJournalEntryRq(date, null, therapeuticTaskName, text, 1)
 
     fun journalEntriesWithUniqueDate(): () -> EditJournalEntryRq {
         val datesIterator = generateSequence { randomRecentLocalDate() }
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/clients/journal/entry/EditJournalEntryPage.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/clients/journal/entry/EditJournalEntryPage.kt
@@ -29,7 +29,8 @@ object EditJournalEntryPage : Component {
             element.getElementById(EditJournalEntryForm.id)!! shouldBeComponent EditJournalEntryForm
 
             EditJournalEntryForm.dateInput.value(element) shouldBe entry.date.toString()
-            EditJournalEntryForm.therapeuticTaskNameInput.value(element) shouldBe entry.therapeuticTask.resolveOrThrow().name
+            EditJournalEntryForm.therapeuticTaskComboBox.value(element) shouldBe entry.therapeuticTask!!.id.toString()
+            EditJournalEntryForm.therapeuticTaskComboBox.title(element) shouldBe entry.therapeuticTask.resolveOrThrow().name
             EditJournalEntryForm.entryTextInput.value(element) shouldBe entry.entryText
             val scriptElement = element.select(FormDraftScript.selector()).single()
             FormDraftScript.clientId.value(scriptElement, UUID::class) shouldBe entry.clientRef.id
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/clients/journal/entry/JournalEntryFrom.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/clients/journal/entry/JournalEntryFrom.kt
@@ -7,7 +7,7 @@ abstract class JournalEntryForm(action: FormAction) : QYogaForm("journalEntryFor
 
     val version = Input.hidden("version", true)
     val dateInput = Input.date("date", true)
-    val therapeuticTaskNameInput = Input.text("therapeuticTaskName", true)
+    val therapeuticTaskComboBox = ComboBox("therapeuticTask", true)
     val entryTextInput = TextArea("journalEntryText", true)
 
     private val addButton = Button("confirmButton", "Сохранить")
@@ -26,7 +26,7 @@ abstract class JournalEntryForm(action: FormAction) : QYogaForm("journalEntryFor
 
     override val components = listOf(
         dateInput,
-        therapeuticTaskNameInput,
+        therapeuticTaskComboBox,
         entryTextInput,
         addButton,
         FormDraftScript
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/therapy/programs/ProgramForm.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/pages/therapist/therapy/programs/ProgramForm.kt
@@ -1,5 +1,6 @@
 package pro.qyoga.tests.pages.therapist.therapy.programs
 
+import pro.qyoga.app.therapist.therapy.therapeutic_tasks.components.SearchTherapeuticTasksController
 import pro.qyoga.tests.platform.html.Button
 import pro.qyoga.tests.platform.html.FormAction
 import pro.qyoga.tests.platform.html.Input
@@ -9,7 +10,7 @@ abstract class ProgramForm(action: FormAction) : QYogaForm("programForm", action
 
     val titleInput by component { Input.text("title", true) }
 
-    val therapeuticTaskInput by component { Input.text("therapeuticTaskName", true) }
+    val therapeuticTaskInput by component { Input.text(SearchTherapeuticTasksController.SEARCH_KEY_PARAM_NAME, true) }
 
     val exerciseSearchInput by component { Input.text("searchKey", false, id = "exerciseSearchInput") }
 
diff --git a/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/ComboBox.kt b/app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/ComboBox.kt
@@ -48,6 +48,9 @@ class ComboBox(baseName: String, override val required: Boolean, val items: List
     override fun value(element: Element): String =
         element.select("input[type=hidden][name=$name]").`val`()
 
+    fun title(element: Element): String =
+        element.select("input[type=text][name=$titleInputId]").`val`()
+
     override fun selector(): String = "div.combo-box-div:has(input[name='${name}'])"
 
     override fun matcher(): Matcher<Element> {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class CreateJournalEntryOp(`
`30`	`30`	`checkNotNull(client) { "Client for journal entry not found by id=$clientId" }`
`31`	`31`
`32`	`32`	`val therapeuticTask = therapeuticTasksRepo.getOrCreate(`
`33`		`- TherapeuticTask(principal.id, editJournalEntryRq.therapeuticTaskName)`
	`33`	`+ TherapeuticTask(principal.id, editJournalEntryRq.therapeuticTaskTitle)`
`34`	`34`	`)`
`35`	`35`	`val newEntry = JournalEntry(`
`36`	`36`	`client.ref(),`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class EditJournalEntryOp(`
`26`	`26`	`principal: QyogaUserDetails,`
`27`	`27`	`): JournalEntry? {`
`28`	`28`	`val therapeuticTask = therapeuticTasksRepo.getOrCreate(`
`29`		`- TherapeuticTask(principal.id, editJournalEntryRq.therapeuticTaskName)`
	`29`	`+ TherapeuticTask(principal.id, editJournalEntryRq.therapeuticTaskTitle)`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`val query = query {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class SearchTherapeuticTasksController(`
`19`	`19`
`20`	`20`	`@GetMapping`
`21`	`21`	`fun search(`
`22`		`- @RequestParam("therapeuticTaskName") searchKey: String,`
	`22`	`+ @RequestParam(SEARCH_KEY_PARAM_NAME) searchKey: String,`
`23`	`23`	`@AuthenticationPrincipal therapist: QyogaUserDetails,`
`24`	`24`	`): ModelAndView {`
`25`	`25`	`val tasks =`
`@@ -35,4 +35,8 @@ class SearchTherapeuticTasksController(`
`35`	`35`	`)`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ companion object {`
	`39`	`+ const val SEARCH_KEY_PARAM_NAME = "therapeuticTaskName"`
	`40`	`+ }`
	`41`	`+`
`38`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class CreateJournalEntryFragmentTest : QYogaAppIntegrationBaseTest() {`
`75`	`75`	`// Проверка`
`76`	`76`	`document.select("body form").single() shouldBeComponent CreateJournalEntryForm`
`77`	`77`	`CreateJournalEntryForm.dateInput.value(document) shouldBe LocalDate.now().toString()`
`78`		`- CreateJournalEntryForm.therapeuticTaskNameInput.value(document) shouldBe createJournalEntryRequest.therapeuticTaskName`
	`78`	`+ CreateJournalEntryForm.therapeuticTaskComboBox.title(document) shouldBe createJournalEntryRequest.therapeuticTaskTitle`
`79`	`79`	`CreateJournalEntryForm.entryTextInput.value(document) shouldBe createJournalEntryRequest.journalEntryText`
`80`	`80`	`document shouldHaveElement JournalEntryForm.DUPLICATED_DATE_MESSAGE`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ class EditJournalEntryPageTest : QYogaAppIntegrationBaseTest() {`
`84`	`84`	`// Проверка`
`85`	`85`	`document.select("body form").single() shouldBeComponent EditJournalEntryForm`
`86`	`86`	`EditJournalEntryForm.dateInput.value(document) shouldBe firstEntryDate.toString()`
`87`		`- EditJournalEntryForm.therapeuticTaskNameInput.value(document) shouldBe editJournalEntryRequest.therapeuticTaskName`
	`87`	`+ EditJournalEntryForm.therapeuticTaskComboBox.title(document) shouldBe editJournalEntryRequest.therapeuticTaskTitle`
`88`	`88`	`EditJournalEntryForm.entryTextInput.value(document) shouldBe editJournalEntryRequest.journalEntryText`
`89`	`89`	`document shouldHaveElement JournalEntryForm.DUPLICATED_DATE_MESSAGE`
`90`	`90`	`}`