- fix scelta provincia (il bottone Avanti non veniva disabilitato).

- Se non scelgo la provincia, non deve farmi vedere la App...
This commit is contained in:
Surya Paolo
2024-03-28 20:26:21 +01:00
parent 6856c4cc8e
commit aa29a7fa46
80 changed files with 10777451 additions and 178 deletions

View File

@@ -1,6 +1,7 @@
<template>
<div class="q-ma-xs">
<div
v-if="tools.visualizzaHomeApp()"
class="row q-my-xs shadow"
style="border-radius: 4px; border: 1px solid rgba(0, 0, 0, 0.12)"
>
@@ -38,7 +39,10 @@
:key="index"
>
<q-card class="no-shadow q-pa-xs">
<q-item class="q-pb-none q-pt-xs cursor-pointer" :to="tools.updateLink(rec.to)">
<q-item
class="q-pb-none q-pt-xs cursor-pointer"
:to="tools.updateLink(rec.to)"
>
<q-item-section>
<q-item-label
:class="
@@ -49,20 +53,29 @@
>
{{ rec.title }}
</q-item-label>
<q-item-label lines="3" no-wrap
<q-item-label
lines="3"
no-wrap
v-if="rec.subtitle"
:class="
(!$q.dark.isActive ? 'text-grey-8' : 'text-white') +
` title_view_subtitle`
"
>
<span v-html="rec.subtitle"></span>
</q-item-label>
</q-item-section>
<q-item-section side class="small_side" style="right: 4px; position: absolute; ">
<q-img v-if="rec.image" :src="rec.image" style="width: 27px;"></q-img>
<q-item-section
side
class="small_side"
style="right: 4px; position: absolute"
>
<q-img
v-if="rec.image"
:src="rec.image"
style="width: 27px"
></q-img>
<q-icon
v-else
:name="rec.icon"
@@ -85,9 +98,7 @@
</div>
</div>
<div
class="row shadow"
>
<div class="row shadow">
<div
v-for="(rec, index) of visulinks"
:class="`col-md-3 col-lg-3 col-sm-6 col-xs-6 text-` + rec.color"
@@ -95,9 +106,13 @@
:key="index"
>
<q-card class="no-shadow q-pa-xxs">
<q-item class="q-pb-none q-pt-xs cursor-pointer" :to="tools.updateLink(rec.to)">
<q-item
class="q-pb-none q-pt-xs cursor-pointer"
:to="tools.updateLink(rec.to)"
>
<q-item-section>
<q-item-label lines="3"
<q-item-label
lines="3"
:class="
(!$q.dark.isActive ? 'text-grey-9' : 'text-white') +
` title_view_small_shadow`
@@ -119,7 +134,11 @@
</q-item-section>
<q-item-section side>
<q-img v-if="rec.image" :src="rec.image" style="width: 35px"></q-img>
<q-img
v-if="rec.image"
:src="rec.image"
style="width: 35px"
></q-img>
<q-icon
v-else
:name="rec.icon"

View File

