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

l'admin non riesce a cambiare il fido degli utenti...

Browse Source
This commit is contained in:
Surya Paolo
2023-06-20 01:08:08 +02:00
parent 874faacd0b
commit 800df74f3f
11 changed files with 42 additions and 32 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.11"
APP_VERSION="1.0.13"
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.11"
APP_VERSION="1.0.13"
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.11"
APP_VERSION="1.0.13"
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="1.0.11"
APP_VERSION="1.0.13"
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.11"
APP_VERSION="1.0.13"
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.11"
APP_VERSION="1.0.13"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

22
src/db/static_data.ts
View File

@@ -101,6 +101,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: true,
infooter: true,
},
{
active: site.confpages && site.confpages.enableCircuits,
order: 16,
path: '/circuits',
materialIcon: 'fas fa-coins',
name: 'mypages.circuits',
component: () => import('@/views/user/mycircuits/mycircuits.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 20,
@@ -156,17 +167,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: false,
infooter: false,
},
{
active: site.confpages && site.confpages.enableCircuits,
order: 133,
path: '/circuits',
materialIcon: 'fas fa-coins',
name: 'mypages.circuits',
component: () => import('@/views/user/mycircuits/mycircuits.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
},
{
active: true,
order: 136,

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

@@ -3052,12 +3052,12 @@ export const colTableCircuit = [
AddCol({
name: 'name', label_trans: 'circuit.name',
required: true,
maxlength: 30,
maxlength: 40,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InView
}),
AddCol({
name: 'path', label_trans: 'circuit.path', required: true,
maxlength: 30,
maxlength: 40,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InView,
allowchar: costanti.ALLOWCHAR_CODE,
}),

2
src/store/NotifStore.ts
View File

@@ -232,7 +232,7 @@ export const useNotifStore = defineStore('NotifStore', {
return Api.SendReq('/sendnotif', 'POST', data)
.then((res) => {
console.log('res', res)
// console.log('res', res)
if (res.status === 200) {
if (res.data.code === serv_constants.RIS_CODE_OK && res.data.record) {
if (res.data.record.dest === userStore.my.username) {

32
src/store/UserStore.ts
View File

@@ -488,6 +488,7 @@ export const useUserStore = defineStore('UserStore', {
getMyCircuitsInCommonByUser(user: IUserFields): any[] {
let arrout = []
let arrfinale = []
let vuoto = false
const circuitStore = useCircuitStore()
@@ -497,21 +498,30 @@ export const useUserStore = defineStore('UserStore', {
else
arrout = tools.getCommon([...this.my.profile.mycircuits], [...user.profile.mycircuits], 'circuitname')
// se non ho neanche 1 circuito in comune, metto il mio preferito
if (arrout.length <= 0) {
const circuit = circuitStore.getCircuitByProvince(this.my.profile.resid_province)
if (circuit)
arrout.push(circuit.name)
else {
if (this.my.profile.mycircuits.length > 0) {
arrout.push(this.my.profile.mycircuits[0].circuitname)
}
// controlla che il circuito sia Abilitato!
for (const circuitname of arrout) {
const circuit = circuitStore.getCircuitByName(circuitname)
if (circuit && circuit.transactionsEnabled) {
arrfinale.push(circuitname)
}
}
console.log('arrout', arrout)
// se non ho neanche 1 circuito in comune, metto il mio preferito
if (arrfinale.length <= 0) {
const circuit = circuitStore.getCircuitByProvince(this.my.profile.resid_province)
if (circuit)
arrfinale.push(circuit.name)
else {
if (this.my.profile.mycircuits.length > 0) {
arrfinale.push(this.my.profile.mycircuits[0].circuitname)
}
}
} else {
}
return arrout
console.log('arrout', arrfinale)
return arrfinale
},
getMyCircuits(): any[] {

2
src/store/globalStore.ts
View File

@@ -1093,7 +1093,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
return Api.SendReq('/settable', 'POST', mydata)
.then((res) => {
this.serverError = false
console.log('res', res)
// console.log('res', res)
if (res && res.data) {
tools.updateMyData(res.data.ris)
if (res.data.rec) {