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 18:15:51 +00:00
parent 3874962fc7
commit 195faeb1bd
1 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,14 +240,47 @@
</div> </div>
<!-- BOOL BUILDER --> <!-- BOOL BUILDER -->
<div v-if="item.uiFieldDataType === 6"> <div v-if="item.uiFieldDataType === 6">
BOOL BUILDER <v-select
v-model="item.tempFilterOperator"
:items="pickLists.boolFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
prepend-icon="fa-filter"
></v-select>
<v-radio-group
v-model="item.tempFilterValue"
v-if="
item.tempFilterOperator != null &&
item.tempFilterOperator != '*NOVALUE*' &&
item.tempFilterOperator != '*HASVALUE*'
"
row
>
<v-radio
:label="lt('False')"
:value="false"
></v-radio>
<v-radio
:label="lt('True')"
:value="true"
></v-radio>
</v-radio-group>
<v-btn
large
block
v-if="item.tempFilterOperator != null"
@click="addFilterCondition(item)"
><v-icon large>fa-plus</v-icon></v-btn
>
</div> </div>
<!-- DECIMAL BUILDER --> <!-- DECIMAL BUILDER -->
<div v-if="item.uiFieldDataType === 7"> <div v-if="item.uiFieldDataType === 7">
<v-select <v-select
v-model="item.tempFilterOperator" v-model="item.tempFilterOperator"
:items="pickLists.integerFilterOperators" :items="pickLists.decimalFilterOperators"
item-text="name" item-text="name"
item-value="id" item-value="id"
:label="lt('Filter')" :label="lt('Filter')"
@@ -274,7 +307,7 @@
<div v-if="item.uiFieldDataType === 8"> <div v-if="item.uiFieldDataType === 8">
<v-select <v-select
v-model="item.tempFilterOperator" v-model="item.tempFilterOperator"
:items="pickLists.integerFilterOperators" :items="pickLists.decimalFilterOperators"
item-text="name" item-text="name"
item-value="id" item-value="id"
:label="lt('Filter')" :label="lt('Filter')"
@@ -562,14 +595,14 @@ export default {
if ( if (
false == filterItemSet && false == filterItemSet &&
item.tempFilterOperator && item.tempFilterOperator &&
item.tempFilterValue item.tempFilterValue != null
) { ) {
filterItem.op = item.tempFilterOperator; filterItem.op = item.tempFilterOperator;
filterItem.value = item.tempFilterValue; filterItem.value = item.tempFilterValue;
//only add if there is both an op and a value //only add if there is both an op and a value
//above here for tokens that isn't a restriction but //above here for tokens that isn't a restriction but
//after passing through those conditions were at a point where there MUST be both //after passing through those conditions were at a point where there MUST be both
if (filterItem.op && filterItem.value) { if (filterItem.op && filterItem.value != null) {
//display //display
var valueDisplay = "selected value"; var valueDisplay = "selected value";
switch (item.uiFieldDataType) { switch (item.uiFieldDataType) {
@@ -588,6 +621,11 @@ export default {
item.tempFilterValue item.tempFilterValue
); );
break; break;
case 6: //BOOL localize
//debugger;
var ltKey = item.tempFilterValue ? "True" : "False";
valueDisplay = this.lt(ltKey);
break;
default: default:
valueDisplay = item.tempFilterValue; valueDisplay = item.tempFilterValue;
break; break;
@@ -850,7 +888,9 @@ function fetchUILocalizedText(vm) {
"DateRangePastYear", "DateRangePastYear",
"DateRangePast90Days", "DateRangePast90Days",
"DateRangePast30Days", "DateRangePast30Days",
"DateRangePast24Hours" "DateRangePast24Hours",
"True",
"False"
]; ];
return window.$gz.locale.fetch(ltKeysRequired); return window.$gz.locale.fetch(ltKeysRequired);