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

Merge pull request 'fix: refs #7187 fix responsive' (!393) from 7187-fix-workerPda into test 

Reviewed-on: verdnatura/salix-front#393
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Pablo Natek 2024-05-23 12:43:34 +00:00
parent d466e9f70a 0896ae24d2
commit 92c7109290
2 changed files with 50 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/pages/Worker/Card/WorkerPda.vue
View File

@ -71,52 +71,34 @@ function reloadData() {
bordered bordered
:key="row.id" :key="row.id"
v-for="row of rows" v-for="row of rows"
class="card q-pt-xs q-mb-sm" class="card q-px-md q-mb-sm container"
> >
<QItem>
<QItemSection side-left>
<VnRow> <VnRow>
<QField <VnInput
:label="t('worker.pda.currentPDA')" :label="t('worker.pda.currentPDA')"
:model-value="row?.deviceProductionFk" :model-value="row?.deviceProductionFk"
disable disable
> />
<template #control> <VnInput
<div tabindex="0" style="padding: none"> :label="t('Model')"
<span>Id: </span> :model-value="row?.deviceProduction?.modelFk"
<span> disable
{{ row?.deviceProductionFk }}&nbsp; />
</span> <VnInput
<span>{{ t('Model') }}: </span> :label="t('Serial number')"
<span> :model-value="row?.deviceProduction?.serialNumber"
{{ row?.deviceProduction?.modelFk }}&nbsp; disable
</span> />
<span>{{ t('SIM serial number') }}: </span> <VnInput
<span>
{{
row?.deviceProduction?.serialNumber
}}&nbsp;
</span>
</div>
</template>
</QField>
<QField
:label="t('Current SIM')" :label="t('Current SIM')"
:model-value="row?.simSerialNumber" :model-value="row?.simSerialNumber"
disable disable
> />
<template #control> <QBtn
<div tabindex="0">{{ row?.simSerialNumber }}</div> flat
</template> icon="delete"
</QField>
</VnRow>
</QItemSection>
<QItemSection side>
<QIcon
name="delete"
size="sm"
class="cursor-pointer"
color="primary" color="primary"
class="btn-delete"
@click=" @click="
openConfirmationModal( openConfirmationModal(
t(`Remove PDA`), t(`Remove PDA`),
@ -128,9 +110,8 @@ function reloadData() {
<QTooltip> <QTooltip>
{{ t('worker.pda.removePDA') }} {{ t('worker.pda.removePDA') }}
</QTooltip> </QTooltip>
</QIcon> </QBtn>
</QItemSection> </VnRow>
</QItem>
</QCard> </QCard>
</template> </template>
</VnPaginate> </VnPaginate>
@ -187,26 +168,20 @@ function reloadData() {
</QPage> </QPage>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.centerCard { .btn-delete {
padding: 5%; max-width: 4%;
width: 100%; margin-top: 30px;
max-width: 70%;
margin: 0 auto;
}
.label {
color: red;
}
.q-field {
height: 65px;
} }
</style> </style>
<i18n> <i18n>
es: es:
Model: Modelo
Serial number: Número de serie
Current SIM: SIM actual
Add new device: Añadir nuevo dispositivo
PDA deallocated: PDA desasignada
Remove PDA: Eliminar PDA Remove PDA: Eliminar PDA
Do you want to remove this PDA?: ¿Desea eliminar este PDA? Do you want to remove this PDA?: ¿Desea eliminar este PDA?
PDA deallocated: PDA desasignada You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
SIM serial number: Número de serie de la SIM
Model: Modelo
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
Add new device: Añadir nuevo dispositivo
</i18n> </i18n>

2
test/cypress/integration/worker/workerPda.spec.js
View File

@ -15,7 +15,7 @@ describe('WorkerPda', () => {
}); });
it('delete pda', () => { it('delete pda', () => {
cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click(); cy.get('.btn-delete').click();
cy.get( cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block' '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
).click(); ).click();