Pagina "Attività" non compare bene la scritta Beni e Servizi... ?!

This commit is contained in:
Surya Paolo
2023-01-29 22:22:41 +01:00
parent 23fd5fc5ef
commit 8176902363
17 changed files with 143 additions and 69 deletions

View File

@@ -1,5 +1,5 @@
<template>
<div v-if="tools.isDebugOn()" class="bg-red text-white">
<div v-if="false && tools.isDebugOn()" class="bg-red text-white">
<span> isAppRunning: {{ isAppRunning }} - </span>
<span> deferredPrompt: {{ deferredPrompt }} - </span>
<span> homescreen: {{ homescreen }} </span>
@@ -69,7 +69,8 @@
<!-- Mostra spiegazione per Android -->
<div v-if="viewAndroid">
<div class="q-ma-sm text-h6"> 1) Cliccare sui 3 puntini verticali<br>
2) Cliccare su 'Installa App' o 'Schermata Home'
2) Cliccare sulla voce 'Installa App' o 'Schermata Home'<br>
3) Andare sulla schermata HOME e cliccare sull'icona di RISO.
</div>
<q-img
src="images/install_app_on_android_1.jpg"
@@ -85,6 +86,14 @@
class="q-my-sm"
></q-img
><br />
><br />
<q-img
src="images/install_app_on_android_3.jpg"
fit="contain"
style="min-width: 350px"
class="q-my-sm"
></q-img
><br />
</div>
</q-slide-transition>
</div>

View File

@@ -29,7 +29,6 @@
:class="$q.screen.lt.sm ? `` : `q-gutter-md q-ma-xs` + ` row`"
>
<div
v-if="!hidetitleIfEmpty || (hidetitleIfEmpty && serverData.length > 0)"
class="q-table__title"
style="min-width: 150px"
>
@@ -54,6 +53,7 @@
<q-btn
v-if="mytable && labelBtnAddExtra"
rounded
outline
size="md"
color="primary"
class="centermydiv q-mb-sm"
@@ -1141,7 +1141,7 @@
>
<q-card class="dialog_card">
<q-bar dense class="bg-primary text-white">
Nuovo:
Nuovo {{mytitle}}:
<q-space />
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
</q-bar>
@@ -1215,7 +1215,7 @@
>
<q-card class="dialog_card">
<q-bar dense class="bg-primary text-white">
Nuovo:
Nuovo {{mytitle}}:
<q-space />
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
</q-bar>

View File

@@ -92,51 +92,53 @@
:canopen="true"
>
<div v-for="(card, ind) of mycards" :key="ind" :name="card.table">
<div v-if="card.table === 'mygroups'">
<q-list>
<span
v-for="(grp, index) in listgroupsfiltered"
:key="index"
class="q-my-sm q-mx-none"
clickable
>
<CMyGroup
:mygrp="grp"
:visu="costanti.USER_GROUPS"
:noaut="true"
<q-card class="q-my-md">
<div v-if="card.table === 'mygroups'">
<q-list>
<span
v-for="(grp, index) in listgroupsfiltered"
:key="index"
class="q-my-sm q-mx-none"
clickable
>
</CMyGroup>
</span>
</q-list>
</div>
<div v-else-if="card.table === 'circuits'">
<div class="text-h6">{{ card.title }}</div>
<q-list>
<span
v-for="(circuit, index) in listcircuitsfiltered"
:key="index"
class="q-my-sm q-mx-none"
clickable
>
<CMyCircuit
:mycircuit="circuit"
:visu="costanti.USER_CIRCUITS"
:noaut="true"
<CMyGroup
:mygrp="grp"
:visu="costanti.USER_GROUPS"
:noaut="true"
>
</CMyGroup>
</span>
</q-list>
</div>
<div v-else-if="card.table === 'circuits'">
<div class="text-h6">{{ card.title }}</div>
<q-list>
<span
v-for="(circuit, index) in listcircuitsfiltered"
:key="index"
class="q-my-sm q-mx-none"
clickable
>
</CMyCircuit>
</span>
</q-list>
</div>
<div v-else>
<CSkill
:table="card.table"
:filtercustom="filtroutente"
:butt_modif_new="isMyRecord(myuser.username)"
:visuinpage="true"
:noaut="true"
:title="card.title"
/>
</div>
<CMyCircuit
:mycircuit="circuit"
:visu="costanti.USER_CIRCUITS"
:noaut="true"
>
</CMyCircuit>
</span>
</q-list>
</div>
<div v-else>
<CSkill
:table="card.table"
:filtercustom="filtroutente"
:butt_modif_new="isMyRecord(myuser.username)"
:visuinpage="true"
:noaut="true"
:title="card.title"
/>
</div>
</q-card>
</div>
</CTitleBanner>
</div>
@@ -149,10 +151,7 @@
<q-dialog v-model="showPic" full-height full-width>
<img :src="getImgUser()" :alt="username" class="full-width" />
</q-dialog>
<q-page-sticky
position="top-right"
:offset="[18, 18]"
>
<q-page-sticky position="top-right" :offset="[18, 18]">
<q-btn
fab
glossy

View File

@@ -205,7 +205,10 @@
v-if="circuitloaded"
:disable="
qtyRef
? qtyRef.hasError || !circuitloaded.transactionsEnabled
? qtyRef.hasError || !circuitloaded.transactionsEnabled ||
((tipoConto === costanti.AccountType.USER) && to_user && (from_username === to_user.username)) ||
((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && !from_groupname) ||
((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && to_group && from_groupname && (to_group.groupname === from_groupname))
: false
"
:label="

View File

@@ -21,7 +21,8 @@
v-bind="$attrs"
:extraparams="extraparams"
:noaut="noaut"
:hidetitleIfEmpty="true">
:hidetitleIfEmpty="true"
:labelBtnAddExtra="`Aggiungi ` + title">
</CGridTableRec>
</div>