wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

feat: refs #7874 use badge type

This commit is contained in:
Jorge Penadés 2024-10-14 13:00:15 +02:00
parent 6f2187cb68
commit 4ff3c18f33
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ onBeforeRouteLeave((to, from, next) => {
url="ObservationTypes" url="ObservationTypes"
v-model="newNote.observationTypeFk" v-model="newNote.observationTypeFk"
option-label="description" option-label="description"
style="flex: 0.15; margin-left: 0" style="flex: 0.15"
:required="true" :required="true"
@keyup.enter.stop="insert" @keyup.enter.stop="insert"
/> />
@ -142,35 +142,29 @@ onBeforeRouteLeave((to, from, next) => {
:title="note.worker?.user.nickname" :title="note.worker?.user.nickname"
/> />
<div class="full-width row justify-between q-pa-xs"> <div class="full-width row justify-between q-pa-xs">
<VnUserLink <div>
:name="`${note.worker.user.nickname}`" <VnUserLink
:worker-id="note.worker.id" :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>
<span v-text="toDateHourMin(note.created)" /> <span v-text="toDateHourMin(note.created)" />
</div> </div>
</QCardSection> </QCardSection>
<QCardSection class="q-pa-xs q-my-none q-py-none"> <QCardSection class="q-pa-xs q-my-none q-py-none">
<VnRow> {{ note.text }}
<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>
</QCardSection> </QCardSection>
</QCard> </QCard>
</TransitionGroup> </TransitionGroup>
@ -180,12 +174,6 @@ onBeforeRouteLeave((to, from, next) => {
<style lang="scss" scoped> <style lang="scss" scoped>
.q-card { .q-card {
width: 90%; width: 90%;
@media (max-width: $breakpoint-sm) {
width: 100%;
}
&__section {
word-wrap: break-word;
}
} }
.q-dialog .q-card { .q-dialog .q-card {
width: 400px; width: 400px;
@ -199,6 +187,23 @@ onBeforeRouteLeave((to, from, next) => {
opacity: 0; opacity: 0;
background-color: $primary; background-color: $primary;
} }
.vn-row > :nth-child(2) {
margin-left: 0;
}
@media (max-width: $breakpoint-xs) {
.vn-row > :deep(*) {
margin-left: 0;
}
.q-card {
width: 100%;
&__section {
padding: 0;
}
}
}
</style> </style>
<i18n> <i18n>
es: es: