diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 1168f5a2..f86750bf 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -82,7 +82,7 @@ export const shared_consts = { SET: 2001, REMOVE_FROM_MYLIST: 2144, REFUSE_REQ: 2145, - CANCEL_REQ: 1146, + CANCEL_REQ: 2146, DELETE: 2170, ADDADMIN: 2180, REMOVEADMIN: 2185, @@ -943,6 +943,11 @@ export const shared_consts = { ID_CIRCUIT_ADDED_ADMIN: 128, ID_CIRCUIT_REMOVED_ADMIN: 256, ID_CIRCUIT_SENDCOINSREQ: 512, + ID_CIRCUIT_COINS_ACCEPTED: 1024, + ID_CIRCUIT_COINS_REFUSED: 2048, + ID_CIRCUIT_SENDCOINSREQ_SENT: 4096, + ID_CIRCUIT_COINS_ACCEPTED_SENT: 8192, + ID_CIRCUIT_COINS_REFUSED_SENT: 16384, TYPEDIR_BOOKING: 6, diff --git a/src/components/CDashboard/CDashboard.scss b/src/components/CDashboard/CDashboard.scss index 27bf74b5..7c4fdb52 100755 --- a/src/components/CDashboard/CDashboard.scss +++ b/src/components/CDashboard/CDashboard.scss @@ -57,6 +57,22 @@ background: linear-gradient(45deg, #ffdf40, #ff8359) !important; } +.progress-bar-5 { + height: 8px; + border-radius: 3px; + background: #ffdf40; + background: -webkit-linear-gradient(45deg, #ffdf40, #ff8359) !important; + background: linear-gradient(45deg, #ffdf40, #ff8359) !important; +} + +.progress-bar-6 { + height: 8px; + border-radius: 3px; + background: #ffdf40; + background: -webkit-linear-gradient(45deg, #ffdf40, #ff8359) !important; + background: linear-gradient(45deg, #ffdf40, #ff8359) !important; +} + .border-top { border-top: 1px solid #efefef; } diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 5f46d8f2..1bb6b3a3 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -1040,7 +1040,7 @@ export default defineComponent({ } function selItem(item: any, col: IColGridTable, inmodif?: boolean) { - console.log('selItem', item, col) + // console.log('selItem', item, col) if (inmodif) { } diff --git a/src/components/CMyCircuit/CMyCircuit.ts b/src/components/CMyCircuit/CMyCircuit.ts index 96e48251..bfcc5ebf 100755 --- a/src/components/CMyCircuit/CMyCircuit.ts +++ b/src/components/CMyCircuit/CMyCircuit.ts @@ -1,6 +1,8 @@ -import { defineComponent, onMounted, PropType, ref, watch } from 'vue' +import { computed, defineComponent, onMounted, PropType, ref, watch } from 'vue' import { useUserStore } from '@store/UserStore' -import { ICircuit, IImgGallery, IUserFields, IUserProfile, IFriends } from 'model' +import { useCircuitStore } from '@store/CircuitStore' + +import { ICircuit, IImgGallery, IUserFields, IUserProfile, IFriends, IAccount } from 'model' import { costanti } from '@costanti' import { shared_consts } from '@/common/shared_vuejs' import { tools } from '@store/Modules/tools' @@ -8,12 +10,13 @@ import { useQuasar } from 'quasar' import { useI18n } from '@/boot/i18n' import { useRoute, useRouter } from 'vue-router' import { CUserNonVerif } from '@/components/CUserNonVerif' +import { CSaldo } from '@/components/CSaldo' import { toolsext } from '@store/Modules/toolsext' export default defineComponent({ name: 'CMyCircuit', emits: ['setCmd'], - components: {CUserNonVerif}, + components: {CUserNonVerif, CSaldo}, props: { mycircuit: { type: Object as PropType, @@ -34,12 +37,17 @@ export default defineComponent({ setup(props, { emit }) { const userStore = useUserStore() + const circuitStore = useCircuitStore() const $q = useQuasar() const { t } = useI18n() const $router = useRouter() const $route = useRoute() const circuit = ref(null) + const account = computed(() => circuit.value ? userStore.getAccountByCircuitId(circuit.value._id) : null ) + + const qtarem = computed(() => account.value ? circuitStore.getRemainingCoinsToSend(account.value) : 0) + const saldo = computed(() => account.value ? account.value.saldo : 0) const table = ref(toolsext.TABCIRCUITS) @@ -88,6 +96,11 @@ export default defineComponent({ tools, table, myusername, + circuitStore, + t, + account, + qtarem, + saldo, } }, }) diff --git a/src/components/CMyCircuit/CMyCircuit.vue b/src/components/CMyCircuit/CMyCircuit.vue index 3f4a7bfb..676293ae 100755 --- a/src/components/CMyCircuit/CMyCircuit.vue +++ b/src/components/CMyCircuit/CMyCircuit.vue @@ -1,7 +1,7 @@