diff --git a/.env.development b/.env.development index bcfab9b1..1c6a8476 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.0.63" +APP_VERSION="0.1.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL="freeplanet" diff --git a/.env.production b/.env.production index 018a3553..5d91f481 100755 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.0.63" +APP_VERSION="0.1.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL=freeplanet diff --git a/public/images/calendario_eventi.jpg b/public/images/calendario_eventi.jpg new file mode 100755 index 00000000..0fb6962d Binary files /dev/null and b/public/images/calendario_eventi.jpg differ diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue.off b/src/components/CEventsCalendar/CEventsCalendar.vue.off index 94cc98d2..042ec488 100755 --- a/src/components/CEventsCalendar/CEventsCalendar.vue.off +++ b/src/components/CEventsCalendar/CEventsCalendar.vue.off @@ -79,7 +79,7 @@ flat round color="white" icon="cancel" v-close-popup Località @@ -831,7 +831,7 @@ size="md" type="a" diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index a597a831..ec6b2205 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -1,4 +1,4 @@ -import { defineComponent, PropType, ref, watch, toRef, onMounted } from 'vue' +import { defineComponent, PropType, ref, watch, toRef, onMounted, toRefs } from 'vue' import { useI18n } from '@src/boot/i18n' import { tools } from '../../store/Modules/tools' @@ -81,12 +81,12 @@ export default defineComponent({ type: Object as PropType, required: false, default: () => { - return { sortBy: '', descending: false, page: 1, rowsNumber: 10, rowsPerPage: 10 } + return { sortBy: 'desc', descending: false, page: 1, rowsNumber: 10, rowsPerPage: 10 } }, }, defaultnewrec: { type: Function, - required: true, + required: false, }, }, components: { CMyPopupEdit, CTitleBanner }, @@ -96,16 +96,18 @@ export default defineComponent({ const userStore = useUserStore() const globalStore = useGlobalStore() + const mypagination = toRef(props, 'pagination') + const addRow = ref('Aggiungi') const newRecordBool = ref(false) const newRecord: any = ref({}) const savenewRec = ref(false) - const mytable = ref('') - const mytitle = ref('') - const mycolumns = ref([]) - const colkey = ref('') + const mytable = toRef(props, 'prop_mytable') + const mytitle = toRef(props, 'prop_mytitle') + const mycolumns = toRef(props, 'prop_mycolumns') + const colkey = toRef(props, 'prop_colkey') const search = ref('') const tablesel = ref('') @@ -138,8 +140,6 @@ export default defineComponent({ const mycodeid = toRef(props, 'prop_codeId') - const mypag = toRef(props, 'pagination') - // emulate 'SELECT count(*) FROM ...WHERE...' function getRowsNumberCount(myfilter?: any) { @@ -206,9 +206,9 @@ export default defineComponent({ emit('savefilter', myfilterand) } - function onRequest(myprops: any) { + function onRequest() { // console.log('onRequest', 'myfilter = ', myfilter) - const { page, rowsPerPage, rowsNumber, sortBy, descending } = myprops.pagination + const { page, rowsPerPage, rowsNumber, sortBy, descending } = mypagination.value const myfilternow = myfilter.value const myfilterandnow = myfilterand.value @@ -235,9 +235,9 @@ export default defineComponent({ serverData.value = [] // fetch data from "server" - fetchFromServer(startRow, endRow, myfilternow, myfilterandnow, sortBy, descending).then((ris: any) => { + return fetchFromServer(startRow, endRow, myfilternow, myfilterandnow, sortBy, descending).then((ris: any) => { - myprops.pagination.rowsNumber = getRowsNumberCount(myfilter) + mypagination.value.rowsNumber = getRowsNumberCount(myfilter) // clear out existing data and add new if (returnedData.value === []) { @@ -252,10 +252,10 @@ export default defineComponent({ // console.log('serverData', serverData) // don't forfunction to update local pagination object - myprops.pagination.page = page - myprops.pagination.rowsPerPage = rowsPerPage - myprops.pagination.sortBy = sortBy - myprops.pagination.descending = descending + mypagination.value.page = page + mypagination.value.rowsPerPage = rowsPerPage + mypagination.value.sortBy = sortBy + mypagination.value.descending = descending // console.log('pagination', pagination) @@ -267,9 +267,7 @@ export default defineComponent({ function refresh_table() { - onRequest({ - pagination: props.pagination - }) + onRequest() rowclicksel.value = null } @@ -410,18 +408,6 @@ export default defineComponent({ } - function created() { - console.log('created') - // serverData = mylist.slice() // [{ chiave: 'chiave1', valore: 'valore 1' }] - - mytable.value = props.prop_mytable - mytitle.value = props.prop_mytitle - mycolumns.value = props.prop_mycolumns - colkey.value = props.prop_colkey - - changeTable(false) - } - function updatedcol() { // console.log('updatedcol') if (mycolumns.value) { @@ -444,7 +430,7 @@ export default defineComponent({ } function getrows() { - return props.pagination.rowsNumber + return mypagination.value.rowsNumber } async function createNewRecordDialog() { @@ -472,7 +458,7 @@ export default defineComponent({ async function createNewRecord() { loading.value = true - const mydata = { + const mydata: any = { table: mytable, data: {} } @@ -487,7 +473,7 @@ export default defineComponent({ const data = await globalStore.saveTable(mydata) serverData.value.push(data) - mypag.value.rowsNumber++ + mypagination.value.rowsNumber++ loading.value = false } @@ -639,7 +625,7 @@ export default defineComponent({ } function changefuncAct(newval: any) { - if (!disabilita) { + if (!disabilita()) { tools.setCookie(tools.CAN_EDIT, newval) } } @@ -733,7 +719,6 @@ export default defineComponent({ onMounted(mounted) - created() return { selItem, @@ -773,6 +758,13 @@ export default defineComponent({ colExtra, colclicksel, selected, + mypagination, + loading, + onRequest, + serverData, + myfilter, + disabilita, + newRecordBool, } } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index a9b11583..f599cef6 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -12,10 +12,10 @@ flat bordered class="my-sticky-header-table" - :data="serverData" + :rows="serverData" :columns="mycolumns" :filter="myfilter" - v-model:pagination="pagination" + v-model:pagination="mypagination" :row-key="colkey" :loading="loading" @request="onRequest" @@ -137,7 +137,7 @@
- +

{{title}}

diff --git a/src/components/CMyFieldDb/CMyFieldDb.ts b/src/components/CMyFieldDb/CMyFieldDb.ts index 292c5059..4cd30812 100755 --- a/src/components/CMyFieldDb/CMyFieldDb.ts +++ b/src/components/CMyFieldDb/CMyFieldDb.ts @@ -180,18 +180,18 @@ export default defineComponent({ return visuValByType(myvalue.value) } - function savefield(value: any, initialval: any) { + function savefield(value: any, initialval: any, myq: any) { myvalue.value = value - setValDb(props.mykey, myvalue.value, props.type, props.serv, props.table, props.mysubkey, props.id) + setValDb(myq, props.mykey, myvalue.value, props.type, props.serv, props.table, props.mysubkey, props.id) } - function savefieldboolean(value: any) { + function savefieldboolean($q: any, value: any) { if (myvalue.value === undefined) myvalue.value = 'true' else myvalue.value = value - setValDb(props.mykey, myvalue, props.type, props.serv, props.table, props.mysubkey, props.id) + setValDb($q, props.mykey, myvalue, props.type, props.serv, props.table, props.mysubkey, props.id) } function selectcountry({ name, iso2, dialCode }: { name: string, iso2: string, dialCode: string }) { @@ -227,7 +227,7 @@ export default defineComponent({ onInput, tools, costanti, - + myq: $q, } }, }) diff --git a/src/components/CMyFieldDb/CMyFieldDb.vue b/src/components/CMyFieldDb/CMyFieldDb.vue index e9080e14..11354d15 100755 --- a/src/components/CMyFieldDb/CMyFieldDb.vue +++ b/src/components/CMyFieldDb/CMyFieldDb.vue @@ -109,7 +109,7 @@
+ @input="savefieldboolean($q)">
@@ -120,19 +120,20 @@ v-model="myvalue" :disable="col.disable" :title="col.title" - @save="savefield" + @save="(val, initialValue) => savefield(val, initialValue, myq)" buttons + v-slot="scope" >
- +
@@ -141,16 +142,17 @@
@@ -194,6 +196,7 @@ :readonly="true" rounded dense debounce="1000" + @keyup.enter="scope.set" :label="title"> diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index 6e40b390..1cc1fbee 100755 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -1,6 +1,6 @@