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

#7323 workerList #719

Merged
jorgep merged 23 commits from 7323-fineTunningWorker into dev 2024-10-07 06:41:37 +00:00
Conversation 0 Commits 23 Files Changed 16 +169 -69
jorgep commented 2024-09-16 14:33:45 +00:00
Member
Copy Link
No description provided.
jorgep added 1 commit 2024-09-16 14:33:46 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
1ff15da8ca fix: refs #7323 workerList
jorgep added 1 commit 2024-09-16 15:12:53 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
da7d0326c0 fix: refs #7323 workerBalance & arrayData setUserParams
jorgep added 1 commit 2024-09-17 11:26:58 +00:00
jorgep added 1 commit 2024-09-17 14:02:22 +00:00
jorgep added 1 commit 2024-09-17 14:09:16 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
41c43fde76 feat: refs #7323 hide log section
jorgep added 1 commit 2024-09-18 07:41:31 +00:00
jorgep added 1 commit 2024-09-23 07:35:15 +00:00
jorgep added 1 commit 2024-09-23 09:38:31 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
7bbad14f53 feat: refs #7323 delete btn
jorgep added 1 commit 2024-09-23 10:55:42 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
f809e0fb31 fix: refs #7323 show prev month week color
jorgep reviewed 2024-09-23 10:56:42 +00:00
src/components/VnTable/VnTable.vue Outdated
@ -669,3 +671,3 @@
shortcut="+"
/>
<QTooltip>
<QTooltip self="top right">
jorgep commented 2024-09-23 10:56:42 +00:00
Author
Member
Copy Link

En algunas secciones se aplicaba scroll al tooltip, así ya no lo hace.

En algunas secciones se aplicaba scroll al tooltip, así ya no lo hace.
jorgep reviewed 2024-09-23 10:59:38 +00:00
src/composables/useArrayData.js Outdated
@ -114,3 +114,3 @@
} else {
store.data = response.data;
if (!document.querySelectorAll('[role="dialog"]').length)
if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
jorgep commented 2024-09-23 10:59:38 +00:00
Author
Member
Copy Link

Cuando se cierra un dialogo , este no se borra, solo está oculto, por tanto,cuando abres un popup después ya no te actualizaba los parámetros

Cuando se cierra un dialogo , este no se borra, solo está oculto, por tanto,cuando abres un popup después ya no te actualizaba los parámetros
jorgep reviewed 2024-09-23 11:00:39 +00:00
src/pages/Worker/Card/WorkerTimeControl.vue Outdated
@ -337,2 +339,2 @@
);
workerTimeControlMails.value = data;
const curMonthStates = (await axios.get(url, { params })).data;
prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
jorgep commented 2024-09-23 11:00:39 +00:00
Author
Member
Copy Link

Suele aparecer la semana del mes anterior, para poder pintarla del color correcto, hace falta hacer 2 llamadas.

Suele aparecer la semana del mes anterior, para poder pintarla del color correcto, hace falta hacer 2 llamadas.
jorgep added 1 commit 2024-09-24 08:15:52 +00:00
jorgep added 1 commit 2024-09-26 07:17:27 +00:00
jorgep added 1 commit 2024-09-26 07:47:59 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e827d3aabf fix: refs #7323 rollback
jorgep changed title from WIP: fix: refs #7323 workerList to #7323 workerList 2024-09-26 07:48:52 +00:00
jorgep added 1 commit 2024-09-26 08:04:55 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
c2b52473a1 fix: refs #7323 align tables
jorgep reviewed 2024-09-26 10:45:52 +00:00
src/pages/Monitor/MonitorOrders.vue
@ -166,3 +142,1 @@
>
<QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
</QBtn>
<div class="q-mt-sm">
jorgep commented 2024-09-26 10:45:52 +00:00
Author
Member
Copy Link

se alinea con la otra tabla

se alinea con la otra tabla
jorgep added the
CR / Tests passed
 label 2024-09-26 10:53:21 +00:00
