verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 72 Releases Wiki Activity

ref #6104 recreate vnlog #96

Merged
jorgep merged 24 commits from 6104-changeVnLog into dev 2023-12-11 11:34:36 +00:00
Conversation 0 Commits 24 Files Changed 19 +1349 -199
jorgep commented 2023-09-18 12:36:34 +00:00
Member
Copy Link
No description provided.
jorgep added the
CR / Tests passed
 label 2023-09-18 12:36:34 +00:00
jorgep added 1 commit 2023-09-18 12:36:35 +00:00
gitea/salix-front/pipeline/head There was a failure building this commit Details
79fc503a01 ref #6104 recreate vnlog
jorgep requested review from alexm 2023-09-18 12:36:41 +00:00
jorgep added 1 commit 2023-09-18 12:39:18 +00:00
gitea/salix-front/pipeline/head There was a failure building this commit Details
bdf288241b ref #6104 fix package
jorgep scheduled this pull request to auto merge when all checks succeed 2023-09-18 12:40:17 +00:00
alexm reviewed 2023-09-18 12:42:11 +00:00
src/css/app.scss Outdated
@ -14,6 +14,10 @@ a {
color: $orange-4;
}
.rounded--full {
alexm commented 2023-09-18 12:42:11 +00:00
Member
Copy Link

Este css no se usa

Este css no se usa
jorgep marked this conversation as resolved
jorgep canceled auto merging this pull request when all checks succeed 2023-09-18 12:50:48 +00:00
jorgep added 1 commit 2023-09-26 09:50:48 +00:00
gitea/salix-front/pipeline/head There was a failure building this commit Details
ca28ecdd8e ref #6104 tests created and searchFn fixed
jorgep added 1 commit 2023-09-27 12:06:28 +00:00
gitea/salix-front/pipeline/head Build queued... Details
36a0f36f8a ref #6104 fix conflicts
jorgep added 1 commit 2023-09-27 12:08:39 +00:00
jorgep added 1 commit 2023-09-28 11:46:50 +00:00
jorgep added 2 commits 2023-09-28 11:57:11 +00:00
jorgep added 1 commit 2023-09-28 11:58:28 +00:00
jorgep changed title from ref #6104 recreate vnlog to WIP ref #6104 recreate vnlog 2023-09-28 14:26:40 +00:00
jorgep added 1 commit 2023-09-29 13:04:00 +00:00
jorgep added 1 commit 2023-09-29 13:14:25 +00:00
jorgep changed title from WIP ref #6104 recreate vnlog to ref #6104 recreate vnlog 2023-09-29 13:15:02 +00:00
jorgep requested review from juan 2023-09-29 13:15:15 +00:00
jorgep added 1 commit 2023-10-02 07:20:09 +00:00
alexm requested changes 2023-10-03 07:50:33 +00:00
src/components/common/VnLog.vue Outdated
@ -64,0 +270,4 @@
const from = date.value
? useIso8601(date.value.split('-').reverse().join('-'))
: undefined;
const to = dateTo.value
alexm commented 2023-10-03 07:41:08 +00:00
Member
Copy Link

https://quasar.dev/quasar-utils/date-utils

https://quasar.dev/quasar-utils/date-utils
jorgep commented 2023-10-04 07:54:43 +00:00
Author
Member
Copy Link

En el menú de filtros se muestra la fecha en formato español, por lo que si hago un casteo directo confunde el día con el mes y al revés. Tengo que hacerlo así:

const from = dateFrom.value
    ? date.formatDate(
          dateFrom.value.split('-').reverse().join('-'),
          'YYYY-MM-DDTHH:mm:ss.SSSZ'
      )
    : undefined;
En el menú de filtros se muestra la fecha en formato español, por lo que si hago un casteo directo confunde el día con el mes y al revés. Tengo que hacerlo así: const from = dateFrom.value ? date.formatDate( dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DDTHH:mm:ss.SSSZ' ) : undefined;
jorgep marked this conversation as resolved
src/composables/useIso8601.js Outdated
@ -0,0 +1,18 @@
export function useIso8601(dateString) {
alexm commented 2023-10-03 07:45:18 +00:00
Member
Copy Link

https://quasar.dev/quasar-utils/date-utils

https://quasar.dev/quasar-utils/date-utils
jorgep marked this conversation as resolved
test/cypress/integration/workerList.spec.js
@ -8,17 +8,17 @@ describe('WorkerList', () => {
it('should load workers', () => {
alexm commented 2023-10-03 07:48:34 +00:00
Member
Copy Link

Mira si pots simplificar els e2e gastant comandos de cypress test/cypress/support/commands.js
Exemple: test/cypress/integration/claimDevelopment.spec.js

Mira si pots simplificar els e2e gastant comandos de cypress test/cypress/support/commands.js Exemple: test/cypress/integration/claimDevelopment.spec.js
jorgep marked this conversation as resolved
test/vitest/helper.js Outdated
@ -14,3 +14,3 @@
},
});
axios.defaults.baseURL = 'http://localhost:9000/api/';
alexm commented 2023-10-03 07:50:07 +00:00
Member
Copy Link

No crec que en test de front el front dega fer peticions al back.
Deuries poder tirar els test de front sense tindre arrancat res

No crec que en test de front el front dega fer peticions al back. Deuries poder tirar els test de front sense tindre arrancat res
jorgep marked this conversation as resolved
jorgep added 1 commit 2023-10-04 13:47:15 +00:00
jorgep requested review from alexm 2023-10-04 13:50:10 +00:00
jorgep added 1 commit 2023-10-04 13:53:42 +00:00
jorgep added 1 commit 2023-10-13 09:06:57 +00:00
jorgep added 1 commit 2023-10-13 10:27:51 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
b29d326797 ref #6104 vnSelectFilter added
alexm requested changes 2023-10-18 05:26:34 +00:00
src/components/common/VnSelectFilter.vue Outdated
@ -83,11 +83,10 @@ const value = computed({
@filter="filterHandler"
hide-selected
fill-input
clearable
alexm commented 2023-10-18 05:23:52 +00:00
Member
Copy Link

Vaig canviar el component

Vaig canviar el component
jorgep marked this conversation as resolved
test/cypress/integration/vnLog.spec.js Outdated
@ -0,0 +7,4 @@
});
it('should filter by insert actions', () => {
cy.get('.q-checkbox__inner').eq(0).click();
alexm commented 2023-10-18 05:25:06 +00:00
Member
Copy Link

Mira si pots gastar les funcions (commands.js) de cypress o si et fa falta alguno creartelo

Mira si pots gastar les funcions (commands.js) de cypress o si et fa falta alguno creartelo
jorgep marked this conversation as resolved
jorgep added 1 commit 2023-10-18 08:19:47 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
e977467eff ref #6104 refactor e2e tests
jorgep requested review from alexm 2023-10-18 08:20:14 +00:00
alexm requested changes 2023-10-18 10:32:38 +00:00
src/components/common/VnLog.vue
@ -52,3 +124,1 @@
if (value === undefined) {
return t('Nothing');
}
const filteredWorkers = ref([]);
alexm commented 2023-10-18 10:25:27 +00:00
Member
Copy Link

Esta variable la definixes pero no la gastes mai

Esta variable la definixes pero no la gastes mai
jorgep marked this conversation as resolved
src/components/common/VnSelectFilter.vue Outdated
@ -85,9 +85,6 @@ const value = computed({
fill-input
ref="vnSelectRef"
>
<template #append>
alexm commented 2023-10-18 10:19:07 +00:00
Member
Copy Link

Fica estes 3 linees perfa o posameles en claimDevelopment

Fica estes 3 linees perfa o posameles en claimDevelopment
jorgep marked this conversation as resolved
test/cypress/integration/vnLog.spec.js
@ -0,0 +1,25 @@
/// <reference types="cypress" />
alexm commented 2023-10-18 10:32:36 +00:00
Member
Copy Link

Los he probado y fallan

Los he probado y fallan
jorgep commented 2023-10-19 07:58:16 +00:00
Author
Member
Copy Link

A mi me funcionan, mirémoslo en mi ordenador a ver @alexm

A mi me funcionan, mirémoslo en mi ordenador a ver @alexm
jorgep commented 2023-11-03 15:22:40 +00:00
Author
Member
Copy Link

Lo miramos en mi ordenador y si que funcionaba

Lo miramos en mi ordenador y si que funcionaba
jorgep marked this conversation as resolved
jorgep added 1 commit 2023-10-19 07:58:59 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
cf404f5dfa ref #6104 refactor
jorgep added 1 commit 2023-10-30 15:22:12 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
3e5c079c00 ref #6104 merge confilcts
jorgep requested review from alexm 2023-11-03 15:22:16 +00:00
alexm approved these changes 2023-11-06 06:07:16 +00:00
Dismissed
jorgep added 1 commit 2023-12-07 15:27:49 +00:00
jorgep dismissed alexm’s review 2023-12-07 15:27:49 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

juan approved these changes 2023-12-11 08:07:12 +00:00
Dismissed
jorgep added 1 commit 2023-12-11 08:14:17 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
42c34f7a46 refs #6104 merge conflicts
jorgep added 1 commit 2023-12-11 11:01:38 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
52622d9a00 refs #6104 fix tests
jorgep dismissed juan’s review 2023-12-11 11:01:38 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jorgep added 1 commit 2023-12-11 11:02:33 +00:00
alexm approved these changes 2023-12-11 11:25:20 +00:00
Dismissed
package.json Outdated
@ -10,3 +10,3 @@
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
"test:e2e": "cypress open",
"test:e2e:ci": "cd ../salix && gulp docker && cd ../salix-front && cypress run --browser chromium",
"test:e2e:ci": "cypress run --browser chrome",
alexm commented 2023-12-11 11:24:51 +00:00
Member
Copy Link

como mucho quita lo del browser i que use electron que es el de por defecto, pero gulp si q esta bien que lo haga

como mucho quita lo del browser i que use electron que es el de por defecto, pero gulp si q esta bien que lo haga
jorgep marked this conversation as resolved
juan approved these changes 2023-12-11 11:28:20 +00:00
Dismissed
jorgep added 1 commit 2023-12-11 11:32:09 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
e7c9a18f36 refs #6104 fix package
jorgep dismissed alexm’s review 2023-12-11 11:32:10 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jorgep dismissed juan’s review 2023-12-11 11:32:10 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

alexm approved these changes 2023-12-11 11:32:48 +00:00
juan approved these changes 2023-12-11 11:33:57 +00:00
jorgep merged commit 0e6417ff6a into dev 2023-12-11 11:34:36 +00:00
jorgep deleted branch 6104-changeVnLog 2023-12-11 11:34:36 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
juan
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
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-front#96
No description provided.
Delete Branch "6104-changeVnLog"

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?