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 16:13:55 +00:00
parent e6e5bf43d7
commit 298e331012
1 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,25 @@
item.uiFieldDataType === 12 item.uiFieldDataType === 12
" "
> >
STRING BUILDER <v-select
v-model="item.tempFilterOperator"
:items="pickLists.stringFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
prepend-icon="fa-filter"
></v-select>
<v-text-field
v-model="item.tempFilterValue"
clearable
></v-text-field>
<v-btn
large
block
v-if="item.tempFilterToken != null"
@click="addFilterCondition(item)"
><v-icon large>fa-plus</v-icon></v-btn
>
</div> </div>
<!-- INTEGER BUILDER --> <!-- INTEGER BUILDER -->
@@ -414,9 +432,6 @@ export default {
this.obj.splice(newIndex, 0, this.obj.splice(index, 1)[0]); this.obj.splice(newIndex, 0, this.obj.splice(index, 1)[0]);
}, },
addFilterCondition(item) { addFilterCondition(item) {
//TODO: Need to also set a filter item DISPLAY property
//so that can display localized for user in the list and then
//change the list to use the DISPLAY property instead
var filterItem = { op: null, value: null, display: null }; var filterItem = { op: null, value: null, display: null };
var filterItemSet = false; var filterItemSet = false;
//DATE relative token? //DATE relative token?
@@ -472,35 +487,43 @@ export default {
if (item.tempFilterOperator && item.tempFilterValue) { if (item.tempFilterOperator && item.tempFilterValue) {
filterItem.op = item.tempFilterOperator; filterItem.op = item.tempFilterOperator;
filterItem.value = item.tempFilterValue; filterItem.value = item.tempFilterValue;
//display //only add if there is both an op and a value
var valueDisplay = "selected value"; //above here for tokens that isn't a restriction but
switch (item.uiFieldDataType) { //after passing through those conditions were at a point where there MUST be both
case 1: //date localize if (filterItem.op && filterItem.value) {
valueDisplay = window.$gz.locale.utcDateToShortDateAndTimeLocalized( //display
item.tempFilterValue var valueDisplay = "selected value";
); switch (item.uiFieldDataType) {
break; case 1: //date localize
case 8: //currency localize valueDisplay = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
valueDisplay = window.$gz.locale.currencyLocalized( item.tempFilterValue
item.tempFilterValue );
); break;
break; case 8: //currency localize
case 7: //decimal localize valueDisplay = window.$gz.locale.currencyLocalized(
valueDisplay = window.$gz.locale.decimalLocalized( item.tempFilterValue
item.tempFilterValue );
); break;
break; case 7: //decimal localize
default: valueDisplay = window.$gz.locale.decimalLocalized(
valueDisplay = item.tempFilterValue; item.tempFilterValue
break; );
break;
default:
valueDisplay = item.tempFilterValue;
break;
}
var opDisplay = window.$gz._.find(
this.pickLists.dateFilterOperators,
{
id: filterItem.op
}
).name;
filterItem.display = opDisplay + " " + valueDisplay;
filterItemSet = true;
} }
var opDisplay = window.$gz._.find(this.pickLists.dateFilterOperators, {
id: filterItem.op
}).name;
filterItem.display = opDisplay + " " + valueDisplay;
filterItemSet = true;
} }
if (filterItemSet) { if (filterItemSet) {