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

#7130 - addFieldInRoutes #259

Merged
jon merged 6 commits from 7130-addFieldInRoutes into dev 2024-04-18 09:34:32 +00:00
Conversation 1 Commits 6 Files Changed 6 +68 -8
jon commented 2024-03-27 06:56:20 +00:00
Member
Copy Link
No description provided.
jon added 17 commits 2024-03-27 06:56:20 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
37a2c33f9f refactor: #6993 set default QTable pagination
gitea/salix-front/pipeline/pr-dev This commit looks good Details
667359ed92 Merge branch 'dev' into 6993-HideAllPagination
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
ff5e09d315 refs #6993 fixed QTable behaviour
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
07cd07427e refs #6993 remove depen
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
4c63e2f5c1 merge
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
6ff8b7be34 refs #6993 fix conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
a5441fb4a9 refs #6993 fix test front
gitea/salix-front/pipeline/pr-dev This commit looks good Details
8ebf4be807 refs: #6993 deleted useless files
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e99b727b77 Merge branch 'dev' into 6993-HideAllPagination
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
9f24f1f97c refactor: refs #6993 merged conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
7072dc783b refactor: refs #6993 fix test error
jon requested review from jgallego 2024-03-27 08:07:11 +00:00
jgallego requested review from alexm 2024-03-27 14:48:50 +00:00
jgallego refused to review 2024-03-27 14:48:53 +00:00
alexm changed title from 7130-addFieldInRoutes to #7130 - addFieldInRoutes 2024-03-28 06:38:58 +00:00
alexm commented 2024-03-28 06:58:13 +00:00
Member
Copy Link

@jgallego
Pots revisar el diseny?
Per lo que he vist en el redmine crec q volieu un checkbox.
Ara esta aixina:
image

@jgallego Pots revisar el diseny? Per lo que he vist en el redmine crec q volieu un checkbox. Ara esta aixina: ![image](/attachments/3e8d3276-60b1-453c-9b06-d5acce978830)
image.png
13 KiB
alexm requested review from jgallego 2024-03-28 06:58:21 +00:00
alexm approved these changes 2024-03-28 07:00:38 +00:00
Dismissed
src/pages/Route/Card/RouteFilter.vue Outdated
@ -213,2 +222,4 @@
from: From
to: To
Served: Served
no: No
alexm commented 2024-03-28 06:36:28 +00:00
Member
Copy Link

Poner las traducciones si i no de manera global

Poner las traducciones si i no de manera global
jon marked this conversation as resolved
jgallego requested changes 2024-03-28 07:21:54 +00:00
Dismissed
src/pages/Route/RouteList.vue Outdated
@ -400,0 +407,4 @@
<template #body-cell-isServed="{ row }">
<QTd>
<div class="lock-icon-cell">
<QIcon
jgallego commented 2024-03-28 07:11:40 +00:00
Owner
Copy Link

Me equivoqué, ahora viendolo no queda claro que rutas han salido y que rutas estan por salir.
Pongamos un checkbox para indicar si la ruta esta servida o no.

Me equivoqué, ahora viendolo no queda claro que rutas han salido y que rutas estan por salir. Pongamos un checkbox para indicar si la ruta esta servida o no.
jon marked this conversation as resolved
jon added 1 commit 2024-03-28 11:19:57 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
37d869d1d5 refactor: refs #7130 requested changes
jon dismissed alexm’s review 2024-03-28 11:19:57 +00:00
Reason:

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

jon requested review from jgallego 2024-03-28 11:20:34 +00:00
jgallego approved these changes 2024-03-28 17:54:47 +00:00
Dismissed
jon added 1 commit 2024-04-02 05:14:17 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
1316fe3896 Merge branch 'dev' into 7130-addFieldInRoutes
jon dismissed jgallego’s review 2024-04-02 05:14:18 +00:00
Reason:

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

jon added 1 commit 2024-04-17 11:49:02 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
79a90c1163 fix: refs #7130 fix conflicts
alexm approved these changes 2024-04-18 07:25:17 +00:00
Dismissed
alexm added 1 commit 2024-04-18 07:25:34 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e804af3512 Merge branch 'dev' into 7130-addFieldInRoutes
jsegarra added 1 commit 2024-04-18 07:37:21 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
43976e8ced fix minor bug to show
jsegarra dismissed alexm’s review 2024-04-18 07:37:21 +00:00
Reason:

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

jsegarra requested review from alexm 2024-04-18 07:41:31 +00:00
alexm approved these changes 2024-04-18 08:08:02 +00:00
jon merged commit bb97acc261 into dev 2024-04-18 09:34:32 +00:00
jon deleted branch 7130-addFieldInRoutes 2024-04-18 09:34:32 +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#259
No description provided.
Delete Branch "7130-addFieldInRoutes"

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?