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

fix: refs #7917 fix route filter freeLancer #3327

Open
carlossa wants to merge 20 commits from 7917-freelancerRoute2 into dev
pull from: 7917-freelancerRoute2
merge into: verdnatura:dev
Conversation 1 Commits 20 Files Changed 7 +102 -125
carlossa commented 2024-12-23 10:56:28 +00:00
Member
Copy Link
No description provided.
carlossa added 1 commit 2024-12-23 10:56:29 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
afb01ed021 fix: refs #7917 fix route filter freeLancer
carlossa added 1 commit 2024-12-23 10:59:49 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
419815ff87 fix: refs #7917 fix back
carlossa added 1 commit 2024-12-23 11:14:25 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
a30cad1da1 fix: refs #7917 fix tback
carlossa added 1 commit 2024-12-23 11:18:49 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
16bbcf8185 fix: refs #7917 fix summary test
carlossa requested review from alexm 2024-12-23 11:24:03 +00:00
alexm requested changes 2024-12-23 17:28:47 +00:00
db/dump/fixtures.before.sql Outdated
@ -4050,2 +4050,4 @@
SET id = 1,
supplierFk = 4;
UPDATE vn.worker
alexm commented 2024-12-23 17:26:32 +00:00
Member
Copy Link

Fica el SQL on toca, q worker estara per dalt.
Sino despres ens tornarem locos per a vore pq un worker esta de una manera.

Igual en la ruta

Fica el SQL on toca, q worker estara per dalt. Sino despres ens tornarem locos per a vore pq un worker esta de una manera. Igual en la ruta
carlossa marked this conversation as resolved
db/dump/fixtures.before.sql Outdated
@ -4052,0 +4054,4 @@
SET isFreelance=1
WHERE firstName='deliveryFreelancer';
INSERT INTO vn.route (workerFk,firstEditorFk,created,vehicleFk,agencyModeFk,`time`,isOk,started,finished,cost,m3,description,zoneFk,priority,invoiceInFk,editorFk,dated)
alexm commented 2024-12-23 17:26:56 +00:00
Member
Copy Link

Les dates ficales relatives

Les dates ficales relatives
carlossa marked this conversation as resolved
modules/route/back/methods/route/filter.js
@ -113,0 +115,4 @@
const worker = await models.Worker.findById(userId, {fields: ['isFreelance']});
const getMyRoute = await models.ACL.checkAccessAcl(ctx, 'Route', 'getRouteByAgency', 'WRITE');
if (userId && getMyRoute && worker.isFreelance) {
alexm commented 2024-12-23 17:28:33 +00:00
Member
Copy Link

comentaliu a Sergio quan vajes a pujarho per si li pot donar algun problema

comentaliu a Sergio quan vajes a pujarho per si li pot donar algun problema
carlossa marked this conversation as resolved
carlossa added 1 commit 2024-12-24 07:13:11 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
85163a13fa fix: refs #7917 fix fixtures
carlossa added 1 commit 2025-01-02 05:26:45 +00:00
carlossa added 1 commit 2025-01-02 07:38:33 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
78a8f80321 fix: refs #7917 fix tback
carlossa added 1 commit 2025-01-10 05:36:26 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
6d661dba85 Merge branch 'dev' into 7917-freelancerRoute2
carlossa requested review from alexm 2025-01-10 05:43:28 +00:00
carlossa added 1 commit 2025-01-13 07:15:02 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
d547456d22 Merge branch 'dev' into 7917-freelancerRoute2
alexm requested changes 2025-01-13 11:33:30 +00:00
db/dump/fixtures.before.sql Outdated
@ -755,2 +755,3 @@
(6, NULL, 57, util.VN_CURDATE(), 5, 7, 'sixth route', 1.7, 60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 3, util.VN_CURDATE()),
(7, NULL, 57, util.VN_CURDATE(), 6, 8, 'seventh route', 0, 70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5, util.VN_CURDATE());
(7, NULL, 57, util.VN_CURDATE(), 6, 8, 'seventh route', 0, 70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5, util.VN_CURDATE()),
(8, '1899-12-30 12:15:00', 132, util.VN_CURDATE(), 1, 1, 'eighth route', 1.8, 10.0, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1, util.VN_CURDATE()),
alexm commented 2025-01-13 11:32:54 +00:00
Member
Copy Link

Poner fechas relativas

Poner fechas relativas
carlossa marked this conversation as resolved
db/dump/fixtures.before.sql Outdated
@ -756,1 +756,3 @@
(7, NULL, 57, util.VN_CURDATE(), 6, 8, 'seventh route', 0, 70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5, util.VN_CURDATE());
(7, NULL, 57, util.VN_CURDATE(), 6, 8, 'seventh route', 0, 70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5, util.VN_CURDATE()),
(8, '1899-12-30 12:15:00', 132, util.VN_CURDATE(), 1, 1, 'eighth route', 1.8, 10.0, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1, util.VN_CURDATE()),
(9, '1899-12-30 13:20:00', 132, util.VN_CURDATE(), 1, 2, 'ninth route', 0.2, 20.0, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 9, util.VN_CURDATE());
alexm commented 2025-01-13 11:32:58 +00:00
Member
Copy Link

Poner fechas relativas

Poner fechas relativas
carlossa marked this conversation as resolved
db/versions/11393-redCamellia/00-firstScript.sql Outdated
@ -0,0 +1,14 @@
INSERT INTO account.`role` (name,description,hasLogin,created,modified)
VALUES ('deliveryFreelancer','Repartidor autónomo',1,'2024-07-05 10:18:58.000','2024-07-05 10:18:58.000');
alexm commented 2025-01-13 11:33:13 +00:00
Member
Copy Link

No poner las fechas

No poner las fechas
carlossa marked this conversation as resolved
carlossa added 2 commits 2025-01-14 06:18:17 +00:00
carlossa added 1 commit 2025-01-14 06:18:30 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
3bdb8f6228 Merge branch 'dev' into 7917-freelancerRoute2
carlossa requested review from alexm 2025-01-14 06:22:13 +00:00
carlossa added 2 commits 2025-01-14 06:23:45 +00:00
carlossa added 1 commit 2025-01-15 05:40:01 +00:00
carlossa commented 2025-01-15 12:04:23 +00:00
Author
Member
Copy Link

-- INSERT INTO account.roleInherit (role, inheritsFrom) VALUES(132, 2);
-- CALL account.role_sync();

-- INSERT INTO account.roleInherit (`role`, inheritsFrom) VALUES(132, 2); -- CALL account.role_sync();
carlossa closed this pull request 2025-01-15 12:04:23 +00:00
carlossa reopened this pull request 2025-01-15 12:04:29 +00:00
carlossa added 1 commit 2025-01-15 12:04:58 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
516147b8bb fix: refs #7917 fix acls
carlossa added 1 commit 2025-01-15 12:13:56 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
53eb1f427b Merge branch 'dev' into 7917-freelancerRoute2
carlossa added 2 commits 2025-01-20 12:27:49 +00:00
carlossa added 1 commit 2025-01-21 12:54:12 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
d66b8f4963 fix: refs #7917 acls
All checks were successful
gitea/salix/pipeline/pr-dev This commit looks good
Required
Details
This pull request doesn't have enough approvals yet. 0 of 1 approvals granted.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
Sign in to join this conversation.
Reviewers
No reviewers
alexm
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
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#3327
No description provided.
Delete Branch "7917-freelancerRoute2"

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?