This commit is contained in:
2021-09-13 19:19:02 +00:00
parent 335514d081
commit 2869bf51c6
3 changed files with 27 additions and 11 deletions

View File

@@ -740,6 +740,10 @@ BUILD 130 CHANGES OF NOTE
- case 3959 updated with info to you and also implemented a slight change as mentioned in case
- Alert notes (was popup notes in v7) changed display color from red to orange as AyaNova errors display in red in similar location don't want them confused
- case 3960 fixed
- case 3961 fixed
- case 3962 fixed
- case 3963 fixed

View File

@@ -37,8 +37,6 @@
<v-icon>$clear</v-icon>
</v-btn>
</div>
<!-- v-if="preFilterMode.ayatype && preFilterMode.id" {icon:null,viz:null,ayatype:null,id:null,clearable:false} -->
</template>
<template v-else>
<v-select
@@ -51,7 +49,7 @@
prepend-icon="$ayiEdit"
@click:prepend="editFilter()"
:append-outer-icon="clearFilterIcon()"
@click:append-outer="clearFilter()"
@click:append-outer="clearFilter(true)"
data-cy="selectSavedFilter"
>
</v-select>
@@ -275,8 +273,9 @@
</template>
<template v-else-if="c.t == 12">
<!-- URL / HTTP -->
<!-- Expects full url with protocol etc in c.v so might need to add to record builder -->
<a :href="c.v" target="_blank">{{ c.v }}</a>
<a :href="ensureUrlFormat(c.v)" target="_blank">{{
c.v
}}</a>
</template>
<template v-else-if="c.t == 14">
<!-- File / memory Size -->
@@ -492,8 +491,9 @@
</template>
<template v-else-if="c.t == 12">
<!-- URL / HTTP -->
<!-- Expects full url with protocol etc in c.v so might need to add to record builder -->
<a :href="c.v" target="_blank">{{ c.v }}</a>
<a :href="ensureUrlFormat(c.v)" target="_blank">{{
c.v
}}</a>
</template>
<template v-else-if="c.t == 14">
<!-- File / memory Size -->
@@ -662,6 +662,11 @@ export default {
}
},
methods: {
ensureUrlFormat: function(u) {
if (u && u.length > 0) {
return u.indexOf("://") === -1 ? "//" + u : u;
}
},
preFilterNav: function() {
window.$gz.eventBus.$emit("openobject", {
type: this.preFilterMode.ayatype,
@@ -697,7 +702,7 @@ export default {
}
return clr;
},
async clearFilter() {
async clearFilter(reloadData) {
//Reset back to DEFAULT filter
setActiveFilter(this); //will not trigger refresh yet
@@ -710,7 +715,9 @@ export default {
window.$gz.form.setErrorBoxErrors(vm);
} else {
await fetchSavedFilterList(this);
await this.getDataFromApi();
if (reloadData) {
await this.getDataFromApi();
}
}
},
clearFilterIcon() {
@@ -1270,6 +1277,11 @@ async function initForm(vm) {
vm.timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
await fetchSavedFilterList(vm);
loadFormSettings(vm);
//If prefilter mode clear any prior filters applied
if (vm.preFilterMode != null) {
await vm.clearFilter(false);
}
}
////////////////////
@@ -1320,7 +1332,6 @@ function saveFormSettings(vm) {
function setActiveFilter(vm, desiredId) {
//Handle a change of filter, ensure it exists, if not then try to select default and if not that then just put in a zero
//if desiredId is falsey then try to pick the default
if (desiredId) {
if (vm.selectLists.savedFilters.find(z => z.id == desiredId)) {
vm.activeFilterId = desiredId;
@@ -1334,6 +1345,7 @@ function setActiveFilter(vm, desiredId) {
vm.activeFilterId = dflt.id;
return;
}
vm.activeFilterId = 0;
}

View File

@@ -432,7 +432,7 @@ async function clickHandler(menuItem) {
case "delete":
m.vm.remove();
break;
case "list":
case "statuslist":
m.vm.$router.push({
name: "svc-quote-status"
});