admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-02-21 21:18:04 +00:00
parent 1c2d9ad7cf
commit be5a3903c6
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ayanova/src/views/ay-data-list-view.vue
View File

@@ -635,12 +635,18 @@ export default {
filterItem.op = "="; //equality
filterItem.value = item.tempFilterToken;
//display
var valueDisplay = window.$gz._.find(
this.pickLists.dateFilterTokens,
{ id: item.tempFilterToken }
).name;
var opDisplay = filterItem.op;
filterItem.display = opDisplay + " " + valueDisplay;
filterItem.display = getDisplayForFilter(
this,
item.uiFieldDataType,
filterItem.op,
filterItem.value
);
// var valueDisplay = window.$gz._.find(
// this.pickLists.dateFilterTokens,
// { id: item.tempFilterToken }
// ).name;
// var opDisplay = filterItem.op;
// filterItem.display = opDisplay + " " + valueDisplay;
filterItemSet = true;
}
}
@@ -1362,7 +1368,7 @@ function getDisplayForFilter(
if (uiFieldDataType === 1) {
if (filterValue != "*select*") {
var valueDisplay = window.$gz._.find(vm.pickLists.dateFilterTokens, {
id: item.tempFilterToken
id: filterValue
}).name;
var opDisplay = filterItem.op;
return filterOperator + " " + valueDisplay;
@@ -1410,7 +1416,7 @@ function getDisplayForFilter(
valueDisplay = vm.lt(ltKey);
break;
case 10: //ENUM localize
valueDisplay = window.$gz.enums.get(item.enumType, filterValue);
valueDisplay = window.$gz.enums.get(enumType, filterValue);
break;
default:
valueDisplay = filterValue;