This commit is contained in:
@@ -604,7 +604,7 @@ export default {
|
||||
|
||||
default:
|
||||
throw new Error(
|
||||
"realtive-date-time-filter-calculater: Date token [" +
|
||||
"relative-date-time-filter-calculater: Date token [" +
|
||||
token +
|
||||
"] was not recognized"
|
||||
);
|
||||
|
||||
@@ -605,10 +605,16 @@ export default {
|
||||
addFilterCondition(item) {
|
||||
let filterItem = { op: null, value: null, display: null };
|
||||
let filterItemSet = false;
|
||||
|
||||
//DATE relative token?
|
||||
if (item.uiFieldDataType === 1) {
|
||||
//some kind of relative date token?
|
||||
if (item.tempFilterToken && item.tempFilterToken != "*select*") {
|
||||
if (
|
||||
item.tempFilterToken &&
|
||||
item.tempFilterToken != "*select*" &&
|
||||
item.tempFilterToken != "*NOVALUE*" &&
|
||||
item.tempFilterToken != "*HASVALUE*"
|
||||
) {
|
||||
//special relative token
|
||||
filterItem.op = "="; //equality
|
||||
filterItem.token = true;
|
||||
@@ -617,6 +623,7 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
debugger;
|
||||
//BLANKS / NONBLANKS TOKENS?
|
||||
if (false == filterItemSet && item.tempFilterOperator == "*NOVALUE*") {
|
||||
filterItem.op = "=";
|
||||
@@ -1050,6 +1057,11 @@ function populateSelectionLists(vm) {
|
||||
vm.selectLists.dateFilterTokens.push(
|
||||
...[
|
||||
{ name: "(" + vm.$ay.t("SelectItem") + ")", id: "*select*" }, //If select then use entry in date /time picker
|
||||
{ name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
|
||||
{
|
||||
name: vm.$ay.t("GridRowFilterDropDownNonBlanksItem"),
|
||||
id: "*HASVALUE*"
|
||||
},
|
||||
{ name: vm.$ay.t("DateRangeYesterday"), id: "*yesterday*" },
|
||||
{ name: vm.$ay.t("DateRangeToday"), id: "*today*" },
|
||||
{ name: vm.$ay.t("DateRangeTomorrow"), id: "*tomorrow*" },
|
||||
|
||||
Reference in New Issue
Block a user