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

Item requests #297

Merged
jsegarra merged 24 commits from :feature/ItemRequests into dev 2024-04-26 06:22:11 +00:00
Conversation 5 Commits 24 Files Changed 9 +783 -13
hyervoni commented 2024-04-16 14:58:50 +00:00
Contributor
Copy Link

https://redmine.verdnatura.es/issues/6534

https://redmine.verdnatura.es/issues/6534
hyervoni added 7 commits 2024-04-16 14:58:50 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
df2760ef60 Add dense attr to inputs
hyervoni requested review from alexm 2024-04-16 14:59:00 +00:00
hyervoni requested review from jsegarra 2024-04-16 14:59:01 +00:00
wbuezas added 1 commit 2024-04-16 15:12:07 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
ba2499db9d resolve conflicts
alexm requested changes 2024-04-18 08:34:35 +00:00
Dismissed
src/i18n/locale/es.yml Outdated
@ -394,3 +394,3 @@
tickets: Tickets
list: Listado
ticketCreate: Nuevo ticket
ticketCreate: New ticket
alexm commented 2024-04-18 07:33:06 +00:00
Member
Copy Link

ticketCreate: Nuevo ticket

ticketCreate: Nuevo ticket
wbuezas commented 2024-04-18 12:10:24 +00:00
Contributor
Copy Link

Corregido.

Commit: 5f01e5c705

Corregido. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/5f01e5c70598337203be7e1be0a673c458d69956
jsegarra marked this conversation as resolved
src/i18n/locale/es.yml
@ -1094,6 +1094,8 @@ item:
list: Listado
diary: Histórico
tags: Etiquetas
create: Crear
alexm commented 2024-04-18 07:33:34 +00:00
Member
Copy Link

Quitar, en teoria se usa ticketCreate: New ticket

Quitar, en teoria se usa `ticketCreate: New ticket`
wbuezas commented 2024-04-18 12:10:43 +00:00
Contributor
Copy Link

Corregido.

Commit: 5f01e5c705

Corregido. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/5f01e5c70598337203be7e1be0a673c458d69956
jsegarra marked this conversation as resolved
src/pages/Item/ItemRequestFilter.vue Outdated
@ -0,0 +243,4 @@
</VnInput>
</QItemSection>
</QItem>
<!-- <vn-icon color-marginal
alexm commented 2024-04-18 08:34:06 +00:00
Member
Copy Link

Quitar?

Quitar?
wbuezas commented 2024-04-18 13:33:54 +00:00
Contributor
Copy Link

Lo había dejado a modo recordatorio para aplicarlo pero se me pasó. Ahora si lo apliqué.

Commit: a3cc6ed95b

Lo había dejado a modo recordatorio para aplicarlo pero se me pasó. Ahora si lo apliqué. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/a3cc6ed95b1da98c014fbf23a73eaf0b67315b12
jsegarra marked this conversation as resolved
alexm commented 2024-04-18 08:34:57 +00:00
Member
Copy Link

Traducciones de los estados
image

Traducciones de los estados ![image](/attachments/47bfb8f1-5c2d-4339-adb4-850f65a8bdb0)
image.png
3.5 KiB
alexm reviewed 2024-04-18 08:36:12 +00:00
src/pages/Item/ItemRequest.vue
@ -0,0 +306,4 @@
<template #body-cell-concept="{ row }">
<QTd>
<QBtn flat dense color="primary"> {{ row.itemDescription }}</QBtn>
<ItemDescriptorProxy :id="row.itemFk" />
alexm commented 2024-04-18 08:36:12 +00:00
Member
Copy Link

No me lo abre

No me lo abre
wbuezas commented 2024-04-18 13:15:26 +00:00
Contributor
Copy Link

Mmm.. que raro, yo si puedo abrirlo

Mmm.. que raro, yo si puedo abrirlo
jsegarra commented 2024-04-23 12:20:37 +00:00
Member
Copy Link

No me lo abre

