diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 9d6df9d9..4cb63e44 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -447,7 +447,7 @@ export default defineComponent({ */ { - label: 'Stato', + label: 'Scambio', table: 'statusSkills', key: 'idStatusSkill', value: 0, @@ -455,7 +455,7 @@ export default defineComponent({ type: costanti.FieldType.multiselect, filter: null, useinput: false, - icon: 'mood', + icon: 'fas fa-exchange-alt', filteradv: true, }, { @@ -493,7 +493,7 @@ export default defineComponent({ searchList_Events.value = [ /*{ - label: 'Stato', + label: 'Scambio', table: 'statusSkills', key: 'idStatusSkill', value: 0, diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue index 25a58290..cfb3db2b 100644 --- a/src/components/CMyCardService/CMyCardService.vue +++ b/src/components/CMyCardService/CMyCardService.vue @@ -269,23 +269,6 @@ - - - - - {{ globalStore.getStatusSkillById(recstatus) }} - - - - -
- {{tools.getstrDateTimeEvent($t, myrec, false)}}
- + {{ tools.getstrDateTimeEvent($t, myrec, false) }} + @@ -103,7 +103,11 @@
- + + + +   + {{ globalStore.getStatusSkillById(recstatus) }} + + + - {{ myrec.descr }}
@@ -173,7 +202,12 @@
( - + {{ tools.getNumPartecipantes(myrec) }} @@ -181,12 +215,16 @@ > - {{ myrec.numseen ? myrec.numseen : 0 }} + {{ + myrec.numseen ? myrec.numseen : 0 + }}   - {{ myrec.numfav ? myrec.numfav : 0 }} + {{ + myrec.numfav ? myrec.numfav : 0 + }} (id: number) => { + const ctrec = state.statusSkills.find((mystatus: IStatusSkill) => mystatus._id === id) + return (ctrec) ? ctrec.icon : '' + + }, + isNewVersionAvailable: (state: IGlobalState) => { // console.log('cfgServer', cfgServer) const serversrec = state.cfgServer.find((x) => (x.chiave === toolsext.SERVKEY_VERS) && (x.idapp === process.env.APP_ID)) @@ -297,7 +303,7 @@ export const useGlobalStore = defineStore('GlobalStore', { const userStore = useUserStore() const messageStore = useMessageStore() const notifStore = useNotifStore() - + if (table === costanti.TABEVENTS) return calendarStore.eventlist @@ -386,7 +392,7 @@ export const useGlobalStore = defineStore('GlobalStore', { } return [] } - + else { return ris } @@ -1524,7 +1530,7 @@ export const useGlobalStore = defineStore('GlobalStore', { const calendarStore = useCalendarStore() const circuitStore = useCircuitStore() const Products = useProducts() - + // console.log('calendarStore: loadAfterLogin') // Load local data const showall = userStore.isAdmin || userStore.isManager ? '1' : '0' @@ -1559,7 +1565,7 @@ export const useGlobalStore = defineStore('GlobalStore', { this.producers = (res.data.producers) ? [...res.data.producers] : [] this.storehouses = (res.data.storehouses) ? [...res.data.storehouses] : [] this.providers = (res.data.providers) ? [...res.data.providers] : [] - + Products.catprods = (res.data.catprods) ? [...res.data.catprods] : [] Products.catprods_gas = (res.data.catprods_gas) ? [...res.data.catprods_gas] : [] @@ -1595,7 +1601,7 @@ export const useGlobalStore = defineStore('GlobalStore', { Products.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' } Products.orders = (res.data.orders) ? [...res.data.orders] : [] - + if (showall) { this.newstosent = (res.data.newstosent) ? [...res.data.newstosent] : [] @@ -1664,8 +1670,8 @@ export const useGlobalStore = defineStore('GlobalStore', { }, - - getArrCardByProv(provstr: string): string[] { + + getArrCardByProv(provstr: string): string[] { const recprov = this.provinces.filter((rec: any) => rec.prov === provstr) @@ -1924,7 +1930,7 @@ export const useGlobalStore = defineStore('GlobalStore', { } if (table === 'cards') { - obj = {card: '', label: '[Nessuna]'} + obj = { card: '', label: '[Nessuna]' } } myarr = [obj, ...myarr]