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

- Transazioni Pendenti (all'Admin compaiono tutte quelle pendenti e con la possibilità di accettarle)

Browse Source
This commit is contained in:
Surya Paolo
2024-09-29 23:26:44 +02:00
parent 5c0d0db45b
commit 744812eb39
8 changed files with 127 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/CMovements/CMovements.scss
View File

@@ -18,4 +18,9 @@
.rigamov {
background-color: lightgray;
}
.causale {
font-weight: bold;
margin-bottom: 8px;
}

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

@@ -18,7 +18,9 @@
</q-item-section>
<q-item-section>
<q-item-label v-if="mov.causal">{{ mov.causal }}</q-item-label>
<q-item-label class="causale" v-if="mov.causal">{{
mov.causal
}}</q-item-label>
<q-item-label lines="1">
{{ t('movement.from') }} <span class="myfrom">{{ mov.myfrom }}</span>
</q-item-label>

6
src/components/CNotifAtTop/CNotifAtTop.vue
View File

@@ -2,7 +2,11 @@
<div class="q-ma-sm text-center">
<q-btn
v-if="num_notifs > 0"
:label="(num_notifs > 1) ? t('circuit.mov_in_arrivo', {mov: num_notifs}) : t('circuit.ris_in_arrivo')"
:label="
num_notifs > 1
? t('circuit.mov_in_arrivo', { mov: num_notifs })
: t('circuit.ris_in_arrivo')
"
@click="shownotif = true"
icon="fas fa-coins"
rounded

11
src/layouts/toolbar/coinsPopover/coinsPopover.ts
View File

@@ -111,8 +111,15 @@ export default defineComponent({
function getlastnotifcoins(username: string): any {
// Get msg for this chat
if (notifStore.last_notifcoins)
return notifStore.last_notifcoins.find((rec: INotif) => rec.dest === username)
if (notifStore.last_notifcoins) {
if (userStore.isAdmin) {
console.log('userStore.isAdmin', userStore.isAdmin, notifStore.last_notifcoins)
return notifStore.last_notifcoins
} else {
return notifStore.last_notifcoins.find((rec: INotif) => rec.dest === username)
}
}
// return users_msg_saved[username]
}

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

@@ -1465,6 +1465,7 @@ const msg_it = {
movements: 'Movimenti',
ris_in_arrivo: '👉🏻 Apri, hai RIS da ricevere !',
mov_in_arrivo: '👉🏻 Apri {mov} transazioni in RIS!',
mov_in_arrivo_sent: '👉🏻 {mov} transazioni UTENTI in RIS!',
transaz: 'mov',
movements_made: 'Movimenti effettuati',
contocomunitario: 'Conto Comunitario',

3
src/store/CircuitStore.ts
View File

@@ -109,7 +109,8 @@ export const useCircuitStore = defineStore('CircuitStore', {
let arrcircnaz = this.listcircuits.filter((rec: ICircuit) => rec.showAlways)
for (const circ of arrcircnaz) {
circ.account = userStore.my.profile.useraccounts.find((rec: IAccount) => rec.circuitId === circ._id)
if (userStore.my.profile.useraccounts)
circ.account = userStore.my.profile.useraccounts.find((rec: IAccount) => rec.circuitId === circ._id)
}
return arrcircnaz

16
src/views/admin/dbop/dbop.vue
View File

@@ -655,6 +655,22 @@
></q-btn>
<br />
</div>
<div class="row">
<q-btn
label="Rimuovi Transazioni Pendenti"
color="primary"
@click="EseguiFunz('RemovePendentTransactions')"
></q-btn>
<br />
</div>
<div class="row">
<q-btn
label="Rimuovi Vecchie Notifiche (indietro di 3 mesi)"
color="primary"
@click="EseguiFunz('RemoveOldNotif90')"
></q-btn>
<br />
</div>
<div class="row">
<q-btn
label="Correggi Transazioni Circuiti"

115
tsconfig.json
View File

@@ -6,9 +6,8 @@
"tests",
"src-pwa",
"public/js",
// these are the eslint-only inclusions
"**/*.config.js" // for *.config.js files
"**/*.config.js" // for *.config.js files
],
"compilerOptions": {
"sourceMap": true,
@@ -16,37 +15,95 @@
"experimentalDecorators": true,
"baseUrl": ".",
"paths": {
"@components": ["src/components/index.ts"],
"@costanti": ["src/store/Modules/costanti.ts"],
"@boot": ["src/boot/*"],
"@views": ["src/views/*"],
"@src/*": ["src/*"],
"@/*": ["src/*"],
"@css": ["src/public/css/variables.scss"],
"@icons": ["src/public/icons/*"],
"@images": ["src/public/images/*"],
"@maps": ["src/public/maps/*"],
"@classes": ["src/classes/index.ts"],
"@utils": ["src/utils/index.ts"],
"@router": ["src/router/index.ts"],
"@validators": ["src/utils/validators.ts"],
"@methods": ["src/utils/methods.ts"],
"@api": ["src/store/Api/index.ts"],
"@api/*": ["src/store/Api/*"],
"@paths": ["src/store/Api/ApiRoutes.ts"],
"@storemod": ["src/store/Modules/*"],
"@store/*": ["src/store/*"],
"@modules": ["src/store/Modules/index.ts"],
"@model": ["src/model/index.ts"],
"@model/*": ["src/model/*"],
"model": ["src/model/index.ts"],
"enums": ["src/enums/*"],
"@components": [
"src/components/index.ts"
],
"@costanti": [
"src/store/Modules/costanti.ts"
],
"@boot": [
"src/boot/*"
],
"@views": [
"src/views/*"
],
"@src/*": [
"src/*"
],
"@/*": [
"src/*"
],
"@css": [
"src/public/css/variables.scss"
],
"@icons": [
"src/public/icons/*"
],
"@images": [
"src/public/images/*"
],
"@maps": [
"src/public/maps/*"
],
"@classes": [
"src/classes/index.ts"
],
"@utils": [
"src/utils/index.ts"
],
"@router": [
"src/router/index.ts"
],
"@validators": [
"src/utils/validators.ts"
],
"@methods": [
"src/utils/methods.ts"
],
"@api": [
"src/store/Api/index.ts"
],
"@api/*": [
"src/store/Api/*"
],
"@paths": [
"src/store/Api/ApiRoutes.ts"
],
"@storemod": [
"src/store/Modules/*"
],
"@store/*": [
"src/store/*"
],
"@modules": [
"src/store/Modules/index.ts"
],
"@model": [
"src/model/index.ts"
],
"@model/*": [
"src/model/*"
],
"model": [
"src/model/index.ts"
],
"enums": [
"src/enums/*"
],
"crypto": [
"node_modules/bcryptjs"
],
}
},
"exclude": [
"node_modules"
"node_modules",
"dist",
"build",
"public/js",
"_ALL_SITES",
"__riso.app",
"docs",
"statics",
"upload",
]
}
}