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

#7648 - Filter entries by days #2722

Merged
jsegarra merged 12 commits from 7648_myEntries_filter into dev 2024-07-15 09:22:35 +00:00
Conversation 1 Commits 12 Files Changed 6 +32 -3
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ca48ad9777 - Show all commits

29
db/dump/fixtures.after.sql
View File

@ -315,4 +315,33 @@ INSERT INTO mysql.roles_mapping (`User`, `Host`, `Role`, `Admin_option`)
FROM mysql.roles_mapping
WHERE `User` LIKE @prefixedLike AND `Host` = @genRoleHost;
UPDATE account.`user`
jsegarra marked this conversation as resolved Outdated
jgallego commented 2024-07-14 07:45:38 +00:00
Outdated
Review
Copy Link

cambia esto tb donde se establece el rol del 1102 así queda unificado

cambia esto tb donde se establece el rol del 1102 así queda unificado
SET `role`=131
WHERE id=1102;
UPDATE vn.travel
jsegarra marked this conversation as resolved Outdated
jgallego commented 2024-07-12 05:55:07 +00:00
Outdated
Review
Copy Link

esto porque va en las fixtures after i no en las fixtures normales modificando la linea de creacion de esos travels?

esto porque va en las fixtures after i no en las fixtures normales modificando la linea de creacion de esos travels?
jsegarra commented 2024-07-12 06:39:54 +00:00
Outdated
Review
Copy Link

Porque tocaba travel y entry, y me parecía mas seguro hacerlo en el after por si rompia cosas.
La verdad es que en el before no lo probé.

Porque tocaba travel y entry, y me parecía mas seguro hacerlo en el after por si rompia cosas. La verdad es que en el before no lo probé.
jsegarra commented 2024-07-12 12:37:54 +00:00
Outdated
Review
Copy Link

Añadir un travel 9 y las entradas asociadas

Añadir un travel 9 y las entradas asociadas
jsegarra commented 2024-07-12 20:41:53 +00:00
Outdated
Review
Copy Link

He tenido que añadir el travel 10 porque ya había un insert en fixture.after

He tenido que añadir el travel 10 porque ya había un insert en fixture.after
SET shipped='2001-01-02',landed='2001-01-05'
WHERE id=4;
UPDATE vn.travel
SET shipped='2001-01-01',landed='2001-01-05'
WHERE id=5;
UPDATE vn.travel
SET landed='2001-01-05',shipped='2001-01-03'
WHERE id=6;
UPDATE vn.travel
SET shipped='2001-01-04',landed='2001-01-05'
WHERE id=7;
UPDATE vn.travel
SET shipped='2001-01-05',landed='2001-01-05'
WHERE id=8;
INSERT INTO vn.entry (supplierFk,invoiceNumber,isBooked,isExcludedFromAvailable,isConfirmed,isOrdered,isRaid,commission,created,evaNotes,travelFk,currencyFk,companyFk,isBlocked__,reference,editorFk,locked)
VALUES
(2,'IN2008',0,1,0,0,1,0.0,'2000-12-01 00:00:00.000','',7,1,442,0,'Movement 8',100,'2024-07-11 09:24:48.000'),
(2,'IN2008',0,1,0,0,1,0.0,'2000-12-01 00:00:00.000','',7,1,442,0,'Movement 8',100,'2024-07-11 09:24:48.000'),
(2,'IN2008',0,1,0,0,1,0.0,'2000-12-04 00:00:00.000','',7,1,442,0,'Movement 8',100,'2024-07-11 09:24:48.000'),
(2,'IN2008',0,1,0,0,1,0.0,'2000-12-02 00:00:00.000','',7,1,442,0,'Movement 8',100,'2024-07-11 09:24:48.000'),
(2,'IN2008',0,1,0,0,1,0.0,'2000-12-03 00:00:00.000','',8,1,442,0,'Movement 8',100,'2024-07-11 09:24:48.000');
FLUSH PRIVILEGES;

2
modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
View File

@ -37,7 +37,7 @@ describe('item lastEntriesFilter()', () => {
const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
const result = await models.Item.lastEntriesFilter(filter, options);
expect(result.length).toEqual(5);
expect(result.length).toEqual(3);
await tx.rollback();
} catch (e) {

2
modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
View File

@ -110,6 +110,6 @@ describe('Travel extraCommunityFilter()', () => {
const result = await app.models.Travel.extraCommunityFilter(ctx, filter);
expect(result.length).toEqual(1);
expect(result.length).toEqual(6);
});
});

2
modules/travel/back/methods/travel/specs/filter.spec.js
View File

@ -68,7 +68,7 @@ describe('Travel filter()', () => {
const result = await app.models.Travel.filter(ctx);
expect(result.length).toEqual(1);
expect(result.length).toEqual(3);
});
it('should return the travel matching "continent"', async() => {