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

- Il circuito viene creato in automatico, quando scegli una provincia.

Browse Source
This commit is contained in:
Surya Paolo
2023-03-21 18:12:06 +01:00
parent de937c73f7
commit 59af1d0b8b
19 changed files with 76 additions and 112 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.5.80"
APP_VERSION="0.5.81"
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.5.80"
APP_VERSION="0.5.81"
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.5.80"
APP_VERSION="0.5.81"
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.5.80"
APP_VERSION="0.5.81"
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.5.80"
APP_VERSION="0.5.81"
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.5.80"
APP_VERSION="0.5.81"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

14
src/components/CFinder/CFinder.ts
View File

@@ -188,19 +188,19 @@ export default defineComponent({
const hint = computed(() => {
if (props.table === toolsext.TABMYGOODS)
return 'nome del Bene o settore da cercare'
return 'digita il nome del Bene o del settore'
else if (props.table === toolsext.TABMYSKILLS)
return 'nome del Servizio o settore da cercare'
return 'digita il nome del Servizio o del settore'
else if (props.table === toolsext.TABMYGROUPS)
return 'nome del Gruppo da cercare'
return 'digita il nome del Gruppo'
else if (props.table === toolsext.TABCIRCUITS)
return 'nome del Circuito da cercare'
return 'digita il nome della provincia'
else if (props.table === toolsext.TABMYBACHECAS)
return 'nome dell\'Evento da cercare'
return 'digita il nome dell\'Evento'
else if (props.table === toolsext.TABMYHOSPS)
return 'nome dell\'Ospitalità da cercare'
return 'digita delle parole da cercare nella descrizione dell\'Ospitalità'
return 'nome da cercare'
return 'digita una parola da cercare'
})
const visuType = computed(() => {

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

@@ -15,7 +15,6 @@
<q-input
v-model="search"
filled
dense
type="search"
debounce="500"
:hint="t('finder.search_skill')"
@@ -23,7 +22,6 @@
>
<template v-slot:after>
<q-btn
dense
label=""
color="primary"
@click="doSearch"

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

@@ -22,6 +22,7 @@ import { useCircuitStore } from '@store/CircuitStore'
const STEP_NAME_SURNAME = 2
const STEP_FOTO = 5
const STEP_CIRCUIT = 3
export default defineComponent({
name: 'CMyProfileTutorial',
@@ -94,6 +95,10 @@ export default defineComponent({
tools.scrollToTop()
}
if ((step.value === STEP_CIRCUIT - 1) || (step.value === STEP_CIRCUIT )) {
mycircuit.value = circuitStore.getCircuitByProvince(strProv.value)
}
if (step.value === STEP_NAME_SURNAME + 1) {
let index = step.value
console.log('Salva ', arrStep[index])
@@ -135,7 +140,7 @@ export default defineComponent({
icon: 'user'
},
{
step: 3,
step: STEP_CIRCUIT,
title: t('tutorial.step_circuito_title'),
extratitle: function () { return mycircuit.value ? ': ' + mycircuit.value.name : '' },
label: t('tutorial.step_circuito'),
@@ -160,7 +165,7 @@ export default defineComponent({
icon: 'fas fa-tshirt',
},
{
step: 5,
step: STEP_FOTO,
title: t('tutorial.step_foto_title'),
extratitle: function () { return ': (' + (userStore.my.profile.img ? t('dialog.yes') : t('dialog.no')) + ')' },
label: t('tutorial.step_foto'),
@@ -351,6 +356,7 @@ export default defineComponent({
completed,
getColorTutorial,
getFirstStepToFill,
STEP_CIRCUIT,
}
},
})

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

@@ -5,9 +5,10 @@
<CTitleBanner
class="q-pa-none"
:title="
!progressStep
? $t('tutorial.title') + ` (` + progressLabel + `)`
: $t('tutorial.title_completed') + ` (` + progressLabel + `)`
(!progressStep
? $t('tutorial.title', {step, numstep}) + ` (` + progressLabel + `)`
: $t('tutorial.title_completed', {step, numstep}) + ` (` + progressLabel + `)`)
"
:bgcolor="getColorTutorial()"
clcolor="text-white"
@@ -168,11 +169,11 @@
? clickFinish()
: $refs.stepper.next()
"
color="primary"
:color="(step === STEP_CIRCUIT && mycircuit && ((!userStore.IsMyCircuitByName(mycircuit.name) && !userStore.IsAskedCircuitByName(mycircuit.name)))) ? 'negative' : 'primary'"
:label="
step === numstep
? $t('dialog.finish')
: $t('dialog.avanti')
: (step === STEP_CIRCUIT && mycircuit && ((!userStore.IsMyCircuitByName(mycircuit.name) && !userStore.IsAskedCircuitByName(mycircuit.name))) ? $t('dialog.salta'): $t('dialog.avanti'))
"
/>
</q-stepper-navigation>

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

File diff suppressed because one or more lines are too long

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

@@ -3102,7 +3102,7 @@ export const colTableCircuit = [
fieldtype: costanti.FieldType.currency, visulabel: true,
showWhen: costanti.showWhen.InPage + costanti.showWhen.InView,
}),
AddCol({ name: 'regulation', label_trans: 'circuit.regulation', fieldtype: costanti.FieldType.html, required: true }),
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: 'transactionsEnabled', label_trans: 'circuit.transactionsEnabled', fieldtype: costanti.FieldType.boolean }),
AddCol({

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

@@ -5592,7 +5592,7 @@ export const tools = {
const circuitStore = useCircuitStore()
const globalStore = useGlobalStore()
// console.log('OUT', res)
// console.log('updateMyData: ', res)
if (res && res.userprofile) {
// console.log('updateMyData', res.userprofile)
@@ -5600,6 +5600,7 @@ export const tools = {
if (res.listcircuits) {
circuitStore.listcircuits = res.listcircuits
// console.log('circuitStore.listcircuits', circuitStore.listcircuits)
}
if (res.mygroups) {
globalStore.mygroups = res.mygroups
@@ -7115,7 +7116,7 @@ export const tools = {
ris = 'profile.born_city_id'
}
if (tablejoin === 'provinces') {
ris = 'profile.born_province'
ris = 'profile.resid_province'
}
if (tablejoin === 'regions') {
ris = ''

2
src/store/NotifStore.ts
View File

@@ -200,7 +200,7 @@ export const useNotifStore = defineStore('NotifStore', {
this.last_notifs = []
}
this.updateArrNotif()
tools.updateMyData(res.data)
tools.updateMyData(res.data.ris)
return true
})
.catch((error) => {

21
src/store/UserStore.ts
View File

@@ -837,6 +837,19 @@ export const useUserStore = defineStore('UserStore', {
async execDbOp(paramquery: any) {
return Api.SendReq('/users/dbop', 'POST', paramquery)
.then((res) => {
return res.data
}).catch((error) => {
return false
})
},
async execDbOpUser(paramquery: any) {
return Api.SendReq('/users/dbopuser', 'POST', paramquery)
.then((res) => {
tools.updateMyData(res.data.ris)
return res.data
}).catch((error) => {
return false
@@ -850,7 +863,9 @@ export const useUserStore = defineStore('UserStore', {
value: step,
}
this.my.profile.stepTutorial = step
return await this.execDbOp({mydata})
const ris = await this.execDbOpUser({mydata})
return ris
},
async savenoNameSurname(val: boolean) {
const mydata = {
@@ -860,7 +875,7 @@ export const useUserStore = defineStore('UserStore', {
}
if (this.my.profile.noNameSurname !== val) {
this.my.profile.noNameSurname = val
return await this.execDbOp({mydata})
return await this.execDbOpUser({mydata})
}
},
async savenoFoto(val: boolean) {
@@ -871,7 +886,7 @@ export const useUserStore = defineStore('UserStore', {
}
if (this.my.profile.noFoto !== val) {
this.my.profile.noFoto = val
return await this.execDbOp({mydata})
return await this.execDbOpUser({mydata})
}
},

13
src/views/user/mycircuit/mycircuit.ts
View File

@@ -86,6 +86,7 @@ export default defineComponent({
const cities = ref([] as ICity[])
watch(() => path.value, (to: any, from: any) => {
loadCircuit()
})
@@ -421,6 +422,17 @@ function extraparams_refused_groups() {
return (circuit.value && circuit.value.admins) ? circuit.value.admins.map((rec) => rec.username).join(', ') : ''
}
function getRegulation(reg: string) {
let strreg = reg + ''
if (!reg) {
const mystringa = t('circuit.regolamento', {nomecircuito: circuit.value!.name})
return mystringa
} else {
return reg
}
}
onMounted(mounted)
return {
@@ -481,6 +493,7 @@ function extraparams_refused_groups() {
loadCircuit,
extraparams_rich_groups,
extraparams_refused_groups,
getRegulation,
}
}
})

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

@@ -773,8 +773,8 @@
</div>
<div class="col-12 text-h7">
<span
v-if="checkifShow('descr') && showrules"
v-html="circuit.regulation"
v-if="checkifShow('descr') && showrules && circuit"
v-html="getRegulation(circuit.regulation)"
></span>
</div>
</q-card-section>
@@ -1029,7 +1029,7 @@
</div>
<q-btn label="vedi Regolamento" @click="showrules = !showrules">
</q-btn>
<div v-if="showrules" v-html="circuit.regulation"></div>
<div v-if="showrules && circuit" v-html="getRegulation(circuit.regulation)"></div>
</q-card-section>
<q-card-actions align="center">
<q-btn

77
src/views/user/myfriends/myfriends.ts
View File

@@ -45,9 +45,9 @@ export default defineComponent({
{
label: 'Provincia',
table: 'provinces',
key: 'idProvince',
key: 'profile.resid_province',
type: costanti.FieldType.select,
value: tools.getCookie(tools.COOK_SEARCH + 'provinces', costanti.FILTER_TUTTI),
value: tools.getCookie(tools.COOK_SEARCH + 'resid_provinces', costanti.FILTER_TUTTI),
addall: true,
arrvalue: [],
filter: getFilterProvinceByRegion,
@@ -55,34 +55,6 @@ export default defineComponent({
icon: 'flag',
tablesel: 'provinces',
},
{
label: 'Comune',
table: 'cities',
key: 'profile.born_city_id',
type: costanti.FieldType.select_by_server,
value: tools.getCookie(tools.COOK_SEARCH + 'cities', costanti.FILTER_TUTTI),
addall: true,
arrvalue: [],
useinput: true,
filter: null,
// filter: getFilterCitiesByProvince,
// param1: shared_consts.PARAM_SHOW_PROVINCE,
tablesel: 'cities',
},
{
label: 'In cambio di',
table: 'contribtypes',
key: 'idContribType',
value: 0,
arrvalue: tools.getCookie(tools.COOK_SEARCH + 'contribtypes', []),
type: costanti.FieldType.multiselect,
filter: null,
useinput: false,
icon: 'fas fa-hand-holding',
filteradv: true,
//icon: 'swap_horizontal_circle',
},
]
filtercustom.value = []
@@ -104,50 +76,6 @@ export default defineComponent({
let af_objId_tab = 'myId'
return {
lookup1: {
lk_tab,
lk_LF,
lk_FF,
lk_as,
af_objId_tab,
lk_proj: {
username: 1,
name: 1,
surname: 1,
'profile.img': 1,
'profile.born_city_id': 1,
'profile.qualifica': 1,
'profile.handshake': 1,
reported: 1,
date_report: 1,
username_who_report: 1,
}
},
lookup2: {
lk_tab: 'cities',
lk_LF: 'profile.born_city_id',
lk_FF: '_id',
lk_as: 'comune',
af_objId_tab: '',
lk_proj: {
idCity: 1,
numLevel: 1,
comune: 1,
userId: 1,
username: 1,
name: 1,
surname: 1,
mycities: 1,
'profile.img': 1,
'profile.qualifica': 1,
reported: 1,
date_report: 1,
username_who_report: 1,
'profile.born_city_id': 1,
'profile.handshake': 1,
}
},
}
}
@@ -161,6 +89,7 @@ export default defineComponent({
}
onMounted(mounted)
return {

2
src/views/user/myfriends/myfriends.vue
View File

@@ -37,6 +37,7 @@
noresultLabel="Username non trovato"
:arrfilters="arrfilterand"
:filtercustom="filtercustom"
:prop_searchList="searchList"
:showType="costanti.SHOW_USERINFO"
:showCol="false"
:extraparams="extraparams()">
@@ -45,7 +46,6 @@
</CMyFriends>
</div>
</template>
<!--:prop_searchList="searchList"-->
<script lang="ts" src="./myfriends.ts">
</script>