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

hotfix: refs #7323 generate code & minor changes #635

Merged
jorgep merged 6 commits from 7323-hotfix-workerFineTunning into master 2024-08-23 06:49:18 +00:00
Conversation 0 Commits 6 Files Changed 6 +99 -41
jorgep commented 2024-08-21 11:34:21 +00:00
Member
Copy Link
No description provided.
jorgep added 1 commit 2024-08-21 11:34:22 +00:00
gitea/salix-front/pipeline/pr-master This commit looks good Details
635ac2716d fix: refs #7323 generate code & minor changes
jorgep reviewed 2024-08-21 11:35:10 +00:00
src/pages/Worker/Card/WorkerSummary.vue
@ -157,3 +141,1 @@
:value="worker.isDisable"
/>
</VnRow>
<VnLv
jorgep commented 2024-08-21 11:35:10 +00:00
Author
Member
Copy Link

Uno debajo del otro.

Uno debajo del otro.
jorgep reviewed 2024-08-21 11:35:49 +00:00
src/pages/Worker/WorkerList.vue Outdated
@ -149,7 +179,7 @@ function uppercaseStreetModel(data) {
auto-load
>
<template #more-create-dialog="{ data }">
<div class="q-pa-lg full-width" style="max-width: 1200px">
jorgep commented 2024-08-21 11:35:49 +00:00
Author
Member
Copy Link

No hacía nada

No hacía nada
jorgep reviewed 2024-08-21 11:36:53 +00:00
src/pages/Worker/WorkerList.vue
@ -164,3 +194,3 @@
/>
<VnRow>
<VnInput v-model="data.firstName" :label="t('worker.create.name')" />
<VnInput
jorgep commented 2024-08-21 11:36:53 +00:00
Author
Member
Copy Link

He creado un punto en la próxima reunión de Salix para que se haga refactor de los componentes create y se pueda usar en los VnTable. Ahora mismo en todos los listados se ha duplicado el código...

He creado un punto en la próxima reunión de Salix para que se haga refactor de los componentes create y se pueda usar en los VnTable. Ahora mismo en todos los listados se ha duplicado el código...
jorgep added 1 commit 2024-08-21 12:18:05 +00:00
gitea/salix-front/pipeline/pr-master This commit looks good Details
517ec87e16 fix: refs #7323 use timeStamp
jorgep added 1 commit 2024-08-21 14:02:23 +00:00
gitea/salix-front/pipeline/pr-master This commit looks good Details
9c99266da6 fix: refs #7323 replace day
jorgep reviewed 2024-08-21 14:04:00 +00:00
src/pages/Worker/Card/WorkerCalendarItem.vue
@ -152,7 +152,7 @@ const getEventAttrs = (timestamp) => {
if (isFestive) {
attrs.class = '--festive';
attrs.label = event.absenceId ?? timestamp.day;
jorgep commented 2024-08-21 14:03:59 +00:00
Author
Member
Copy Link

Esto mostraba el id de la ausencia... en lugar del día. Además, en la lógica de Salix, no he visto nada parecido.

Esto mostraba el id de la ausencia... en lugar del día. Además, en la lógica de Salix, no he visto nada parecido.
jorgep added 1 commit 2024-08-21 14:04:58 +00:00
jorgep changed title from WIP: hotfix: refs #7323 generate code & minor changes to hotfix: refs #7323 generate code & minor changes 2024-08-21 14:06:13 +00:00
jorgep requested review from jgallego 2024-08-21 14:06:50 +00:00
jorgep added 1 commit 2024-08-21 14:36:50 +00:00
gitea/salix-front/pipeline/pr-master This commit looks good Details
fd09a6bfbe fix: refs #7323 test
jorgep added the
CR / Tests passed
 label 2024-08-21 14:38:42 +00:00
jorgep added 1 commit 2024-08-22 10:14:21 +00:00
gitea/salix-front/pipeline/pr-master This commit looks good Details
48277a5f20 fix: refs #7323 vertical align
jorgep reviewed 2024-08-22 10:23:47 +00:00
src/pages/Worker/Card/WorkerTimeControl.vue
@ -550,1 +554,3 @@
style="padding: 20px 16px !important"
:style="{
padding: '20px 16px !important',
'vertical-align': 'baseline',
jorgep commented 2024-08-22 10:23:47 +00:00
Author
Member
Copy Link

Alinea arriba del todo las horas. Probado en Firefox, chorme y Edge.

Alinea arriba del todo las horas. Probado en Firefox, chorme y Edge.
jgallego approved these changes 2024-08-23 06:46:44 +00:00
jorgep merged commit 9636d5a3ad into master 2024-08-23 06:49:18 +00:00
jorgep deleted branch 7323-hotfix-workerFineTunning 2024-08-23 06:49:18 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
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#635
No description provided.
Delete Branch "7323-hotfix-workerFineTunning"

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?