ver 1.0.19

This commit is contained in:
Surya Paolo
2023-11-03 12:49:17 +01:00
parent cb11903707
commit a071d17410
28 changed files with 144 additions and 103 deletions

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="15" APP_ID="15"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="15" APP_ID="15"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.17" APP_VERSION="1.0.19"
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14" APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -15,6 +15,7 @@ const baseConfig = {
filename: '[nametranslate].js', filename: '[nametranslate].js',
publicPath: '/', publicPath: '/',
path: path.resolve(__dirname, 'dist'), path: path.resolve(__dirname, 'dist'),
chunkFormat: 'commonjs' // or 'module' as needed
}, },
resolve: { resolve: {
extensions: [ extensions: [

View File

@@ -123,17 +123,18 @@
"crypto": false "crypto": false
}, },
"browserslist": [ "browserslist": [
"last 100 Chrome versions", "last 80 Chrome versions",
"last 40 Firefox versions", "last 40 Firefox versions",
"last 20 Edge versions", "last 10 Edge versions",
"last 55 Safari versions", "last 45 Safari versions",
"last 90 Android versions", "last 80 Android versions",
"last 250 ChromeAndroid versions", "last 120 ChromeAndroid versions",
"last 60 FirefoxAndroid versions", "last 30 FirefoxAndroid versions",
"last 35 iOS versions", "last 20 iOS versions",
"last 10 Opera versions", "last 10 Opera versions",
"> 0.03%", "> 0.03%",
"not dead" "not dead",
"fully supports es6-module"
], ],
"engines": { "engines": {
"node": ">= 16.14.0", "node": ">= 16.14.0",

View File

@@ -192,7 +192,7 @@ export const shared_consts = {
TABLES_WITH_FILTER_FIELD: ['caldate'], TABLES_WITH_FILTER_FIELD: ['caldate'],
TABLES_WITH_SPECIAL_FILTER: ['pub_to_share'], TABLES_WITH_SPECIAL_FILTER: ['pub_to_share'],
COL_WITH_FILTER_GTE: ['numMaxPeopleHosp'], COL_WITH_FILTER_GTE: ['numMaxPeopleHosp'],
TABLES_WITH_DATE: ['mybachecas', 'myhosps'], TABLES_WITH_DATE: ['mybachecas', 'myhosps'], // 'mybachecas'
TABLES_WITH_SORTING: ['mybachecas', 'myhosps'], TABLES_WITH_SORTING: ['mybachecas', 'myhosps'],
TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'], TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps'], TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps'],

View File

@@ -5,7 +5,7 @@
<span> homescreen: {{ homescreen }} </span> <span> homescreen: {{ homescreen }} </span>
</div> </div>
<div v-if="finishLoading" class="row justify-center"> <div v-if="finishLoading" class="row justify-center">
<div v-if="!isAppRunning" class="q-ma-sm"> <div v-if="!isAppRunning">
<!-- App not running --> <!-- App not running -->
<q-btn <q-btn

View File

@@ -143,7 +143,7 @@ export default defineComponent({
if (props.table === toolsext.TABMYBACHECAS) if (props.table === toolsext.TABMYBACHECAS)
return { sortBy: 'dateTimeStart', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 } return { sortBy: 'dateTimeStart', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 }
else if (props.table === toolsext.TABMYGROUPS) else if (props.table === toolsext.TABMYGROUPS)
return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 } return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 }
else if (props.table === toolsext.TABMOVEMENTS) else if (props.table === toolsext.TABMOVEMENTS)
return { sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 20 } return { sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 20 }
else if (props.table === toolsext.TABCIRCUITS) else if (props.table === toolsext.TABCIRCUITS)

View File

@@ -312,6 +312,8 @@ export default defineComponent({
const addRow = ref('Aggiungi') const addRow = ref('Aggiungi')
const actmonth = ref('') const actmonth = ref('')
const drawmonth = ref(true)
const newRecordBool = ref(false) const newRecordBool = ref(false)
const newRecordBoolOld = ref(false) const newRecordBoolOld = ref(false)
@@ -331,6 +333,9 @@ export default defineComponent({
const showSpin = ref(false) const showSpin = ref(false)
const showNotification = ref(false) const showNotification = ref(false)
// const withdate = computed(() => shared_consts.TABLES_WITH_DATE.includes(tablesel.value))
const withdate = ref(false)
const loading = ref(false) const loading = ref(false)
const alreadymounting = ref(false) const alreadymounting = ref(false)
const editOn = computed({ const editOn = computed({
@@ -2274,6 +2279,21 @@ export default defineComponent({
} }
} }
function setShowMonth(row: any, index: number) {
if (actmonth.value !== tools.getstrMonth(row.dateTimeStart)) {
actmonth.value = tools.getstrMonth(row.dateTimeStart)
drawmonth.value = true
} else {
drawmonth.value = false
}
return drawmonth.value
}
function ifShowMonth() {
return drawmonth.value
}
/*function showNotification() { /*function showNotification() {
$router.push('/notifs') $router.push('/notifs')
} */ } */
@@ -2386,6 +2406,9 @@ export default defineComponent({
getNumRecFromQuery, getNumRecFromQuery,
actmonth, actmonth,
alreadymounting, alreadymounting,
withdate,
setShowMonth,
ifShowMonth,
} }
} }
}) })

View File

@@ -385,7 +385,7 @@
</div> </div>
</div> </div>
<div v-for="(row, index) in serverData" :key="index"> <div v-for="(row, indexrow) in serverData" :key="indexrow">
<div <div
v-if=" v-if="
showType === costanti.SHOW_MYCARD || showType === costanti.SHOW_MYCARD ||
@@ -395,19 +395,10 @@
shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel)) shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel))
" "
> >
<div v-if="row && shared_consts.TABLES_WITH_DATE.includes(tablesel)"> <div v-if="row && withdate">
<div <div v-if="setShowMonth(row, indexrow)">
v-if=" <div>
actmonth !== tools.getstrMonth(row.dateTimeStart) || <div v-if="row.dateTimeStart">
!actmonth ||
index === 0
"
>
<span style="display: none">{{
(actmonth = tools.getstrMonth(row.dateTimeStart))
}}</span>
<div class="">
<div>
<strong>{{ tools.getstrMonth(row.dateTimeStart) }}</strong> <strong>{{ tools.getstrMonth(row.dateTimeStart) }}</strong>
</div> </div>
<div> <div>
@@ -415,25 +406,6 @@
</div> </div>
</div> </div>
</div> </div>
<div
v-if="
false &&
((row.dateTimeStart &&
tools.getstrVeryShortDate(row.dateTimeStart) !== actual) ||
index === 0)
"
class="actualdate"
>
<span style="display: none">{{
(actual = tools.getstrVeryShortDate(row.dateTimeStart))
}}</span>
<q-chip
class="text-center shadow-5 glossy bg-orange"
icon="fas fa-calendar-day"
>{{ tools.getstrDateLong(row.dateTimeStart) }}</q-chip
>
</div>
</div> </div>
<CMyRecGrpCard <CMyRecGrpCard
@@ -1126,7 +1098,7 @@
</template> </template>
</q-table> </q-table>
<q-page-sticky <!--<q-page-sticky
v-if="mytable && butt_modif_new && !hidetitleIfEmpty" v-if="mytable && butt_modif_new && !hidetitleIfEmpty"
position="bottom-right" position="bottom-right"
:offset="[18, 68]" :offset="[18, 68]"
@@ -1139,7 +1111,7 @@
color="primary" color="primary"
@click="createNewRecordDialog" @click="createNewRecordDialog"
/> />
</q-page-sticky> </q-page-sticky>-->
<q-dialog <q-dialog
v-model="visupagedialog" v-model="visupagedialog"

