From a1b3b25c2b5561cd663f326812939a18f190caa1 Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Fri, 27 Mar 2020 16:59:09 -0400 Subject: [PATCH] fix: Run print format without operator's. (#420) --- src/store/modules/ADempiere/panel.js | 13 +++++++++++-- src/store/modules/ADempiere/reportControl.js | 11 +++++------ src/utils/ADempiere/dictionaryUtils.js | 18 +++++++++++------- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/store/modules/ADempiere/panel.js b/src/store/modules/ADempiere/panel.js index 66b1e748..4015291c 100644 --- a/src/store/modules/ADempiere/panel.js +++ b/src/store/modules/ADempiere/panel.js @@ -1406,12 +1406,21 @@ const panel = { value = undefined } - // only to fields type Time, Datea and DateTime + let operator + // set default operator of field + if (isAdvancedQuery || ['process', 'report'].includes(parameterItem.panelType)) { + operator = parameterItem.operator + } + // only to fields type Time, Date and DateTime, and is range, with values + // manage as Array = [value, valueTo] if (parameterItem.isRange && parameterItem.componentPath !== 'FieldNumber') { + operator = 'LESS_EQUAL' // operand to value is second position of array parametersRange.push({ columnName: `${parameterItem.columnName}_To`, + operator, value: valueTo }) + operator = 'GREATER_EQUAL' // rewrite to assign first position of array } return { @@ -1419,7 +1428,7 @@ const panel = { value, isRange: parameterItem.isRange, values, - operator: isAdvancedQuery ? parameterItem.operator : undefined + operator } }) diff --git a/src/store/modules/ADempiere/reportControl.js b/src/store/modules/ADempiere/reportControl.js index b35eeb45..c7f4763f 100644 --- a/src/store/modules/ADempiere/reportControl.js +++ b/src/store/modules/ADempiere/reportControl.js @@ -143,12 +143,11 @@ const reportControl = { instanceUuid, option }) { - if (isEmptyValue(printFormatUuid)) { - printFormatUuid = getters.getDefaultPrintFormat(processUuid).printFormatUuid - } - - const parametersList = rootGetters.getParametersToServer({ containerUuid: processUuid }) return new Promise(resolve => { + if (isEmptyValue(printFormatUuid)) { + printFormatUuid = getters.getDefaultPrintFormat(processUuid).printFormatUuid + } + const parametersList = rootGetters.getParametersToServer({ containerUuid: processUuid }) getReportOutput({ parametersList, printFormatUuid, @@ -166,7 +165,7 @@ const reportControl = { isError: false, instanceUuid, isReport: true, - option: option + option } commit('setNewReportOutput', reportOutput) diff --git a/src/utils/ADempiere/dictionaryUtils.js b/src/utils/ADempiere/dictionaryUtils.js index 155e788b..c40454f0 100644 --- a/src/utils/ADempiere/dictionaryUtils.js +++ b/src/utils/ADempiere/dictionaryUtils.js @@ -198,13 +198,17 @@ export function generateField({ } // Overwrite some values - if (typeRange) { - field.uuid = `${field.uuid}_To` - field.columnName = `${field.columnName}_To` - field.name = `${field.name} To` - field.value = parsedDefaultValueTo - field.defaultValue = field.defaultValueTo - field.parsedDefaultValue = field.parsedDefaultValueTo + if (field.isRange) { + field.operator = 'GREATER_EQUAL' + if (typeRange) { + field.uuid = `${field.uuid}_To` + field.columnName = `${field.columnName}_To` + field.name = `${field.name} To` + field.value = parsedDefaultValueTo + field.defaultValue = field.defaultValueTo + field.parsedDefaultValue = field.parsedDefaultValueTo + field.operator = 'LESS_EQUAL' + } } // hidden field type button