- corretto img profilo

- corretto coordinata non obbligatoria
This commit is contained in:
Surya Paolo
2024-09-17 18:50:05 +02:00
parent b9a5c54071
commit d4e0f2cf1a
44 changed files with 155 additions and 96 deletions

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="19"
DIRECTORY_LOCAL="newfreeplanet"

View File

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

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="19"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,5 +1,5 @@
APP_VERSION="1.0.60"
SERVICE_WORKER_FILE="service-worker_1.0.60.js"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker_1.0.61.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=/var/www/nodejs_test.riso_server

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="19"
DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -1,6 +1,6 @@
{
"name": "abitaregliiblei",
"version": "1.0.60",
"version": "1.0.61",
"description": "Abitare Gli Iblei",
"productName": "AbitareGliIblei",
"author": "Paolo Arena",

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
{
"name": "fioredellavita",
"version": "1.0.60",
"version": "1.0.61",
"description": "Fiore Della Vita",
"productName": "Fiore Della Vita",
"author": "Paolo Arena",

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="16"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,6 +1,6 @@
{
"name": "gruppomacro",
"version": "1.0.60",
"version": "1.0.61",
"description": "GruppoMacro",
"productName": "Gruppo Macro",
"author": "Paolo Arena",

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL="newfreeplanet"

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.60"
APP_VERSION="1.0.61"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="16"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,6 +1,6 @@
{
"name": "riso",
"version": "1.0.60",
"version": "1.0.61",
"description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.",
"productName": "Riso",
"author": "Paolo Arena",

View File

@@ -1,6 +1,6 @@
{
"name": "abitaregliiblei",
"version": "1.0.60",
"version": "1.0.61",
"description": "Abitare Gli Iblei",
"productName": "AbitareGliIblei",
"author": "Paolo Arena",

View File

@@ -34,7 +34,7 @@ self.addEventListener('activate', (event) => {
});
const VersioneApp = "1.0.60";
const VersioneApp = "1.0.61";
console.log(' [ VER-' + VersioneApp + ' ] _---------________------ PAO: this is my custom service worker');

View File

@@ -1448,8 +1448,8 @@ export default defineComponent({
}
function showandsel(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsel CGridTable', row, col, newval)
function showandsave(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsave CGridTable', row, col, newval)
rowsel.value = row
colsel.value = col
idsel = row._id
@@ -2542,7 +2542,7 @@ export default defineComponent({
return {
selItem,
SaveValdb,
showandsel,
showandsave,
annulla,
SaveValue,
updatedcol,

View File

@@ -549,7 +549,7 @@
minuteinterval="1"
@save="SaveValue"
@show="selItem(row, col)"
@showandsave="showandsel"
@showandsave="showandsave"
>
</CMyPopupEdit>
</div>
@@ -953,7 +953,7 @@
minuteinterval="1"
@save="SaveValue"
@show="selItem(props.row, col)"
@showandsave="showandsel"
@showandsave="showandsave"
>
</CMyPopupEdit>
</div>
@@ -1103,7 +1103,7 @@
minuteinterval="1"
@save="SaveValue"
@show="selItem(props.row, col)"
@showandsave="showandsel"
@showandsave="showandsave"
>
</CMyPopupEdit>
</div>
@@ -1296,7 +1296,7 @@
:subfield="mycol.subfield"
@save="SaveValdb"
@show="selItem(rowclicksel, mycol)"
@showandsave="showandsel"
@showandsave="showandsave"
@annulla="annulla"
@update_col="update_col"
>
@@ -1356,7 +1356,7 @@
:insertMode="true"
@save="SaveValue"
@show="selItem(newRecord, col)"
@showandsave="showandsel"
@showandsave="showandsave"
@update_col="update_col"
>
</CMyPopupEdit>
@@ -1431,7 +1431,7 @@
:insertMode="true"
@save="SaveValue"
@show="selItem(newRecord, col)"
@showandsave="showandsel"
@showandsave="showandsave"
>
</CMyPopupEdit>
</div>
@@ -1495,7 +1495,7 @@
minuteinterval="1"
@save="SaveValue"
@show="selItem(recModif, col, true)"
@showandsave="showandsel"
@showandsave="showandsave"
@update_col="update_col"
>
</CMyPopupEdit>

View File

@@ -1317,8 +1317,8 @@ export default defineComponent({
}
function showandsel(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsel CGridTable', row, col, newval)
function showandsave(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsave CGridTable', row, col, newval)
rowsel.value = row
colsel.value = col
idsel = row._id
@@ -2262,7 +2262,7 @@ export default defineComponent({
return {
selItem,
SaveValdb,
showandsel,
showandsave,
annulla,
SaveValue,
updatedcol,

View File

@@ -198,7 +198,7 @@
minuteinterval="1"
@save="SaveValue"
@show="selItem(row, col)"
@showandsave="showandsel"
@showandsave="showandsave"
>
</CMyPopupEdit>
</div>
@@ -276,7 +276,7 @@
:subfield="mycol.subfield"
@save="SaveValdb"
@show="selItem(rowclicksel, mycol)"
@showandsave="showandsel"
@showandsave="showandsave"
@annulla="annulla"
@update_col="update_col"
>
@@ -336,7 +336,7 @@
:insertMode="true"
@save="SaveValue"
@show="selItem(newRecord, col)"
@showandsave="showandsel"
@showandsave="showandsave"
@update_col="update_col"
>
</CMyPopupEdit>
@@ -411,7 +411,7 @@
:insertMode="true"
@save="SaveValue"
@show="selItem(newRecord, col)"
@showandsave="showandsel"
@showandsave="showandsave"
>
</CMyPopupEdit>
</div>
@@ -475,7 +475,7 @@
minuteinterval="1"
@save="SaveValue"
@show="selItem(recModif, col, true)"
@showandsave="showandsel"
@showandsave="showandsave"
@update_col="update_col"
>
</CMyPopupEdit>

View File

@@ -652,7 +652,13 @@
}}</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-if="myrec.coordinate_gps">
<q-item
clickable
v-if="
myrec.coordinate_gps.address ||
myrec.coordinate_gps.coordinates
"
>
<q-item-section avatar>
<q-icon color="blue" name="fas fa-crosshairs" />
</q-item-section>
@@ -669,6 +675,7 @@
</div>
<q-btn
:label="t('attivita.vediinmappa')"
v-if="myrec.coordinate_gps.coordinates"
color="primary"
icon="fas fa-map-marker-alt"
size="md"

View File

@@ -147,8 +147,8 @@ export default defineComponent({
const { setValDb, getValDb } = MixinBase()
function showandsel(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsel CMyFieldDb:', newval)
function showandsave(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsave CMyFieldDb:', newval)
console.log('subkey', props.mysubkey, 'sskey', props.mysubsubkey)
tools.saveInDBForTypes($q, props.mykey, newval, props.type, props.serv, props.table, props.mysubkey, props.id, props.indrec, props.mysubsubkey, props.specialField);
@@ -172,13 +172,13 @@ export default defineComponent({
}
function mounted() {
// console.log('CMYFIELDDB: Tab = ', props.table, 'subkey=', props.mysubkey, 'key=', props.mykey, 'mycolProp', props.mycol)
if (props.rec) {
row.value = props.rec
}
if (props.mycol && props.mycol.name !== '') {
col.value = props.mycol
} else {
// console.log('Tab = ', props.table, 'key=', props.mykey, 'mycolProp', props.mycol)
col.value = fieldsTable.getColByTable(props.table, props.mykey)
}
@@ -194,7 +194,7 @@ export default defineComponent({
globalStore,
col,
row,
showandsel,
showandsave,
withBorder,
save,
}

View File

@@ -1,27 +1,40 @@
<template>
<div class="text-center">
<div class="row items-center justify-center q-gutter-md q-ma-xs">
<div v-if="title" class="q-ma-xs">
<q-field rounded outlined :bg-color="($q.dark.isActive ? '' : 'blue-4')" dense style="min-width:110px;">
<q-field
rounded
outlined
:bg-color="$q.dark.isActive ? '' : 'blue-4'"
dense
style="min-width: 110px"
>
<template v-slot:control>
<div class="centermydiv">
<div v-if="myimg" class="text-center">
<q-img
:src="myimg"
class="text-center"
style="height: 50px; width: 50px;"
:alt="title">
style="height: 50px; width: 50px"
:alt="title"
>
</q-img>
</div>
<div class="self-center full-width no-outline text-center" tabindex="0">{{ title }}</div>
<div
class="self-center full-width no-outline text-center"
tabindex="0"
>
{{ title }}
</div>
</div>
</template>
</q-field>
</div>
<div :class="` q-ma-sm q-pa-sm col-grow popupedit `" :style="withBorder() ? `` : ``">
<div
:class="` q-ma-sm q-pa-sm col-grow popupedit `"
:style="withBorder() ? `` : ``"
>
<CMyPopupEdit
debounce="1000"
:fielddb="true"
@@ -51,11 +64,10 @@
:pickup="pickup"
v-model:row="row"
minuteinterval="1"
@showandsave="showandsel"
@showandsave="showandsave"
@save="save"
:notAllowAtChar="notAllowAtChar"
>
</CMyPopupEdit>
</div>
</div>

View File

@@ -177,8 +177,8 @@ export default defineComponent({
}
function showandsel(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsel CMyFieldDb', row, col, newval)
function showandsave(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsave CMyFieldDb', row, col, newval)
emit('save', props.rec, newval)
if (props.nosaveToDb)
@@ -246,7 +246,7 @@ export default defineComponent({
recordCol,
pickup,
jointable,
showandsel,
showandsave,
mykey,
mysubkey,
mysubsubkey,

View File

@@ -1,25 +1,45 @@
<template>
<div v-if="visuElem()" :class="mytitle ? `row items-center justify-center q-ma-xs text-center` : ``">
<div
v-if="visuElem()"
:class="
mytitle ? `row items-center justify-center q-ma-xs text-center` : ``
"
>
<div v-if="mytitle" class="q-ma-xs">
<q-field rounded outlined :bg-color="($q.dark.isActive ? '' : 'blue-4')" dense style="min-width:110px;">
<q-field
rounded
outlined
:bg-color="$q.dark.isActive ? '' : 'blue-4'"
dense
style="min-width: 110px"
>
<template v-slot:control>
<div class="centermydiv">
<div v-if="myimg" class="text-center">
<q-img
:src="myimg"
class="text-center"
style="height: 50px; width: 50px;"
:alt="mytitle">
style="height: 50px; width: 50px"
:alt="mytitle"
>
</q-img>
</div>
<div v-if="mytitle" class="self-center full-width no-outline text-center" tabindex="0">{{ mytitle }}</div>
<div
v-if="mytitle"
class="self-center full-width no-outline text-center"
tabindex="0"
>
{{ mytitle }}
</div>
</div>
</template>
</q-field>
</div>
<div :class="` col-grow clpopupVisuCard ` + getclass()" :style="withBorder() ? `` : ``">
<div
:class="` col-grow clpopupVisuCard ` + getclass()"
:style="withBorder() ? `` : ``"
>
<CMyPopupEdit
v-bind="$attrs"
:isrec="true"
@@ -46,9 +66,8 @@
minuteinterval="1"
:path="path"
:nosaveToDb="nosaveToDb"
@showandsave="showandsel"
@showandsave="showandsave"
>
</CMyPopupEdit>
</div>
<slot></slot>

View File

@@ -273,7 +273,7 @@ export default defineComponent({
})
*/
function crea() {
// console.log('crea', isFieldDb(), 'props.mycol', props.mycol)
console.log('crea', isFieldDb(), 'props.mycol', props.mycol)
if (props.mycol && props.mycol.name && props.mycol.name !== 'test') {
col.value = { ...props.mycol }
@@ -295,7 +295,6 @@ export default defineComponent({
_id: '',
imagefile: myvalue.value,
vers_img: 1,
// order: 1,
alt: 'img',
}]
} else if (props.type === costanti.FieldType.imgcard) {
@@ -319,6 +318,8 @@ export default defineComponent({
}
}
console.log('popupedit myvalue.value: ', myvalue.value)
if (props.tablesel) {
// let obj = tools.getParamsByTable(props.table)
// console.log('OBJ:', obj)
@@ -468,7 +469,7 @@ export default defineComponent({
try {
// console.log('mounted', 'isFieldDb()', isFieldDb())
console.log('mounted', 'isFieldDb()', myrow.value)
if (isFieldDb() && !props.isrec) {
// console.log(' . none...')
} else {
@@ -487,7 +488,7 @@ export default defineComponent({
myvalue.value = myrow.value
}
}
// console.log('props.field', props.field, 'props.subfield', props.subfield, 'myvalue: ', myvalue)
console.log('props.field', props.field, 'props.subfield', props.subfield, 'myvalue: ', myvalue)
}
} catch (e) {
@@ -663,9 +664,11 @@ export default defineComponent({
// console.log('DOPO myvalue', myvalue, newVal, myvalueprec)
}
console.log('Savedb: type', col.value.fieldtype)
if (col.value.fieldtype === costanti.FieldType.image) {
console.log('newVal.imagefile', newVal)
myvalue.value = newVal
myvalue.value = tools.getImgFileToSaveByFilename(newVal)
} else if (col.value.fieldtype === costanti.FieldType.imgcard) {
console.log('newVal.imagefile', newVal)
myvalue.value = newVal

View File

@@ -418,7 +418,7 @@
>
<div v-if="canEdit">
<span class="text-h7 text-weight-bold row justify-center">
{{ $t(col.label_trans) }}
{{ $t(col.label_trans ? col.label_trans : '') }}
</span>
<CGallery
:imagebak="

View File

@@ -147,8 +147,8 @@ export default defineComponent({
const { setValDb, getValDb } = MixinBase()
function showandsel(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsel CMyFieldDb', row, col, newval)
function showandsave(row: any, col: any, newval: any, valinitial: any) {
console.log('showandsave CMyFieldDb', row, col, newval)
if (newval !== valinitial) {
tools.saveInDBForTypes($q, props.mykey, newval, props.type, props.serv, props.table, props.mysubkey, props.id, props.indrec, props.mysubsubkey, props.specialField)
@@ -190,7 +190,7 @@ export default defineComponent({
globalStore,
col,
row,
showandsel,
showandsave,
withBorder,
save,
}

View File

@@ -2,7 +2,14 @@
<div>
<div class="row">
<div :class="` `" :style="withBorder() ? `` : ``">
<div v-if="title && ((type === costanti.FieldType.string || type === costanti.FieldType.number))" class="q-ma-xs">
<div
v-if="
title &&
(type === costanti.FieldType.string ||
type === costanti.FieldType.number)
"
class="q-ma-xs"
>
<q-field
rounded
outlined
@@ -62,7 +69,7 @@
:pickup="pickup"
v-model:row="row"
minuteinterval="1"
@showandsave="showandsel"
@showandsave="showandsave"
@save="save"
>
</CMyPopupEdit>

View File

@@ -10,7 +10,7 @@
<meta name="description" content="<%= productDescription %>">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="version" content="1.0.60">
<meta name="version" content="1.0.61">
<meta name="viewport"
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">

View File

@@ -1080,5 +1080,5 @@
"idapp" : "19",
"chiave" : "vers",
"userId" : "ALL",
"valore" : "1.0.60"
"valore" : "1.0.61"
}

View File

@@ -335,7 +335,7 @@ function getRoutesAd(site: ISites) {
level_parent: 0,
level_child: 0.5,
onlyManager: true,
onlyEditor: true
onlyEditor: false
},
{
active: site.confpages && site.confpages.sendNewsletter,

View File

@@ -8838,13 +8838,21 @@ export const tools = {
}
},
getImgFileToSaveByFilename(filename_o_rec: any) {
if (filename_o_rec && filename_o_rec.imagefile) {
return filename_o_rec.imagefile
} else {
return filename_o_rec
}
},
async saveInDBForTypes($q: any, mykey: string, newval: any, type: any, serv: boolean, table?: string, mysubkey: string, id: any, indrec?: number, mysubsubkey: string, specialField: ISpecialField): boolean {
const { setValDb, getValDb } = MixinBase()
let eseguito = false
if (table === 'myelems') {
// if (table === 'myelems') {
if (type === costanti.FieldType.image && newval.imagefile) {
let myval = newval.imagefile
@@ -8855,7 +8863,7 @@ export const tools = {
eseguito = true
}
}
// }
if (!eseguito) {

View File

@@ -128,7 +128,6 @@
</CMyFieldDb>
<div class="myrow">
<CMyFieldDb
v-if="false"
:title="$t('reg.nationality')"
@@ -180,7 +179,11 @@
>
</CMySelectCity>
<CMySelectCity
v-if="globalStore.isPresenteCardsByProv(userStore.my.profile.resid_province)"
v-if="
globalStore.isPresenteCardsByProv(
userStore.my.profile.resid_province
)
"
:label="$t('reg.resid_card')"
table="users"
jointable="cards"