@@ -324,6 +324,13 @@ export default defineComponent({
return ''
}
function getrealdirectory() {
if (props.directory == 'productinfos')
return 'products'
else
return props.directory
}
function getsrcimg(gallerylistery: any) {
if (!gallerylistery.imagefile) {
@@ -332,15 +339,21 @@ export default defineComponent({
if (gallerylistery) {
if (tools.getextfile(gallerylistery.imagefile) === 'pdf')
return 'images/images/pdf.jpg'
else
return costanti.DIR_UPLOAD + props.directory + '/' + gallerylistery.imagefile
else {
if (tools.contieneSlash(gallerylistery.imagefile)) {
return gallerylistery.imagefile
} else {
return costanti.DIR_UPLOAD + getrealdirectory() + '/' + gallerylistery.imagefile
}
}
} else {
return 'images/noimg.png';
}
}
function getParamDir() {
return tools.escapeslash(props.directory)
return tools.escapeslash(getrealdirectory())
}
function getUrl() {
@@ -393,6 +406,7 @@ export default defineComponent({
onRejected,
isListImgValid,
costanti,
getrealdirectory,
}
}
})

View File

@@ -5,6 +5,7 @@
<div class="q-pa-xs">
<q-card v-if="isListImgValid" :class="getclass()" @click="apri">
<div v-for="(mygallery, index) in getlistimages()" :key="index">
<div v-if="index === 0">
<q-img
@@ -51,6 +52,7 @@
</div>
<div v-else>
<div class=" row">
<!--<q-draggable-rows
v-model="order">-->

View File

@@ -1,3 +1,9 @@
.map-container {
height: 400px;
}
.button-text {
font-size: 14px;
color: black;
cursor: pointer;
}

File diff suppressed because one or more lines are too long

View File

@@ -1,18 +1,10 @@
<template>
<div>
comuniData: {{comuniData}}
<div
v-if="arrprovince"
id="map"
:style="`height:${myheight()}px; width:99%`"
>
<l-map :zoom="zoom" :center="center">
<l-tile-layer :url="url"></l-tile-layer>
<l-geo-json
:geojson="comuniData"
:options="{ style: styleFunction }"
></l-geo-json>
</l-map>
<div v-if="visumappa">
<div v-if="initialMap">
center: {{ center }} zoom: {{ zoom }}
</div>
<div id="map" :style="`height:${myheight()}px; width:99%`">
</div>
</div>
</template>

View File

@@ -143,7 +143,7 @@
!userStore.IsMyCircuitByName(circuit.name) &&
!userStore.IsAskedCircuitByName(circuit.name) &&
!userStore.IsRefusedCircuitByName(circuit.name)
"
"
color="positive"
:label="$t('circuit.apri')"
@click="
@@ -380,6 +380,7 @@
icon="fas fa-user-plus"
color="primary"
:label="$t('circuit.ask')"
rounded
@click="
requestToEnterCircuit = true;
groupnameSel = null;

View File

@@ -133,7 +133,7 @@ export default defineComponent({
title: t('tutorial.step_residence_title'),
extratitle: function () { return ': ' + contact.value!.profile.resid_province },
label: t('tutorial.step_residence'),
checkOk: function (): boolean { return contact.value ? !!contact.value.profile.resid_province : false },
checkOk: function (): boolean { return contact.value ? contact.value.profile.resid_province !== '' : false },
checkOkReal: function (): boolean { return this.checkOk() },
icon: 'house',
required: true,
@@ -407,9 +407,20 @@ export default defineComponent({
}
function isNextDisable() {
function getindstepByStep(step: number) {
for (let indstep = 0; indstep < arrStep.value.length; indstep++) {
if (arrStep.value[indstep].step === step)
return indstep
}
return -1
}
function isNextDisable(step: number) {
try {
return arrStep.value[indstep.value - 1].required && !arrStep.value[indstep.value - 1].checkOk()
const indstep = getindstepByStep(step)
if (indstep >= 0)
return arrStep.value[indstep].required && !arrStep.value[indstep].checkOk()
return false
} catch (e) {
return false
}

View File

@@ -224,7 +224,7 @@
/>
<q-btn
:flat="isSalta(recstep.step)"
:disabled="isNextDisable()"
:disabled="isNextDisable(recstep.step)"
@click="
isSalta(recstep.step)
? askToConfirmSkip(recstep.step)
@@ -289,6 +289,7 @@
class="bg-red text-white"
v-if="
userStore.my.profile.calc.numGoodsAndServices <= 0 && !nascondiavviso
&& tools.visualizzaHomeApp()
"
>
<span v-html="$t('tutorial.step_beniservizi')"></span>

View File

@@ -1,5 +1,8 @@
<template>
<div class="row text-center justify-evenly items-center">
<div
v-if="tools.visualizzaHomeApp()"
class="row text-center justify-evenly items-center"
>
<div class="q-mb-sm">
<q-btn
icon="fas fa-download"

View File

@@ -18,9 +18,21 @@
>Sei in attesa di essere abilitato da
{{ tools.getAportadorSolidario() }}.<br>
Ti arriverà una notifica sulla Chat Telegram <strong>'BOT RISO'</strong>.<br /><br />
Se non dovesse arrivarti entro qualche ora, contattalo per ricordarglielo.<br />
</div>
<q-btn
rounded
class="q-ma-sm"
color="positive"
@click="tools.refreshPage()"
icon="refresh"
label="Aggiorna la Pagina"
>
</q-btn>
<br>
<q-btn
rounded
class="q-ma-sm"