View File

@@ -14,7 +14,7 @@ import { useI18n } from '@/boot/i18n'
import { toolsext } from '@store/Modules/toolsext' import { toolsext } from '@store/Modules/toolsext'
import { useQuasar } from 'quasar' import { useQuasar } from 'quasar'
import { costanti } from '@costanti' import { costanti } from '@costanti'
import { IColGridTable, IImgGallery, IUserFields } from 'model' import { IColGridTable, ICircuit, IImgGallery, IUserFields } from 'model'
import { shared_consts } from '@/common/shared_vuejs' import { shared_consts } from '@/common/shared_vuejs'
import { colCitys, fieldsTable } from '@store/Modules/fieldsTable' import { colCitys, fieldsTable } from '@store/Modules/fieldsTable'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
@@ -52,7 +52,7 @@ export default defineComponent({
const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '') const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
const myrec = ref({}) const myrec = ref(<ICircuit | undefined>{})
const col = ref(<IColGridTable>{}) const col = ref(<IColGridTable>{})
function profile() { function profile() {

View File

@@ -22,7 +22,7 @@
<q-img <q-img
v-if="tools.getValue(myrec, 'photos', '')" v-if="tools.getValue(myrec, 'photos', '')"
:src="tools.getFullFileName(tools.getValue(myrec, 'photos', ''), table, myrec.username, myrec.path)" :src="tools.getFullFileName(tools.getValue(myrec, 'photos', ''), table, userStore.my.username, myrec.path)"
class="img" class="img"
alt="immagine del circuito"></q-img> alt="immagine del circuito"></q-img>
</div> </div>
@@ -59,7 +59,7 @@
{{ tools.getValue(myrec, mycol.field, mycol.subfield) }} {{ tools.getValue(myrec, mycol.field, mycol.subfield) }}
</div> </div>
</div> </div>
<div v-else-if="mycol.name === 'photos' && myrec.photos.length <= 1"> <div v-else-if="mycol.name === 'photos' && myrec.photos && myrec.photos.length <= 1">
</div> </div>
<div v-else-if="mycol.name === 'admins'"> <div v-else-if="mycol.name === 'admins'">
<CMyFieldRec <CMyFieldRec

View File

@@ -20,9 +20,9 @@ import { useI18n } from '@/boot/i18n'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { useCircuitStore } from '@store/CircuitStore' import { useCircuitStore } from '@store/CircuitStore'
const STEP_NAME_SURNAME = 2 const STEP_CIRCUIT = 2
const STEP_FOTO = 5 const STEP_NAME_SURNAME = 20
const STEP_CIRCUIT = 3 const STEP_FOTO = 50
export default defineComponent({ export default defineComponent({
name: 'CMyProfileTutorial', name: 'CMyProfileTutorial',
@@ -55,6 +55,7 @@ export default defineComponent({
const showAccountInfo = ref(false) const showAccountInfo = ref(false)
const step = ref(1) const step = ref(1)
const nascondiavviso = ref(false)
const username = ref('') const username = ref('')
const showsendCoinTo = ref(false) const showsendCoinTo = ref(false)
@@ -62,7 +63,6 @@ export default defineComponent({
const contact = ref(<IUserFields | null>null) const contact = ref(<IUserFields | null>null)
const filtroutente = ref(<any[]>[]) const filtroutente = ref(<any[]>[])
const stepTut = computed(() => userStore.my.profile.stepTutorial) const stepTut = computed(() => userStore.my.profile.stepTutorial)
@@ -134,7 +134,7 @@ export default defineComponent({
icon: 'house', icon: 'house',
required: true, required: true,
}, },
{ /*{
step: STEP_NAME_SURNAME, // 2 step: STEP_NAME_SURNAME, // 2
title: t('tutorial.step_nomecognome_title'), title: t('tutorial.step_nomecognome_title'),
extratitle: function () { return ': ' + (contact.value ? tools.getNomeUtenteEUsernameByRecUser(contact.value) : '') }, extratitle: function () { return ': ' + (contact.value ? tools.getNomeUtenteEUsernameByRecUser(contact.value) : '') },
@@ -143,7 +143,7 @@ export default defineComponent({
checkOkReal: function () { return ((contact.value ? !!contact.value.name : false)) }, checkOkReal: function () { return ((contact.value ? !!contact.value.name : false)) },
icon: 'user', icon: 'user',
required: false, required: false,
}, },*/
{ {
step: STEP_CIRCUIT, step: STEP_CIRCUIT,
title: t('tutorial.step_circuito_title'), title: t('tutorial.step_circuito_title'),
@@ -167,8 +167,8 @@ export default defineComponent({
icon: 'img: images/1ris_rosso_100.png', icon: 'img: images/1ris_rosso_100.png',
required: false, required: false,
}, },
{ /*{
step: 4, step: 3,
title: t('tutorial.step_beniservizi_title'), title: t('tutorial.step_beniservizi_title'),
extratitle: function () { return ': (' + userStore.my.profile.calc.numGoodsAndServices + ')' }, extratitle: function () { return ': (' + userStore.my.profile.calc.numGoodsAndServices + ')' },
label: t('tutorial.step_beniservizi'), label: t('tutorial.step_beniservizi'),
@@ -178,21 +178,21 @@ export default defineComponent({
checkOkReal: function () { return this.checkOk() }, checkOkReal: function () { return this.checkOk() },
icon: 'fas fa-tshirt', icon: 'fas fa-tshirt',
required: false, required: false,
}, },*/
{ /*{
step: STEP_FOTO, step: STEP_FOTO,
title: t('tutorial.step_foto_title'), title: t('tutorial.step_profilo_title'),
extratitle: function () { return ': (' + (userStore.my.profile.img ? t('dialog.yes') : t('dialog.no')) + ')' }, extratitle: function () { return ': (' + (userStore.my.profile.img ? t('dialog.yes') : t('dialog.no')) + ')' },
label: t('tutorial.step_foto'), label: t('tutorial.step_profilo'),
checkOk: function () { checkOk: function () {
return !!userStore.my.profile.img return !!userStore.my.profile.img
}, },
checkOkReal: function () { return this.checkOk() }, checkOkReal: function () { return this.checkOk() },
icon: 'fas fa-tshirt', icon: 'fas fa-tshirt',
required: false, required: false,
}, },*/
{ {
step: 6, step: 3,
title: t('tutorial.step_fine_title'), title: t('tutorial.step_fine_title'),
extratitle: function () { return '' }, extratitle: function () { return '' },
label: t('tutorial.step_fine'), label: t('tutorial.step_fine'),
@@ -382,7 +382,7 @@ export default defineComponent({
} }
function getColorDone(step: number) { function getColorDone(step: number) {
return arrStep[step - 1].checkOkReal() ? 'positive' : 'negative' return arrStep[step].checkOkReal() ? 'positive' : 'negative'
} }
onMounted(mounted) onMounted(mounted)
@@ -419,6 +419,7 @@ export default defineComponent({
isSalta, isSalta,
askToConfirmSkip, askToConfirmSkip,
getColorDone, getColorDone,
nascondiavviso,
} }
}, },
}) })

View File

@@ -1,14 +1,20 @@
<template> <template>
<div v-if="contact"> <div v-if="contact">
<div class="row items-center"> <div class="row items-center">
<div :class="step >= numstep ? 'col-10' : 'col-12'"> <div v-if="progressStep !== 1"
:class="step >= numstep ? 'col-10' : 'col-12'">
<CTitleBanner <CTitleBanner
class="q-pa-none" class="q-pa-none"
:title=" :title="
(!progressStep !progressStep
? $t('tutorial.title', {step, numstep}) + ` (` + progressLabel + `)` ? $t('tutorial.title', { step, numstep }) +
: $t('tutorial.title_completed', {step, numstep}) + ` (` + progressLabel + `)`) ` (` +
progressLabel +
`)`
: $t('tutorial.title_completed', { step, numstep }) +
` (` +
progressLabel +
`)`
" "
:bgcolor="getColorTutorial()" :bgcolor="getColorTutorial()"
clcolor="text-white" clcolor="text-white"
@@ -17,7 +23,7 @@
> >
<q-slide-transition> <q-slide-transition>
<div v-show="step < numstep"> <div v-show="step < numstep">
<div class="q-my-sm"> <!--<div class="q-my-sm">
<q-linear-progress <q-linear-progress
stripe stripe
size="25px" size="25px"
@@ -35,11 +41,12 @@
</div> </div>
</q-linear-progress> </q-linear-progress>
</div> </div>
<CMyUserOnlyView -->
<!--<CMyUserOnlyView
:mycontact="contact" :mycontact="contact"
:visu="costanti.FIND_PEOPLE" :visu="costanti.FIND_PEOPLE"
> >
</CMyUserOnlyView> </CMyUserOnlyView>-->
<div class=""> <div class="">
<q-stepper <q-stepper
@@ -57,7 +64,7 @@
:title="recstep.title + recstep.extratitle()" :title="recstep.title + recstep.extratitle()"
:icon="recstep.icon" :icon="recstep.icon"
:done="recstep.checkOk()" :done="recstep.checkOk()"
:done-color="getColorDone(recstep.step)" :done-color="getColorDone(index)"
> >
<div v-html="recstep.label"></div> <div v-html="recstep.label"></div>
<br /> <br />
@@ -76,7 +83,7 @@
> >
</CMySelectCity> </CMySelectCity>
</q-banner> </q-banner>
<div v-else-if="step === 2"> <div v-else-if="step === 101">
<q-banner> <q-banner>
<div class="myrow"> <div class="myrow">
<CMyFieldDb <CMyFieldDb
@@ -100,7 +107,7 @@
</div> </div>
</q-banner> </q-banner>
</div> </div>
<div v-else-if="step === 3" class=""> <div v-else-if="step === 2" class="">
<CMyCircuit <CMyCircuit
:mycircuit="mycircuit" :mycircuit="mycircuit"
:visu="costanti.ENTER_TO_THE_CIRCUIT" :visu="costanti.ENTER_TO_THE_CIRCUIT"
@@ -108,7 +115,8 @@
> >
</CMyCircuit> </CMyCircuit>
</div> </div>
<div v-else-if="step === 4" class=""> <div v-else-if="step === 300" class="">
<!--
<div <div
v-for="(card, ind) of mycards" v-for="(card, ind) of mycards"
:key="ind" :key="ind"
@@ -117,6 +125,7 @@
<q-card class="q-my-md"> <q-card class="q-my-md">
<div> <div>
<CSkill <CSkill
v-if="false"
:table="card.table" :table="card.table"
:filtercustom="filtroutente" :filtercustom="filtroutente"
:butt_modif_new="true" :butt_modif_new="true"
@@ -127,20 +136,21 @@
</div> </div>
</q-card> </q-card>
</div> </div>
-->
</div> </div>
<div v-else-if="step === 5" class="">
<div v-else-if="step === 105" class="">
<div class="myrow"> <div class="myrow">
<CMyFieldDb <!--<CMyFieldDb
:title="$t('reg.photo')" :title="$t('reg.photo')"
table="users" table="users"
mykey="profile" mykey="profile"
mysubkey="img" mysubkey="img"
:type="costanti.FieldType.image" :type="costanti.FieldType.image"
> >
</CMyFieldDb> </CMyFieldDb>-->
</div> </div>
{{ $t('tutorial.step_altri_in_profilo') }}
<q-btn <q-btn
glossy glossy
label="Modifica Profilo" label="Modifica Profilo"
@@ -150,7 +160,6 @@
/> />
</div> </div>
<div v-else-if="step === 6" class=""></div>
<div <div
v-if="recstep.checkOkReal() && recstep.label_ok" v-if="recstep.checkOkReal() && recstep.label_ok"
class="clBorderService" class="clBorderService"
@@ -168,16 +177,20 @@
<q-btn <q-btn
:flat="isSalta()" :flat="isSalta()"
:disabled="isNextDisable()" :disabled="isNextDisable()"
@click="(step === STEP_CIRCUIT && isSalta()) ? askToConfirmSkip() : @click="
(step === numstep step === STEP_CIRCUIT && isSalta()
? askToConfirmSkip()
: step === numstep
? clickFinish() ? clickFinish()
: $refs.stepper.next()) : $refs.stepper.next()
" "
:color="isSalta() ? 'negative' : 'primary'" :color="isSalta() ? 'negative' : 'primary'"
:label=" :label="
step === numstep step === numstep
? $t('dialog.finish') ? $t('dialog.finish')
: (isSalta() ? $t('dialog.salta'): $t('dialog.avanti')) : isSalta()
? $t('dialog.salta')
: $t('dialog.avanti')
" "
/> />
</q-stepper-navigation> </q-stepper-navigation>
@@ -189,7 +202,7 @@
</CTitleBanner> </CTitleBanner>
</div> </div>
<q-btn <q-btn
v-if="step >= numstep" v-if="(step >= numstep) && progressStep !== 1"
:class="`col-2 ` + getColorTutorial()" :class="`col-2 ` + getColorTutorial()"
icon="fas fa-arrow-right" icon="fas fa-arrow-right"
color="text-white" color="text-white"
@@ -199,6 +212,17 @@
@click="step = 1" @click="step = 1"
> >
</q-btn> </q-btn>
<q-banner
inline-actions
class="bg-red text-white"
v-if="userStore.my.profile.calc.numGoodsAndServices <= 0 && !nascondiavviso"
>
<span v-html="$t('tutorial.step_beniservizi')"></span>
<template v-slot:action>
<q-btn flat color="white" label="Chiudi" @click="nascondiavviso = true" />
</template>
</q-banner>
</div> </div>
</div> </div>
<q-dialog v-model="showAccountInfo" full-height full-width> <q-dialog v-model="showAccountInfo" full-height full-width>

View File

@@ -1,4 +1,4 @@
import { defineComponent, onMounted, PropType, ref, watch } from 'vue' import { defineComponent, onMounted, PropType, ref, watch, computed } from 'vue'
import { useUserStore } from '@store/UserStore' import { useUserStore } from '@store/UserStore'
import { IImgGallery, IUserFields, IUserProfile } from 'model' import { IImgGallery, IUserFields, IUserProfile } from 'model'
import { costanti } from '@costanti' import { costanti } from '@costanti'
@@ -49,6 +49,9 @@ export default defineComponent({
const myrec = ref(<any>null) const myrec = ref(<any>null)
const visupage = ref(false) const visupage = ref(false)
const disabilita = computed(() => {
return props.table === shared_consts.TABLES_MYBACHECAS
})
watch(() => props.prop_myrec, (newval, oldval) => { watch(() => props.prop_myrec, (newval, oldval) => {
@@ -125,6 +128,7 @@ export default defineComponent({
getNameToShow, getNameToShow,
isPartecipero, isPartecipero,
calendarStore, calendarStore,
disabilita,
} }
}, },
}) })

View File

@@ -334,6 +334,7 @@ export default defineComponent({
} }
console.log('signup.aportador_solidario', signup.aportador_solidario) console.log('signup.aportador_solidario', signup.aportador_solidario)
console.log('getasktoverify', tools.getAskToVerifyReg())
if (tools.getAskToVerifyReg()) { if (tools.getAskToVerifyReg()) {

View File

@@ -212,6 +212,7 @@ export interface IUserFields {
made_gift?: boolean made_gift?: boolean
tokens?: IToken[] tokens?: IToken[]
date_reg?: Date
lasttimeonline?: Date lasttimeonline?: Date
profile: IUserProfile profile: IUserProfile
qualified?: boolean qualified?: boolean

View File

@@ -1516,9 +1516,11 @@ const msg_it = {
step_circuito: 'Entra nel Circuito del tuo territorio. Potrai così utilizzare il tuo conto personale in RIS, per scambiare Beni, Servizi, ecc.', step_circuito: 'Entra nel Circuito del tuo territorio. Potrai così utilizzare il tuo conto personale in RIS, per scambiare Beni, Servizi, ecc.',
step_circuito_ok: 'Ottimo! Sei entrato nel Circuito del tuo territorio. Puoi così utilizzare il tuo conto personale in RIS, per scambiare Beni, Servizi, ecc.', step_circuito_ok: 'Ottimo! Sei entrato nel Circuito del tuo territorio. Puoi così utilizzare il tuo conto personale in RIS, per scambiare Beni, Servizi, ecc.',
step_beniservizi_title: 'I Tuoi Annunci', step_beniservizi_title: 'I Tuoi Annunci',
step_beniservizi: 'Per poter usufruire dei Beni, Servizi ed Ospitalità, è necessario che ogni partecipante si rende disponibile per offrire almeno una di queste cose, aggiungendole alla App.', step_beniservizi: 'Ricordati di aggiungere cosa tu Offri: Tra <strong>Beni, Servizi e/o Ospitalità</strong>',
step_foto_title: 'Foto Profilo', step_foto_title: 'Foto Profilo',
step_foto: 'Se vuoi puoi inserire una foto o un\'immagine che ti rappresenta.', step_foto: 'Se vuoi puoi inserire una foto o un\'immagine che ti rappresenta.',
step_profilo_title: 'Profilo',
step_profilo: 'Aggiorna il tuo Profilo (foto)',
step_altri_in_profilo: 'Per vedere e modificare tutte le altre informazioni di Profilo:', step_altri_in_profilo: 'Per vedere e modificare tutte le altre informazioni di Profilo:',
step_fine_title: 'Fine', step_fine_title: 'Fine',
step_fine: 'Hai completato l\'aggiornamento del tuo Profilo. Ricorda che potrai modificarlo, cliccando sulla prima icona in alto a destra 🙎🏻‍♂️ .', step_fine: 'Hai completato l\'aggiornamento del tuo Profilo. Ricorda che potrai modificarlo, cliccando sulla prima icona in alto a destra 🙎🏻‍♂️ .',

View File

@@ -224,8 +224,8 @@ export const costanti = {
small: true, small: true,
table: '', table: '',
}, },
{ /*{
visible: true, visible: false,
title: 'Sostieni il Progetto', title: 'Sostieni il Progetto',
to: '/fundraising', to: '/fundraising',
icon: 'fas fa-hand-holding-heart', icon: 'fas fa-hand-holding-heart',
@@ -237,7 +237,7 @@ export const costanti = {
table: '', table: '',
}, },
{ {
visible: true, visible: false,
title: 'Assistenza', title: 'Assistenza',
to: '/istruzioni', to: '/istruzioni',
icon: 'fas fa-question', icon: 'fas fa-question',
@@ -247,7 +247,7 @@ export const costanti = {
small: true, small: true,
link: true, link: true,
table: '', table: '',
}, },*/
{ {
visible: false, visible: false,
title: 'Social', title: 'Social',

View File

@@ -250,7 +250,6 @@ export const useUserStore = defineStore('UserStore', {
actions: { actions: {
getMypaginationMembers(): any { getMypaginationMembers(): any {
return { sortBy: 'namecomplete', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 15 } return { sortBy: 'namecomplete', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 15 }
}, },
@@ -1898,5 +1897,17 @@ export const useUserStore = defineStore('UserStore', {
}, },
isDateRegOld() {
try {
const dateold = tools.addDays(tools.getDateNow(), -(30 * 6))
if (this.my)
return this.my.date_reg! && new Date(this.my.date_reg).getTime() < dateold.getTime()
else
return true
} catch (e) {
return false
}
},
}, },
}) })

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB