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

2023-01-29 22:22:41 +01:00
parent 23fd5fc5ef
commit 8176902363
17 changed files with 143 additions and 69 deletions
--- a/aaa.txt
+++ b/aaa.txt
@@ -0,0 +1,32 @@
+
+
+TRA CIRCUITI:
+Fai la Transazione
+
+Le transazioni extraterritoriali fuori dal circuito devono andare in altra.
+
+- Rita di VICENZA sia partito (con 10) paga a VITERBO.
+
+TRANSAZIONI EXTRATERRITORIALI.
+ sul circuito Viterbo mi compare la lista delle transazioni extraterr., suddivise per territorio.
+ e posso scambiare con quelli di Vicenza.
+
+
+Possibilità di ricevere i RIS da chiunque.
+
+OSPITE
+RESIDENTI
+
+
+ - Rita di VICENZA offre un Servizio a Pietro di AGRIGENTO.
+ - a Sergio gli appare anche Pietro di AGRIGENTO.
+ -
+
+RITA -10 VICENZA
+RITA +20 AGRIGENTO
+SERGIO +10 VICENZA
+
+
+PROFILO:
+il "invia monete" compare a tutti, almeno devi essere collegato in 1 circuito.
+
--- a/public/images/install_app_on_android_2.jpg
+++ b/public/images/install_app_on_android_2.jpg
--- a/public/images/install_app_on_android_3.jpg
+++ b/public/images/install_app_on_android_3.jpg
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -364,7 +364,7 @@ module.exports = configure((ctx) => ({
      ],
      related_applications: [{
        "platform": "webapp",
-        "url": "https://test.riso.app/manifest.json"
+        "url": "https://www.riso.app/manifest.json"
      }]
    },
  },
--- a/src/components/CCheckAppRunning/CCheckAppRunning.vue
+++ b/src/components/CCheckAppRunning/CCheckAppRunning.vue
@@ -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>
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -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>
--- a/src/components/CMyActivities/CMyActivities.vue
+++ b/src/components/CMyActivities/CMyActivities.vue
@@ -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
--- a/src/components/CSendCoins/CSendCoins.vue
+++ b/src/components/CSendCoins/CSendCoins.vue
@@ -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="
--- a/src/components/CSkill/CSkill.vue
+++ b/src/components/CSkill/CSkill.vue
@@ -21,7 +21,8 @@
        v-bind="$attrs"
        :extraparams="extraparams"
        :noaut="noaut"
