ver "0.5.9"

Saldo ora comprende anche le transazioni Pendenti (e le visualizza)
2022-09-18 01:20:48 +02:00
parent f625278801
commit da17c2b060
26 changed files with 148 additions and 32 deletions
--- a/src/components/CCurrencyValue/CCurrencyValue.ts
+++ b/src/components/CCurrencyValue/CCurrencyValue.ts
@@ -45,6 +45,11 @@ export default defineComponent({
      type: Number,
      required: true,
    },
+    valueextra: {
+      type: String,
+      required: false,
+      default: '',
+    },
  },
  components: {},
  setup(props, { emit }) {
--- a/src/components/CCurrencyValue/CCurrencyValue.vue
+++ b/src/components/CCurrencyValue/CCurrencyValue.vue
@@ -28,7 +28,7 @@
            <q-icon v-else name="fas fa-coins" size="sm"/>
        </template>
        <template v-slot:control>
-          <div class="align_elem_right">{{ tools.roundDec2(value) }}
+          <div class="align_elem_right">{{valueextra}}{{ tools.roundDec2(value) }}
            <q-tooltip :offset="[10, 10]" v-model="showingtooltip">{{tips}}</q-tooltip>
          </div>
        </template>
--- a/src/components/CMyCircuit/CMyCircuit.vue
+++ b/src/components/CMyCircuit/CMyCircuit.vue
@@ -14,6 +14,7 @@
          <q-item-label v-if="circuit.longdescr" caption lines="3"><em>{{ circuit.longdescr }}</em></q-item-label>
          <q-item-label lines="1">
            <CSaldo
+              :account="account"
              :symbol="circuit.symbol"
              :color="circuit.color"
              :saldo="saldo"
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -67,7 +67,7 @@
              </q-btn>
              <q-avatar v-else-if="col.tipovisu === costanti.TipoVisu.LINKIMG && myvalue" size="60px">

-                <q-img :src="getImgUser(contact)" :alt="myvalue" img-class="imgprofile" height="60px"/>
+                <q-img :src="userStore.getImgUserByRow(row, col)" :alt="myvalue" img-class="imgprofile" height="60px"/>
              </q-avatar>
              <q-btn v-else-if="col.tipovisu === costanti.TipoVisu.BUTTON && myvalue" rounded size="sm"
                     color="primary" icon="person" :to="col.link.replace(col.name, myvalue)" :label="myvalue">
@@ -111,7 +111,7 @@
              </q-btn>
              <q-avatar v-else-if="col.tipovisu === costanti.TipoVisu.LINKIMG && myvalue" size="60px">

-                <q-img :src="getImgUser(contact)" :alt="myvalue" img-class="imgprofile" height="60px"/>
+                <q-img :src="userStore.getImgUserByRow(row, col)" :alt="myvalue" img-class="imgprofile" height="60px"/>
              </q-avatar>
              <q-btn v-else-if="col.tipovisu === costanti.TipoVisu.BUTTON && myvalue" rounded size="sm"
                     color="primary" icon="person" :to="col.link.replace(col.name, myvalue)" :label="myvalue">
--- a/src/components/CSaldo/CSaldo.ts
+++ b/src/components/CSaldo/CSaldo.ts
@@ -5,6 +5,10 @@ import { CCurrencyValue } from '../CCurrencyValue'

 import { date, useQuasar } from 'quasar'
 import { useI18n } from '@/boot/i18n'
+import { IAccount, ISpecialField } from 'model'
+import { CMyFieldDb } from '@/components/CMyFieldDb'
+import { CMyFieldRec } from '@/components/CMyFieldRec'
+import { colTableNotifCoins } from '@store/Modules/fieldsTable'

 export default defineComponent({
  name: 'CSaldo',
@@ -18,6 +22,11 @@ export default defineComponent({
      required: true,
      default: 0,
    },
+    account: {
+      type: Object as PropType<IAccount>,
+      required: false,
+      default: null,
+    },
    qtarem: {
      type: Number,
      required: false,
@@ -29,10 +38,11 @@ export default defineComponent({
      default: '',
    },
  },
-  components: { CCurrencyValue },
+  components: { CCurrencyValue, CMyFieldRec },
  setup(props, { emit }) {
    const $q = useQuasar()
    const { t } = useI18n()
+    const color_border = ref('red')

    const showingtooltip = ref(false)

@@ -46,6 +56,9 @@ export default defineComponent({
    return {
      showingtooltip,
      t,
+      colTableNotifCoins,
+      tools,
+      color_border,
    }
  },
 })
--- a/src/components/CSaldo/CSaldo.vue
+++ b/src/components/CSaldo/CSaldo.vue
@@ -5,9 +5,42 @@
    :tips="t('account.saldo_tips', {fido: qtarem, symbol})"
    :color="color"
    :value="saldo"
+    :valueextra="account && account.notifspending ? `* `: ''"
    :label="t('account.saldo') + ` (` + t('account.dispon') + `: ` + qtarem + `)`">

  </CCurrencyValue>
+
+  <div v-if="account && account.notifspending" :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 ">
+        <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>
+
+            <CMyFieldRec
+              table="sendnotifs"
+              :id="myrec._id"
+              :rec="myrec"
+              :field="mycol.name"
+              :canEdit="false"
+              :canModify="false">
+            </CMyFieldRec>
+          </div>
+        </span>
+      </div>
+    </div>
+  </div>
+
+
 </template>

 <script lang="ts" src="./CSaldo.ts">
--- a/src/components/CSendCoins/CSendCoins.ts
+++ b/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('')
+    const qty = ref(<number>1)
    const causal = ref('')
    const bothcircuits = ref(<any>[])

@@ -86,11 +86,12 @@ export default defineComponent({

          const quanti = [...Array(20).keys()].map(i => i + 1)
          for (const ind of quanti) {
+            let valuenorm = ind * numstep.value
            let value = ind * numstep.value
            if (value > remainingCoins.value) {
              break
            } else {
-              const label = value.toString()
+              const label = valuenorm.toString()
              arrayMarkerLabel.value.push({ value, label })
            }
          }
--- a/src/components/CSendCoins/CSendCoins.vue
+++ b/src/components/CSendCoins/CSendCoins.vue
@@ -40,6 +40,10 @@
              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 })]"
              :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"
            >
              <!--val => val > circuitStore.getMaxCoinsToSend(accountloaded) || t('circuit.qta_max_to_send', { maxqta: tools.getRemainingCoinsToSend(accountloaded), symbol: circuitloaded.symbol })]" -->
              <template v-slot:append>
@@ -56,6 +60,7 @@
              v-model="qty"
              color="green"
              markers
+              readonly
              track-size="10px"
              :step="numstep"
              :marker-labels="arrayMarkerLabel"
@@ -65,7 +70,7 @@
              switch-marker-labels-side
              :inner-max="remainingCoins"
              :min="0"
-              :max="Number(maxsendable ? maxsendable.toFixed(2) : 0)"
+              :max="Number(maxsendable ? maxsendable: 0)"
            />
          </div>