This commit is contained in:
2021-02-05 22:48:35 +00:00
parent e59b847b54
commit d49ec7db64
2 changed files with 48 additions and 10 deletions

View File

@@ -14,10 +14,7 @@ LISTVIEW REPLACE CURRENT <----HERE not THERE ---v
(below this is all past for reference) (below this is all past for reference)
TODO (now) TODO (now)
TODO: Test date and times both input properly but display in lists etc properly when switching zones
concern is I missed something about the timezone forced issue so need to see it works everywhree
CLIENT CLIENT

View File

@@ -29,16 +29,31 @@
data-cy="selectSavedFilter" data-cy="selectSavedFilter"
> >
</v-select> </v-select>
<!-- <template v-slot:header
><div class="v-data-table-header-mobile__wrapper">
<v-select
v-model="mobileSelectedFilterColumn"
:items="headers"
item-text="text"
item-value="fk"
prepend-outer-icon="$ayiEdit"
>
</v-select>
</div>
</template> -->
<v-spacer></v-spacer> <v-spacer></v-spacer>
<div> <div>
<v-btn @click="refresh"> <v-btn @click="refresh">
<v-icon data-cy="refresh">$ayiSync</v-icon> <v-icon data-cy="refresh">$ayiSync</v-icon>
</v-btn> </v-btn>
<!-- <v-btn class="ml-6" @click="refresh"> <v-btn
<v-icon data-cy="refresh">$ayiBell</v-icon> v-if="$vuetify.breakpoint.xs"
</v-btn> --> class="ml-6"
@click="refresh"
>
<v-icon data-cy="refresh">$ayiFilter</v-icon>
</v-btn>
<v-btn class="ml-6" @click="editColumnView"> <v-btn class="ml-6" @click="editColumnView">
<v-icon data-cy="filter">$ayiColumns</v-icon> <v-icon data-cy="filter">$ayiColumns</v-icon>
</v-btn> </v-btn>
@@ -50,7 +65,11 @@
> >
{{ $ay.t("NoData") }} {{ $ay.t("NoData") }}
</div> </div>
<!-- WIDE TABLE VIEW --> <!--
################################################################################################################################################
WIDE TABLE VIEW
################################################################################################################################################
-->
<template v-if="$vuetify.breakpoint.smAndUp"> <template v-if="$vuetify.breakpoint.smAndUp">
<v-data-table <v-data-table
:headers="headers" :headers="headers"
@@ -206,7 +225,11 @@
</template> </template>
</v-data-table> </v-data-table>
</template> </template>
<!-- MOBILE TABLE VIEW --> <!--
########################################################################
MOBILE TABLE VIEW
########################################################################
-->
<template v-else> <template v-else>
<v-data-table <v-data-table
:headers="headers" :headers="headers"
@@ -230,6 +253,23 @@
class="elevation-1" class="elevation-1"
data-cy="datatable" data-cy="datatable"
> >
<!-- <template v-for="h in headers" v-slot:[`header.${h.value}`]>
<span :key="h.text">
<v-btn icon @click.stop="filter(h)" class="ml-n8 mr-1"
><v-icon :color="filterColor(h)">$ayiFilter</v-icon></v-btn
>
{{ h.text }}
</span>
</template> -->
<!-- <template v-slot:top>
<div>
TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP
<br />
TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP
</div>
</template> -->
<!-- <template v-slot:header="{ props }"> -->
<template v-slot:body="{ items }"> <template v-slot:body="{ items }">
<v-row> <v-row>
<v-col <v-col
@@ -395,6 +435,7 @@ export default {
selectLists: { selectLists: {
savedFilters: [] savedFilters: []
}, },
mobileSelectedFilterColumn: null,
headers: [], headers: [],
serverColumns: [], serverColumns: [],
serverFilter: [], serverFilter: [],