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

#5926 - Worker/PDA docuware #2482

Open
jsegarra wants to merge 40 commits from 5926_pda_worker_docuware into dev
pull from: 5926_pda_worker_docuware
merge into: verdnatura:dev
Conversation 1 Commits 40 Files Changed 26 +722 -161
jsegarra commented 2024-05-20 09:20:53 +00:00
Member
Copy Link
No description provided.
jsegarra added 1 commit 2024-05-20 12:05:20 +00:00
jsegarra added 1 commit 2024-05-20 20:40:07 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
85f8690634 feat(salix): refs #5926 docuwareUpload for Worker
jsegarra added 2 commits 2024-05-21 09:18:49 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
1c4ea2642f Merge branch 'dev' into 5926_pda_worker_docuware
jsegarra added 2 commits 2024-05-21 21:58:31 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
a3a46d28be feat(salix): refs #5926 report(1)
jsegarra added 5 commits 2024-05-30 10:31:45 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
11381258cc feat(salix): refs #5926 #6321 ruse core methods
jsegarra added 1 commit 2024-06-03 12:13:06 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
4c34ce66a0 Merge branch 'dev' into 5926_pda_worker_docuware
jsegarra added 7 commits 2024-06-07 00:00:24 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
e3679c8b9a feat(salix): refs #5926 #5926 update docuwareUpload models
jsegarra added 3 commits 2024-06-10 08:15:47 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
23553a3694 test(salix): refs #5926 docuware.core.spec
jsegarra requested review from alexm 2024-06-10 10:11:19 +00:00
jsegarra changed title from WIP: 5926 - Worker/PDA docuware to 5926 - Worker/PDA docuware 2024-06-10 10:11:22 +00:00
jsegarra added 2 commits 2024-06-12 20:30:04 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
00b8d30916 Merge branch 'dev' into 5926_pda_worker_docuware
jsegarra added 1 commit 2024-06-17 08:09:31 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
9f7df66119 Merge branch 'dev' into 5926_pda_worker_docuware
alexm requested changes 2024-07-08 06:14:50 +00:00
alexm left a comment
Member
Copy Link

El png de europe no habria q moverlo no? Seria o ponerlo en un lugar general o duplicarlo

El png de europe no habria q moverlo no? Seria o ponerlo en un lugar general o duplicarlo
back/methods/docuware/core.js
@ -4,0 +12,4 @@
let isDeviceConfigured = false;
if (!config)
config = existsSync(`../docuware.${env}.json`) ?? {};
alexm commented 2024-07-08 05:53:13 +00:00
Member
Copy Link

Esto que es?

Esto que es?
jsegarra commented 2024-07-08 09:18:44 +00:00
Author
Member
Copy Link

Es una funcionalidad que he hecho muy similar a print.development.json para que si existe algún archivo de configuración de tablet.
Esto es útil para hacer pruebas reales con la tablet 4 o con datos falsos

Es una funcionalidad que he hecho muy similar a print.development.json para que si existe algún archivo de configuración de tablet. Esto es útil para hacer pruebas reales con la tablet 4 o con datos falsos
back/methods/docuware/specs/core.spec.js
@ -41,0 +112,4 @@
it('should return uploadOptions', async() => {
spyOn(Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
// const dialogs = {
alexm commented 2024-07-08 05:58:42 +00:00
Member
Copy Link

Quitar?

Quitar?
jsegarra marked this conversation as resolved
db/dump/fixtures.after.sql Outdated
@ -315,4 +315,6 @@ INSERT INTO mysql.roles_mapping (`User`, `Host`, `Role`, `Admin_option`)
FROM mysql.roles_mapping
WHERE `User` LIKE @prefixedLike AND `Host` = @genRoleHost;
INSERT INTO vn.docuware (code,fileCabinetName,`action`,dialogName,findById,dmsTypeFk,modelFk)
alexm commented 2024-07-08 06:13:00 +00:00
Member
Copy Link

En el after?
Yo diria que tiene que ir en un version

En el after? Yo diria que tiene que ir en un version
jsegarra commented 2024-07-08 09:50:48 +00:00
Author
Member
Copy Link

Si lo muevo de aquí a 00-firstScript, al hacer myt run me da error:

Error: Cannot add or update a child row: a foreign key constraint fails (vn.docuware, CONSTRAINT docuware_FK FOREIGN KEY (dmsTypeFk) REFERENCES dmsType (id) ON UPDATE CASCADE)

Si lo muevo de aquí a 00-firstScript, al hacer myt run me da error: Error: Cannot add or update a child row: a foreign key constraint fails (`vn`.`docuware`, CONSTRAINT `docuware_FK` FOREIGN KEY (`dmsTypeFk`) REFERENCES `dmsType` (`id`) ON UPDATE CASCADE)
jsegarra commented 2024-07-08 09:59:08 +00:00
Author
Member
Copy Link

Tiene que ir en fixtures.after y en version porque sino en local falla

Tiene que ir en fixtures.after y en version porque sino en local falla
db/versions/11062-tealArborvitae/00-firstScript.sql Outdated
@ -0,0 +3,4 @@
ALTER TABLE vn.docuware ADD CONSTRAINT docuware_module_FK FOREIGN KEY (modelFk) REFERENCES salix.module(code);
ALTER TABLE vn.docuwareTablet ADD fileCabinet varchar(100) NULL;
-- Auto-generated SQL script #202405221107
alexm commented 2024-07-08 06:06:39 +00:00
Member
Copy Link

Quitar

Quitar
jsegarra marked this conversation as resolved
db/versions/11062-tealArborvitae/00-firstScript.sql
@ -0,0 +9,4 @@
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('Worker','signPdaPdf','READ','ALLOW','ROLE','hr');
-- Auto-generated SQL script #202406061008
alexm commented 2024-07-08 06:06:42 +00:00
Member
Copy Link

quitar

quitar
jsegarra marked this conversation as resolved
e2e/tests.js Outdated
@ -36,20 +36,7 @@ async function test() {
const jasmine = new Jasmine();
const specFiles = [
`./e2e/paths/01*/*[sS]pec.js`,
alexm commented 2024-07-08 06:07:03 +00:00
Member
Copy Link

Dejar

Dejar
jsegarra marked this conversation as resolved
jsegarra added 3 commits 2024-07-08 10:16:13 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
590e0af038 test(salix): refs #5926 #5926 fix test
jsegarra added 1 commit 2024-07-08 10:20:22 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
1dd65d29e9 feat(salix): refs #5926 #5926 revert europe.png folder
jsegarra commented 2024-07-08 10:20:51 +00:00
Author
Member
Copy Link

El png de europe no habria q moverlo no? Seria o ponerlo en un lugar general o duplicarlo

El editor se debió rallar porque esa imagen no me hace falta.

> El png de europe no habria q moverlo no? Seria o ponerlo en un lugar general o duplicarlo El editor se debió rallar porque esa imagen no me hace falta.
jsegarra added 1 commit 2024-07-08 10:21:04 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
62dcfec8a4 Merge branch 'dev' into 5926_pda_worker_docuware
jsegarra requested review from alexm 2024-07-08 10:21:12 +00:00
sergiodt changed title from 5926 - Worker/PDA docuware to WIP: 5926 - Worker/PDA docuware 2024-07-11 12:08:08 +00:00
jsegarra changed title from WIP: 5926 - Worker/PDA docuware to WIP: #5926 - Worker/PDA docuware 2024-07-12 21:01:02 +00:00
jsegarra added 4 commits 2024-07-12 21:14:18 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
ef931f71a0 feat: refs #5926 remove comments and others
jsegarra changed title from WIP: #5926 - Worker/PDA docuware to #5926 - Worker/PDA docuware 2024-07-15 07:36:27 +00:00
jsegarra added 1 commit 2024-07-23 21:09:29 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
8f66e7c1ca Merge branch 'dev' into 5926_pda_worker_docuware
jsegarra added 3 commits 2024-07-23 21:12:51 +00:00
alexm added 1 commit 2024-09-11 06:50:41 +00:00
alexm added 1 commit 2024-09-11 08:30:49 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
70ebe7ea47 fix: refs #5926 typo
All checks were successful
gitea/salix/pipeline/pr-dev This commit looks good
Required
Details
This pull request has changes conflicting with the target branch.
  • back/methods/docuware/specs/core.spec.js
  • back/methods/docuware/upload.js
  • db/dump/fixtures.before.sql
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#2482
No description provided.
Delete Branch "5926_pda_worker_docuware"

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?