#8449 - vnLogFilter #1640

Merged
alexm merged 20 commits from 8449-vnLogFilter into dev 2025-03-31 11:13:18 +00:00
Member
No description provided.
alexm added 9 commits 2025-03-26 08:23:16 +00:00
alexm added 1 commit 2025-03-26 08:23:31 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4179219f15
Merge branch 'dev' into 8449-vnLogFilter
alexm reviewed 2025-03-26 08:24:44 +00:00
@ -72,39 +71,8 @@ const filter = {
};
const paginate = ref();
const actions = ref();
Author
Member

Se quita (casi) todo lo referente a los filtros, ya que se mueve a VnLogFilter

Se quita (casi) todo lo referente a los filtros, ya que se mueve a VnLogFilter
jorgep marked this conversation as resolved
alexm reviewed 2025-03-26 08:25:01 +00:00
@ -291,3 +244,1 @@
return { between: [from, to] };
case 'to': {
if (dateFrom.value) {
function exprBuilder(param, value) {
Author
Member

Ponemos bien el exprBuilder

Ponemos bien el `exprBuilder`
jorgep marked this conversation as resolved
alexm reviewed 2025-03-26 08:25:26 +00:00
@ -371,3 +278,4 @@
await applyFilter();
}
onMounted(() => {
Author
Member

VnLog es una seccion que se suele filtra, creo que vale la pena que se muestre de primeras

VnLog es una seccion que se suele filtra, creo que vale la pena que se muestre de primeras
jorgep marked this conversation as resolved
alexm reviewed 2025-03-26 08:28:25 +00:00
@ -109,4 +109,2 @@
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
});
it('should correctly set the selectedFilters when filtering', () => {
Author
Member

Ya no existe esta logica, al usar VnFilterPanel (por debajo) el se encarga del filtrado

Ya no existe esta logica, al usar VnFilterPanel (por debajo) el se encarga del filtrado
jorgep marked this conversation as resolved
alexm reviewed 2025-03-26 08:29:14 +00:00
@ -61,6 +61,10 @@ const $props = defineProps({
type: Object,
default: null,
},
showTagChips: {
Author
Member

Añado esta propiedad, ya que en VnLogFilter no veo que valga la pena tenerlo, ademas hace que no vaya bien los checkboxs

Añado esta propiedad, ya que en VnLogFilter no veo que valga la pena tenerlo, ademas hace que no vaya bien los checkboxs
jorgep marked this conversation as resolved
alexm reviewed 2025-03-26 08:29:45 +00:00
@ -15,3 +9,1 @@
cy.get('.q-page').click();
cy.validateContent(chips[0], 'Document');
cy.validateContent(chips[1], 'Beginning');
cy.get('[data-cy="vnLog-checkbox"]').eq(0).click();
Author
Member

Los mejoro, basandome en resultados del VnLog, no en chips...

Los mejoro, basandome en resultados del VnLog, no en chips...
jorgep marked this conversation as resolved
alexm reviewed 2025-03-26 08:30:11 +00:00
@ -381,3 +380,1 @@
originId: route.params.id,
changedModel: 'Sale',
changedModelId: saleId,
query: {
Author
Member

Arreglado 😉

Arreglado 😉
jorgep marked this conversation as resolved
alexm added 1 commit 2025-03-26 10:45:18 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
a7c23f4bbb
feat(VnLogFilter): refs #8449 enable orders
alexm added 1 commit 2025-03-26 10:48:47 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
8c7dabd8fb
fix(VnOrder): refs #8449 hover style
alexm added 1 commit 2025-03-26 10:50:47 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
9918230096
fix(VnOrder): refs #8449 adjust padding for vertical alignment in table cells
alexm reviewed 2025-03-26 10:51:03 +00:00
@ -71,3 +71,3 @@
>
<span :title="label">{{ label }}</span>
<div v-if="name && model?.index">
<div v-if="name">
Author
Member

El and estaba mal. ya que hace que no salga el modo sin ningún order

El and estaba mal. ya que hace que no salga el modo sin ningún order
jorgep marked this conversation as resolved
alexm reviewed 2025-03-26 10:51:42 +00:00
@ -84,3 +84,3 @@
:class="[
model?.index ? 'color-vn-text' : 'bg-transparent',
vertical ? 'q-px-none' : '',
vertical ? 'q-mx-none q-py-lg' : '',
Author
Member
Arreglado estilo del hover: https://redmine.verdnatura.es/issues/8449#note-10
jorgep marked this conversation as resolved
alexm reviewed 2025-03-26 10:51:51 +00:00
@ -91,3 +91,3 @@
>
<div
class="column flex-center"
class="column justify-center text-center"
Author
Member

//

//
Member

No entiendo este comentario. Supongo que quieres decir que va relacionado con el anterior

No entiendo este comentario. Supongo que quieres decir que va relacionado con el anterior
alexm requested review from jorgep 2025-03-26 10:52:14 +00:00
alexm added 1 commit 2025-03-26 10:53:51 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
7a273fb35f
Merge branch 'dev' into 8449-vnLogFilter
alexm added 1 commit 2025-03-27 08:39:33 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
75a20f7ca7
Merge branch 'dev' into 8449-vnLogFilter
alexm added 1 commit 2025-03-27 13:14:57 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
6e27edcf54
Merge branch 'dev' into 8449-vnLogFilter
alexm reviewed 2025-03-27 13:15:34 +00:00
@ -190,3 +190,3 @@
store.order = order;
resetPagination();
fetch({});
await fetch({});
Author
Member

Hacia que si falla la petición no se puede manejar

Hacia que si falla la petición no se puede manejar
jorgep marked this conversation as resolved
alexm added 1 commit 2025-03-28 10:55:52 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e05d3140a3
Merge branch 'dev' into 8449-vnLogFilter
jorgep requested changes 2025-03-28 11:43:52 +00:00
Dismissed
jorgep left a comment
Member
  • Se ha perdido el btn flotante de quitar todos los filtros
* Se ha perdido el btn flotante de quitar todos los filtros
@ -48,3 +60,3 @@
v-model="orders[col.orderBy ?? col.name]"
:name="col.orderBy ?? col.name"
:data-key="$attrs['data-key']"
:data-key="$attrs['dataKey']"
Member

Estás seguro que es así? los atributos van en kebab-case. Lo he revisado en local , tiene que ser kebab-case

Estás seguro que es así? los atributos van en kebab-case. Lo he revisado en local , tiene que ser kebab-case
Member

image

![image](/attachments/1e617dca-65e1-4228-b7b1-69ce96af11ee)
247 KiB
Author
Member

He dejado el nativo de los filtros
image

He dejado el nativo de los filtros ![image](/attachments/e768b4a4-5f2d-402d-af03-6350a915318f)
alexm added 1 commit 2025-03-31 09:44:06 +00:00
alexm added 1 commit 2025-03-31 10:35:18 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
497eb3a8bb
refactor(VnLog): refs #8449 clear filters when has userParams
alexm changed title from 8449-vnLogFilter to #8449 - vnLogFilter 2025-03-31 10:35:29 +00:00
alexm requested review from jorgep 2025-03-31 10:36:01 +00:00
alexm added 1 commit 2025-03-31 10:50:36 +00:00
jorgep approved these changes 2025-03-31 10:51:31 +00:00
alexm scheduled this pull request to auto merge when all checks succeed 2025-03-31 10:51:55 +00:00
alexm merged commit a937b2d3ac into dev 2025-03-31 11:13:18 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
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-front#1640
No description provided.