Versione 1.0.17

- Fix saldo pendente
- aggiunto bottone markup Telegram
- aggionta opzione per registrarsi direttamente su Telegram, senza doversi registrare ad un sito

src/components/CGridTableRec/CGridTableRec.ts

@@ -1085,7 +1085,7 @@ export default defineComponent({
       const myfilternow = myfilter.value
       const myfilterandnow = myfilterand.value
 
-      console.log('onUpdateData')
+      // console.log('onUpdateData')
 
       if (ordinam.value) {
         sortBy = ordinam.value
@@ -1097,7 +1097,7 @@ export default defineComponent({
       savefilter()
 
       if (!mytable.value) {
-        console.log('   startsearch.value', startsearch.value)
+        // console.log('   startsearch.value', startsearch.value)
         startsearch.value = false
         if (myinfscroll.value) {
           // @ts-ignore
@@ -1118,7 +1118,7 @@ export default defineComponent({
 
       startsearch.value = true
 
-      console.log('   TRUE: startsearch.value', startsearch.value)
+      // console.log('   TRUE: startsearch.value', startsearch.value)
 
       if ((startRow < pagination.value.rowsNumber) || clickbuttsearch.value) {
 
@@ -1160,7 +1160,7 @@ export default defineComponent({
           changetable.value = false
           startsearch.value = false
 
-          console.log('   FINE- startsearch.value', startsearch.value)
+          // console.log('   FINE- startsearch.value', startsearch.value)
 
           if (myinfscroll.value) {
             // @ts-ignore
@@ -1197,7 +1197,7 @@ export default defineComponent({
     }
 
     function refresh_infscroll(done: any) {
-      console.log('refresh_infscroll', 'pag', pagination.value.rowsNumber, 'done', done)
+      // console.log('refresh_infscroll', 'pag', pagination.value.rowsNumber, 'done', done)
       rowclicksel.value = null
 
       onUpdateData(0,
@@ -1209,7 +1209,7 @@ export default defineComponent({
 
 
     function refresh() {
-      console.log('refresh', 'startsearch', startsearch.value)
+      // console.log('refresh', 'startsearch', startsearch.value)
 
       clickbuttsearch.value = true
       // console.log('refresh')
@@ -1260,7 +1260,7 @@ export default defineComponent({
         myvertical.value === costanti.VISUTABLE_SCHEDA_USER ||
         (props.showType === costanti.SHOW_USERINFO))) {
 
-        console.log('REFRR - updateTables.value', newval)
+        // console.log('REFRR - updateTables.value', newval)
         refresh()
 
         userStore.updateTables = false

src/components/CHours/CHours.vue

@@ -11,7 +11,7 @@
         :arrfilters="myarrfilterand"
         :filterdef="myfilterdef"
         :prop_codeId="todoId"
-        :defaultnewrec="getdefaultnewrec"
+        :defaultnewrec="getdefaultnewrec()"
         :extraparams="extraparams()"
         labeladd="Aggiungi Ora">
 

src/components/CInfoAccount/CInfoAccount.ts

@@ -53,6 +53,7 @@ export default defineComponent({
     const circuitStore = useCircuitStore()
 
     const table = ref(toolsext.TABMYGROUPS)
+    const loadSaldo = ref(false)
 
     const circuit = ref(<ICircuit | null | undefined>null)
 
@@ -95,6 +96,22 @@ export default defineComponent({
 
     }
 
+    function loadAccount() {
+      // console.log('loadAccount')
+      // Group
+      const grp = userStore.getGroupByGroupname(props.grp.groupname)
+      if (grp)
+        myaccount.value = grp.account
+    }
+
+
+    async function aggiornaSaldo() {
+      loadSaldo.value = true
+      await circuitStore.aggiornaSaldo(circuit.value!._id, props.grp ? props.grp.groupname : '');
+      loadAccount()
+      loadSaldo.value = false
+    }
+
     onMounted(mounted)
 
     return {
@@ -112,6 +129,8 @@ export default defineComponent({
       t,
       myaccount,
       save,
+      aggiornaSaldo,
+      loadSaldo,
     }
   },
 })

src/components/CInfoAccount/CInfoAccount.vue

@@ -6,7 +6,6 @@
 
     <q-separator />
 
-
     <CSaldo
       v-if="tools.isUserOk() && myaccount"
       :account="myaccount"
@@ -17,6 +16,23 @@
     >
     </CSaldo>
 
+    <div class="text-center">
+      <div class="text-center">
+        <q-spinner v-if="loadSaldo" color="primary" size="3em" :thickness="2" />
+      </div>
+      <q-btn
+        v-if="myaccount && !loadSaldo && (grp ? tools.iAmAdminGroup(grp.groupname) : tools.iAmAdminCircuit(circuit.name))"
+        outline
+        rounded
+        dense
+        color="green"
+        icon="fas fa-redo"
+        :label="t('movement.updatewallet')"
+        @click="aggiornaSaldo()"
+      >
+      </q-btn>
+    </div>
+
     <q-card-section>
       <div v-if="myaccount.date_created" class="container">
         <q-icon name="fas fa-lightbulb" class="iconcirc"></q-icon>

src/components/CMyGroup/CMyGroup.vue

@@ -32,6 +32,7 @@
               :saldo="grp.account.saldo"
             >
             </CSaldo>
+
           </q-item-label>
         </q-item-section>
 

src/components/CUserInfoAccount/CUserInfoAccount.vue

@@ -6,13 +6,13 @@
 
     <q-separator />
 
-    
+
     <CSaldo
       v-if="tools.isUserOk() && myaccount"
       :account="myaccount"
       :symbol="circuit.symbol"
       :color="circuit.color"
-      :saldo="myaccount.saldo"
+      :saldo="myaccount.saldo_pend"
       :qtarem="myaccount ? circuitStore.getRemainingCoinsToSend(myaccount) : 0"
     >
     </CSaldo>

src/components/MyHeader/MyHeader.ts

@@ -367,14 +367,14 @@ export default defineComponent({
      */
 
     function RefreshApp() {
-        // Unregister Service Worker
-        navigator.serviceWorker.getRegistrations().then((registrations) => {
-        for (const registration of registrations) {
-          registration.unregister()
-        }
-      })
 
       if (Platform.is.ios) {
+        // Unregister Service Worker
+        navigator.serviceWorker.getRegistrations().then((registrations) => {
+          for (const registration of registrations) {
+            registration.unregister()
+          }
+        })
 
         // window.location.reload()
       } else {