- fix RIS in pendenti, se troppi msg, non compariva piu
- cataloghi, ricerca pickup
This commit is contained in:
@@ -109,17 +109,17 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
|
||||
function getlastnotif(username: string): any {
|
||||
function getlastnotifcoins(username: string): any {
|
||||
// Get msg for this chat
|
||||
if (notifStore.last_notifs)
|
||||
return notifStore.last_notifs.find((rec: INotif) => rec.dest === username)
|
||||
if (notifStore.last_notifcoins)
|
||||
return notifStore.last_notifcoins.find((rec: INotif) => rec.dest === username)
|
||||
// return users_msg_saved[username]
|
||||
}
|
||||
|
||||
function getlastdataread(username: string): any {
|
||||
// Get msg for this
|
||||
|
||||
let myrec = getlastnotif(username)
|
||||
let myrec = getlastnotifcoins(username)
|
||||
const lastdata: any = (myrec && myrec.lastdataread) ? myrec.lastdataread : tools.getLastDateReadReset()
|
||||
|
||||
let mydate = ''
|
||||
@@ -143,7 +143,8 @@ export default defineComponent({
|
||||
|
||||
return notifStore.updateNotifDataFromServer({
|
||||
username,
|
||||
lastdataread: getlastdataread(username)
|
||||
lastdataread: getlastdataread(username),
|
||||
qualinotif: shared_consts.QualiNotifs.CIRCUITS
|
||||
}).then((ris) => {
|
||||
|
||||
notifStore.updateNotification = false
|
||||
|
||||
@@ -55,6 +55,8 @@
|
||||
|
||||
</CMyCircuits>
|
||||
|
||||
|
||||
|
||||
<div class="row justify-center margin_buttons q-gutter-lg">
|
||||
<q-btn-toggle
|
||||
v-model="show_all"
|
||||
@@ -73,7 +75,7 @@
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="clBorderSperator"></div>
|
||||
<div class="clBorderSperator"></div>
|
||||
|
||||
<div class="q-ma-xs">
|
||||
<q-list bordered class="rounded-borders">
|
||||
@@ -163,13 +165,13 @@
|
||||
<q-btn dense rounded icon="fas fa-ellipsis-h">
|
||||
<q-menu>
|
||||
<q-list style="min-width: 150px">
|
||||
<q-item clickable v-close-popup @click="notifStore.setRead(notif._id)">
|
||||
<q-item clickable v-close-popup @click="notifStore.setRead(notif._id, true)">
|
||||
<q-item-section side>
|
||||
<q-icon name="fas fa-trash-alt"/>
|
||||
</q-item-section>
|
||||
<q-item-section>{{ $t('notifs.read') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item clickable v-close-popup @click="notifStore.deleteRec(username, notif._id)">
|
||||
<q-item clickable v-close-popup @click="notifStore.deleteRec(username, notif._id, true)">
|
||||
<q-item-section side>
|
||||
<q-icon name="fas fa-trash-alt"/>
|
||||
</q-item-section>
|
||||
|
||||
@@ -179,7 +179,8 @@ export default defineComponent({
|
||||
|
||||
return notifStore.updateNotifDataFromServer({
|
||||
username: myusername,
|
||||
lastdataread: getlastdataread(myusername)
|
||||
lastdataread: getlastdataread(myusername),
|
||||
qualinotif: shared_consts.QualiNotifs.OTHERS
|
||||
}).then((ris) => {
|
||||
|
||||
notifStore.updateNotification = false
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="notifStore.setRead(notif._id)"
|
||||
@click="notifStore.setRead(notif._id, false)"
|
||||
>
|
||||
<q-item-section side>
|
||||
<q-icon name="fas fa-trash-alt" />
|
||||
@@ -261,7 +261,7 @@
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="notifStore.deleteRec(username, notif._id)"
|
||||
@click="notifStore.deleteRec(username, notif._id, false)"
|
||||
>
|
||||
<q-item-section side>
|
||||
<q-icon name="fas fa-trash-alt" />
|
||||
|
||||
Reference in New Issue
Block a user