jorgep requested review from jsegarra 2024-09-26 10:53:39 +00:00
jsegarra requested changes 2024-09-26 11:56:14 +00:00
Dismissed
src/pages/Worker/Card/WorkerTimeControl.vue
@ -329,0 +330,4 @@
const month = date.getMonth() + 1;
const prevMonth = month == 1 ? 12 : month - 1;
let prevMonthStates = [];
jsegarra commented 2024-09-26 11:54:37 +00:00
Member
Copy Link

porque defines aquí la variable en vez de const en la propia llamada?

porque defines aquí la variable en vez de const en la propia llamada?
jorgep marked this conversation as resolved
src/pages/Worker/Card/WorkerTimeControl.vue Outdated
@ -336,3 +339,1 @@
{ params }
);
workerTimeControlMails.value = data;
const curMonthStates = (await axios.get(url, { params })).data;
jsegarra commented 2024-09-26 11:56:11 +00:00
Member
Copy Link

Mmm...no se puede simplificar en una funcion ya que lo que cambia es el valor de params

Mmm...no se puede simplificar en una funcion ya que lo que cambia es el valor de params
jorgep commented 2024-09-26 12:44:52 +00:00
Author
Member
Copy Link

Tendría que cambiar el back.

Tendría que cambiar el back.
jsegarra commented 2024-09-26 12:50:17 +00:00
Member
Copy Link

Lo que digo que no repetir tanto la llamada a axios si ambas tienen el mismo formato

Lo que digo que no repetir tanto la llamada a axios si ambas tienen el mismo formato
jorgep commented 2024-09-26 12:56:30 +00:00
Author
Member
Copy Link

es que para 1 línea no veo la necesidad de crear una fn...

es que para 1 línea no veo la necesidad de crear una fn...
jorgep commented 2024-09-26 13:13:34 +00:00
Author
Member
Copy Link

Si lo prefieres así:

const [curMonthStates, prevMonthStates] = await Promise.all([
        axios.get(url, { params }),
        axios.get(url, { params: { ...params, month: prevMonth } }),
    ]);

    workerTimeControlMails.value = curMonthStates.data.concat(prevMonthStates.data);
Si lo prefieres así: ``` const [curMonthStates, prevMonthStates] = await Promise.all([ axios.get(url, { params }), axios.get(url, { params: { ...params, month: prevMonth } }), ]); workerTimeControlMails.value = curMonthStates.data.concat(prevMonthStates.data); ```
jsegarra commented 2024-09-26 16:25:06 +00:00
Member
Copy Link

Esto es lo que yo pensaba, pero bueno, lo dejamos así

