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

feat: refs #8087 refs#8087 Redadas en travel #908

Merged
carlosap merged 14 commits from 8087-nuevosCamposTravel into dev 2024-11-21 11:51:52 +00:00
Conversation 0 Commits 14 Files Changed 10 +54 -80
carlosap commented 2024-11-11 13:21:15 +00:00
Member
Copy Link
No description provided.
carlosap added 1 commit 2024-11-11 13:21:15 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
fc73149dcf feat: refs #8087 refs#8087 Redadas en travel
carlosap requested review from jgallego 2024-11-11 13:21:21 +00:00
jgallego requested changes 2024-11-11 13:55:25 +00:00
Dismissed
src/pages/Travel/Card/TravelBasicData.vue Outdated
@ -100,3 +101,3 @@
<i18n>
es:
raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si no se especifican días, la fecha no cambiará
jgallego commented 2024-11-11 13:54:53 +00:00
Owner
Copy Link

Si no se especifican días si açò es deixar-ho buit, millor dir-ho així.
Si se deja vacio

`Si no se especifican días ` si açò es deixar-ho buit, millor dir-ho així. `Si se deja vacio`
carlosap marked this conversation as resolved
src/pages/Travel/TravelList.vue Outdated
@ -234,2 +235,3 @@
})
}}</QTooltip
>
>{{ console.log(row.daysInForward) }}
jgallego commented 2024-11-11 13:55:23 +00:00
Owner
Copy Link

borrar

borrar
carlosap marked this conversation as resolved
carlosap added 1 commit 2024-11-11 14:00:10 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e9fad1a44e feat: refs #8087 refs#8087 Redadas en travel
carlosap requested review from jgallego 2024-11-11 14:00:14 +00:00
jgallego approved these changes 2024-11-12 06:25:27 +00:00
Dismissed
carlosap added 1 commit 2024-11-12 10:24:07 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4a0c15ed90 Merge branch 'dev' into 8087-nuevosCamposTravel
carlosap dismissed jgallego’s review 2024-11-12 10:24:08 +00:00
Reason:

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

carlosap added 2 commits 2024-11-12 15:27:44 +00:00
jorgep added 1 commit 2024-11-12 15:38:09 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4572817699 feat: refs #8087 reactive data
carlosap requested review from jgallego 2024-11-12 15:52:12 +00:00
jgallego requested changes 2024-11-13 07:51:51 +00:00
Dismissed
src/pages/Travel/Card/TravelBasicData.vue Outdated
@ -100,3 +96,3 @@
<i18n>
es:
raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si se deja vacio, la fecha no cambiará
jgallego commented 2024-11-13 07:50:57 +00:00
Owner
Copy Link

@alexm dona problemes les cometes en les traduccions?, no sé si tenim mes exemples y a més no se si cal podria anar el camp tal cual

@alexm dona problemes les cometes en les traduccions?, no sé si tenim mes exemples y a més no se si cal podria anar el camp tal cual
alexm commented 2024-11-13 07:54:23 +00:00
Member
Copy Link

Ho acabe de probar en la meua rama i no pareix q done problemes

Ho acabe de probar en la meua rama i no pareix q done problemes
carlosap marked this conversation as resolved
jgallego requested review from alexm 2024-11-13 07:52:00 +00:00
jgallego dismissed jgallego’s review 2024-11-13 07:52:31 +00:00
Reason:

en que revise alex prou, jo ho veig ok

alexm reviewed 2024-11-13 07:55:10 +00:00
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue Outdated
@ -447,0 +446,4 @@
<VnSelect
:label="t('basicData.company')"
v-model="formData.companyFk"
option-value="id"
alexm commented 2024-11-13 07:55:10 +00:00
Member
Copy Link

option-value="id" es la opcio per defecte, no caldria ficarlo

option-value="id" es la opcio per defecte, no caldria ficarlo
carlosap marked this conversation as resolved
alexm reviewed 2024-11-13 07:55:31 +00:00
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue Outdated
@ -447,0 +449,4 @@
option-value="id"
option-label="code"
:options="companiesOptions"
hide-selected
alexm commented 2024-11-13 07:55:31 +00:00
Member
Copy Link

igaul que estes opcions tambe son por defecte(hide-selected,map-options)

igaul que estes opcions tambe son por defecte(hide-selected,map-options)
carlosap marked this conversation as resolved
alexm approved these changes 2024-11-13 07:56:27 +00:00
Dismissed
alexm added 1 commit 2024-11-13 07:56:35 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
9ac3316567 Merge branch 'dev' into 8087-nuevosCamposTravel
jgallego approved these changes 2024-11-14 06:47:46 +00:00
Dismissed
carlosap added 1 commit 2024-11-19 10:10:42 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
8c20b8736b feat: refs #8087 refs#8087 Redadas en travel
carlosap dismissed alexm’s review 2024-11-19 10:10:42 +00:00
Reason:

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

carlosap dismissed jgallego’s review 2024-11-19 10:10:42 +00:00
Reason:

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

carlosap requested review from alexm 2024-11-19 10:11:03 +00:00
carlosap added 1 commit 2024-11-19 13:04:17 +00:00
carlosap added 1 commit 2024-11-20 12:14:53 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
317e9ad034 Merge branch 'dev' into 8087-nuevosCamposTravel
alexm requested changes 2024-11-20 12:20:03 +00:00
Dismissed
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue Outdated
@ -417,0 +433,4 @@
:rules="validate('basicData.company')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md no-wrap">
alexm commented 2024-11-20 12:19:53 +00:00
Member
Copy Link

VnRow es un component per a quan hi ha dins 2, si el format es movil, bote uno baix del altre. En este cas diria que no cal. I en el cas de fer falta, no cal ficar el class

VnRow es un component per a quan hi ha dins 2, si el format es movil, bote uno baix del altre. En este cas diria que no cal. I en el cas de fer falta, no cal ficar el class
carlosap marked this conversation as resolved
carlosap added 2 commits 2024-11-20 13:29:58 +00:00
carlosap requested review from alexm 2024-11-20 13:32:39 +00:00
carlosap added 1 commit 2024-11-20 18:06:06 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
087ec5f39f Merge branch 'dev' into 8087-nuevosCamposTravel
alexm approved these changes 2024-11-21 06:04:04 +00:00
carlosap added 1 commit 2024-11-21 11:45:22 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
242bf6f318 Merge branch 'dev' into 8087-nuevosCamposTravel
carlosap merged commit 977512cae0 into dev 2024-11-21 11:51:52 +00:00
carlosap deleted branch 8087-nuevosCamposTravel 2024-11-21 11:51:52 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
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
4 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#908
No description provided.
Delete Branch "8087-nuevosCamposTravel"

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?