@alexm en salix no se abre. Resulta que itemFk es null

> No me lo abre @alexm en salix no se abre. Resulta que itemFk es null
jsegarra commented 2024-04-23 12:30:28 +00:00
Member
Copy Link

En lilium está bien hecho, el fallo se corrige desde Salix en la verdnatura/salix#2355

En lilium está bien hecho, el fallo se corrige desde Salix en la https://gitea.verdnatura.es/verdnatura/salix/pulls/2355
jsegarra marked this conversation as resolved
wbuezas added 1 commit 2024-04-18 12:09:31 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
5f01e5c705 change es translations
wbuezas added 1 commit 2024-04-18 12:19:24 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
7165e48bff Add states translations
wbuezas commented 2024-04-18 12:19:48 +00:00
Contributor
Copy Link

Traducciones de los estados

@alexm traducciones agregadas.

Commit: 7165e48bff

> Traducciones de los estados @alexm traducciones agregadas. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/7165e48bff1ab000b6de088ed18a42d57743fde8
wbuezas added 1 commit 2024-04-18 13:32:41 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
a3cc6ed95b Add filter dates tooltip
jsegarra requested changes 2024-04-23 12:04:33 +00:00
Dismissed
src/pages/Item/ItemRequest.vue Outdated
@ -0,0 +331,4 @@
name="thumb_down"
color="primary"
size="sm"
class="cursor-pointer"
jsegarra commented 2024-04-23 12:03:58 +00:00
Member
Copy Link

falta la clase fill para la mano y para el icono de archivo

falta la clase fill para la mano y para el icono de archivo
wbuezas commented 2024-04-23 12:15:18 +00:00
Contributor
Copy Link

Fill agregado al icon de la mano.
El icon de archivo no cambia con hover state en salix y lo veo bien ya que no tiene ninguna accion mas que mostrar un tooltip.

Commit: 4396f7d6ba

Fill agregado al icon de la mano. El icon de archivo no cambia con hover state en salix y lo veo bien ya que no tiene ninguna accion mas que mostrar un tooltip. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/4396f7d6ba7ff40d3f819daab34f5cf017c40458
jsegarra commented 2024-04-23 12:16:15 +00:00
Member
Copy Link