Esto es lo que yo pensaba, pero bueno, lo dejamos así
jsegarra requested changes 2024-09-26 12:07:24 +00:00
Dismissed
src/components/VnTable/VnTable.vue Outdated
@ -498,6 +498,7 @@ function handleOnDataSaved(_) {
auto-width
class="no-margin q-px-xs"
:class="[getColAlign(col), col.columnClass]"
:style="col.style"
jsegarra commented 2024-09-26 11:56:45 +00:00
Member
Copy Link

y v-bind="col"???

y v-bind="col"???
src/components/VnTable/VnTable.vue Outdated
@ -526,6 +527,7 @@ function handleOnDataSaved(_) {
:class="getColAlign(col)"
class="sticky no-padding"
@click="stopEventPropagation($event)"
:style="col.style"
jsegarra commented 2024-09-26 11:57:09 +00:00
Member
Copy Link

v-bind="col" serviria?

v-bind="col" serviria?
jorgep commented 2024-09-26 12:58:52 +00:00
Author
Member
Copy Link

No me la quiero jugar a que rompa el estilo en otras secciones. Lo digo porque hay otras propiedades que se han añadido en algunas tablas que puede que no se estaban aplicando y con el bind sí.

No me la quiero jugar a que rompa el estilo en otras secciones. Lo digo porque hay otras propiedades que se han añadido en algunas tablas que puede que no se estaban aplicando y con el bind sí.
src/pages/Monitor/MonitorOrders.vue Outdated
@ -169,0 +159,4 @@
color="primary"
@click="
openConfirmationModal(
$t('salesOrdersTable.deleteConfirmTitle'),
jsegarra commented 2024-09-26 12:02:14 +00:00
Member
Copy Link

es un texto tan tan genérico, que propongo moverlo a global

es un texto tan tan genérico, que propongo moverlo a global
jorgep marked this conversation as resolved
src/pages/Worker/Card/WorkerBalance.vue
@ -60,0 +65,4 @@
{
title: t('delete'),
icon: 'delete',
action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
jsegarra commented 2024-09-26 12:06:55 +00:00
Member
Copy Link

Duda: Eliminamos sin confirmar?

Duda: Eliminamos sin confirmar?
jorgep commented 2024-09-26 12:49:47 +00:00
Author
Member
Copy Link

no

no
jorgep marked this conversation as resolved
src/pages/Worker/Card/WorkerBalance.vue Outdated
@ -72,2 +84,2 @@
title: t('Create workerBalance'),
onDataSaved: () => tableRef.reload(),
title: t('Create balance'),
onDataSaved: () => $refs.tableRef.reload(),
jsegarra commented 2024-09-26 12:04:51 +00:00
Member
Copy Link

porque usas $refs si ya tienes tableRef como varaiable

porque usas $refs si ya tienes tableRef como varaiable
jorgep marked this conversation as resolved
jorgep reviewed 2024-09-26 12:51:51 +00:00
jorgep reviewed 2024-09-26 12:52:18 +00:00
src/pages/Worker/Card/WorkerMedical.vue
@ -68,0 +72,4 @@
{
title: t('delete'),
icon: 'delete',
action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
jorgep commented 2024-09-26 12:52:18 +00:00
Author
Member
Copy Link

Si que pregunta.

Si que pregunta.
jsegarra commented 2024-09-26 12:53:07 +00:00
Member
Copy Link

Si si, lo he comprobado despues del primer mensaje.
Desconocia que habiamos añadido esta funcionalidad

Si si, lo he comprobado despues del primer mensaje. Desconocia que habiamos añadido esta funcionalidad
jorgep marked this conversation as resolved
jorgep added 1 commit 2024-09-26 13:03:27 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
18ea23adf1 refactor: refs #7323 pr request
jorgep added 1 commit 2024-09-26 13:16:45 +00:00
jorgep requested review from jsegarra 2024-09-26 13:17:17 +00:00
jsegarra approved these changes 2024-09-26 13:24:29 +00:00
Dismissed
jorgep added 1 commit 2024-09-26 13:28:03 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
7eb951ef13 fix: refs #7323 use right locale
jorgep dismissed jsegarra’s review 2024-09-26 13:28:03 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jorgep requested review from jsegarra 2024-09-26 13:45:12 +00:00
jsegarra added 1 commit 2024-09-26 16:21:24 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
3caeb9e738 Merge branch 'dev' into 7323-fineTunningWorker
jsegarra approved these changes 2024-09-26 16:21:28 +00:00
Dismissed
jorgep added 1 commit 2024-10-03 07:17:08 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
1536cbe205 Merge branch 'dev' into 7323-fineTunningWorker
jorgep dismissed jsegarra’s review 2024-10-03 07:17:10 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jorgep requested review from jsegarra 2024-10-03 07:18:26 +00:00
jsegarra approved these changes 2024-10-03 07:20:57 +00:00
Dismissed
jorgep added 1 commit 2024-10-03 07:59:48 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
30e34ea299 Merge branch 'dev' into 7323-fineTunningWorker
jorgep dismissed jsegarra’s review 2024-10-03 07:59:49 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jorgep added 1 commit 2024-10-04 07:47:49 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
cebb3b2b16 Merge branch 'dev' into 7323-fineTunningWorker
jorgep requested review from jsegarra 2024-10-04 07:57:52 +00:00
jorgep added 2 commits 2024-10-04 11:38:00 +00:00
jsegarra approved these changes 2024-10-04 17:50:53 +00:00
jorgep added 1 commit 2024-10-07 06:39:09 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
355c84ad06 Merge branch 'dev' into 7323-fineTunningWorker
jorgep merged commit 120f96fedc into dev 2024-10-07 06:41:37 +00:00
jorgep deleted branch 7323-fineTunningWorker 2024-10-07 06:41:37 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jsegarra
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#719
No description provided.
Delete Branch "7323-fineTunningWorker"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?