-        :hidetitleIfEmpty="true">
+        :hidetitleIfEmpty="true"
+        :labelBtnAddExtra="`Aggiungi ` + title">

      </CGridTableRec>
    </div>
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -1101,6 +1101,8 @@ export interface ICircuit {
  refused_groups?: IGroupShort[]
  // --- Mem:
  movements: IMovement[]
+
+  account?: IAccount | null
 }

 export interface IMovement {
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1258,7 +1258,9 @@ const msg_it = {
      refuse_coins_qty: 'Rifiuta',
      refuse_coins: 'Rifiuta Monete',
      movements: 'Movimenti',
-      gruppicom: 'Conti Comunitari',
+      contocomunitario: 'Conto Comunitario',
+      conticollettivi: 'Conti Collettivi',
+      listaconticollettivi: 'Lista Conti Collettivi',
      qta_remaining_to_send: 'Quantità massima inviabile {maxqta} {symbol}',
      qta_not_valid: 'Quantità non valida',
      qta_max_to_send: 'Quantità massima inviabile {maxqta} {symbol}',
--- a/src/store/CircuitStore.ts
+++ b/src/store/CircuitStore.ts
@@ -82,7 +82,7 @@ export const useCircuitStore = defineStore('CircuitStore', {

    },

-    getCircuitsListByGroup(mygrp: IMyGroup): ICircuit[] | undefined | null  {
+    getCircuitsListByGroup(mygrp: IMyGroup): ICircuit[]  {
      return this.listcircuits.filter((rec: ICircuit) => mygrp.mycircuits!.findIndex((circ: IMyCircuit) => circ.circuitname === rec.name) >= 0)
    },

--- a/src/store/NotifStore.ts
+++ b/src/store/NotifStore.ts
@@ -118,7 +118,7 @@ export const useNotifStore = defineStore('NotifStore', {
              }
            }
            this.updateArrNotif()
-          }, 20000)
+          }, 10000)

        })
        .catch((error) => {
--- a/src/views/user/mycircuit/mycircuit.vue
+++ b/src/views/user/mycircuit/mycircuit.vue
@@ -221,7 +221,7 @@
                costanti.ENABLE_CONTI_COMUNITARI &&
                tools.iAmAdminCircuit(circuit.name)
              "
-              :label="t('circuit.gruppicom')"
+              :label="t('circuit.conticollettivi')"
              name="gruppicom"
              icon="fas fa-users"
            ></q-tab>
@@ -322,7 +322,7 @@
              </q-btn>
              </div>

-              <CTitleSec title="Lista Gruppi Comunitari" />
+              <CTitleSec :title="$t('circuit.listaconticollettivi')" />

              <CGridTableRec
                v-if="!loading"
@@ -522,7 +522,7 @@
                      </span>
                    </div>
                    <div :class="$q.screen.lt.sm ? '' : 'row'">
-                      <div v-if="circuit.fido_scoperto_default" class="sezioni">
+                      <div class="sezioni">
                        <CCurrencyValue
                          :symbol="tools.getSymbolByCircuit(circuit)"
                          :color="tools.getColorByCircuit(circuit)"
@@ -534,7 +534,7 @@
                        >
                        </CCurrencyValue>
                      </div>
-                      <div v-if="circuit.fido_scoperto_default" class="sezioni">
+                      <div class="sezioni">
                        <CCurrencyValue
                          :symbol="tools.getSymbolByCircuit(circuit)"
                          :color="tools.getColorByCircuit(circuit)"
@@ -547,7 +547,7 @@
                        </CCurrencyValue>
                      </div>
                      <div
-                        v-if="circuit.fido_scoperto_default_grp"
+                        v-if="circuit.qta_max_default_grp"
                        class="sezioni"
                      >
                        <CCurrencyValue
@@ -562,7 +562,6 @@
                        </CCurrencyValue>
                      </div>
                      <div
-                        v-if="circuit.fido_scoperto_default_grp"
                        class="sezioni"
                      >
                        <CCurrencyValue
@@ -874,6 +873,14 @@
            </div>
            <div v-html="circuit.regulation"></div>
          </q-card-section>
+          <q-card-section class="inset-shadow">
+            <div style="font-weight: bold; font-size: 1.25rem">
+             {{t('circuit.contocomunitario')}}
+            </div>
+            <div>
+              ...
+            </div>
+          </q-card-section>
          <q-card-actions align="center">
            <q-btn
              class="centeritems"
--- a/src/views/user/mygroup/mygroup.scss
+++ b/src/views/user/mygroup/mygroup.scss
@@ -27,3 +27,10 @@
 .title_param{
  font-size: 1.25rem;
 }
+
+
+.circuit_name {
+  text-align: center;
+  font-weight: bold;
+  font-size: 1rem;
+}
--- a/src/views/user/mygroup/mygroup.ts
+++ b/src/views/user/mygroup/mygroup.ts
@@ -22,12 +22,15 @@ import { shared_consts } from '@/common/shared_vuejs'
 import { colmyUserPeople, colmyUserGroup } from '@store/Modules/fieldsTable'
 import { useNotifStore } from '@store/NotifStore'
 import { useCircuitStore } from '@src/store/CircuitStore'
+import circuitsList from '@src/rootgen/admin/circuitsList/circuitsList'


 export default defineComponent({
  name: 'mygroup',
-  components: { CProfile, CTitleBanner, CMyFieldRec,
-    CSaldo, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged },
+  components: {
+    CProfile, CTitleBanner, CMyFieldRec,
+    CSaldo, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged
+  },
  props: {},
  setup() {
    const userStore = useUserStore()
@@ -62,7 +65,7 @@ export default defineComponent({

    const cities = ref(<ICity[]>[])

-    const circuitslist = ref(<ICircuit[] | null | undefined>[])
+    const circuitslist = ref(<ICircuit[]>[])

    function profile() {
      return userStore.my.profile
@@ -87,6 +90,14 @@ export default defineComponent({
            if (mygrp.value && tools.iAmAdminGroup(groupname.value)) {
              circuitslist.value = circuitStore.getCircuitsListByGroup(mygrp.value)
            }
+            if (circuitslist.value) {
+              for (let i = 0; i < circuitslist.value.length; i++) {
+                let myc = data.mygroup.mycircuits.find((circ: IMyCircuit) => circ.circuitname === circuitslist.value[i].name)
+                if (myc) {
+                  circuitslist.value[i].account = myc.account
+                }
+              }
+            }
          } else {
            mygrp.value = null
            users_in_group.value = []
@@ -248,6 +259,7 @@ export default defineComponent({
      mystatus,
      cities,
      circuitslist,
+      circuitStore,
    }
  }
 })
--- a/src/views/user/mygroup/mygroup.vue
+++ b/src/views/user/mygroup/mygroup.vue
@@ -483,12 +483,12 @@
            </q-tab-panel>
            <q-tab-panel name="circuits">
              <div v-for="(circuit, ind) of circuitslist" :key="ind">
-                circuit.account: {{ circuit.account}}
+                <div class="circuit_name">{{circuit.name}}: </div>
                <CSaldo
                  :account="circuit.account"
                  :symbol="circuit.symbol"
                  :color="circuit.color"
-                  :saldo="circuit.account"
+                  :saldo="circuit.account.saldo"
                  :qtarem="circuit.account ? circuitStore.getRemainingCoinsToSend(circuit.account) : 0"
                >
                </CSaldo>