surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set notif if service your province

Browse Source
This commit is contained in:
Surya Paolo
2023-04-13 13:46:53 +02:00
parent dc502611fa
commit 35db79b479
15 changed files with 83 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

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

2
.env.example.production
View File

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

2
.env.test.risosrv
View File

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

2
_ALL_SITES/riso.app/.env.development
View File

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

2
_ALL_SITES/riso.app/.env.production
View File

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

2
_ALL_SITES/terradellavisione.app/.env.development
View File

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

13
src/common/shared_vuejs.ts
View File

@@ -1023,6 +1023,7 @@ export const shared_consts = {
NEW_ADV_MY_GROUPS: 8,
NEW_ADV_MY_RIS_CIRCUIT: 16,
NEW_ADV_SECTOR: 32,
NEW_ADV_YOUR_PROVINCE: 64,
},
StatusNotifs: {
@@ -1066,6 +1067,7 @@ export const shared_consts = {
TYPEDIR_BACHECA: 1,
ID_BACHECA_NEW_GOOD: 1,
ID_BACHECA_NEW_SERVICE: 2,
ID_BACHECA_NEW_HOSP: 4,
TYPEDIR_EVENTS: 2,
ID_EVENTS_NEW_REC: 1,
@@ -1151,7 +1153,11 @@ export const shared_consts = {
{
value: 2, // ID_BACHECA_NEW_SERVICE
labeltrans: 'notifsid.bacheca_new_service',
}
},
{
value: 4, // ID_BACHECA_NEW_HOSP
labeltrans: 'notifsid.bacheca_new_hosp',
},
],
},
{
@@ -1230,6 +1236,11 @@ export const shared_consts = {
labeltrans: 'notifs.warn_city',
directory: 1,
},*/
{
value: 64, // NEW_ADV_YOUR_PROVINCE
labeltrans: 'notifs.warn_your_province',
directory: 1,
},
{
value: 2, // NEW_ADV_PROVINCE
labeltrans: 'notifs.warn_province',

67
src/components/CContactUser/CContactUser.vue
View File

@@ -1,6 +1,19 @@
<template>
<div class="row justify-evenly items-center q-pa-sm q-ma-sm">
<div
v-if="showBtnActivities"
class="col-md-6 col-sm-6 q-ma-xs col-xs-12 text-center q-mb-md"
>
<q-btn
icon="fas fa-house-user"
size="md"
color="orange"
:label="$t('profile.myactivities')"
:to="`/attivita/` + myuser.username"
>
</q-btn>
</div>
<div class="q-ma-sx">
<q-btn
v-if="getLinkUserTelegram()"
@@ -9,7 +22,7 @@
:type="tools.isUserOk() ? 'a' : 'btn'"
size="md"
rounded
:label="$t('msgs.telegrammsg')"
:label="$t('dialog.contact')"
:href="tools.isUserOk() ? getLinkUserTelegram() : null"
@click="!tools.isUserOk() ? (showingtooltip = !showingtooltip) : false"
target="__blank"
@@ -54,58 +67,6 @@
>
</q-btn>
</div>
<div v-if="myuser._id" class="q-ma-sx">
<q-btn
v-if="getLinkWebSite()"
icon="fas fa-globe"
color="blue"
type="a"
size="md"
rounded
:label="$t('reg.website')"
:href="tools.isUserOk() ? getLinkWebSite() : null"
@click="!tools.isUserOk() ? (showingtooltip = !showingtooltip) : false"
target="__blank"
>
</q-btn>
</div>
</div>
<div class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
<div v-if="myuser._id" class="col-12">
<q-btn
v-if="myuser.username === myusername()"
icon="fas fa-link"
color="blue"
size="md"
rounded
:label="$t('reg.link_reg_and_msg')"
@click="
tools.sendMsgTelegramCmd(
$q,
$t,
shared_consts.MsgTeleg.SHARE_MSGREG,
true
);
"
>
</q-btn>
</div>
<div
v-if="showBtnActivities"
class="col-md-6 col-sm-6 q-ma-xs col-xs-12 text-center"
>
<q-btn
icon="fas fa-house-user"
size="md"
color="orange"
:label="$t('profile.myactivities')"
:to="`/attivita/` + myuser.username"
>
</q-btn>
</div>
<q-tooltip v-if="showingtooltip" class="bg-red text-body2 text-bold" :offset="[10, 10]" v-model="showingtooltip"
>Per contattare la persona:<br />Entra ed Accedi a RISO</q-tooltip
>
</div>
<div v-if="showsendCoinTo">
<CSendCoins

4
src/components/CMyActivities/CMyActivities.vue
View File

@@ -197,9 +197,9 @@
<CSkill
:table="card.table"
:filtercustom="filtrobookmark(card.table)"
:butt_modif_new="isMyRecord(myuser.username)"
:butt_modif_new="false"
:visuinpage="true"
:noaut="true"
:noaut="false"
:title="card.title"
/>
</div>

20
src/components/CMyCardService/CMyCardService.ts
View File

@@ -137,17 +137,23 @@ export default defineComponent({
}
function clicca(tipo: any, myset: any, title: string) {
if (myset && tipo === costanti.TIPOFAVBOOK.FAVORITE) {
userStore.setFavorite($q, t, myrec.value._id, props.table, myrec.value);
}
if (myset && tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
userStore.setBookmark($q, t, myrec.value._id, props.table, myrec.value);
let mylist = null
if (tipo === costanti.TIPOFAVBOOK.FAVORITE) {
if (myset) {
userStore.setFavorite($q, t, myrec.value._id, props.table, myrec.value);
}
mylist = myrec.value.myfav
} else if (tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
if (myset) {
userStore.setBookmark($q, t, myrec.value._id, props.table, myrec.value);
}
mylist = myrec.value.mybook
}
if (!myset) {
if (!myset && mylist && mylist.length > 0) {
usersList.value.show = true;
usersList.value.title = title;
usersList.value.list = myrec.value.myfav;
usersList.value.list = mylist;
}
}

4
src/components/CMyCircuit/CMyCircuit.vue
View File

@@ -40,7 +40,7 @@
</q-item-label>
<q-item-label
@click="naviga(tools.getPathByTableAndRec(table, circuit))"
v-if="circuit.longdescr"
v-if="circuit.longdescr && circuit.longdescr !== circuit.name"
caption
lines="3"
><em>{{ circuit.longdescr }}</em>
@@ -107,7 +107,7 @@
lines="1"
>
<CSaldo
v-if="tools.isUserOk() && username === account.username"
v-if="tools.isUserOk() && username === myusername()"
:account="account"
:symbol="circuit.symbol"
:color="circuit.color"

2
src/components/CMyProfileTutorial/CMyProfileTutorial.vue
View File

@@ -60,7 +60,7 @@
:done-color="getColorDone(recstep.step)"
>
<div
v-if="recstep.checkOk() && recstep.label_ok"
v-if="recstep.checkOkReal() && recstep.label_ok"
v-html="recstep.label_ok"
></div>
<div v-else v-html="recstep.label"></div>

8
src/statics/lang/it.js
View File

@@ -846,9 +846,10 @@ const msg_it = {
coins: 'Notifiche Transazioni',
nonotif: 'Nessuna Nuova Notifica',
nocoins: 'Nessuna Nuova Transazione',
warn_province: 'nelle Province',
warn_sector: 'in un Settore',
warn_region: 'nelle Regioni',
warn_your_province: 'nella tua Provincia',
warn_province: 'nelle Province...',
warn_sector: 'in un Settore...',
warn_region: 'nelle Regioni...',
warn_city: 'in una Città selezionata',
warn_my_groups: 'nei miei Gruppi',
warn_my_ris_circuit: 'nei miei Circuiti',
@@ -879,6 +880,7 @@ const msg_it = {
notifsid: {
bacheca_new_good: 'Nuovo Bene',
bacheca_new_service: 'Nuovo Servizio',
bacheca_new_hosp: 'Nuova Ospitalità',
events_new: 'Nuovo Evento',
friends_new: 'Nuova Richiesta di Amicizia',
groups_new: 'Si creano Nuovi Gruppi',

15
src/views/user/myprofile/myprofile.ts
View File

@@ -154,6 +154,20 @@ export default defineComponent({
return username === userStore.my.username
}
function getLinkWebSite() {
if (userStore.userprofile) {
let mysite = userStore.userprofile.profile.website
if (mysite) {
if (!mysite.startsWith('http')) {
mysite = 'https://' + mysite
}
}
return mysite
} else {
return ''
}
}
onMounted(mounted)
return {
@@ -190,6 +204,7 @@ export default defineComponent({
usersList,
handshake_inCommon,
globalStore,
getLinkWebSite,
}
}
})

13
src/views/user/myprofile/myprofile.vue
View File

@@ -652,6 +652,19 @@
:canEdit="false"
>
</CDateTime>
<CLabel
v-if="!!getLinkWebSite()"
v-bind="$attrs"
:copy="false"
label="Sito Web"
>
<span
v-html="
tools.getlinkhref(getLinkWebSite(), getLinkWebSite())
"
/>
</CLabel>
<CLabel
v-if="!!userStore.userprofile.profile.cell"
v-bind="$attrs"