verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #5599 remove returns #1511

Merged
carlossa merged 15 commits from 5599-ticketColors into dev 2023-05-23 08:23:58 +00:00
Conversation 0 Commits 15 Files Changed 6 +203 -29
carlossa commented 2023-05-10 09:39:43 +00:00
Member
Copy Link
No description provided.
carlossa added 1 commit 2023-05-10 09:39:44 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
61d6f47162 refs #5599 remove returns
carlossa added 1 commit 2023-05-10 09:56:13 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f4be69c85c refs #5599 select state.classColor
carlossa added 1 commit 2023-05-10 11:55:47 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
c59915f951 refs #5599 procedure
alexm reviewed 2023-05-10 12:02:33 +00:00
db/changes/232001/00-procedure.sql Outdated
@ -0,0 +65,4 @@
dest.lines,
dest.liters,
origin.futureLines - origin.hasStock AS notMovableLines,
(origin.futureLines = origin.hasStock) AS isFullMovable
alexm commented 2023-05-10 12:02:33 +00:00
Member
Copy Link

Aci has de traure tant origin.classColor com dest.classColor

Aci has de traure tant origin.classColor com dest.classColor
alexm reviewed 2023-05-10 12:02:53 +00:00
db/changes/232001/00-procedure.sql Outdated
@ -0,0 +97,4 @@
SELECT
t.id ticketFk,
t.addressFk,
st.name state,
alexm commented 2023-05-10 12:02:53 +00:00
Member
Copy Link

Falta afegir st.classColor

Falta afegir st.classColor
alexm reviewed 2023-05-10 12:03:20 +00:00
modules/ticket/back/methods/ticket/getTicketsFuture.js Outdated
@ -159,6 +159,11 @@ module.exports = Self => {
stmts.push('CALL ticket_getProblems(FALSE)');
stmt = new ParameterizedSQL(`
alexm commented 2023-05-10 12:03:20 +00:00
Member
Copy Link

Aço no cal, pq ja teu trau tmp.filter

Aço no cal, pq ja teu trau tmp.filter
alexm reviewed 2023-05-10 12:04:57 +00:00
modules/ticket/front/advance/index.html Outdated
@ -123,3 +123,3 @@
<td>
<span
class="chip {{$ctrl.stateColor(ticket.state)}}">
class="chip {{$ctrl.stateColor(ticket.stateColor)}}">
alexm commented 2023-05-10 12:04:57 +00:00
Member
Copy Link

Aci, com ja ho tens en ticket (tmp.filter), sols has de fer {{ticket.classColor}}

Aci, com ja ho tens en ticket (tmp.filter), sols has de fer {{ticket.classColor}}
alexm reviewed 2023-05-10 12:05:06 +00:00
modules/ticket/front/future/index.js Outdated
@ -101,3 +98,1 @@
else if (state === 'Libre')
return 'notice';
}
// stateColor(state) {
alexm commented 2023-05-10 12:05:06 +00:00
Member
Copy Link

Tot este codi ja no cal

Tot este codi ja no cal
carlossa added 1 commit 2023-05-10 12:43:20 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
9a813c075c refs #5599 procedure y colorClass
carlossa added 1 commit 2023-05-10 12:49:30 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
e258e779b3 refs #5599 ticketFuture
carlossa added 2 commits 2023-05-10 13:59:41 +00:00
gitea/salix/pipeline/head This commit looks good Details
43a91194fd refs #5599 remove e2e
carlossa added the
CR / Tests passed
 label 2023-05-11 13:01:07 +00:00
carlossa added 2 commits 2023-05-11 13:48:43 +00:00
gitea/salix/pipeline/head This commit looks good Details
fd85cd2d98 refs #5599 replace
carlossa added 1 commit 2023-05-12 09:15:57 +00:00
gitea/salix/pipeline/head This commit looks good Details
943e8b09c1 refs #5599 DELIMITER
carlossa added 1 commit 2023-05-12 09:18:00 +00:00
gitea/salix/pipeline/head This commit looks good Details
9cbf3006a0 refs #5599 futureState
carlossa changed title from WIP: refs #5599 remove returns to refs #5599 remove returns 2023-05-12 09:20:21 +00:00
carlossa requested review from jgallego 2023-05-22 10:41:47 +00:00
jgallego requested changes 2023-05-22 11:00:50 +00:00
jgallego left a comment
Owner
Copy Link

dime que has canviat dels procs perque així no ho puc vore

dime que has canviat dels procs perque així no ho puc vore
jgallego approved these changes 2023-05-22 13:33:43 +00:00
carlossa added 1 commit 2023-05-22 13:51:39 +00:00
gitea/salix/pipeline/head This commit looks good Details
a7c59f51b9 Merge branch 'dev' into 5599-ticketColors
carlossa scheduled this pull request to auto merge when all checks succeed 2023-05-22 13:56:47 +00:00
carlossa canceled auto merging this pull request when all checks succeed 2023-05-23 06:14:32 +00:00
carlossa added 1 commit 2023-05-23 06:23:23 +00:00
gitea/salix/pipeline/head This commit looks good Details
ee8685329f Merge branch 'dev' into 5599-ticketColors
carlossa added 1 commit 2023-05-23 07:13:51 +00:00
gitea/salix/pipeline/head This commit looks good Details
d7d94796d6 Merge branch 'dev' into 5599-ticketColors
carlossa added 1 commit 2023-05-23 07:38:04 +00:00
gitea/salix/pipeline/head This commit looks good Details
84abba5566 Merge branch 'dev' into 5599-ticketColors
carlossa merged commit 766d809523 into dev 2023-05-23 08:23:58 +00:00
carlossa deleted branch 5599-ticketColors 2023-05-23 08:23:58 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 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#1511
No description provided.
Delete Branch "5599-ticketColors"

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?