verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 105 Releases Wiki Activity

#7874 add observation type #765

Merged
jorgep merged 22 commits from 7874-addObservationType into dev 2024-10-14 14:16:45 +00:00
Conversation 6 Commits 22 Files Changed 5 +37 -32
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ff3c18f33 - Show all commits

69
src/components/ui/VnNotes.vue
View File

@ -81,7 +81,7 @@ onBeforeRouteLeave((to, from, next) => {
url="ObservationTypes"
v-model="newNote.observationTypeFk"
option-label="description"
style="flex: 0.15; margin-left: 0"
style="flex: 0.15"
:required="true"
@keyup.enter.stop="insert"
/>
@ -142,35 +142,29 @@ onBeforeRouteLeave((to, from, next) => {
:title="note.worker?.user.nickname"
/>
<div class="full-width row justify-between q-pa-xs">
<VnUserLink
:name="`${note.worker.user.nickname}`"
:worker-id="note.worker.id"
/>
<div>
<VnUserLink
:name="`${note.worker.user.nickname}`"
:worker-id="note.worker.id"
/>
<QBadge
class="q-ml-xs"
outline
color="grey"
v-if="selectType && note.observationTypeFk"
>
{{
observationTypes.find(
(ot) => ot.id === note.observationTypeFk
)?.description
}}
</QBadge>
</div>
jorgep marked this conversation as resolved Outdated
jsegarra commented 2024-10-10 15:16:51 +00:00
Outdated
Review
Copy Link

Porque usamos vnselect para informar al usuario del tipo? Entendería esto si de alguna manera cambiase de estado, es decir readonly o no.
Mi propuesta es que sea un texto o por ejemplo un QBadge outlined
Veo consigo usar vnselect readonly

Porque usamos vnselect para informar al usuario del tipo? Entendería esto si de alguna manera cambiase de estado, es decir readonly o no. Mi propuesta es que sea un texto o por ejemplo un QBadge outlined Veo consigo usar vnselect readonly
jorgep commented 2024-10-10 15:26:49 +00:00
Outdated
Review
Copy Link

Es para seguir el patrón de estilo de otras secciones. @jgallego que opinas?

Es para seguir el patrón de estilo de otras secciones. @jgallego que opinas?
<span v-text="toDateHourMin(note.created)" />
</div>
</QCardSection>
<QCardSection class="q-pa-xs q-my-none q-py-none">
<VnRow>
<VnSelect
:label="t('Observation type')"
v-if="selectType && note.observationTypeFk"
url="ObservationTypes"
v-model="note.observationTypeFk"
option-label="description"
style="flex: 0.15"
dense
readonly
:is-clearable="false"
/>
<span
:style="{
flex: 0.85,
'align-self':
selectType & $q.screen.gt.xs ? 'end' : 'baseline',
}"
v-text="note.text"
/>
</VnRow>
{{ note.text }}
</QCardSection>
</QCard>
</TransitionGroup>
@ -180,12 +174,6 @@ onBeforeRouteLeave((to, from, next) => {
<style lang="scss" scoped>
.q-card {
width: 90%;
@media (max-width: $breakpoint-sm) {
width: 100%;
}
&__section {
word-wrap: break-word;
}
}
.q-dialog .q-card {
width: 400px;
@ -199,6 +187,23 @@ onBeforeRouteLeave((to, from, next) => {
opacity: 0;
background-color: $primary;
}
.vn-row > :nth-child(2) {
jorgep commented 2024-10-14 11:19:32 +00:00
Review
Copy Link

El vnSelect

El vnSelect
margin-left: 0;
}
@media (max-width: $breakpoint-xs) {
.vn-row > :deep(*) {
margin-left: 0;
}
.q-card {
width: 100%;
&__section {
padding: 0;
}
}
}
</style>
<i18n>
es: