4794-mdb_block #1170

Merged
vicent merged 17 commits from 4794-mdb_block into dev 2022-12-22 09:19:16 +00:00
Owner
No description provided.
jgallego added 3 commits 2022-11-23 08:48:07 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
32f28e91b5
feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head This commit looks good Details
df4acb70a3
feat: add backTest
jgallego reviewed 2022-11-23 09:00:49 +00:00
@ -0,0 +1,11 @@
CREATE TABLE `vn`.`mdbApp` (
`app` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
Author
Owner

primary key

primary key
vicent marked this conversation as resolved
@ -0,0 +3,4 @@
`baselineBranchFk` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`userFk` int(10) unsigned DEFAULT NULL,
`locked` datetime DEFAULT NULL,
UNIQUE KEY `app_UN` (`app`),
Author
Owner

quitar

quitar
vicent marked this conversation as resolved
@ -2734,0 +2734,4 @@
INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
VALUES
('com', 'master', NULL, NULL),
Author
Owner

no usar nombre "conocidos" ejemplo foo, bar

no usar nombre "conocidos" ejemplo foo, bar
vicent marked this conversation as resolved
@ -246,2 +246,3 @@
"There aren't records for this week": "No existen registros para esta semana",
"Empty data source": "Origen de datos vacio"
"Empty data source": "Origen de datos vacio",
"App locked": "Aplicación bloquada por el usuario {{userId}}"
Author
Owner

bloqueada

bloqueada
vicent marked this conversation as resolved
@ -0,0 +39,4 @@
try {
const mdbApp = await models.MdbApp.findById(appName, null, myOptions);
const updatedMdbApp = await mdbApp.updateAttributes({
Author
Owner

hay que comprobar que no este bloqueado previamente

hay que comprobar que no este bloqueado previamente
vicent marked this conversation as resolved
@ -0,0 +6,4 @@
try {
const options = {transaction: tx};
const appName = 'com';
Author
Owner

foo

foo
vicent marked this conversation as resolved
vicent added 2 commits 2022-11-23 09:41:54 +00:00
vicent added 1 commit 2022-11-23 09:57:10 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f313a53cde
refactor: cambiadas fixtures, backTest y traducciones
vicent added 74 commits 2022-11-25 06:42:02 +00:00
gitea/salix/pipeline/head This commit looks good Details
4f25961988
Created checkbox and logic, package-lock
gitea/salix/pipeline/head There was a failure building this commit Details
0739608de3
Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit Details
e85505ee8e
#4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2fc12dff52
#4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head This commit looks good Details
d6a0580203
feat: traducciones modelo Ticket
gitea/salix/pipeline/head There was a failure building this commit Details
9d0cd36afe
Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
60d12826e4
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
843e5ae736
feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
284837083c
feat: coge el idioma local
gitea/salix/pipeline/head This commit looks good Details
dd8117b6a4
feat: añadidas traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
46c7aa24b8
fix: corregidas traducciones
gitea/salix/pipeline/head This commit looks good Details
0089b821cf
fix: corregido test intermitente
gitea/salix/pipeline/head This commit looks good Details
3d352fa0fd
fix: locale no puede ser undefined
gitea/salix/pipeline/head This commit looks good Details
a733bc8c2f
refs #4789 hasInvoice on ticket searchbar @3h30m
gitea/salix/pipeline/head There was a failure building this commit Details
813cf78128
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
3fde11c3ed
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
40ea9805cf
fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good Details
0099b42fe3
requested changes
gitea/salix/pipeline/head This commit looks good Details
40398da48d
refs #4789 @30m tested the requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
cb6ae41c13
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
8876bc2b68
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
cac8879ec7
fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index
gitea/salix/pipeline/head There was a failure building this commit Details
c51354b13f
refs #3949 textfield, edit and create dialog added
gitea/salix/pipeline/head There was a failure building this commit Details
89141419c1
fix: merge filter
gitea/salix/pipeline/head This commit looks good Details
e148284332
jenkins test
gitea/salix/pipeline/head This commit looks good Details
d5521adb6b
working on tests
gitea/salix/pipeline/head This commit looks good Details
5552cd654e
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
8613b196d8
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head There was a failure building this commit Details
bb640da8f0
Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
83ed79569a
refs #4844
gitea/salix/pipeline/head There was a failure building this commit Details
ccce6af021
fix: add translations
gitea/salix/pipeline/head There was a failure building this commit Details
a8520f851c
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
9a47b2fea4
Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
164b797ab8
front and e2e tests done
gitea/salix/pipeline/head There was a failure building this commit Details
7f89899d6c
fix: closeTicket
gitea/salix/pipeline/head There was a failure building this commit Details
7ccf37c079
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
23cf2d9aaf
Merge branch 'dev' into 3949-invoiceIn-add-docFk
gitea/salix/pipeline/head There was a failure building this commit Details
e3831cc1e3
Merge pull request 'fixes #3949 invoiceIn basic-data añadir campo docFk' (!1172) from 3949-invoiceIn-add-docFk into dev
Reviewed-on: #1172
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
5124b3b681
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head There was a failure building this commit Details
a2e08c5907
Merge pull request 'fixes #4547 check compensation and tests' (!1161) from 4547-fix-compensation into dev
Reviewed-on: #1161
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
927b5a63ec
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
c17435f6c4
Merge pull request 'closes #4789 hasInvoice on ticket searchbar' (!1153) from 4789-search-ticket-without-invoice into dev
Reviewed-on: #1153
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
b8c6734798
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
8e6d0bd6b0
Merge pull request 'fixes #4457 hasInvoiceElectronic-para-cliente' (!1116) from 4457-hasInvoiceElectronic-para-cliente into dev
Reviewed-on: #1116
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
74e8789439
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
8e74ddf267
Merge pull request 'fixes #4793-models_translation' (!1148) from 4793-models_translation into dev
Reviewed-on: #1148
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
20d0d053ac
Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head There was a failure building this commit Details
9517063853
Merge pull request 'fixes #4682-searchbar_filter' (!1164) from 4682-searchbar_filter into dev
Reviewed-on: #1164
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
d233286a3f
Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head There was a failure building this commit Details
0f40aa3e27
Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev
Reviewed-on: #1175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
e34fb3e4db
Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head This commit looks good Details
82cc2b1208
Merge pull request 'DEV_fix_closeTicket' (!1173) from DEV_fix_closeTicket into dev
Reviewed-on: #1173
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
vicent added 2 commits 2022-11-25 11:17:34 +00:00
vicent changed title from 4794-mdb_block to WIP: 4794-mdb_block 2022-11-29 08:49:19 +00:00
jgallego reviewed 2022-11-30 09:59:14 +00:00
@ -0,0 +41,4 @@
}
try {
const mdbApp = await models.MdbApp.findById(appName, null, myOptions);
Author
Owner

traer solo los campos necesarios ejemplo:
{fields: ['locked','userFk']}

traer solo los campos necesarios ejemplo: `{fields: ['locked','userFk']}`
vicent marked this conversation as resolved
@ -0,0 +46,4 @@
const message = $t('App locked', {
userId: mdbApp.userFk
});
if (mdbApp.locked) throw new UserError(message);
Author
Owner

si se usa dentro del if crearla dentro del if.
En este caso se puede poner todo el codigo dentro de los parentesis, sin crear la variable

si se usa dentro del if crearla dentro del if. En este caso se puede poner todo el codigo dentro de los parentesis, sin crear la variable
vicent marked this conversation as resolved
@ -58,0 +67,4 @@
const message = $t('App locked', {
userId: mdbApp.userFk
});
if (mdbApp.locked && mdbApp.userFk != userId) throw new UserError(message);
Author
Owner

mensaje dentro del if como arriba.

mensaje dentro del if como arriba.
vicent marked this conversation as resolved
vicent changed title from WIP: 4794-mdb_block to 4794-mdb_block 2022-11-30 13:27:53 +00:00
vicent requested review from joan 2022-11-30 13:28:25 +00:00
vicent added the
CR / Tests passed
label 2022-11-30 13:28:31 +00:00
vicent added 1 commit 2022-12-01 06:11:08 +00:00
vicent added 1 commit 2022-12-01 06:22:20 +00:00
gitea/salix/pipeline/head This commit looks good Details
444d495b7f
refactor: codigo reducido
joan requested changes 2022-12-13 07:32:57 +00:00
@ -0,0 +1,4 @@
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
Contributor

Cambiar a carpeta actual

Cambiar a carpeta actual
vicent marked this conversation as resolved
@ -0,0 +31,4 @@
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
Contributor

En este caso no es necesario transaccionar si no se te pasa una transacción

En este caso no es necesario transaccionar si no se te pasa una transacción
vicent marked this conversation as resolved
vicent added 3 commits 2022-12-15 06:17:48 +00:00
vicent requested review from joan 2022-12-15 06:17:59 +00:00
jgallego reviewed 2022-12-15 06:24:04 +00:00
@ -0,0 +38,4 @@
locked: null
}, myOptions);
if (tx) await tx.commit();
Author
Owner

el commit estas segur que es necesari?

el commit estas segur que es necesari?
Contributor

No, no está gastantse. Aso es per a cuant se crea la transacció desde dins. Tampoc faría falta el try-cach perque no te que fer rollback la propia ruta.

No, no está gastantse. Aso es per a cuant se crea la transacció desde dins. Tampoc faría falta el try-cach perque no te que fer rollback la propia ruta.
vicent marked this conversation as resolved
joan requested changes 2022-12-15 07:24:04 +00:00
@ -0,0 +26,4 @@
const models = Self.app.models;
const myOptions = {};
let tx;
Contributor

Llevar tot lo referent a tx i try-catch

Llevar tot lo referent a tx i try-catch
vicent marked this conversation as resolved
vicent requested review from juan 2022-12-16 12:55:58 +00:00
jgallego requested review from joan 2022-12-16 12:56:49 +00:00
jgallego removed review request for joan 2022-12-16 12:57:05 +00:00
vicent added 1 commit 2022-12-20 08:09:35 +00:00
gitea/salix/pipeline/head This commit looks good Details
1a616fa1d4
refactor: delete transaction
vicent requested review from joan 2022-12-20 08:09:57 +00:00
juan approved these changes 2022-12-20 16:53:00 +00:00
joan approved these changes 2022-12-21 07:03:08 +00:00
vicent added 1 commit 2022-12-21 07:06:06 +00:00
vicent requested review from joan 2022-12-21 07:06:53 +00:00
joan approved these changes 2022-12-21 07:20:21 +00:00
vicent added 1 commit 2022-12-22 08:30:42 +00:00
vicent approved these changes 2022-12-22 09:19:06 +00:00
vicent left a comment
Contributor

Ya estaba aprobado, simplemente he hecho git pull origin dev.

Ya estaba aprobado, simplemente he hecho git pull origin dev.
vicent merged commit 9e045e15b7 into dev 2022-12-22 09:19:16 +00:00
vicent deleted branch 4794-mdb_block 2022-12-22 09:19:16 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
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#1170
No description provided.