{{ value.toFixed(2) }}
{{tips}}
diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts
index 56e0de0b..0c88c6ca 100755
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -114,6 +114,8 @@ export default defineComponent({
const mypagination = computed(() => {
if (props.table === toolsext.TABMYBACHECAS)
return { sortBy: 'dateTimeStart', descending: false, page: 1, rowsNumber: 20, rowsPerPage: 20 }
+ else if (props.table === toolsext.TABMOVEMENTS)
+ return { sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }
return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }
})
diff --git a/src/components/CNotifAtTop/CNotifAtTop.scss b/src/components/CNotifAtTop/CNotifAtTop.scss
new file mode 100755
index 00000000..e69de29b
diff --git a/src/components/CNotifAtTop/CNotifAtTop.ts b/src/components/CNotifAtTop/CNotifAtTop.ts
new file mode 100755
index 00000000..24d27489
--- /dev/null
+++ b/src/components/CNotifAtTop/CNotifAtTop.ts
@@ -0,0 +1,75 @@
+import { defineComponent, onMounted, PropType, ref, watch } from 'vue'
+import { useQuasar } from 'quasar'
+import { useI18n } from '@/boot/i18n'
+import { useGlobalStore } from '@store/globalStore'
+import { useUserStore } from '@store/UserStore'
+import { fieldsTable } from '@store/Modules/fieldsTable'
+import { tools } from '@store/Modules/tools'
+import { costanti } from '@costanti'
+import { shared_consts } from '@/common/shared_vuejs'
+import { CMyFieldDb } from '@/components/CMyFieldDb'
+import { CDateTime } from '@/components/CDateTime'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { computed } from 'vue'
+import { INotif } from 'model'
+import { useNotifStore } from '@store/NotifStore'
+import { useCircuitStore } from '@store/CircuitStore'
+import { useRouter } from 'vue-router'
+import MixinUsers from '@/mixins/mixin-users'
+
+export default defineComponent({
+ name: 'CNotifAtTop',
+ props: {
+ },
+ components: { },
+ setup(props, { emit }) {
+ const q = useQuasar()
+ const { t } = useI18n()
+ const globalStore = useGlobalStore()
+ const userStore = useUserStore()
+ const notifStore = useNotifStore()
+ const circuitStore = useCircuitStore()
+ const $router = useRouter()
+
+ const { getImgByNotif, getNotifText, getTypeDirNotif, getTypeIdNotif } = MixinUsers()
+
+ const lasts_notifs_req = computed(() => notifStore.getnotifs_coinsreq())
+ const num_notifs = computed(() => lasts_notifs_req.value.length)
+
+ function mounted() {
+ //
+ }
+
+ function clickNotif(notif: INotif) {
+ if (notif.openUrl) {
+ let mylink = tools.updateQueryStringParameter(notif.openUrl, 'idnotif', notif._id)
+ console.log('mylink', mylink, notif._id)
+ if (mylink) {
+ $router.replace(mylink)
+ }
+ }
+ }
+
+
+ onMounted(mounted)
+
+ return {
+ q,
+ t,
+ getImgByNotif,
+ getNotifText,
+ getTypeDirNotif,
+ getTypeIdNotif,
+ tools,
+ costanti,
+ shared_consts,
+ fieldsTable,
+ globalStore,
+ toolsext,
+ lasts_notifs_req,
+ num_notifs,
+ clickNotif,
+ }
+ },
+})
+
diff --git a/src/components/CNotifAtTop/CNotifAtTop.vue b/src/components/CNotifAtTop/CNotifAtTop.vue
new file mode 100755
index 00000000..da5c1e6d
--- /dev/null
+++ b/src/components/CNotifAtTop/CNotifAtTop.vue
@@ -0,0 +1,58 @@
+
+
+
+
-
+
@@ -22,48 +22,57 @@
-
-
-
+
+
+
+
diff --git a/src/components/index.ts b/src/components/index.ts
index 919cc01d..2cadb8e2 100755
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -62,3 +62,4 @@ export * from './CNotifSettings'
// export * from './CPreloadImages'
export * from './CSendCoins'
export * from './CCurrencyValue'
+export * from './CNotifAtTop'
diff --git a/src/layouts/toolbar/notifPopover/notifPopover.vue b/src/layouts/toolbar/notifPopover/notifPopover.vue
index 004810c4..067f27e9 100755
--- a/src/layouts/toolbar/notifPopover/notifPopover.vue
+++ b/src/layouts/toolbar/notifPopover/notifPopover.vue
@@ -163,7 +163,7 @@
size="sm"
icon="fas fa-user-plus"
color="positive" :label="$t('circuit.accept_coins')"
- @click="tools.acceptCoins($q, notif.sender, notif.extrarec)"
+ @click="tools.acceptCoins($q, notif.sender, notif)"
/>
+
+
+
+
-
-
-
-
-
-
+ {{ circuitloaded.symbol }}
+
+
+
- {{ circuitloaded.symbol }}
-
-
-
+
+
+ {
if (res) {
if (res.cansend) {
@@ -5265,7 +5267,7 @@ export const tools = {
})
},
- sendCoinsByCircuit($q: any, circuit: ICircuit, sendcoinrec: ISendCoin): any {
+ async sendCoinsByCircuit($q: any, circuit: ICircuit, sendcoinrec: ISendCoin) {
const userStore = useUserStore()
@@ -5274,7 +5276,7 @@ export const tools = {
let msg = ''
msg = t('circuit.question_sendcoinsto', { coin: circuit.symbol, dest: sendcoinrec.dest, qty: sendcoinrec.qty })
- $q.dialog({
+ return $q.dialog({
message: msg,
ok: {
label: t('dialog.yes'),
@@ -5288,7 +5290,11 @@ export const tools = {
return userStore.setCircuitCmd($q, t, username, sendcoinrec.circuitname, shared_consts.CIRCUITCMD.SENDCOINS_REQ, true, sendcoinrec)
.then((res: any) => {
- if (res.cansend) {
+ console.log('setCircuitCmd ', res)
+ if (res && res.cansend) {
+ if (res.useraccounts && res.useraccounts.length > 0) {
+ userStore.my.profile.useraccounts = res.useraccounts
+ }
tools.showPositiveNotif($q, t('circuit.coins_sendrequest_sent'))
} else {
tools.showNegativeNotif($q, res.errormsg)
@@ -5296,7 +5302,9 @@ export const tools = {
})
})
- return null
+ return await new Promise((resolve, reject) => {
+ resolve(false)
+ })
},
cancelReqCircuit($q: any, username: string, circuitname: string) {
@@ -6311,11 +6319,11 @@ export const tools = {
return ''
}
},
- getRemainingCoinsToSend(account: IAccount) {
- return account.saldo + account.fidoConcesso;
+ roundDec2(mynum: number): number {
+ return (Math.round(mynum * 100)/100);
},
- getMaxCoinsToSend(account: IAccount) {
- return account.qta_maxConcessa - account.saldo;
+ roundDec2Str(mynum: number): string {
+ return (Math.round(mynum * 100)/100).toFixed(2);
},
// getLocale() {
// if (navigator.languages && navigator.languages.length > 0) {
diff --git a/src/store/Modules/toolsext.ts b/src/store/Modules/toolsext.ts
index ee304ba2..31ec7886 100755
--- a/src/store/Modules/toolsext.ts
+++ b/src/store/Modules/toolsext.ts
@@ -60,6 +60,7 @@ export const func_tools = {
export const toolsext = {
TABUSER: 'users',
TABFRIENDS: 'friends',
+ TABMOVEMENTS: 'movements',
TABMYGROUPS: 'mygroups',
TABSKILLS: 'skills',
TABGOODS: 'goods',
diff --git a/src/store/NotifStore.ts b/src/store/NotifStore.ts
index dc6f2ec7..37037123 100755
--- a/src/store/NotifStore.ts
+++ b/src/store/NotifStore.ts
@@ -25,6 +25,12 @@ export const useNotifStore = defineStore('NotifStore', {
},
+ getnotifs_coinsreq: (mystate: INotifState) => (): INotif[] => {
+ const ctrec = (mystate.last_notifs) ? mystate.last_notifs.slice(0, 20).filter((rec) => !rec.read && rec.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS && rec.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ) : []
+ return (ctrec)
+
+ },
+
getnumNotifUnread: (mystate: INotifState) => () => {
const myarr = mystate.last_notifs.filter((notif) => !notif.read)
return (tools.isArray(myarr) ? myarr.length : 0)
@@ -55,6 +61,19 @@ export const useNotifStore = defineStore('NotifStore', {
this.updateArrNotif()
},
+ updateRecNotif(recnotif: INotif) {
+ if (recnotif) {
+ const myrec = this.last_notifs.find((rec: any) => rec._id === recnotif._id)
+ if (myrec) {
+ myrec.status = recnotif.status
+ myrec.read = recnotif.read
+ myrec.descr = recnotif.descr
+
+ this.updateArrNotif()
+ }
+ }
+ },
+
async setBadgeIconApp(){
// Get our dummy count and update it,
// just to give more context for this demo.
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 2ba565c3..7a903708 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -27,6 +27,7 @@ import { costanti } from '@costanti'
import { IMyGroup } from '@model/UserStore'
import globalroutines from '../globalroutines/index'
+import { useNotifStore } from '@store/NotifStore'
export const DefaultUser: IUserFields = {
_id: '',
@@ -1226,9 +1227,14 @@ export const useUserStore = defineStore('UserStore', {
},
async setCircuitCmd($q: any, t: any, usernameOrig: string, circuitname: string, cmd: number, value: any, extrarec?: any) {
- return Api.SendReq('/users/circuits/cmd', 'POST', { usernameOrig, circuitname, cmd, value, extrarec })
+ return await Api.SendReq('/users/circuits/cmd', 'POST', { usernameOrig, circuitname, cmd, value, extrarec })
.then((res) => {
this.updateTables = true
+ if (res.data.recnotif) {
+ const notifStore = useNotifStore()
+
+ notifStore.updateRecNotif(res.data.recnotif)
+ }
return res.data
}).catch((error) => {
tools.showNegativeNotif($q, t('db.recfailed'))
diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue
index 95db9235..036cbd6e 100755
--- a/src/views/user/mycircuit/mycircuit.vue
+++ b/src/views/user/mycircuit/mycircuit.vue
@@ -123,6 +123,7 @@
:arrfilters="arrfilterand"
:filtercustom="filtercustom_rich"
:prop_searchList="searchList"
+ :prop_pagination="{ sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }"
:showType="costanti.SHOW_MOVEMENTS"
keyMain=""
:showCol="false"
diff --git a/src/views/user/mycircuits/mycircuits.ts b/src/views/user/mycircuits/mycircuits.ts
index 76880279..e5cd656b 100755
--- a/src/views/user/mycircuits/mycircuits.ts
+++ b/src/views/user/mycircuits/mycircuits.ts
@@ -1,6 +1,7 @@
import { CMyCircuits } from '@/components/CMyCircuits'
import { CFinder } from '@/components/CFinder'
import { CGridTableRec } from '@/components/CGridTableRec'
+import { CNotifAtTop } from '@/components/CNotifAtTop'
import { tools } from '@store/Modules/tools'
import { toolsext } from '@store/Modules/toolsext'
import { computed, defineComponent, onMounted, ref, watch } from 'vue'
@@ -14,7 +15,7 @@ import { shared_consts } from '@/common/shared_vuejs'
export default defineComponent({
name: 'mycircuits',
- components: { CMyCircuits, CGridTableRec, CFinder },
+ components: { CMyCircuits, CGridTableRec, CFinder, CNotifAtTop },
props: {},
setup() {
const userStore = useUserStore()
diff --git a/src/views/user/mycircuits/mycircuits.vue b/src/views/user/mycircuits/mycircuits.vue
index bdd43ca5..cdacb6a2 100755
--- a/src/views/user/mycircuits/mycircuits.vue
+++ b/src/views/user/mycircuits/mycircuits.vue
@@ -1,5 +1,6 @@
+
+