sorry :(, aparece FILL por defecto, sin hacer hover

sorry :(, aparece FILL por defecto, sin hacer hover
jsegarra marked this conversation as resolved
src/pages/Item/ItemRequestFilter.vue
@ -0,0 +16,4 @@
},
});
const stateOptions = [
jsegarra commented 2024-04-23 12:04:31 +00:00
Member
Copy Link

No se traducen

No se traducen
wbuezas commented 2024-04-23 12:11:05 +00:00
Contributor
Copy Link

Corregido.

Commit: 81a630d6cd

Corregido. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/81a630d6cd9bb0f85d3031a0f22dcf87b85936cd
jsegarra marked this conversation as resolved
jsegarra requested changes 2024-04-23 12:06:23 +00:00
Dismissed
src/pages/Item/ItemRequest.vue
@ -0,0 +303,4 @@
/>
</QTd>
</template>
<template #body-cell-concept="{ row }">
jsegarra commented 2024-04-23 12:06:21 +00:00
Member
Copy Link

A mi tampoco me lo abre.
Y es correcto porque es body-cell-description, y no concept

He conseguido que me aparezca el concepto como si fuese un descriptor y no me lo abre.

A mi tampoco me lo abre. Y es correcto porque es body-cell-description, y no concept He conseguido que me aparezca el concepto como si fuese un descriptor y no me lo abre.
jsegarra marked this conversation as resolved
jsegarra reviewed 2024-04-23 12:07:45 +00:00
src/pages/Item/ItemRequestDenyForm.vue
@ -0,0 +33,4 @@
:url-create="`TicketRequests/${$props.requestId}/deny`"
:title="t('Specify the reasons to deny this request')"
:form-initial-data="bankEntityFormData"
@on-data-saved="onDataSaved"
jsegarra commented 2024-04-23 12:07:42 +00:00
Member
Copy Link

Los botones creo que están al reves

Los botones creo que están al reves
wbuezas commented 2024-04-23 12:18:58 +00:00
Contributor
Copy Link

Cambiado.

Commit: 672bc9ca9d

Cambiado. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/672bc9ca9d660e306a32fbcdcff73222a30a76b5
jsegarra marked this conversation as resolved
wbuezas added 1 commit 2024-04-23 12:10:37 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
81a630d6cd Add more translations
wbuezas added 1 commit 2024-04-23 12:13:18 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
4396f7d6ba Fill thumb_down icon on hover
wbuezas added 1 commit 2024-04-23 12:18:38 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
672bc9ca9d Change form model popup buttons order
jsegarra added 4 commits 2024-04-23 12:24:23 +00:00
jsegarra added 10 commits 2024-04-24 12:29:12 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4a0ae8aa45 Item summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4d418c9cb7 Pull new traduction yml files and add translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
92429295cd more translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
5f46ad225e Fix genus and specie value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
861e4385bb Merge branch 'dev' into feature/ItemsSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
1ea74d0639 fix: minor updates
gitea/salix-front/pipeline/pr-dev This commit looks good Details
299838bfa5 Merge branch 'dev' into feature/ItemsSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
51b432dfd0 fix icon
jsegarra approved these changes 2024-04-24 12:29:25 +00:00
Dismissed
jsegarra added 1 commit 2024-04-25 12:05:12 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
166d678d0b Merge branch 'dev' into feature/ItemRequests
jsegarra requested review from alexm 2024-04-25 12:05:35 +00:00
alexm requested changes 2024-04-25 13:00:17 +00:00
Dismissed
alexm left a comment
Member
Copy Link

image
Duplica peticiones.
Debería hacer 1 por linia y hace 2

![image](/attachments/f6c66e91-d1b1-4bda-99b4-5fe48249e942) Duplica peticiones. Debería hacer 1 por linia y hace 2
image.png
65 KiB
alexm commented 2024-04-25 13:00:33 +00:00
Member
Copy Link

Salix:
image

Salix: ![image](/attachments/a892ef0f-e33c-4c6a-aef3-ed95bba942e3)
image.png
48 KiB
jsegarra added 1 commit 2024-04-25 13:26:12 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
fb4170d83d fix Double request when update row
jsegarra dismissed jsegarra’s review 2024-04-25 13:26:12 +00:00
Reason:

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

jsegarra requested review from alexm 2024-04-25 13:27:28 +00:00
jsegarra added 1 commit 2024-04-25 13:32:05 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e5eb3010a3 fix: Change method because X updates row
alexm commented 2024-04-26 06:16:49 +00:00
Member
Copy Link

Deberia poner "it" si haces click si que abre ese
image

Deberia poner "it" si haces click si que abre ese ![image](/attachments/23c65c73-50ad-4c2e-b006-f48f0293ed95)
image.png
18 KiB
image.png
8.2 KiB
image.png
alexm approved these changes 2024-04-26 06:20:37 +00:00
jsegarra added 1 commit 2024-04-26 06:21:39 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
3116bf0944 Merge branch 'dev' into feature/ItemRequests
jsegarra merged commit 22478bed48 into dev 2024-04-26 06:22:11 +00:00
wbuezas commented 2024-04-26 13:41:06 +00:00
Contributor
Copy Link

Deberia poner "it" si haces click si que abre ese
image

@alexm esto lo solucione de paso en otra PR #333 (comment)

> Deberia poner "it" si haces click si que abre ese > ![image](/attachments/23c65c73-50ad-4c2e-b006-f48f0293ed95) @alexm esto lo solucione de paso en otra PR https://gitea.verdnatura.es/verdnatura/salix-front/pulls/333#issuecomment-49720
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#297
No description provided.
Delete Branch ":feature/ItemRequests"

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?