re-factor / cleanup
This commit is contained in:
@@ -2,20 +2,20 @@
|
||||
<div>
|
||||
<gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
|
||||
<gz-data-table-filter
|
||||
ref="dataTableFilter"
|
||||
:data-list-key="dataListKey"
|
||||
:active-filter-id="activeFilterId"
|
||||
ref="dataTableFilter"
|
||||
>
|
||||
</gz-data-table-filter>
|
||||
<gz-data-table-filter-manager
|
||||
ref="dataTableFilterManager"
|
||||
:data-list-key="dataListKey"
|
||||
:active-filter-id="activeFilterId"
|
||||
ref="dataTableFilterManager"
|
||||
>
|
||||
</gz-data-table-filter-manager>
|
||||
<gz-data-table-mobile-filter-column-selector
|
||||
:headers="headers"
|
||||
ref="dataTableMobileFilterColumnSelector"
|
||||
:headers="headers"
|
||||
>
|
||||
</gz-data-table-mobile-filter-column-selector>
|
||||
<v-card>
|
||||
@@ -25,7 +25,7 @@
|
||||
<v-btn text @click="preFilterNav()">
|
||||
<v-icon data-cy="clickThru">{{ preFilterMode.icon }}</v-icon>
|
||||
</v-btn>
|
||||
<span @click="preFilterNav()" class="text-h5">
|
||||
<span class="text-h5" @click="preFilterNav()">
|
||||
{{ preFilterMode.viz }}</span
|
||||
>
|
||||
<v-btn
|
||||
@@ -44,12 +44,12 @@
|
||||
item-text="name"
|
||||
item-value="id"
|
||||
:label="$ay.t('Filter')"
|
||||
@input="selectedFilterChanged"
|
||||
prepend-icon="$ayiEdit"
|
||||
@click:prepend="editFilter()"
|
||||
:append-outer-icon="clearFilterIcon()"
|
||||
@click:append-outer="clearFilter(true)"
|
||||
data-cy="selectSavedFilter"
|
||||
@input="selectedFilterChanged"
|
||||
@click:prepend="editFilter()"
|
||||
@click:append-outer="clearFilter(true)"
|
||||
>
|
||||
</v-select>
|
||||
</template>
|
||||
@@ -61,8 +61,8 @@
|
||||
</v-btn>
|
||||
|
||||
<v-btn
|
||||
text
|
||||
v-if="$vuetify.breakpoint.xs"
|
||||
text
|
||||
class="ml-12"
|
||||
@click="mobileColumnFilterSelect"
|
||||
>
|
||||
@@ -79,8 +79,8 @@
|
||||
</div>
|
||||
</v-card-title>
|
||||
<div
|
||||
class="text-h5 ml-3 accent--text"
|
||||
v-if="!loading && records.length < 1"
|
||||
class="text-h5 ml-3 accent--text"
|
||||
>
|
||||
{{ $ay.t("NoData") }}
|
||||
</div>
|
||||
@@ -92,9 +92,9 @@
|
||||
-->
|
||||
<template v-if="$vuetify.breakpoint.smAndUp">
|
||||
<v-data-table
|
||||
v-model="selected"
|
||||
:headers="headers"
|
||||
:items="records"
|
||||
v-model="selected"
|
||||
:options.sync="dataTablePagingOptions"
|
||||
:server-items-length="totalRecords"
|
||||
:loading="loading"
|
||||
@@ -120,8 +120,8 @@
|
||||
<v-btn
|
||||
v-if="h.flt"
|
||||
icon
|
||||
@click.stop="filter(h)"
|
||||
class="ml-n4 mr-1"
|
||||
@click.stop="filter(h)"
|
||||
><v-icon :color="filterColor(h)">$ayiFilter</v-icon></v-btn
|
||||
>
|
||||
{{ h.text }}
|
||||
@@ -299,9 +299,9 @@
|
||||
-->
|
||||
<template v-else>
|
||||
<v-data-table
|
||||
v-model="selected"
|
||||
:headers="headers"
|
||||
:items="records"
|
||||
v-model="selected"
|
||||
:options.sync="dataTablePagingOptions"
|
||||
:server-items-length="totalRecords"
|
||||
:loading="loading"
|
||||
@@ -345,9 +345,9 @@
|
||||
</template>
|
||||
<v-list dense>
|
||||
<v-list-item
|
||||
two-line
|
||||
v-for="c in item.columns"
|
||||
:key="c.key"
|
||||
two-line
|
||||
>
|
||||
<v-list-item-content>
|
||||
<v-list-item-title>
|
||||
@@ -519,6 +519,34 @@
|
||||
//has duplicate values in it and should be unique in every row
|
||||
const MAX_TEXT_COLUMN_LENGTH = 1024;
|
||||
export default {
|
||||
props: {
|
||||
formKey: { type: String, default: null },
|
||||
dataListKey: { type: String, default: null },
|
||||
clientCriteria: {
|
||||
type: String,
|
||||
default: undefined
|
||||
},
|
||||
preFilterMode: {
|
||||
type: Object,
|
||||
default: null
|
||||
},
|
||||
showSelect: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
singleSelect: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
reload: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
ridColumnOpenable: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: true,
|
||||
@@ -550,34 +578,6 @@ export default {
|
||||
}
|
||||
};
|
||||
},
|
||||
props: {
|
||||
formKey: { type: String, default: null },
|
||||
dataListKey: { type: String, default: null },
|
||||
clientCriteria: {
|
||||
type: String,
|
||||
default: undefined
|
||||
},
|
||||
preFilterMode: {
|
||||
type: Object,
|
||||
default: null
|
||||
},
|
||||
showSelect: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
singleSelect: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
reload: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
ridColumnOpenable: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dataTablePagingOptions: {
|
||||
async handler() {
|
||||
@@ -645,6 +645,13 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
//get pick lists
|
||||
const vm = this;
|
||||
await initForm(vm);
|
||||
vm.loading = false;
|
||||
vm.getDataFromApi();
|
||||
},
|
||||
methods: {
|
||||
ensureUrlFormat: function(u) {
|
||||
if (u && u.length > 0) {
|
||||
@@ -699,8 +706,8 @@ export default {
|
||||
`data-list-filter/${this.activeFilterId}`
|
||||
);
|
||||
if (res.error) {
|
||||
vm.formState.serverError = res.error;
|
||||
window.$gz.form.setErrorBoxErrors(vm);
|
||||
this.formState.serverError = res.error;
|
||||
window.$gz.form.setErrorBoxErrors(this);
|
||||
} else {
|
||||
await fetchSavedFilterList(this);
|
||||
if (reloadData) {
|
||||
@@ -747,7 +754,7 @@ export default {
|
||||
const sortBy = [];
|
||||
const sortDesc = [];
|
||||
if (rsort != null) {
|
||||
Object.keys(rsort).forEach((key, index) => {
|
||||
Object.keys(rsort).forEach(key => {
|
||||
//Pull column header name "value" from "fk"matching "key" here from this.headers columns.c0 etc here from this.headers see above method
|
||||
const found = this.headers.find(z => z.fk == key);
|
||||
if (found != null) {
|
||||
@@ -961,13 +968,6 @@ export default {
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
//get pick lists
|
||||
const vm = this;
|
||||
await initForm(vm);
|
||||
vm.loading = false;
|
||||
vm.getDataFromApi();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1161,24 +1161,25 @@ async function buildRecords(listData, columndefinitions, ridColumnOpenable) {
|
||||
display = window.$gz.locale.durationLocalized(display, true); //duration localized with no seconds
|
||||
break;
|
||||
case 17: //Authorization Roles
|
||||
if (availableRoles == null) {
|
||||
availableRoles = window.$gz.enums.getSelectionList(
|
||||
"AuthorizationRoles"
|
||||
);
|
||||
}
|
||||
const roles = display;
|
||||
const roleNames = [];
|
||||
{
|
||||
if (availableRoles == null) {
|
||||
availableRoles = window.$gz.enums.getSelectionList(
|
||||
"AuthorizationRoles"
|
||||
);
|
||||
}
|
||||
const roles = display;
|
||||
const roleNames = [];
|
||||
|
||||
if (roles != null && roles != 0) {
|
||||
for (let i = 0; i < availableRoles.length; i++) {
|
||||
const role = availableRoles[i];
|
||||
if (!!(roles & role.id)) {
|
||||
roleNames.push(role.name);
|
||||
if (roles != null && roles != 0) {
|
||||
for (let i = 0; i < availableRoles.length; i++) {
|
||||
const role = availableRoles[i];
|
||||
if (roles & role.id) {
|
||||
roleNames.push(role.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
display = roleNames.join(", ");
|
||||
}
|
||||
display = roleNames.join(", ");
|
||||
|
||||
break;
|
||||
default:
|
||||
//do nothing, allow it to stay as is (checkbox, plain text etc)
|
||||
|
||||
Reference in New Issue
Block a user