Skip to content

Commit

Permalink
fix: List lookups.
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwinBetanc0urt committed Apr 8, 2024
1 parent e784ba4 commit 8850a37
Show file tree
Hide file tree
Showing 22 changed files with 74 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export default {
this.containerManager.getSearchRecordsList({
parentUuid,
containerUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
tableName: TABLE_NAME,
uuid: this.metadata.uuid,
id: this.metadata.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ export const refreshLookup = {
store.dispatch('deleteLookup', {
parentUuid: fieldAttributes.parentUuid,
containerUuid: fieldAttributes.containerUuid,
contextColumnNames: fieldAttributes.reference.contextColumnNames,
contextColumnNamesByDefaultValue: fieldAttributes.contextColumnNames,
contextColumnNames: fieldAttributes.reference.context_column_names,
contextColumnNamesByDefaultValue: fieldAttributes.context_column_names,
uuid: fieldAttributes.uuid,
//
value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ export default ({
containerManager.getSearchRecordsList({
parentUuid,
containerUuid: uuidForm,
contextColumnNames: fieldAttributes.reference.contextColumnNames,
tableName: fieldAttributes.reference.tableName,
contextColumnNames: fieldAttributes.reference.context_column_names,
tableName: fieldAttributes.reference.table_name,
uuid: fieldAttributes.uuid,
id: fieldAttributes.id,
// filters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,8 @@ export default {
this.containerManager.getSearchRecordsList({
parentUuid,
containerUuid: this.uuidForm,
contextColumnNames: this.metadata.reference.contextColumnNames,
tableName: this.metadata.reference.tableName,
contextColumnNames: this.metadata.reference.context_column_names,
tableName: this.metadata.reference.table_name,
uuid: this.metadata.uuid,
id: this.metadata.id,
filters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default {
this.containerManager.getSearchRecordsList({
parentUuid,
containerUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
tableName: TABLE_NAME,
uuid: this.metadata.uuid,
id: this.metadata.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ export default {
this.containerManager.getSearchRecordsList({
containerUuid: this.metadata.containerUuid,
parentUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
tableName: this.metadata.reference.tableName,
contextColumnNames: this.metadata.reference.context_column_names,
tableName: this.metadata.reference.table_name,
columnName: this.metadata.columnName,
uuid: this.metadata.uuid,
id: this.metadata.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export default {
return GENERAL_INFO_SEARCH_LIST_FORM
},
tableName() {
return this.metadata.reference.tableName
return this.metadata.reference.table_name
},
shortsKey() {
return {
Expand Down Expand Up @@ -425,10 +425,10 @@ export default {
this.containerManager.getSearchRecordsList({
containerUuid: this.uuidForm,
parentUuid: this.metadata.parentUuid,
tableName: this.metadata.reference.tableName,
tableName: this.metadata.reference.table_name,
columnName: this.metadata.columnName,
id: this.metadata.id,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
filters: values,
pageNumber,
pageSize
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ export default ({
containerManager.getSearchRecordsList({
parentUuid,
containerUuid: uuidForm,
contextColumnNames: fieldAttributes.reference.contextColumnNames,
tableName: fieldAttributes.reference.tableName,
contextColumnNames: fieldAttributes.reference.context_column_names,
tableName: fieldAttributes.reference.table_name,
uuid: fieldAttributes.uuid,
id: fieldAttributes.id,
// filters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export default {
this.containerManager.getSearchRecordsList({
parentUuid,
containerUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
tableName: TABLE_NAME,
uuid: this.metadata.uuid,
id: this.metadata.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default {
if (isEmptyValue(this.metadata.reference)) {
return fieldRender
}
switch (this.metadata.reference.tableName) {
switch (this.metadata.reference.table_name) {
case 'C_BPartner':
fieldRender = () => import('@/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo')
break
Expand All @@ -108,7 +108,7 @@ export default {
return icon
}
return iconSearchFieldByTable(
this.metadata.reference.tableName
this.metadata.reference.table_name
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ export default {
const allOptions = store.getters.getStoredLookupAll({
parentUuid: this.metadata.parentUuid,
containerUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNamesByDefaultValue: this.metadata.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
contextColumnNamesByDefaultValue: this.metadata.context_column_names,
uuid: this.metadata.uuid,
id: this.metadata.id,
//
tableName: this.metadata.reference.tableName,
tableName: this.metadata.reference.table_name,
columnName: this.metadata.columnName,
value: this.value
})
Expand Down Expand Up @@ -308,8 +308,8 @@ export default {
value = rowData[elementName]
}
// when value is referneced as Account_ID -> C_ElementValue_ID, C_Currency_ID_To -> C_Currency_ID
if (isEmptyValue(value) && !isEmptyValue(reference) && !isEmptyValue(reference.tableName)) {
const referenceColumn = reference.tableName + IDENTIFIER_COLUMN_SUFFIX
if (isEmptyValue(value) && !isEmptyValue(reference) && !isEmptyValue(reference.table_name)) {
const referenceColumn = reference.table_name + IDENTIFIER_COLUMN_SUFFIX
value = rowData[referenceColumn]
}

Expand Down
10 changes: 5 additions & 5 deletions src/components/ADempiere/FieldDefinition/FieldSelect/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@ export default {
this.containerManager.getLookupList({
parentUuid: this.metadata.parentUuid,
containerUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
uuid: this.metadata.uuid,
id: this.metadata.id,
//
tableName: this.metadata.reference.tableName,
tableName: this.metadata.reference.table_name,
columnName: this.metadata.columnName,
columnUuid: this.metadata.columnUuid,
searchValue: searchQuery,
Expand All @@ -406,11 +406,11 @@ export default {
this.$store.dispatch('deleteLookup', {
parentUuid: this.metadata.parentUuid,
containerUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNamesByDefaultValue: this.metadata.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
contextColumnNamesByDefaultValue: this.metadata.context_column_names,
uuid: this.metadata.uuid,
//
tableName: this.metadata.reference.tableName,
tableName: this.metadata.reference.table_name,
columnName: this.metadata.columnName,
value: this.value
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,24 @@ export default {
return store.getters.getStoredLookupList({
parentUuid: this.metadata.parentUuid,
containerUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
uuid: this.metadata.uuid,
id: this.metadata.id,
//
tableName: this.metadata.reference.tableName,
tableName: this.metadata.reference.table_name,
columnName: this.metadata.columnName
})
},
getStoredLookupAll() {
const allOptions = store.getters.getStoredLookupAll({
parentUuid: this.metadata.parentUuid,
containerUuid: this.metadata.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNamesByDefaultValue: this.metadata.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
contextColumnNamesByDefaultValue: this.metadata.context_column_names,
uuid: this.metadata.uuid,
id: this.metadata.id,
//
tableName: this.metadata.reference.tableName,
tableName: this.metadata.reference.table_name,
columnName: this.metadata.columnName,
value: this.value
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ export default {
}

let contextAttributesList = []
if (!isEmptyValue(this.metadata.reference) && !isEmptyValue(this.metadata.reference.contextColumnNames)) {
if (!isEmptyValue(this.metadata.reference) && !isEmptyValue(this.metadata.reference.context_column_names)) {
contextAttributesList = getContextAttributes({
parentUuid: this.parentUuid,
containerUuid: this.containerUuid,
contextColumnNames: this.metadata.reference.contextColumnNames,
contextColumnNames: this.metadata.reference.context_column_names,
keyName: 'key'
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ export default ({
})

const contextAttributesList = computed(() => {
if (!isEmptyValue(fieldAttributes.reference) && !isEmptyValue(fieldAttributes.reference.contextColumnNames)) {
if (!isEmptyValue(fieldAttributes.reference) && !isEmptyValue(fieldAttributes.reference.context_column_names)) {
return getContextAttributes({
parentUuid,
containerUuid,
contextColumnNames: fieldAttributes.reference.contextColumnNames,
contextColumnNames: fieldAttributes.reference.context_column_names,
keyName: 'key'
})
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ADempiere/Form/VPOS/Collection/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@ export default {
})
if (!this.isEmptyValue(value.reference) && this.isEmptyValue(displayPaymentType)) {
this.$store.dispatch('getLookupListFromServer', {
tableName: value.reference.tableName,
tableName: value.reference.table_name,
query: value.reference.query
})
}
Expand Down
32 changes: 16 additions & 16 deletions src/components/ADempiere/Form/VPOS/Collection/typeCollection.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<!--
ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
Copyright (C) 2017-Present E.R.P. Consultores y Asociados, C.A.
Contributor(s): Yamel Senih ysenih@erpya.com www.erpya.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
Copyright (C) 2018-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com
Contributor(s): Edwin Betancourt EdwinBetanc0urt@outlook.com https://github.com/EdwinBetanc0urt
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <https:www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https:www.gnu.org/licenses/>.
-->
<template>
<el-container style="background: white; height: 100% !important;display: block;">
Expand Down Expand Up @@ -110,7 +110,7 @@
}}
</span>
</div>
<div class="bottom clearfix" style="margin-top: 0px !important!">
<div class="bottom clearfix" style="margin-top: 0px !important;">
<el-button
type="text"
class="button"
Expand Down Expand Up @@ -261,7 +261,7 @@ export default {
listPaymentType(value) {
if (!this.isEmptyValue(value) && !this.isEmptyValue(value.reference)) {
this.tenderTypeDisplaye({
tableName: value.reference.tableName,
tableName: value.reference.table_name,
query: value.reference.query
})
}
Expand All @@ -273,7 +273,7 @@ export default {
}
if (!this.isEmptyValue(this.listPaymentType) && !this.isEmptyValue(this.listPaymentType.reference)) {
this.tenderTypeDisplaye({
tableName: this.listPaymentType.reference.tableName,
tableName: this.listPaymentType.reference.table_name,
query: this.listPaymentType.reference.query
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
}}
</span>
</div>
<div class="bottom clearfix" style="margin-top: 0px !important!">
<div class="bottom clearfix" style="margin-top: 0px !important;">
<el-button
type="text"
class="button"
Expand Down Expand Up @@ -708,7 +708,7 @@ export default {
})
if (!this.isEmptyValue(value.reference) && this.isEmptyValue(displayPaymentType)) {
this.$store.dispatch('getLookupListFromServer', {
tableName: value.reference.tableName,
tableName: value.reference.table_name,
query: value.reference.query
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
}}
</span>
</div>
<div class="bottom clearfix" style="margin-top: 0px !important!">
<div class="bottom clearfix" style="margin-top: 0px !important;">
<el-button
type="text"
class="button"
Expand Down Expand Up @@ -709,7 +709,7 @@ export default {
})
if (!this.isEmptyValue(value.reference) && this.isEmptyValue(displayPaymentType)) {
this.$store.dispatch('getLookupListFromServer', {
tableName: value.reference.tableName,
tableName: value.reference.table_name,
query: value.reference.query
})
}
Expand Down
10 changes: 5 additions & 5 deletions src/store/modules/ADempiere/data/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,13 @@ const actions = {
const options = rootGetters.getStoredLookupAll({
parentUuid,
containerUuid,
contextColumnNames: itemField.reference.contextColumnNames,
contextColumnNamesByDefaultValue: itemField.contextColumnNames,
contextColumnNames: itemField.reference.context_column_names,
contextColumnNamesByDefaultValue: itemField.context_column_names,
//
id: itemField.id,
fieldUuid: itemField.uuid,
columnName: itemField.columnName,
tableName: itemField.reference.tableName,
tableName: itemField.reference.table_name,
value: valueGetDisplayColumn
})

Expand Down Expand Up @@ -205,12 +205,12 @@ const actions = {
const { displayedValue } = await dispatch('getLookupItemFromServer', {
parentUuid,
containerUuid,
contextColumnNames: itemField.reference.contextColumnNames,
contextColumnNames: itemField.reference.context_column_names,
//
id: itemField.id,
fieldUuid: itemField.uuid,
columnName: itemField.columnName,
tableName: itemField.reference.tableName,
tableName: itemField.reference.table_name,
value: valueGetDisplayColumn
})
values[itemField.displayColumnName] = displayedValue
Expand Down
8 changes: 4 additions & 4 deletions src/utils/ADempiere/contextUtils/contextField.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ export function getParentFields({
read_only_logic,
reference,
default_value,
contextColumnNames = [],
context_column_names = [],
default_value_to
}) {
let contextColumnNamesByReference = []
// validate reference
if (!isEmptyValue(reference) && !isEmptyValue(reference.contextColumnNames)) {
contextColumnNamesByReference = reference.contextColumnNames
if (!isEmptyValue(reference) && !isEmptyValue(reference.context_column_names)) {
contextColumnNamesByReference = reference.context_column_names
}

// remove duplicated elements
Expand All @@ -65,7 +65,7 @@ export function getParentFields({
// For Read Only Logic
...evaluator.parseDepends(read_only_logic),
// For Default Value
...contextColumnNames,
...context_column_names,
// For Default Value
...evaluator.parseDepends(default_value),
// For Default Value To
Expand Down
Loading

0 comments on commit 8850a37

Please sign in to comment.