surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quando accedi al Circuito RIS Nazionale, ti imposta il Fido e QtaMax DOPPIA rispetto al tuo Circuito Locale

Browse Source
This commit is contained in:
Surya Paolo
2023-11-15 17:50:24 +01:00
parent a071d17410
commit 0642375eaf
18 changed files with 91 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

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

2
.env.example.production
View File

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

2
.env.test.risosrv
View File

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

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

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

2
_ALL_SITES/fioredellavita.riso.app/.env.test
View File

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

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

@@ -1,4 +1,4 @@
APP_VERSION="1.0.19"
APP_VERSION="1.0.20"
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="1.0.19"
APP_VERSION="1.0.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

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

@@ -1,4 +1,4 @@
APP_VERSION="1.0.19"
APP_VERSION="1.0.20"
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="1.0.19"
APP_VERSION="1.0.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

6
src/common/shared_vuejs.ts
View File

@@ -221,6 +221,11 @@ export const shared_consts = {
VISIB_ONLY_MANAGER: 2,
VISIB_ONLY_ADMIN: 4,
CIRCUIT_CFG: {
MULT_FIDO_USER: 2.0,
MULT_FIDO_GROUP: 2.0,
},
Visibility_Group: {
PRIVATE: 1,
HIDDEN: 2,
@@ -1694,6 +1699,7 @@ export const shared_consts = {
nome_valuta: 1,
fido_scoperto_default: 1,
deperimento: 1,
showAlways: 1,
status: 1,
transactionsEnabled: 1,
qta_max_default: 1,

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

@@ -107,7 +107,7 @@
lines="1"
>
<CSaldo
v-if="tools.isUserOk() && username === myusername()"
v-if="tools.isUserOk() && username === myusername() && account"
:account="account"
:symbol="circuit.symbol"
:color="circuit.color"
@@ -115,8 +115,38 @@
:qtarem="qtarem"
>
</CSaldo>
</q-item-label>
<q-item-label
lines="4"
v-if="
tools.isUserOk() &&
username === myusername() &&
!account &&
visu !== costanti.ENTER_TO_THE_CIRCUIT
"
>
<div class="centermydiv text-center">
<q-banner inline-actions class="bg-blue text-white">
<span v-html="$t('circuit.non_entrato')"></span>
<template v-slot:action>
<q-btn
v-if="
!userStore.IsMyCircuitByName(circuit.name) &&
!userStore.IsAskedCircuitByName(circuit.name) &&
!userStore.IsRefusedCircuitByName(circuit.name)
"
color="positive"
:label="$t('circuit.apri')"
@click="
requestToEnterCircuit = true;
groupnameSel = null;
"
/>
</template>
</q-banner>
</div>
</q-item-label>
</q-item-section>
<q-item-section

10
src/components/CMyCircuits/CMyCircuits.ts
View File

@@ -115,6 +115,16 @@ export default defineComponent({
arr = []
}
if (props.modelValue === costanti.MY_CIRCUITS) {
const arrtoinsert: any = circuitStore.listcircuits.filter((circ: any) => circ.showAlways)
for (const rec of arrtoinsert) {
if (arr.findIndex(myrec => myrec._id === rec._id) < 0) {
// Se non c'è il circuito Nazionale, glielo aggiungo
arr.push(rec)
}
}
}
return arr
}

5
src/components/CMyProfileTutorial/CMyProfileTutorial.ts
View File

@@ -95,9 +95,10 @@ export default defineComponent({
tools.scrollToTop()
}
if ((step.value === STEP_CIRCUIT - 1) || (step.value === STEP_CIRCUIT )) {
if ((step.value === STEP_CIRCUIT )) {
mycircuit.value = circuitStore.getCircuitByProvince(strProv.value)
userStore.savenoCircuit(isAskedToCircuit())
console.log('isAskedToCircuit()', isAskedToCircuit())
// userStore.savenoCircuit(isAskedToCircuit())
}
if (step.value === STEP_NAME_SURNAME + 1) {

1
src/model/GlobalStore.ts
View File

@@ -1108,6 +1108,7 @@ export interface ICircuit {
qta_max_default_grp?: number
data_costituz?: Date
deperimento: boolean
showAlways: boolean
transactionsEnabled: boolean
status: number
freq_deper?: string

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

@@ -228,7 +228,7 @@ const msg_it = {
refusedgroup: 'Rifiutato a {username} la richiesta di entrare nel Gruppo',
youarerefusedgroup: 'Ti è stato rifiutata la richiesta di entrare in questo Gruppo (per info chiedi all\'amministratore del gruppo)',
youarerefusedcircuit: 'Ti è stato rifiutata la richiesta di entrare in questo Circuito (per info chiedi all\'amministratore del gruppo)',
insertgoodorservices_to_enter_circuit: 'Per poter inviare RIS è necessario aggiungere almeno un Bene, Servizio o offrire Ospitalità',
insertgoodorservices_to_enter_circuit: 'Per poter inviare RIS è consigliato partecipare al circuito, aggiungendo quello che possiamo proporre noi (un Bene, un Servizio, Ospitalità, ecc...)',
deletedgroup: 'Gruppo Eliminato',
domanda_addtofriend: 'Aggiungere agli amici {username}?',
domanda_addtohandshake: 'Confermi che hai conosciuto personalmente e dai la tua fiducia a {username} ?',
@@ -1219,6 +1219,8 @@ const msg_it = {
preferences: 'Preferenze',
},
circuit: {
apri: 'Entra !',
non_entrato: 'Per far parte di questo Circuito devi chiedere di Entrare!',
link_chat: 'Chat {name}',
link_group: 'Gruppo Telegram',
chat_gruppo_telegram_circuito: 'Entra nella chat di Gruppo Telegram dove conoscerai persone della tua provincia',
@@ -1263,6 +1265,7 @@ const msg_it = {
qta_max_default_tips_grp: 'Rappresenta quanto credito ti è concesso accumulare al gruppo. Incentiviamo così a frequenti scambi tra i partecipanti',
data_costituz: 'Data Costituzione',
deperimento: 'Deperimento',
showAlways: 'Mostra Sempre',
freq_deper: 'Frequenza Deperimento',
minuto_deper: 'Minuto Dep.',
ora_deper: 'Ora Dep.',

2
src/store/Modules/fieldsTable.ts
View File

@@ -3005,6 +3005,7 @@ export const colTableCircuitComplete = [
AddCol({ name: 'qta_max_default_grp', label_trans: 'circuit.qta_max_default_grp', fieldtype: costanti.FieldType.currency }),
AddCol({ name: 'data_costituz', label_trans: 'circuit.data_costituz', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'deperimento', label_trans: 'circuit.deperimento', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'showAlways', label_trans: 'circuit.showAlways', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'transactionsEnabled', label_trans: 'circuit.transactionsEnabled', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'freq_deper', label_trans: 'circuit.freq_deper' }),
AddCol({ name: 'minuto_deper', label_trans: 'circuit.minuto_deper', fieldtype: costanti.FieldType.number }),
@@ -3144,6 +3145,7 @@ export const colTableCircuit = [
}),
AddCol({ name: 'regulation', label_trans: 'circuit.regulation', fieldtype: costanti.FieldType.html, required: false }),
AddCol({ name: 'deperimento', label_trans: 'circuit.deperimento', fieldtype: costanti.FieldType.boolean, disable: true }),
AddCol({ name: 'showAlways', label_trans: 'circuit.showAlways', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'transactionsEnabled', label_trans: 'circuit.transactionsEnabled', fieldtype: costanti.FieldType.boolean }),
AddCol({
name: 'status', label_trans: 'circuit.status',

1
src/store/Modules/tools.ts
View File

@@ -7065,6 +7065,7 @@ export const tools = {
admins: [],
color: '#ff5500',
deperimento: false,
showAlways: false,
transactionsEnabled: false,
status: shared_consts.CIRCUIT_STATUS.FASE1_CREAZIONE_GRUPPO,
symbol: 'RIS',

42
src/views/user/mycircuit/mycircuit.vue
View File

@@ -107,7 +107,7 @@
class="fit column no-wrap justify-evenly items-center content-start"
>
<div class="row justify-center">
<q-avatar size="70px">
<q-avatar v-if="getImgCircuit()" size="70px">
<q-img
:src="getImgCircuit()"
:alt="circuit.name"
@@ -116,7 +116,7 @@
@click="showPic = true"
/>
</q-avatar>
<div class="q-mx-sm text-h6" style="align-self: center">
<div class="q-mx-xs text-h6" style="align-self: center">
<span v-if="checkifShow('name')"> {{ circuit.name }}</span>
</div>
<div>
@@ -449,8 +449,8 @@
style="max-width: 500px"
v-if="tools.iCanShowCircuitsMember(circuit)"
>
<div class="text-h6">{{ t('circuit.contideigruppi') }}:</div>
<div class="text-h7 q-mb-sm">
<div class="text-h7">{{ t('circuit.contideigruppi') }}:</div>
<div class="text-h8 q-mb-sm">
<div v-html="$t('circuit.collettivi_info')"></div>
</div>
<q-tabs
@@ -670,22 +670,22 @@
<div>
<q-card>
<q-card-section>
<div class="text-h6">{{ t('circuit.info') }}</div>
<div class="text-h7">{{ t('circuit.info') }}</div>
</q-card-section>
<q-separator />
<q-card-section>
<div class="text-h7 q-mb-sm">
<div class="text-h8 q-mb-sm">
<div v-html="$t('circuit.aggiuntive')"></div>
</div>
<q-card-section>
<div class="text-h6">{{ t('circuit.descr') }}:</div>
<div class="text-h7">{{ t('circuit.descr') }}:</div>
</q-card-section>
<q-separator />
<q-card-section>
<div class="col-12 text-h7">
<div class="col-12 text-h8">
<span
v-if="checkifShow('descr')"
v-html="circuit.longdescr"
@@ -752,7 +752,7 @@
<div class="sezioni">
<q-icon name="fas fa-coins" class="iconcirc"></q-icon>
{{ t('circuit.symbol') }}:
<span class="text-h5">
<span class="text-h7">
<em
class="q-px-sm text-black rounded-borders"
:style="
@@ -880,7 +880,7 @@
<q-card v-if="circuit.name">
<q-card-section>
<div class="text-h6">{{ t('circuit.regulation') }}:</div>
<div class="text-h8">{{ t('circuit.regulation') }}:</div>
</q-card-section>
<q-separator />
@@ -892,14 +892,14 @@
>
</q-btn>
</div>
<div class="col-12 text-h7">
<div class="col-12 text-h8">
<span
v-if="checkifShow('descr') && showrules && circuit"
v-html="getRegulation(circuit.regulation)"
></span>
</div>
</q-card-section>
<div v-if="circuit.createdBy" class="container">
<div v-if="circuit.createdBy" class="container text-h8">
<q-icon name="fas fa-lightbulb" class="iconcirc"></q-icon>
{{
$t('shared.createddate', {
@@ -913,15 +913,17 @@
tools.getstrDate(circuit.date_updated) !==
tools.getstrDate(circuit.date_created)
"
class="container"
class="container text-h8"
>
<q-icon name="fas fa-pencil-alt" class="iconcirc"></q-icon>
<span class="element">{{
<span class="element text-h8">{{
$t('shared.lastmodify', {
date: tools.getstrDateYY(circuit.date_updated),
})
}}</span>
<br>
</div>
<br>
</q-card>
</q-tab-panel>
@@ -1028,15 +1030,15 @@
<q-tab-panel name="comunitario">
<q-card v-if="circuit.name">
<q-card-section>
<div class="text-h6">{{ t('circuit.contocomunitario') }}:</div>
<div class="text-h7 q-mb-sm">
<div class="text-h7">{{ t('circuit.contocomunitario') }}:</div>
<div class="text-h8 q-mb-sm">
{{ $t('circuit.info_contocom') }}
</div>
</q-card-section>
<q-separator />
<q-card-section>
<div class="col-12 text-h7 text-center">
<div class="col-12 text-h8 text-center">
<span v-if="checkifShow('descr')">
<CSaldo
v-if="tools.isUserOk() && circuit.account"
@@ -1120,13 +1122,13 @@
animation="fade"
/>
<q-card flat bordered style="width: 250px">
<div class="text-h6">
<div class="text-h7">
<q-skeleton :animation="animation" />
</div>
<div class="col-12 text-h7 text-grey text-center">
<div class="col-12 text-h8 text-grey text-center">
{{ path }}
</div>
<div class="col-12 text-h7">
<div class="col-12 text-h8">
<q-skeleton :animation="animation" />
</div>