se sei sulla pagina, la notifica di "gia letto" non viene settata.

- aggiunto "RIS" ai tipi di contributi
- Amicizia accettata compare 2 volte nelle notifiche
- Bottone click sull utente non funziona

src/components/CGridTableRec/CGridTableRec.ts

@@ -362,11 +362,11 @@ export default defineComponent({
     })
 
     $router.beforeResolve((to: any) => {
-      // console.log('beforeResolve', visupagedialog.value, 'to', to)
+      console.log('beforeResolve', visupagedialog.value, 'to', to)
 
       if (visupagedialog.value && !to.meta.newpage) {
-        visupagedialog.value = false
-        return false
+        // visupagedialog.value = false
+        // return false
       }
 
     })

src/components/CGridTableRec/CGridTableRec.vue

@@ -741,7 +741,7 @@
       </template>
     </q-table>
 
-    <q-dialog v-model="visupagedialog" @hide="hidewindow" :maximized="$q.screen.lt.sm">
+    <q-dialog v-model="visupagedialog" @hide="hidewindow" :maximized="$q.screen.lt.sm" persistent>
       <CMyCardGrpPopup
         v-if="mytable === toolsext.TABMYGROUPS"
         :table="mytable"

src/components/CSaldo/CSaldo.scss

@@ -0,0 +1,3 @@
+.testo {
+  font-size: 1rem;
+}

src/components/CSaldo/CSaldo.vue

@@ -5,26 +5,27 @@
     :tips="t('account.saldo_tips', {fido: qtarem, symbol})"
     :color="color"
     :value="saldo"
-    :valueextra="account && account.notifspending ? `* `: ''"
+    :valueextra="account && account.notifspending.length > 0 ? `* `: ''"
     :label="t('account.saldo') + ` (` + t('account.dispon') + `: ` + qtarem + `)`">
 
   </CCurrencyValue>
 
-  <div v-if="account && account.notifspending" :class="`text-h5 bordo_stondato_stretto full-width`"
+
+  <div v-if="account && account.notifspending.length > 0" :class="`text-h5 bordo_stondato_stretto full-width`"
        :style="(!$q.screen.lt.sm ? `min-width: 250px; ` : ``) + (color_border ? `border-color: ` + color_border + `!important;`: '')">
     <div class="text-center text-h7-dense text-italic text-grey-14">
       {{ t('movement.pendingtransaction') }}
     </div>
 
     <div v-for="(myrec, index) in account.notifspending" :key="myrec._id">
-      <div class="row justify-evenly items-center q-gutter-xs ">
+      <div class="row justify-evenly items-center bordo_stondato_pending">
         <span v-for="(mycol, indcol) of colTableNotifCoins" :key="indcol">
           <div
             class="col"
             style="display: flex;"
             v-if="(mycol.visible && (tools.checkIfShowField(mycol, tools.TIPOVIS_SHOW_RECORD, false, tools.getValue(myrec, mycol.field, mycol.subfield))))">
 
-            <span  v-if="mycol.name === 'datenotif'">{{ index + 1 }}</span>
+            <span class="testo" v-if="mycol.name === 'datenotif'">{{ index + 1 }}°</span>
 
             <CMyFieldRec
               table="sendnotifs"

src/components/CSendCoins/CSendCoins.ts

@@ -35,7 +35,7 @@ export default defineComponent({
 
     const from_username = ref(userStore.my.username)
     const circuitsel = ref('')
-    const qty = ref(<number>1)
+    const qty = ref(<string|number>'')
     const causal = ref('')
     const bothcircuits = ref(<any>[])
 
@@ -51,6 +51,7 @@ export default defineComponent({
     const arrayMarkerLabel = ref(<any>[])
 
     const qtyRef = ref(<any>null)
+    const causalRef = ref(<any>null)
 
     watch(() => circuitsel.value, (newval, oldval) => {
       tools.setCookie(tools.CIRCUIT_USE, newval)
@@ -165,6 +166,7 @@ export default defineComponent({
       arrayMarkerLabel,
       remainingCoins,
       qtyRef,
+      causalRef,
       maxsendable,
       circuitStore,
       numstep,

src/components/CSendCoins/CSendCoins.vue

@@ -37,13 +37,13 @@
             <q-input
               ref="qtyRef"
               class="q-py-sm text-h5"
-              outlined v-model="qty" type="text"
-              :rules="[ val => val <= circuitStore.getRemainingCoinsToSend(accountloaded) || t('circuit.qta_remaining_to_send', { maxqta: circuitStore.getRemainingCoinsToSend(accountloaded), symbol: circuitloaded.symbol })]"
+              outlined v-model="qty" type="number"
+              :rules="[
+                val => val <= circuitStore.getRemainingCoinsToSend(accountloaded) || t('circuit.qta_remaining_to_send', { maxqta: circuitStore.getRemainingCoinsToSend(accountloaded), symbol: circuitloaded.symbol }),
+                val => val > 0 || t('circuit.qta_not_valid')]"
               :label="t('movement.amount_to_send', {qtamax: circuitStore.getRemainingCoinsToSend(accountloaded) ? circuitStore.getRemainingCoinsToSend(accountloaded).toFixed(2) : 0 + ` ` + circuitloaded.symbol})"
-              mask="#.##"
-              fill-mask="0"
-              reverse-fill-mask
               input-class="text-right"
+              v-on:keyup.enter="$event.target.nextElementSibling.focus()"
             >
               <!--val => val > circuitStore.getMaxCoinsToSend(accountloaded) || t('circuit.qta_max_to_send', { maxqta: tools.getRemainingCoinsToSend(accountloaded), symbol: circuitloaded.symbol })]" -->
               <template v-slot:append>
@@ -60,9 +60,8 @@
               v-model="qty"
               color="green"
               markers
-              readonly
               track-size="10px"
-              :step="numstep"
+              :step="numstep/2"
               :marker-labels="arrayMarkerLabel"
               label-always
               :label-value="priceLabel"
@@ -74,7 +73,9 @@
             />
           </div>
 
-          <q-input v-model="causal" label="Note" class="q-my-sm full-width">
+          <q-input
+            ref="causalRef"
+            v-model="causal" label="Note" class="q-my-sm full-width">
           </q-input>
 
         </q-card-section>