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:25:00 +00:00
parent b5b6df95f8
commit 5cd361c271
1 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,13 +634,13 @@ export default {
//special relative token
filterItem.op = "="; //equality
filterItem.value = item.tempFilterToken;
//display
filterItem.display = getDisplayForFilter(
this,
item.uiFieldDataType,
filterItem.op,
filterItem.value
);
// //display
// filterItem.display = getDisplayForFilter(
// this,
// item.uiFieldDataType,
// filterItem.op,
// filterItem.value
// );
// var valueDisplay = window.$gz._.find(
// this.pickLists.dateFilterTokens,
// { id: item.tempFilterToken }
@@ -656,29 +656,29 @@ export default {
filterItem.op = "=";
filterItem.value = "*NULL*";
//display
var valueDisplay = window.$gz._.find(
this.pickLists.stringFilterOperators,
{
id: item.tempFilterOperator
}
).name;
// var valueDisplay = window.$gz._.find(
// this.pickLists.stringFilterOperators,
// {
// id: item.tempFilterOperator
// }
// ).name;
filterItem.display = valueDisplay;
// filterItem.display = valueDisplay;
filterItemSet = true;
}
if (false == filterItemSet && item.tempFilterOperator == "*HASVALUE*") {
filterItem.op = "!=";
filterItem.value = "*NULL*";
//display
var valueDisplay = window.$gz._.find(
this.pickLists.stringFilterOperators,
{
id: item.tempFilterOperator
}
).name;
// //display
// var valueDisplay = window.$gz._.find(
// this.pickLists.stringFilterOperators,
// {
// id: item.tempFilterOperator
// }
// ).name;
filterItem.display = valueDisplay;
// filterItem.display = valueDisplay;
filterItemSet = true;
}
@@ -694,53 +694,60 @@ export default {
//above here for tokens that isn't a restriction but
//after passing through those conditions were at a point where there MUST be both
if (filterItem.op && filterItem.value != null) {
//display
var valueDisplay = "selected value";
switch (item.uiFieldDataType) {
case 1: //date localize
valueDisplay = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
item.tempFilterValue
);
break;
case 8: //currency localize
valueDisplay = window.$gz.locale.currencyLocalized(
item.tempFilterValue
);
break;
case 7: //decimal localize
valueDisplay = window.$gz.locale.decimalLocalized(
item.tempFilterValue
);
break;
case 6: //BOOL localize
//debugger;
var ltKey = item.tempFilterValue ? "True" : "False";
valueDisplay = this.lt(ltKey);
break;
case 10: //ENUM localize
valueDisplay = window.$gz.enums.get(
item.enumType,
item.tempFilterValue
);
break;
default:
valueDisplay = item.tempFilterValue;
break;
}
// //display
// var valueDisplay = "selected value";
// switch (item.uiFieldDataType) {
// case 1: //date localize
// valueDisplay = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
// item.tempFilterValue
// );
// break;
// case 8: //currency localize
// valueDisplay = window.$gz.locale.currencyLocalized(
// item.tempFilterValue
// );
// break;
// case 7: //decimal localize
// valueDisplay = window.$gz.locale.decimalLocalized(
// item.tempFilterValue
// );
// break;
// case 6: //BOOL localize
// //debugger;
// var ltKey = item.tempFilterValue ? "True" : "False";
// valueDisplay = this.lt(ltKey);
// break;
// case 10: //ENUM localize
// valueDisplay = window.$gz.enums.get(
// item.enumType,
// item.tempFilterValue
// );
// break;
// default:
// valueDisplay = item.tempFilterValue;
// break;
// }
var opDisplay = window.$gz._.find(
this.pickLists.stringFilterOperators,
{
id: filterItem.op
}
).name;
filterItem.display = opDisplay + ' "' + valueDisplay + '"';
// var opDisplay = window.$gz._.find(
// this.pickLists.stringFilterOperators,
// {
// id: filterItem.op
// }
// ).name;
// filterItem.display = opDisplay + ' "' + valueDisplay + '"';
filterItemSet = true;
}
}
if (filterItemSet) {
//display
filterItem.display = getDisplayForFilter(
this,
item.uiFieldDataType,
filterItem.op,
filterItem.value
);
//add only if not already in the collection (accidental double click)
if (!window.$gz._.find(item.filter.items, filterItem)) {
item.filter.items.push(filterItem);
@@ -1390,7 +1397,7 @@ function getDisplayForFilter(
//VALUE FILTER
//Nothing more to do if there isn't both a value AND an operator at this point
if (filterOperator == null || filterValue != null) {
if (filterOperator == null || filterValue == null) {
if (window.$gz.errorHandler.devMode()) {
throw "ay-data-list-view::getDisplayForFilter Value filter missing one ore more of Operator, Value";
}