[])
+
watch(() => myel.value.order, (value, oldval) => {
mounted()
})
@@ -222,6 +224,11 @@ export default defineComponent({
if (props.myelem)
newtype.value = props.myelem.type
+
+ if (myel.value.class4) {
+ selectedClasses.value = myel.value.class4.split(' ').filter(Boolean)
+ }
+
}
function clickOnElem() {
@@ -237,6 +244,27 @@ export default defineComponent({
modifElem()
+ }
+
+ function dupNewCard() {
+ if (!myel.value.listcards)
+ return
+
+ const myfindcard = myel.value.listcards[tabCard.value]
+
+ if (myfindcard) {
+ let mycard = { ...myfindcard }
+ delete mycard._id
+ mycard._id = objectId()
+
+ const bakcard = [...myel.value.listcards]
+
+ myel.value.listcards = []
+ myel.value.listcards = [...bakcard, mycard]
+ modifElem()
+ }
+
+
}
function addNewElemText() {
@@ -284,7 +312,12 @@ export default defineComponent({
if (props.myelem.listcards) {
props.myelem.listcards.forEach((rec: IMyCard) => {
if (recpass._id === rec._id) {
- rec.imagefile = myval
+ if (myval.imagefile) {
+ rec.imagefile = myval.imagefile
+ rec.vers_img = tools.getGenerateVersionImage()
+ } else {
+ rec.imagefile = myval
+ }
}
})
}
@@ -292,7 +325,11 @@ export default defineComponent({
if (props.myelem.elemsText) {
props.myelem.elemsText.forEach((rec: IElemText) => {
if (recpass._id === rec._id) {
- rec.text = myval
+ if (myval.imagefile) {
+ rec.text = myval.imagefile
+ } else {
+ rec.text = myval
+ }
}
})
}
@@ -335,6 +372,11 @@ export default defineComponent({
modifElem()
}
+ function updateSizeHeight(value: any) {
+ myel.value.heightimg = value; // Aggiorna widthimg con il nuovo valore
+ modifElem()
+ }
+
function toggleSize() {
emit('toggleSize', null)
}
@@ -402,6 +444,30 @@ export default defineComponent({
emit('saveElem', myelem)
}
+ function classiImmagineOptions() {
+ // Ritorna l'array delle classi, ad esempio:
+ return [
+ { label: 'Tonda', value: 'image-circle' },
+ { label: 'Sbordata', value: 'image-round-bordered' },
+ { label: 'Ombrata', value: 'image-ombra' },
+ // Aggiungi altre classi se necessario
+ ];
+ }
+
+ function updateClass4(selectedOptions: any) {
+
+ // Aggiorna selectedClasses
+ selectedClasses.value = selectedOptions;
+
+ if (myel.value) {
+ // Imposta myel.class2 come stringa
+ myel.value.class4 = selectedOptions.join(' '); // Converte l'array in una stringa separata da spazi
+
+ saveElem()
+ }
+ }
+
+
onMounted(mounted)
return {
@@ -449,6 +515,11 @@ export default defineComponent({
orderOptions,
addOrder,
moveElem,
+ updateSizeHeight,
+ dupNewCard,
+ updateClass4,
+ selectedClasses,
+ classiImmagineOptions,
}
},
diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue
index 8801feae..0d0c09af 100755
--- a/src/components/CMyEditElem/CMyEditElem.vue
+++ b/src/components/CMyEditElem/CMyEditElem.vue
@@ -173,16 +173,20 @@
dense
style="width: 150px"
/>
-
-
+ @new-value="updateSizeHeight"
+ style="width: 150px"
+ />
@@ -281,6 +285,42 @@
>
+
+ Banner:
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -356,11 +411,11 @@
- Card {{ ind + 1 }}
+ Scheda {{ ind + 1 }}
+
+
-
-
+ @new-value="updateSizeHeight"
+ style="width: 150px"
+ />
-
-
-
+
-
+ dense
+ @new-value="updateSizeHeight"
+ style="width: 150px"
+ />
{ address: '', coordinates: [0, 0] })
+ const carouselRef = ref(null)
+ const isAtStart = ref(true)
+ const isAtEnd = ref(false)
+ const activeIndex = ref(0)
+
watch(() => myel.value.order, (value, oldval) => {
mounted()
})
@@ -173,14 +179,28 @@ export default defineComponent({
disableSave.value = false
}
+ const checkScrollPosition = () => {
+ const container = carouselRef.value
+ if (!container || !myel.value || !myel.value.listcards) return
+
+ isAtStart.value = container.scrollLeft <= 0
+ isAtEnd.value = container.scrollLeft + container.clientWidth >= container.scrollWidth - 1
+
+ const cardWidth = container.scrollWidth / myel.value.listcards.length
+ activeIndex.value = Math.round(container.scrollLeft / cardWidth)
+ }
+
function mounted() {
- //console.log('mounted elem ')
- //console.log(props.myelem.type)
myel.value = props.myelem
neworder.value = props.myelem.order
if (props.myelem)
newtype.value = props.myelem.type
+
+ nextTick(() => {
+ checkScrollPosition()
+ carouselRef.value?.addEventListener('scroll', checkScrollPosition)
+ })
}
function clickOnElem() {
@@ -271,6 +291,10 @@ export default defineComponent({
clickshare,
isAppRunning,
coordaddr,
+ isAtStart,
+ isAtEnd,
+ activeIndex,
+ carouselRef,
}
},
diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue
index fe6297ec..a79c95ea 100755
--- a/src/components/CMyElem/CMyElem.vue
+++ b/src/components/CMyElem/CMyElem.vue
@@ -31,65 +31,71 @@
-
-
+
-
-
- {{ rec.alt }}
-
-
-
- {{ rec.description }}
-
-
-
-
-
-
-
-
+
+
+ {{ tools.getText(rec.alt) }}
+
+
+
+ {{ rec.description }}
+
+
+
+
+
+
+
+
+
+
+
@@ -468,6 +474,10 @@
CDashGroup
+
CSendRISTo
diff --git a/src/components/CMyGroup/CMyGroup.vue b/src/components/CMyGroup/CMyGroup.vue
index 950c6a07..b66a7ab8 100755
--- a/src/components/CMyGroup/CMyGroup.vue
+++ b/src/components/CMyGroup/CMyGroup.vue
@@ -1,12 +1,8 @@
-
-
+
-
+
{{ grp.title }} ({{ grp.groupname }})
@@ -33,7 +29,6 @@
:saldo="grp.account.saldo"
>
-
diff --git a/src/components/CMyGroupOnlyView/CMyGroupOnlyView.vue b/src/components/CMyGroupOnlyView/CMyGroupOnlyView.vue
index 2e010136..abc191e6 100755
--- a/src/components/CMyGroupOnlyView/CMyGroupOnlyView.vue
+++ b/src/components/CMyGroupOnlyView/CMyGroupOnlyView.vue
@@ -2,10 +2,7 @@
-
+
{{ labelextra }}
@@ -19,7 +16,7 @@
-
+
{{ grp.title }} ({{ grp.groupname }})
diff --git a/src/components/CMyImgUser/CMyImgUser.scss b/src/components/CMyImgUser/CMyImgUser.scss
new file mode 100755
index 00000000..b892863a
--- /dev/null
+++ b/src/components/CMyImgUser/CMyImgUser.scss
@@ -0,0 +1,4 @@
+.myflex{
+ display: flex;
+ flex: 1;
+}
diff --git a/src/components/CMyImgUser/CMyImgUser.ts b/src/components/CMyImgUser/CMyImgUser.ts
new file mode 100755
index 00000000..96f9e804
--- /dev/null
+++ b/src/components/CMyImgUser/CMyImgUser.ts
@@ -0,0 +1,100 @@
+import { defineComponent, onMounted, PropType, ref, watch } from 'vue'
+import { useUserStore } from '@store/UserStore'
+import { ICircuit, IImgGallery, IMovQuery, IUserFields, IUserProfile } from 'model'
+import { costanti } from '@costanti'
+import { shared_consts } from '@/common/shared_vuejs'
+import { tools } from '@store/Modules/tools'
+import { useQuasar } from 'quasar'
+import { CSendCoins } from '@/components/CSendCoins'
+import { CSaldo } from '@/components/CSaldo'
+import { CUserInfoAccount } from '@/components/CUserInfoAccount'
+import { useI18n } from '@/boot/i18n'
+import { useRoute, useRouter } from 'vue-router'
+import { useCircuitStore } from '@store/CircuitStore'
+
+export default defineComponent({
+ name: 'CMyImgUser',
+ components: { CSendCoins, CSaldo, CUserInfoAccount },
+ emits: ['setCmd', 'showInnerDialog'],
+ props: {
+ mycontact: {
+ type: Object as PropType,
+ required: false,
+ default: null,
+ },
+ mov: {
+ type: Object as PropType,
+ required: false,
+ default: null,
+ },
+ from: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
+ myusername: {
+ type: String,
+ required: false,
+ default: null,
+ },
+ groupname: {
+ type: String,
+ required: false,
+ default: '',
+ },
+ },
+
+ setup(props, { emit }) {
+
+ const userStore = useUserStore()
+ const $q = useQuasar()
+ const { t } = useI18n()
+ const $router = useRouter()
+ const $route = useRoute()
+
+ const showsendCoinTo = ref(false)
+
+ const showAccountInfo = ref(false)
+
+ const contact = ref(null)
+ const circuit = ref(null)
+
+ watch(() => props.mycontact, (newval, oldval) => {
+ mounted()
+ })
+
+ function mounted() {
+ if (props.mycontact) {
+ contact.value = props.mycontact
+ }
+ }
+
+ function getImgUser(profile: IUserFields) {
+ return userStore.getImgByProfile(profile)
+ }
+
+ function getImgUserMov(tipoconto: number, from: boolean) {
+ return userStore.getImgByMov(props.mov!, tipoconto, from, true)
+ }
+
+ function naviga(path: string) {
+ $router.push(path)
+ }
+
+ onMounted(mounted)
+
+ return {
+ contact,
+ costanti,
+ getImgUser,
+ getImgUserMov,
+ naviga,
+ shared_consts,
+ userStore,
+ tools,
+ circuit,
+ showAccountInfo,
+ showsendCoinTo,
+ }
+ },
+})
diff --git a/src/components/CMyImgUser/CMyImgUser.vue b/src/components/CMyImgUser/CMyImgUser.vue
new file mode 100755
index 00000000..610c3680
--- /dev/null
+++ b/src/components/CMyImgUser/CMyImgUser.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CMyImgUser/index.ts b/src/components/CMyImgUser/index.ts
new file mode 100755
index 00000000..63a69f64
--- /dev/null
+++ b/src/components/CMyImgUser/index.ts
@@ -0,0 +1 @@
+export { default as CMyImgUser } from './CMyImgUser.vue'
diff --git a/src/components/CMyPageElem/CMyPageElem.ts b/src/components/CMyPageElem/CMyPageElem.ts
index 030d80a7..d9803894 100755
--- a/src/components/CMyPageElem/CMyPageElem.ts
+++ b/src/components/CMyPageElem/CMyPageElem.ts
@@ -7,6 +7,7 @@ import { IMyElem, IMyPage } from '@src/model'
import { useGlobalStore } from '@store/globalStore'
import { LandingFooter } from '@/components/LandingFooter'
import { CMyElem } from '@/components/CMyElem'
+import { CTitleBanner } from '@/components/CTitleBanner'
import { CMyEditElem } from '@/components/CMyEditElem'
import { CMyPageElem2 } from '@/components/CMyPageElem2'
@@ -21,7 +22,10 @@ import { useRouter } from 'vue-router'
export default defineComponent({
name: 'CMyPageElem',
- components: { LandingFooter, CImgTitle, CTitle, CMyElem, CMyEditElem, CMyPageElem2 },
+ components: {
+ LandingFooter, CImgTitle, CTitle, CMyElem,
+ CMyEditElem, CMyPageElem2, CTitleBanner,
+ },
props: {
title: String,
mypath: {
@@ -73,7 +77,7 @@ export default defineComponent({
},
set(value: boolean) {
- return globalStore.editOn = value
+ return tools.updateEditOn(value)
}
})
const visuEditor = ref(false)
diff --git a/src/components/CMyPageElem/CMyPageElem.vue b/src/components/CMyPageElem/CMyPageElem.vue
index aa0eb80e..2b8f7f06 100755
--- a/src/components/CMyPageElem/CMyPageElem.vue
+++ b/src/components/CMyPageElem/CMyPageElem.vue
@@ -83,8 +83,32 @@
+
+
+
+
- Reg: {{ tools.getstrDateShort(contact.date_reg) }}
+ Reg: {{ tools.getstrDateShort(contact.date_reg) }}
@@ -418,7 +422,7 @@
clickable
v-close-popup
dense
- @click="naviga(`/my/` + contact.username + '?sendris=1')"
+ @click="naviga(`/my/` + contact.username + '?sendris=0')"
>
@@ -807,7 +811,7 @@
clickable
v-close-popup
dense
- @click="naviga(`/my/` + contact.username + '?sendris=1')"
+ @click="naviga(`/my/` + contact.username + '?sendris=0')"
>
diff --git a/src/components/CSendCoins/CSendCoins.ts b/src/components/CSendCoins/CSendCoins.ts
index 72e5898f..88f691d4 100755
--- a/src/components/CSendCoins/CSendCoins.ts
+++ b/src/components/CSendCoins/CSendCoins.ts
@@ -92,10 +92,10 @@ export default defineComponent({
const arrTypesAccounts = ref([
{
label: t('circuit.user'),
- value: costanti.AccountType.USER,
+ value: shared_consts.AccountType.USER,
},
])
- const tipoConto = ref(costanti.AccountType.USER)
+ const tipoConto = ref(shared_consts.AccountType.USER)
const priceLabel = computed(() => circuitloaded.value ? `${qty.value} ` + circuitloaded.value.symbol : '')
const arrayMarkerLabel = ref([])
@@ -114,7 +114,7 @@ export default defineComponent({
watch(() => tipoConto.value, (newval, oldval) => {
- if (tipoConto.value === costanti.AccountType.COLLECTIVE_ACCOUNT) {
+ if (tipoConto.value === shared_consts.AccountType.COLLECTIVE_ACCOUNT) {
if (arrGroupsList.value.length >= 1)
from_groupname.value = arrGroupsList.value[0].value
}
@@ -157,7 +157,7 @@ export default defineComponent({
arrTypesAccounts.value = [
{
label: t('circuit.user'),
- value: costanti.AccountType.USER,
+ value: shared_consts.AccountType.USER,
},
]
@@ -165,13 +165,13 @@ export default defineComponent({
if (!!datasaved.value.circuit) {
circuitloaded.value = datasaved.value.circuit
- if (tipoConto.value === costanti.AccountType.USER) {
+ if (tipoConto.value === shared_consts.AccountType.USER) {
accountloaded.value = userStore.getAccountByCircuitId(circuitloaded.value._id)
- } else if (tipoConto.value === costanti.AccountType.COLLECTIVE_ACCOUNT) {
+ } else if (tipoConto.value === shared_consts.AccountType.COLLECTIVE_ACCOUNT) {
groupSel.value = userStore.my.profile.manage_mygroups.find((group: IMyGroup) => from_groupname.value === group.groupname)
accountloaded.value = groupSel.value ? groupSel.value.account : null
- } else if (tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT) {
+ } else if (tipoConto.value === shared_consts.AccountType.COMMUNITY_ACCOUNT) {
from_contocom.value = circuitloaded.value.path
accountloaded.value = circuitloaded.value ? circuitloaded.value.account : null
}
@@ -197,14 +197,14 @@ export default defineComponent({
arrTypesAccounts.value.push(
{
label: t('circuit.conticollettivi'),
- value: costanti.AccountType.COLLECTIVE_ACCOUNT,
+ value: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
})
}
if (tools.iCanSendCoinsSuperUserCircuit(circuitsel.value) && (!props.to_contocom)) {
arrTypesAccounts.value.push({
label: t('circuit.contocom'),
- value: costanti.AccountType.COMMUNITY_ACCOUNT,
+ value: shared_consts.AccountType.COMMUNITY_ACCOUNT,
})
}
@@ -253,7 +253,7 @@ export default defineComponent({
arrTypesAccounts.value = [
{
label: t('circuit.user'),
- value: costanti.AccountType.USER,
+ value: shared_consts.AccountType.USER,
},
]
@@ -341,8 +341,8 @@ export default defineComponent({
myrecsendcoin.groupdest = props.to_group ? props.to_group.groupname : ''
myrecsendcoin.contoComDest = props.to_contocom
- myrecsendcoin.grouporig = tipoConto.value === costanti.AccountType.COLLECTIVE_ACCOUNT ? from_groupname.value : ''
- myrecsendcoin.contoComOrig = tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT ? from_contocom.value : ''
+ myrecsendcoin.grouporig = tipoConto.value === shared_consts.AccountType.COLLECTIVE_ACCOUNT ? from_groupname.value : ''
+ myrecsendcoin.contoComOrig = tipoConto.value === shared_consts.AccountType.COMMUNITY_ACCOUNT ? from_contocom.value : ''
myrecsendcoin.dest = props.to_user ? props.to_user.username : ''
diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue
index 09d227f4..80b52d7f 100755
--- a/src/components/CSendCoins/CSendCoins.vue
+++ b/src/components/CSendCoins/CSendCoins.vue
@@ -12,13 +12,9 @@
-
+
-
-
+
{ show: false, title: '', list: [], listgroup: [] })
- const tipoConto = ref(costanti.AccountType.USER)
+ const tipoConto = ref(shared_consts.AccountType.USER)
const loading = ref(false)
const circuitpath = computed(() => {
const circ = circuitStore.getCircuitByProvinceAndCard(userStore.my.profile.resid_province, userStore.my.profile.resid_card)
@@ -46,11 +46,11 @@ export default defineComponent({
const arrTypesAccounts = ref([
{
label: t('circuit.user'),
- value: costanti.AccountType.USER,
+ value: shared_consts.AccountType.USER,
},
{
label: t('circuit.conticollettivi'),
- value: costanti.AccountType.COLLECTIVE_ACCOUNT,
+ value: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
}
])
diff --git a/src/components/CSendRISTo/CSendRISTo.vue b/src/components/CSendRISTo/CSendRISTo.vue
index 9b1f8cb9..762f7061 100755
--- a/src/components/CSendRISTo/CSendRISTo.vue
+++ b/src/components/CSendRISTo/CSendRISTo.vue
@@ -75,7 +75,7 @@
:options="arrTypesAccounts"
/>
-
+
diff --git a/src/components/CSignIn/CSignIn.ts b/src/components/CSignIn/CSignIn.ts
index 9066e531..158bfbfa 100755
--- a/src/components/CSignIn/CSignIn.ts
+++ b/src/components/CSignIn/CSignIn.ts
@@ -113,7 +113,7 @@ export default defineComponent({
tools.checkApp()
if ($q.screen.lt.sm) {
- globalStore.setleftDrawerOpen(false)
+ // globalStore.setleftDrawerOpen(false)
}
if (riscode === tools.OK) {
if (userStore.isLogged) {
diff --git a/src/components/CStatusReg/CStatusReg.scss b/src/components/CStatusReg/CStatusReg.scss
index e85fe059..db24281a 100755
--- a/src/components/CStatusReg/CStatusReg.scss
+++ b/src/components/CStatusReg/CStatusReg.scss
@@ -1,3 +1,9 @@
.index_diffusore {
font-size: 1rem;
}
+
+.flex-container {
+ display: flex;
+ justify-content: space-between;
+ /* Distribuisce gli elementi uniformemente */
+}
\ No newline at end of file
diff --git a/src/components/CStatusReg/CStatusReg.ts b/src/components/CStatusReg/CStatusReg.ts
index d97e6178..8a5e88ea 100755
--- a/src/components/CStatusReg/CStatusReg.ts
+++ b/src/components/CStatusReg/CStatusReg.ts
@@ -28,8 +28,10 @@ import { useRouter } from 'vue-router'
export default defineComponent({
name: 'CStatusReg',
props: {},
- components: { CTitleBanner, CElemStat,
- CCardState, CCardStat, CLineChart, CMyFieldRec, CTimeAgo },
+ components: {
+ CTitleBanner, CElemStat,
+ CCardState, CCardStat, CLineChart, CMyFieldRec, CTimeAgo
+ },
setup(props, { attrs, slots, emit }) {
const { t } = useI18n()
const $q = useQuasar()
@@ -52,6 +54,7 @@ export default defineComponent({
num_reg: 0,
num_reg_today: 0,
online_today: 0,
+ activeusers: 0,
num_passeggeri: 0,
num_imbarcati: 0,
num_teleg_attivo: 0,
@@ -66,7 +69,13 @@ export default defineComponent({
strettelist: [],
receiveRislist: [],
receiveRislistgroup: [],
- checkuser: { verified_email: false }
+ checkuser: { verified_email: false },
+ num_transaz_tot: 0,
+ tot_RIS_transati: 0,
+ num_circuiti_attivi: 0,
+ num_circuiti: 0,
+ num_annunci: 0,
+ last_transactions: [],
})
const visustat = computed(() => {
@@ -113,7 +122,7 @@ export default defineComponent({
function checkifpolling() {
if (userStore.my.profile) {
//if (!tools.isUserOk() && tools.appid() === tools.IDAPP_RISO)
- // NUMSEC_TO_POLLING.value = 10
+ // NUMSEC_TO_POLLING.value = 10
}
if (eseguipolling.value) {
diff --git a/src/components/CStatusReg/CStatusReg.vue b/src/components/CStatusReg/CStatusReg.vue
index d193d119..e0ba3782 100755
--- a/src/components/CStatusReg/CStatusReg.vue
+++ b/src/components/CStatusReg/CStatusReg.vue
@@ -7,28 +7,78 @@
bgcolor="bg-primary"
clcolor="text-white"
mystyle=""
- myclass="myshad"
+ myclass="sfondo_gradiente_blu myshad"
:canopen="true"
>
-
+
+
+
+
+
+
+
+
+
import('@src/root/fundraising/fundraising.vue'),
diff --git a/src/layouts/menuone/menuOne copy.vue b/src/layouts/menuone/menuOne copy.vue
new file mode 100755
index 00000000..c4368537
--- /dev/null
+++ b/src/layouts/menuone/menuOne copy.vue
@@ -0,0 +1,356 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ tools.getLabelByItem(child2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ tools.getLabelByItem(getmenuByPath(child2)) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ tools.getLabelByItem(myitemmenu)
+ }}
+ {{
+ myitemmenu.subtitle
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layouts/menuone/menuOne.scss b/src/layouts/menuone/menuOne.scss
index 85601337..56ca06a2 100755
--- a/src/layouts/menuone/menuOne.scss
+++ b/src/layouts/menuone/menuOne.scss
@@ -1,6 +1,7 @@
-.prova{
+.prova {
color: red;
}
+
.q-list-header {
min-height: 12px;
padding: 5px 8px;
@@ -42,13 +43,15 @@
transform: rotate(-180deg);
}
-.my-menu, .my-menu > i{
+.my-menu,
+.my-menu>i {
min-height: 40px;
min-width: 26px;
font-size: 1rem;
}
-.my-menu-small, .my-menu-small > i{
+.my-menu-small,
+.my-menu-small>i {
min-height: 40px;
min-width: 26px;
font-size: 0.75rem;
@@ -56,35 +59,39 @@
.isAdmin {
color: red !important;
+ background: linear-gradient(180deg, rgba(255, 0, 0, 0.15), white, rgba(255, 0, 0, 0.15));
}
.isSocioResidente {
color: darkgreen;
}
-.isCalendar {
+.isCalendar {}
+.isDoc {
+ background: linear-gradient(180deg, rgba(152, 198, 226, 0.45), white, rgba(152, 198, 226, 0.45));
}
.isManager {
color: green !important;
+ background: linear-gradient(180deg, rgba(125, 151, 125, 0.273), white, rgba(0, 128, 0, 0.273));
}
.isFacilitatore {
color: #201a80;
}
-.my-menu-icon{
+.my-menu-icon {
min-width: 2px;
font-size: 1rem;
}
-.my-menu-icon > i{
+.my-menu-icon>i {
min-width: 26px;
font-size: 1.25rem;
}
-.clexpansion{
+.clexpansion {
min-width: 0 !important;
}
@@ -92,24 +99,25 @@
background-color: rgba(174, 189, 241, 0.71);
}
-.my-menu-separat > i{
+.my-menu-separat>i {
min-width: 26px;
font-size: 1rem;
}
-.my-menu-icon-none > i{
+.my-menu-icon-none>i {
display: none;
}
-.clicon img, .clicon {
+.clicon img,
+.clicon {
font-size: 16px;
}
-.q-item__section--avatar{
+.q-item__section--avatar {
min-width: 30px;
}
-.OLD_q-item__section--side{
+.OLD_q-item__section--side {
padding-right: 8px;
}
@@ -137,6 +145,7 @@
font-weight: bold;
text-shadow: 0.0512rem 0.052rem .01rem #555;
}
+
.subtitle {
font-style: italic;
-}
+}
\ No newline at end of file
diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts
index f91aa1e7..4fc5d38f 100755
--- a/src/layouts/menuone/menuOne.ts
+++ b/src/layouts/menuone/menuOne.ts
@@ -6,16 +6,12 @@ import { useRoute } from 'vue-router'
import { static_data } from '@/db/static_data'
import { useUserStore } from '@store/UserStore'
+import { CMenuItem } from '../../components/CMenuItem'
+
export default defineComponent({
name: 'MenuOne',
- props: {
- clBase: {
- type: String,
- required: false,
- default: 'my-menu',
- },
- },
+ components: { CMenuItem },
setup(props) {
const route = useRoute()
const userStore = useUserStore()
@@ -29,10 +25,12 @@ export default defineComponent({
const myroutes = ref([])
- const getmenu = computed(() => globalStore.getmenu )
+ const getmenu = computed(() => globalStore.getmenu)
const islogged = computed(() => userStore.isLogged)
+ const clBase = ref('my-menu')
+
function setParentVisibilityBasedOnRoute(parent: any) {
parent.routes.forEach((item: any) => {
if (path.value === item.path) {
@@ -51,11 +49,11 @@ export default defineComponent({
myroutes.value = static_data.routes
}
- watch(() => islogged.value,(to, from) => {
+ watch(() => islogged.value, (to, from) => {
updatemenu()
})
- watch(() => finishLoading.value,(to, from) => {
+ watch(() => finishLoading.value, (to, from) => {
updatemenu()
})
@@ -78,7 +76,7 @@ export default defineComponent({
}
function getmymenuclass(elem: IListRoutes) {
- let menu: string = props.clBase
+ let menu: string = clBase.value
if (elem.color) {
menu += ` ${elem.color}`
@@ -111,6 +109,12 @@ export default defineComponent({
return 'clBase'
}
+ function getmenuByPath(path: string) {
+ const mymenufind = static_data.routes.find((menu: any) => menu.path === '/' + path)
+
+ return mymenufind
+ }
+
myroutes.value = static_data.routes
return {
@@ -124,7 +128,8 @@ export default defineComponent({
myroutes,
getimgiconclass,
getimgiconclass2,
-
+ getmenuByPath,
+ clBase,
}
},
})
diff --git a/src/layouts/menuone/menuOne.vue b/src/layouts/menuone/menuOne.vue
index 48725d04..7bd632ea 100755
--- a/src/layouts/menuone/menuOne.vue
+++ b/src/layouts/menuone/menuOne.vue
@@ -1,153 +1,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ tools.getLabelByItem(child2) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ tools.getLabelByItem(myitemmenu) }}
- {{ myitemmenu.subtitle }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 35337073..15d627ce 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -20,6 +20,7 @@ export interface INotData {
num_reg?: number
num_reg_today?: number
online_today?: number
+ activeusers?: number
num_passeggeri?: number
num_imbarcati?: number
email_non_verif?: number
@@ -41,9 +42,13 @@ export interface INotData {
checkuser?: any // ICheckUser
numreg_untilday?: number
reg_daily?: string
- imbarcati_daily?: string
- imbarcati_weekly?: string
reg_weekly?: string
+ num_transaz_tot?: number
+ tot_RIS_transati?: number
+ num_circuiti?: number
+ num_circuiti_attivi?: number
+ num_annunci?: number
+ last_transactions?: IMovement[]
}
@@ -160,6 +165,8 @@ export interface IMyElem {
listcards?: IMyCard[]
catalogo?: ICatalogo
elemsText?: IElemText[]
+ titleBanner: string
+ classBanner: string
}
export interface IElemText {
@@ -210,6 +217,8 @@ export interface IMyPage {
extraclass?: string
loadFirst?: boolean
showFooter?: boolean
+ mainMenu?: boolean
+ sottoMenu?: String[]
//Memory
loaded?: boolean
@@ -563,6 +572,8 @@ export interface IListRoutes {
idelem?: string
urlroute?: string
img?: string
+ mainMenu?: boolean
+ sottoMenu?: String[]
// ------------------------
faIcon?: string
text?: string
@@ -657,6 +668,7 @@ export interface IMyCard {
color?: string
content?: string
colorsub?: string
+ link?: string
}
export interface ICatalogo {
@@ -1201,6 +1213,56 @@ export interface ICircuit {
account?: IAccount | null
}
+export interface IMovUserProfile {
+ img: string
+}
+
+export interface IMovUserQuery {
+ verified_by_aportador: boolean
+ username: string
+ profile: IMovUserProfile
+}
+
+
+export interface IMovGroupQuery {
+ verified_by_aportador: boolean
+ groupname: string
+ title: string
+ photos: string
+}
+
+
+export interface IMovContoComQuery {
+ path: string
+ name: string
+}
+
+export interface IMovCircuitQuery {
+ name: string
+ symbol: string
+}
+
+export interface IMovQuery {
+ tipocontofrom: number
+ tipocontoto: number
+ userfrom: IMovUserQuery
+ userto: IMovUserQuery
+
+ groupfrom: IMovGroupQuery
+ groupto: IMovGroupQuery
+
+ contocomfrom: IMovContoComQuery
+ contocomto: IMovContoComQuery
+
+ circuitfrom: IMovCircuitQuery
+
+ transactionDate: Date
+ amount: number
+ causal: string
+ notifId: string
+}
+
+
export interface IMovement {
_id: string
transactionDate: Date
@@ -1226,6 +1288,18 @@ export interface IMovVisu {
expiringDate: Date
}
+export interface ITransaction {
+ _id: string
+ transacDate: Date
+ mitt_username: string
+ mitt_group: string
+ dest_username: string
+ dest_group: string
+ circuito: string
+ amount: number
+ causale: string
+}
+
export interface IAccount {
_id: string
username: string
diff --git a/src/root_spec/home_arcadei/home_arcadei.scss b/src/root_spec/home_arcadei/home_arcadei.scss
deleted file mode 100755
index 0e32f575..00000000
--- a/src/root_spec/home_arcadei/home_arcadei.scss
+++ /dev/null
@@ -1,452 +0,0 @@
-
-.testo-banda {
- //background: -webkit-gradient(linear, left top, left bottom, from(#3144f0), to(transparent));
- //background: linear-gradient(180deg, #3144f0, transparent);
- //background: rgba(0, 0, 0, .6)
-}
-
-$grayshadow: #555;
-
-$textcol: blue;
-$textcol_scuro: darkblue;
-
-p {
- margin: 0 0 1.25rem;
- //text-shadow: .125rem .125rem .25rem $grayshadow;
-}
-
-h4 {
- font-size: 1.25rem;
-}
-
-.mycard {
- visibility: hidden;
-}
-
-.landing {
-}
-
-.landing_background {
- background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed;
- background-size: cover
-}
-
-.landing > section {
- display: -webkit-box;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-pack: center;
- -ms-flex-pack: center;
- justify-content: center;
- //padding: 0 16px
-}
-
-.intro {
- display: flex;
- justify-content: space-between;
- align-items: stretch;
- /* flex-flow: row nowrap; */
-
- padding: 1.25rem 0 1.25rem 0;
- margin: .125rem;
-
- * {
- width: 100%;
- flex: 1;
- margin-left: auto;
- margin-right: auto;
- }
-
- &__associazione {
- min-width: 350px;
- }
-
- &__comeassociarsi {
- min-width: 350px;
- }
-}
-
-.subtitle {
- font-weight: 600;
- text-align: center;
- letter-spacing: 0.125rem;
- text-transform: uppercase;
- font-size: 1rem;
-}
-
-.landing > section.padding {
- padding: 5.62rem 1rem;
-}
-
-.landing > section.padding_testo {
- padding-top: 1.25rem;
- padding-bottom: 1rem;
-}
-
-.landing > section.padding_gallery {
- padding-top: 3.125rem;
- padding-bottom: 5.625rem;
-}
-
-.landing > section > div {
- position: relative;
- width: 100%
-}
-
-.maxwidth1200 {
- max-width: 1200px;
-}
-
-.landing__toolbar {
- background: -webkit-gradient(linear, left top, left bottom, from(#000), to(transparent));
- background: linear-gradient(180deg, #000, transparent);
- padding: 0 !important
-}
-
-.landing__toolbar .q-btn {
- border-radius: 0 0 .315rem .315rem;
- -ms-flex-item-align: stretch;
- align-self: stretch
-}
-
-.landing__hero {
- min-height: 50vh
-}
-
-.landing__header {
- height: 18vh
-}
-
-.landing__arrow {
- bottom: 1.5rem;
- opacity: .4
-}
-
-.landing__front {
- background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(0, 0, 0, .6)));
- background: linear-gradient(180deg, transparent, rgba(0, 0, 0, .6) 15%)
-}
-
-.landing__logo {
- width: 9.40rem;
- height: 9.40rem;
- margin-top: 1.315rem;
- //-webkit-animation: logo-rotate 240s linear infinite;
- //animation: logo-rotate 240s linear infinite
-}
-
-.landing__features .q-icon {
- font-size: 4rem
-}
-
-h4 {
- line-height: 1.5;
- text-shadow: .25rem .25rem .5rem $grayshadow;
-}
-
-.landing__features h4, .landing__features h6 {
- margin: 1rem 0
-}
-
-.landing__features p {
- opacity: .7;
- font-size: 1rem;
- line-height: 1.5;
-}
-
-.landing__footer {
- //background: -webkit-gradient(linear, left top, left bottom, color-stop(65%, rgba(0, 0, 0, .1)), to(#000));
- background: linear-gradient(180deg, rgba(0, 0, 0, .8) 95%, #FFF);
- padding-top: 4.5rem !important;
- padding-bottom: 4.5rem !important;
- padding-left: 1.25rem;
- padding-right: 1.25rem;
- color: #9f9f9f;
-}
-
-.icon_contact:hover {
- color: blue;
- border-color: white;
- border-width: .0625rem;
-}
-
-.landing__footer .doc-link {
- color: $textcol;
-}
-
-.landing__footer .doc-link:hover {
- opacity: .8
-}
-
-.landing__swirl-bg {
- background-repeat: no-repeat !important;
- background-position: top;
- background-size: contain !important;
- background-image: url(../../../public/images/landing_first_section.png) !important
-}
-
-.feat-descr {
- font-size: 1.15rem;
-}
-
-.feat-descr:hover {
- transition: opacity 0.5s ease-in-out;
- opacity: 0.9;
-}
-
-.q-col-gutter-sm {
- padding: 3.125rem 3.125rem;
- //margin-left: -48px
-}
-
-body.mobile .landing {
- //background: unset
-}
-
-body.mobile .landing:before {
- content: "";
- position: fixed;
- top: 0;
- height: 100vh;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: -1;
- //background: #000 url(../../public/images/cover.jpg) 50%;
-
- background-size: cover
-}
-
-/*
-@-webkit-keyframes logo-rotate {
- to {
- -webkit-transform: rotate(-1turn);
- transform: rotate(-1turn)
- }
-}
-
-@keyframes logo-rotate {
- to {
- -webkit-transform: rotate(-1turn);
- transform: rotate(-1turn)
- }
-}
-*/
-
-.home {
- //background-color: rgb(250, 250, 250);
- padding: 3.125rem;
- display: flex;
- //flex-wrap: nowrap;
- flex-direction: column;
- align-items: center;
- justify-content: space-between;
-}
-
-.btn-start {
- margin: 3.125rem;
-}
-
-.shadow {
- //color: white;
- text-shadow: 0.125rem 0.125rem 0.25rem $grayshadow;
-}
-
-.text-h1, h1 {
- font-size: 3rem;
- font-weight: bold;
- line-height: 3rem;
- letter-spacing: -.01562em;
- margin-bottom: 8px !important;
-}
-
-.text-h2 {
- font-size: 3.75rem;
- font-weight: 300;
- line-height: 3.75rem;
- letter-spacing: -.00833em;
-}
-
-.text-weight-bold {
- font-weight: 700;
-}
-
-.text-vers {
- font-size: 0.75rem;
- font-weight: 400;
- line-height: 1.75rem;
- letter-spacing: .00937em;
- text-shadow: .25rem .25rem .5rem $grayshadow;
-}
-
-.homep-cover-img-1 {
- background: #000 url(../../../public/images/foto1.jpg) no-repeat 50% fixed;
- //transition: background-image 1s ease-in-out;
-}
-
-.homep-cover-img-2 {
- background: #000 url(../../../public/images/foto2.jpg) no-repeat 50% fixed;
- //transition: background-image 1s ease-in-out;
-}
-
-.homep-cover-img-3 {
- background: #000 url(../../../public/images/foto3.jpg) no-repeat 50% fixed;
- //transition: background-image 1s ease-in-out;
-}
-
-.homep-cover-img.hide-filter:before {
- opacity: 0
-}
-
-.landing__footer-icons {
- font-size: 1.75rem
-}
-
-.landing__footer-icons a {
- margin: 0 .5rem .5rem;
- text-decoration: none;
- outline: 0;
- color: $textcol;
- transition: color .28s
-}
-
-.landing__footer-icons a:hover {
- color: $textcol_scuro;
-}
-
-.doc-img {
- max-width: 100%;
-}
-
-.mylist {
- background: #3fdaff;
- padding-left: 1.25rem;
-}
-
-.clgutter {
- margin-top: 1.25rem;
- padding: .62rem;
-}
-
-.carousel_img_3 {
- //background-image: url(../../public/images/cibo_sano.jpg);
- background-size: cover !important;
- background-position: 50% center !important;
- background-repeat: no-repeat !important;
-}
-
-@media (max-width: 718px) {
- // PER VERSIONE MOBILE
-
- .landing__hero {
- text-align: center
- }
- .landing__header {
- height: 7vh
- }
- .clgutter {
- margin-top: 0;
- padding: 0;
- }
- .landing__hero .text-h1, h1 {
- font-size: 2rem;
- line-height: 2.05rem;
- margin-bottom: 1.25rem
- }
-
- .landing > section.padding {
- padding: 2.5rem 1rem;
- }
-
- .landing > section.padding_testo {
- padding-top: 1.25rem;
- padding-bottom: 1rem;
- }
-
- .landing > section.padding_gallery {
- padding-top: 3.125rem;
- padding-bottom: 5.625rem;
-
- max-width: 800px;
- }
-
- .landing > section.padding_gallery > div {
- padding-top: 3.125rem;
- padding-bottom: 5.625rem;
-
- }
-
- .landing__features h4, .landing__features h6 {
- margin: 1.25rem 0
- }
-
- h4 {
- line-height: 1.4;
- text-shadow: 0.25rem 0.25rem 0.5rem $grayshadow;
- }
-
- .landing .feature-item {
- text-align: center;
- margin-top: 1.25rem;
- }
- .landing__hero-content {
- padding-bottom: 11.25rem;
- }
- .landing__hero2-content {
- padding-bottom: 7.25rem;
- }
- .landing__hero-btns {
- -webkit-box-pack: center;
- -ms-flex-pack: center;
- justify-content: center
- }
-
- .q-col-gutter-sm {
- padding: .625rem .315rem;
- }
-
- .text-subtitle1 {
- font-size: 1.25rem;
- }
- .text-vers {
- font-size: 0.6rem;
- }
-
- .carousel_img_3 {
- //background-image: url(../../public/images/cibo_sano.jpg);
- background-size: 620px 620px !important;
- background-position: 50% top !important;
- background-repeat: no-repeat !important;
- }
-
-}
-
-.custom-caption {
- text-align: center;
- padding: .75rem;
- color: $textcol;
- background-color: rgba(0, 0, 0, .3);
-}
-
-.sfondo-grigio {
- padding: 1rem;
- color: $textcol;
- background-color: rgba(0, 0, 0, .35);
-}
-
-.mycontacts {
- color: gray;
- letter-spacing: 0.078rem;
-}
-
-.mycontacts_title {
- text-shadow: 0.125rem 0.125rem 0.125rem #555;
- font-weight: bold;
- color: #999;
- letter-spacing: 0.125rem;
-}
-
-.mycontacts_text {
- color: #999;
- letter-spacing: 0.093rem;
-}
diff --git a/src/root_spec/home_arcadei/home_arcadei.ts b/src/root_spec/home_arcadei/home_arcadei.ts
deleted file mode 100755
index 34ca347d..00000000
--- a/src/root_spec/home_arcadei/home_arcadei.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { defineComponent, ref, onMounted, watch, computed } from 'vue'
-
-import { useGlobalStore } from '@store/globalStore'
-import { useRoute } from 'vue-router'
-import { useUserStore } from '@store/UserStore'
-
-import { Logo } from '../../components/logo'
-
-import { LandingFooter } from '../../components/LandingFooter'
-import { CMyPage } from '../../components/CMyPage/index'
-
-import { tools } from '@src/store/Modules/tools'
-import { static_data } from '@src/db/static_data'
-import { toolsext } from '@src/store/Modules/toolsext'
-import { Screen } from 'quasar'
-import { CCardCarousel, CEventsCalendar, COpenStreetMap } from '@components'
-import MixinBase from '@src/mixins/mixin-base'
-import { firstimagehome } from '@src/db/static_data'
-import MixinMetaTags from '@/mixins/mixin-metatags'
-
-export default defineComponent({
- name: 'home_arcadei',
- components: { Logo, LandingFooter, CMyPage, CCardCarousel, CEventsCalendar, COpenStreetMap },
-
- setup() {
- const animare = ref(0)
- const slide = ref('first')
- const slide2 = ref(1)
-
- const getImmagini = ref([
- {
- title: '', subtitle: '',
- alt: 'Arcadei',
- img: 'images/arcadei/img1.png'
- },
- ])
-
- const userStore = useUserStore()
- const globalStore = useGlobalStore()
-
- const { setValDb, getValDb } = MixinBase()
- const { setmeta, getsrcbyimg } = MixinMetaTags()
-
- function getheightgallery() {
- if (tools.isMobile())
- return '400px'
- else
- return '600px'
- }
-
- function created() {
- //
- }
-
- function getArrDisciplines() {
- return globalStore.disciplines.filter((rec: any) => rec.showinhome)
- }
-
- created()
-
- return {
- tools,
- toolsext,
- static_data,
- animare,
- slide,
- slide2,
- getheightgallery,
- getArrDisciplines,
- getImmagini,
- getValDb,
- firstimagehome,
- getsrcbyimg,
- setmeta,
- }
- },
-})
-
diff --git a/src/root_spec/home_arcadei/home_arcadei.vue b/src/root_spec/home_arcadei/home_arcadei.vue
deleted file mode 100755
index dd7ba147..00000000
--- a/src/root_spec/home_arcadei/home_arcadei.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{tools.getappname()}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- expand_more
-
-
-
-
-
-
-
-
-
-
-
{{tools.getappname()}}
-
- {{$t('msg.sottoTitoloApp')}}
-
-
- {{$t('msg.sottoTitoloApp2')}}
-
-
- {{$t('msg.sottoTitoloApp3')}}
-
-
-
-
-
- expand_more
-
-
-
-
-
-
-
-
-
-
-
{{tools.getappname()}}
-
- {{$t('msg.sottoTitoloApp')}}
-
-
{{$t('msg.sottoTitoloApp2')}}
-
-
- {{$t('msg.sottoTitoloApp3')}}
-
-
-
- {{$t('msg.sottoTitoloApp4')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{
- $t('components.authentication.email_verification.link_sent') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{index + 1}}. {{rec.title}}
-
{{rec.subtitle}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/router/routesAdmin.ts b/src/router/routesAdmin.ts
index abd502e9..2398f201 100644
--- a/src/router/routesAdmin.ts
+++ b/src/router/routesAdmin.ts
@@ -435,6 +435,17 @@ function getRoutesAd(site: ISites) {
inmenu: false,
infooter: false,
},
+ {
+ active: true,
+ order: 145,
+ path: '/attivita/:username',
+ materialIcon: 'fas fa-user',
+ name: 'mypages.attivita',
+ component: () => import('@/views/user/myactivities/myactivities.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
{
active: true,
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 4a09ce0c..11e082c5 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1205,6 +1205,7 @@ const msg_it = {
date_updated: 'Ult. Aggiornamento',
},
mypages: {
+ attivita: 'Attività ',
find_people: 'Cerca Persone',
find_group: 'Cerca Gruppo',
manage_my_groups: 'Amministratore',
@@ -1537,6 +1538,8 @@ const msg_it = {
allmov: 'Vedi i movimenti di Tutto il Circuito',
showsaldi: 'Mostra i Saldi dei membri',
updatewallet: 'Aggiorna',
+ from: 'Mittente:',
+ to: 'Destinatario:',
},
editor: {
showtool: 'Mostra strumenti per formattare il testo',
@@ -1648,9 +1651,10 @@ const msg_it = {
},
statusreg: {
- reg: 'Partecipanti',
+ reg: 'Utenti Attivi',
verifieds: 'Verificati',
online_today: 'On Line Oggi',
+ activeusers: 'Utenti Attivi',
autorizzati: 'Autorizzati',
autorizzare: 'In attesa di Abilitazione',
passeggeri: 'Passeggeri Navi',
@@ -1669,6 +1673,11 @@ const msg_it = {
req: 'Passi',
people: 'Inv.',
peoplelegend: 'Numero d\'Invitati',
+ numtransazioni: 'Scambi in RIS',
+ totristransati: 'RIS transati',
+ num_circuiti_attivi: 'Circuiti Attivi',
+ num_annunci: 'Annunci Attivi',
+ last_transactions: 'Ultime transazioni in RIS',
},
tutorial: {
@@ -1855,7 +1864,11 @@ const msg_it = {
err_removed: 'Errore durante la rimozione della casella di posta ',
err_addemail: 'Errore durante la creazione della nuova casella di posta',
err_setmailuserpwd: 'Errore durante la modifica della password',
- }
+ },
+
+ header: {
+ area_personale: 'Area Personale',
+ },
},
};
diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts
index 88a0c61a..c5774878 100755
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -29,11 +29,6 @@ export const costanti = {
ENABLE_FRIENDS: false,
ENABLE_CONTI_COLLETTIVI: true,
- AccountType: {
- USER: 0,
- COLLECTIVE_ACCOUNT: 1,
- COMMUNITY_ACCOUNT: 2,
- },
Lang: {
IT: 1,
@@ -115,6 +110,7 @@ export const costanti = {
visuonstat: true,
small: false,
showfavorite: true,
+ showinoptions: true,
},
{
visible: true,
@@ -129,6 +125,7 @@ export const costanti = {
visuonstat: true,
small: false,
showfavorite: true,
+ showinoptions: true,
},
{
visible: true,
@@ -145,6 +142,7 @@ export const costanti = {
table: 'myhosps',
visuonstat: true,
showfavorite: true,
+ showinoptions: true,
},
{
visible: false,
@@ -201,6 +199,7 @@ export const costanti = {
visuonstat: true,
small: false,
showfavorite: true,
+ showinoptions: true,
},
{
visible: false,
@@ -276,6 +275,7 @@ export const costanti = {
small: false,
showfavorite: true,
forgroup: true,
+ showinoptions: false,
},
],
@@ -430,6 +430,7 @@ export const costanti = {
currency: 15000,
cards: 16000,
color: 17000,
+ arrmenu: 18000,
},
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 4ea27481..c3132b7e 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -69,7 +69,7 @@ function AddCol(params: IColGridTable) {
allowNewValue: (params.allowNewValue === undefined) ? false : params.allowNewValue,
showpicprofile_ifnotset: (params.showpicprofile_ifnotset === undefined) ? false : params.showpicprofile_ifnotset,
extrafield: (params.extrafield === undefined) ? '' : params.extrafield,
- tipoconto: (params.tipoconto === undefined) ? costanti.AccountType.USER : params.tipoconto,
+ tipoconto: (params.tipoconto === undefined) ? shared_consts.AccountType.USER : params.tipoconto,
visible: (params.visible === undefined) ? true : params.visible,
icon: (params.icon === undefined) ? '' : params.icon,
action: (params.action === undefined) ? '' : params.action,
@@ -144,6 +144,7 @@ export const colmylistcards = [
AddCol({ name: 'color', label_trans: 'color' }),
AddCol({ name: 'content', label_trans: 'content' }),
AddCol({ name: 'colorsub', label_trans: 'colorsub' }),
+ AddCol({ name: 'link', label_trans: 'link' }),
]
export const colmyelems = [
@@ -220,9 +221,15 @@ export const colmypage = [
AddCol({ name: 'order', label_trans: 'pages.order', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'active', label_trans: 'pages.active', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'inmenu', label_trans: 'pages.inmenu', fieldtype: costanti.FieldType.boolean }),
- AddCol({ name: 'infooter', label_trans: 'pages.infooter', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'title', label_trans: 'pages.title' }),
AddCol({ name: 'subtitle', label_trans: 'pages.subtitle' }),
+ AddCol({ name: 'mainMenu', label_trans: 'pages.mainMenu', fieldtype: costanti.FieldType.boolean }),
+ AddCol({
+ name: 'sottoMenu', label_trans: 'pages.sottoMenu',
+ fieldtype: costanti.FieldType.multiselect,
+ jointable: 'mypages',
+ }),
+ AddCol({ name: 'infooter', label_trans: 'pages.infooter', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'img1', label_trans: 'pages.img1' }),
AddCol({ name: 'content', label_trans: 'pages.contentfield', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'video1', label_trans: 'pages.video1' }),
@@ -732,7 +739,7 @@ export const colmyMovement = [
link: '/my/userfrom.username',
noshowlabel: true,
extrafield: 'movement.from',
- tipoconto: costanti.AccountType.USER,
+ tipoconto: shared_consts.AccountType.USER,
}),
AddCol({
name: 'groupfrom.groupname',
@@ -745,7 +752,7 @@ export const colmyMovement = [
link: '/grp/groupfrom.groupname',
noshowlabel: true,
extrafield: 'movement.fromCColl',
- tipoconto: costanti.AccountType.COLLECTIVE_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
}),
AddCol({
name: 'contocomfrom.path',
@@ -758,7 +765,7 @@ export const colmyMovement = [
link: '/circuit/contocomfrom.path',
noshowlabel: true,
extrafield: 'movement.fromCCom',
- tipoconto: costanti.AccountType.COMMUNITY_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COMMUNITY_ACCOUNT,
}),
AddCol({
name: 'userto.username',
@@ -771,7 +778,7 @@ export const colmyMovement = [
link: '/my/userto.username',
extrafield: 'movement.to',
noshowlabel: true,
- tipoconto: costanti.AccountType.USER,
+ tipoconto: shared_consts.AccountType.USER,
}),
AddCol({
@@ -785,7 +792,7 @@ export const colmyMovement = [
link: '/grp/groupto.groupname',
extrafield: 'movement.toCColl',
noshowlabel: true,
- tipoconto: costanti.AccountType.COLLECTIVE_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
}),
AddCol({
name: 'contocomfto.path',
@@ -798,7 +805,7 @@ export const colmyMovement = [
link: '/circuit/contocomto.path',
noshowlabel: true,
extrafield: 'movement.toCCom',
- tipoconto: costanti.AccountType.COMMUNITY_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COMMUNITY_ACCOUNT,
}),
AddCol({
@@ -820,7 +827,7 @@ export const colmyMovementTable = [
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/my/userfrom.username',
- tipoconto: costanti.AccountType.USER,
+ tipoconto: shared_consts.AccountType.USER,
required: true,
}),
AddCol({
@@ -832,7 +839,7 @@ export const colmyMovementTable = [
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/grp/groupfrom.groupname',
- tipoconto: costanti.AccountType.COLLECTIVE_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
required: true,
}),
AddCol({
@@ -844,7 +851,7 @@ export const colmyMovementTable = [
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/circuit/contocomfrom.path',
- tipoconto: costanti.AccountType.COMMUNITY_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COMMUNITY_ACCOUNT,
required: true,
}),
AddCol({
@@ -856,7 +863,7 @@ export const colmyMovementTable = [
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/my/userto.username',
- tipoconto: costanti.AccountType.USER,
+ tipoconto: shared_consts.AccountType.USER,
required: true,
}),
@@ -869,7 +876,7 @@ export const colmyMovementTable = [
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/grp/groupto.groupname',
- tipoconto: costanti.AccountType.COLLECTIVE_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
required: true,
}),
AddCol({
@@ -881,7 +888,7 @@ export const colmyMovementTable = [
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/circuit/contocomto.path',
- tipoconto: costanti.AccountType.COMMUNITY_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COMMUNITY_ACCOUNT,
required: true,
}),
@@ -2658,8 +2665,8 @@ export const fields = {
name: 'type', label_trans: 'col.type', fieldtype: costanti.FieldType.select, jointable: 'fieldstype',
}),
AddCol({ name: 'value_str', label_trans: 'col.value', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'value_date', label_trans: 'cal.data', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'value_num', label_trans: 'cal.num', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'value_date', label_trans: 'cal.data', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'value_bool', label_trans: 'cal.bool', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'serv', label_trans: 'cal.serv', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'crypted', label_trans: 'cal.crypted', fieldtype: costanti.FieldType.boolean }),
@@ -3682,7 +3689,7 @@ export const colmyUserCircuit = [
fieldtype: costanti.FieldType.username_chip,
link: '/circuit/contocom',
noshowlabel: true,
- tipoconto: costanti.AccountType.COMMUNITY_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COMMUNITY_ACCOUNT,
}),
AddCol({
@@ -3693,7 +3700,7 @@ export const colmyUserCircuit = [
fieldtype: costanti.FieldType.username_chip,
link: '/circuit/groupname',
noshowlabel: true,
- tipoconto: costanti.AccountType.COLLECTIVE_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
}),
AddCol({ name: 'deperibile', label_trans: 'account.deperibile', fieldtype: costanti.FieldType.boolean }),
@@ -3726,7 +3733,7 @@ export const colTableNotifCoins = [
fieldtype: costanti.FieldType.username_chip,
link: '/my/extrarec.dest',
noshowlabel: true,
- tipoconto: costanti.AccountType.USER,
+ tipoconto: shared_consts.AccountType.USER,
}),
AddCol({
@@ -3739,7 +3746,7 @@ export const colTableNotifCoins = [
fieldtype: costanti.FieldType.username_chip,
link: '/grp/extrarec.groupdest',
noshowlabel: true,
- tipoconto: costanti.AccountType.COLLECTIVE_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COLLECTIVE_ACCOUNT,
}),
AddCol({
name: 'extrarec.contoComDest',
@@ -3751,7 +3758,7 @@ export const colTableNotifCoins = [
fieldtype: costanti.FieldType.username_chip,
link: '/circuit/extrarec.contoComDest',
noshowlabel: true,
- tipoconto: costanti.AccountType.COMMUNITY_ACCOUNT,
+ tipoconto: shared_consts.AccountType.COMMUNITY_ACCOUNT,
}),
AddCol({ name: 'extrarec.qty', field: 'extrarec', subfield: 'qty', label_trans: 'movement.amount', fieldtype: costanti.FieldType.currency }),
AddCol({ name: 'extrarec.causal', field: 'extrarec', subfield: 'causal', label_trans: 'movement.causal', tipovisu: costanti.TipoVisu.TESTO_BORDATO }),
@@ -3936,6 +3943,13 @@ export const fieldsTable = {
colkey: 'path',
collabel: 'title',
},
+ {
+ value: 'mypages',
+ label: 'Pagine Web',
+ columns: colmypage,
+ colkey: 'path',
+ collabel: 'title',
+ },
{
value: 'products',
label: 'Prodotti',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 45eb46da..1e9b9bde 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -14,6 +14,7 @@ import {
IUserFields,
Privacy,
TipoVisu, IGroup, IMySkill, IMyBacheca, IImgGallery, IMsgGlobParam, IUserExport, ISpecialField, IAccount, IMyCircuit, ISendCoin, IMovement, IMovVisu, INotif, IMyElem, IMyCard, ILabelValue, ILabelValueStr, IAnim, ILang, IGroupShort, IPagination, IFavorite, IBookmark,
+ IMovQuery,
} from '@model'
import MixinBase from '@/mixins/mixin-base'
@@ -489,7 +490,7 @@ export const tools = {
{ label: 'sienna', value: '#a0522d' },
{ label: 'silver', value: '#c0c0c0' },
{ label: 'skyblue', value: '#87ceeb' },
- { label: 'slateblue', value: '#6a5acd' },
+ { label: 'slateblue', value: '#6a5acdd' },
{ label: 'slategray', value: '#708090' },
{ label: 'snow', value: '#fffafa' },
{ label: 'springgreen', value: '#00ff7f' },
@@ -7352,8 +7353,8 @@ export const tools = {
return this.getPathByTableAndRec(table, rec)
},
- getPathByGroup(grp: any, table: string) {
- return '/' + shared_consts.getDirectoryByTable(table) + '/' + grp.groupname
+ getPathByGroup(grp: any) {
+ return '/' + shared_consts.getDirectoryByTable(shared_consts.TABLES_MYGROUPS) + '/' + grp.groupname
},
getPathByCircuit(circuit: any, table: string) {
@@ -7369,7 +7370,7 @@ export const tools = {
if (shared_consts.TABLES_REC_ID.includes(table)) {
return '/' + shared_consts.getDirectoryByTable(table) + '/' + rec['_id']
} else if (table === toolsext.TABMYGROUPS) {
- return this.getPathByGroup(rec, table)
+ return this.getPathByGroup(rec)
} else if (table === toolsext.TABCIRCUITS) {
return this.getPathByCircuit(rec, table)
}
@@ -8009,7 +8010,7 @@ export const tools = {
let obj = { label: '', value: '', icon: '' }
for (let i = 0; i < costanti.MAINCARDS.length; i++) {
let rec: any = costanti.MAINCARDS[i]
- if (rec.table) {
+ if (rec.table && rec.showinoptions) {
obj.label = rec.title
obj.value = rec.table
obj.icon = rec.icon
@@ -8561,10 +8562,26 @@ export const tools = {
openUrl(url: string) {
+ url = url.replace('{link_chat_territoriale}', this.getLinkChatTerritoriale())
+
window.open(url, '_blank');
},
+ getText(mystr: string) {
+
+ mystr = mystr.replace('{miaprovincia}', this.getProvincia())
+
+ if (mystr.includes('{titolo_prov_riso}')) {
+ let titleprovincia = translate('dashboard.link_gruppo_telegram')
+ titleprovincia = titleprovincia.replace('{prov}', this.getProvincia())
+
+ mystr = mystr.replace('{titolo_prov_riso}', titleprovincia)
+ }
+
+ return mystr
+ },
+
getCircuitYourProvince() {
const circuitStore = useCircuitStore()
@@ -8737,6 +8754,15 @@ export const tools = {
return shared_consts.VERSIONI_PRODOTTO.find((rec: any) => rec.value === versione)
},
+ numtostr(value: number): string {
+ try {
+ value = Math.round(value)
+ return value.toLocaleString('it-IT')
+ } catch (e) {
+ return ''
+ }
+ },
+
convertToDecimal6(stringValue: string) {
// Converti la stringa in un numero
try {
@@ -8876,6 +8902,63 @@ export const tools = {
},
+ updateEditOn(value: boolean) {
+ const globalStore = useGlobalStore()
+
+ globalStore.editOn = value
+
+ if (this.getCookie('edn') === '1' && !value) {
+ this.setCookie('edn', '0')
+ }
+ if (this.getCookie('edn') !== '1' && value) {
+ this.setCookie('edn', '1')
+ }
+ },
+
+ replaceStringCaseInsensitive(originalString: string, searchString: string, replaceString: string) {
+ // Crea una regex con il flag 'i' per la ricerca case-insensitive
+ const regex = new RegExp(searchString, 'gi'); // 'g' per global, 'i' per case-insensitive
+ return originalString.replace(regex, replaceString);
+ },
+
+ getStringaConto(mov: IMovQuery) {
+
+ let mystr = ''
+ let mystrfrom = ''
+ let mystrto = ''
+
+ let tipocontofrom = shared_consts.AccountType.USER
+ let tipocontoto = shared_consts.AccountType.USER
+
+ if (mov.contocomfrom && mov.contocomfrom.name) {
+ mystrfrom += mov.contocomfrom.name + ' '
+ tipocontofrom = shared_consts.AccountType.COMMUNITY_ACCOUNT
+ }
+ if (mov.groupfrom) {
+ mystrfrom += mov.groupfrom.groupname + ' '
+ tipocontofrom = shared_consts.AccountType.COLLECTIVE_ACCOUNT
+ }
+ if (mov.userfrom) {
+ mystrfrom += mov.userfrom.username + ' '
+ }
+
+ if (mov.contocomto && mov.contocomto.name) {
+ mystrto += mov.contocomto.name + ' '
+ tipocontoto = shared_consts.AccountType.COMMUNITY_ACCOUNT
+ }
+ if (mov.groupto) {
+ mystrto += mov.groupto.groupname + ' '
+ tipocontoto = shared_consts.AccountType.COLLECTIVE_ACCOUNT
+ }
+ if (mov.userto) {
+ mystrto += mov.userto.username + ' '
+ }
+
+ mystr = t('movement.from') + mystrfrom + ' ' + t('movement.to') + mystrto
+
+ return { str: mystr.trim(), tipocontofrom, tipocontoto }
+ },
+
// FINE !
// getLocale() {
diff --git a/src/store/Modules/toolsext.ts b/src/store/Modules/toolsext.ts
index 0b494496..80e38cb9 100755
--- a/src/store/Modules/toolsext.ts
+++ b/src/store/Modules/toolsext.ts
@@ -8,7 +8,7 @@ import { Router } from 'vue-router'
import { ISpecialField } from 'model'
export const func_tools = {
- getLocale(vero ?: boolean): string {
+ getLocale(vero?: boolean): string {
const userStore = useUserStore()
if (userStore) {
return userStore.lang
@@ -85,7 +85,7 @@ export const toolsext = {
TABGALLERY: 'gallery',
TABMAILINGLIST: 'mailinglist',
TABGROUPS: 'groups',
- TABMYPAGE: 'mypage',
+ TABMYPAGE: 'mypages',
TABMYELEMS: 'myelems',
TABMYBOT: 'bots',
TABCALZOOM: 'calzoom',
@@ -201,21 +201,21 @@ export const toolsext = {
return userStore.my[keystr]
}
} else if (table === 'todos') {
- // console.log('id', id, 'idmain', idmain)
- const indcat = todos.categories.indexOf(idmain)
- console.log('indcat', indcat)
- if (indcat >= 0) {
- const myrec = todos.todos[indcat].find((rec: any) => rec._id === id)
- // console.log('myrec', myrec)
- let ris = null
- if (myrec) {
- ris = myrec[keystr]
- }
- console.log('ris', ris)
- return ris
+ // console.log('id', id, 'idmain', idmain)
+ const indcat = todos.categories.indexOf(idmain)
+ console.log('indcat', indcat)
+ if (indcat >= 0) {
+ const myrec = todos.todos[indcat].find((rec: any) => rec._id === id)
+ // console.log('myrec', myrec)
+ let ris = null
+ if (myrec) {
+ ris = myrec[keystr]
}
+ console.log('ris', ris)
+ return ris
+ }
- return ''
+ return ''
} else {
const ris = globalStore.getValueSettingsByKey(keystr, serv)
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 344cbb4f..18a5e344 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -16,6 +16,7 @@ import {
ISignupIscrizioneConacreisOptions,
ISignupIscrizioneArcadeiOptions,
ISettings,
+ IMovQuery,
} from '@src/model'
import { tools } from '@store/Modules/tools'
import translate from '@src/globalroutines/util'
@@ -415,16 +416,16 @@ export const useUserStore = defineStore('UserStore', {
if (row.hasOwnProperty(col.name)) {
value = row[col.name]
}
- let tipoconto = costanti.AccountType.USER
+ let tipoconto = shared_consts.AccountType.USER
if (col.hasOwnProperty('tipoconto') && col.tipoconto) {
tipoconto = col.tipoconto
}
let img = ''
- if (tipoconto === costanti.AccountType.USER) {
+ if (tipoconto === shared_consts.AccountType.USER) {
img = this.getImgByUsername(value)
- } else if (tipoconto === costanti.AccountType.COLLECTIVE_ACCOUNT) {
+ } else if (tipoconto === shared_consts.AccountType.COLLECTIVE_ACCOUNT) {
img = this.getImgByGroupname(value)
- } else if (tipoconto === costanti.AccountType.COMMUNITY_ACCOUNT) {
+ } else if (tipoconto === shared_consts.AccountType.COMMUNITY_ACCOUNT) {
img = this.getImgByCircuitpath(value)
}
@@ -445,14 +446,14 @@ export const useUserStore = defineStore('UserStore', {
if (!reale)
img = 'images/noimg-user.svg'
- let tipoconto = costanti.AccountType.USER
+ let tipoconto = shared_consts.AccountType.USER
if (col && col.hasOwnProperty('tipoconto') && col.tipoconto) {
tipoconto = col.tipoconto
}
- if (tipoconto === costanti.AccountType.COLLECTIVE_ACCOUNT) {
+ if (tipoconto === shared_consts.AccountType.COLLECTIVE_ACCOUNT) {
img = this.getImgByGroupname(myrec.groupname)
- } else if (tipoconto === costanti.AccountType.COMMUNITY_ACCOUNT) {
+ } else if (tipoconto === shared_consts.AccountType.COMMUNITY_ACCOUNT) {
img = this.getImgByCircuitpath(myrec.path)
} else {
if (myrec.profile && myrec.profile.img) {
@@ -470,6 +471,35 @@ export const useUserStore = defineStore('UserStore', {
return ''
},
+ getImgByMov(mov: IMovQuery, tipoconto: number, from: boolean, reale: boolean): string {
+ try {
+
+ let img = ''
+ if (!reale)
+ img = 'images/noimg-user.svg'
+
+ if (tipoconto === shared_consts.AccountType.COLLECTIVE_ACCOUNT) {
+ img = this.getImgByGroup(from ? mov.groupfrom : mov.groupto)
+ // img = this.getImgByGroupname(from ? mov.groupfrom.groupname : mov.groupto.groupname)
+ } else if (tipoconto === shared_consts.AccountType.COMMUNITY_ACCOUNT) {
+ img = this.getImgByCircuitpath(from ? mov.contocomfrom.path : mov.contocomto.path)
+ } else {
+ let myuser = from ? mov.userfrom : mov.userto
+ if (myuser && myuser.profile.img) {
+ img = costanti.DIR_UPLOAD + 'profile/' + myuser.username + '/' + myuser.profile.img
+ }
+ }
+
+ return img
+ } catch (e) {
+ //
+ }
+ if (!reale)
+ return 'images/noimg-user.svg'
+ else
+ return ''
+ },
+
IsAskedCircuitByName(name: string): boolean {
if (this.my.profile.asked_circuits && this.my.profile.asked_circuits.length > 0)
@@ -621,7 +651,7 @@ export const useUserStore = defineStore('UserStore', {
return this.getImgByCircuit(mycirc)
},
- getImgByGroup(group: IMyGroup | null): string {
+ getImgByGroup(group: any): string {
try {
// ++Todo: Sistemare!
@@ -718,12 +748,12 @@ export const useUserStore = defineStore('UserStore', {
let name = ''
let myrec = this.getRecByCol(user, col)
- let tipoconto = costanti.AccountType.USER
+ let tipoconto = shared_consts.AccountType.USER
if (col && col.hasOwnProperty('tipoconto')) {
tipoconto = col.tipoconto
}
- if (tipoconto === costanti.AccountType.USER) {
+ if (tipoconto === shared_consts.AccountType.USER) {
if (!!myrec.name)
name = myrec.name + ' '
if (!!myrec.surname)
@@ -735,14 +765,14 @@ export const useUserStore = defineStore('UserStore', {
if (col && col.field === 'extrarec' && !name) {
name = myrec.dest
}
- } else if (tipoconto === costanti.AccountType.COLLECTIVE_ACCOUNT) {
+ } else if (tipoconto === shared_consts.AccountType.COLLECTIVE_ACCOUNT) {
if (myrec.hasOwnProperty('descr'))
return myrec.descr
else if (myrec.hasOwnProperty('groupname'))
return myrec.groupname
else if (myrec.hasOwnProperty('grouporig'))
return myrec.grouporig
- } else if (tipoconto === costanti.AccountType.COMMUNITY_ACCOUNT) {
+ } else if (tipoconto === shared_consts.AccountType.COMMUNITY_ACCOUNT) {
if (myrec.hasOwnProperty('name'))
return myrec.name
else if (myrec.hasOwnProperty('contocom'))
@@ -1451,8 +1481,8 @@ export const useUserStore = defineStore('UserStore', {
if (isLogged) {
// console.log('this.isLogged', this.isLogged)
- if (!tools.isMobile)
- globalStore.setleftDrawerOpen(localStorage.getItem(toolsext.localStorage.leftDrawerOpen) === 'true')
+ //if (!tools.isMobile)
+ // globalStore.setleftDrawerOpen(localStorage.getItem(toolsext.localStorage.leftDrawerOpen) === 'true')
globalStore.setCategorySel(localStorage.getItem(toolsext.localStorage.categorySel))
await globalStore.checkUpdates()
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index 22c57bc3..6ffd7f68 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -575,6 +575,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
level_parent: page.l_par,
submenu: page.submenu,
extraclass: page.extraclass,
+ mainMenu: page.mainMenu,
+ sottoMenu: page.sottoMenu,
})
}
}
@@ -985,6 +987,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
await globalroutines('readall', 'config', null)
+ this.editOn = tools.getCookie('edn', '0') === '1'
+
return isok
},
diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue
index b5effc91..01f40c85 100755
--- a/src/views/user/mycircuit/mycircuit.vue
+++ b/src/views/user/mycircuit/mycircuit.vue
@@ -37,7 +37,9 @@
{{ circuit.name }}
- Gruppo: {{ groupnameSel.groupname }}
+
+ Gruppo: {{ groupnameSel.groupname }}
+
@@ -45,9 +47,17 @@
- Regolamento:
-
-
+
+ Regolamento:
+
+
+
-
+
@@ -79,7 +94,10 @@ tools.setRequestCircuit(
-
+
-
- {{
- $t('circuit.exit_circuit')
- }}
+ {{ $t('circuit.exit_circuit') }}
@@ -153,9 +175,17 @@ tools.setRequestCircuit(
-
+
-
+
{{ t('circuit.movements') }}:
-
+
-
-
+
+
-
+
-
+
-
+
- {{
- $t('circuit.beforeentertolocalcircuit')
- }}
+ {{ $t('circuit.beforeentertolocalcircuit') }}
- {{
- $t('db.insertgoodorservices_to_enter_circuit')
- }}
+ {{ $t('db.insertgoodorservices_to_enter_circuit') }}
-
+
- {{
- $t('db.insertgoodorservices_to_enter_circuit')
- }}
+ {{ $t('db.insertgoodorservices_to_enter_circuit') }}
@@ -394,8 +450,8 @@ tools.setRequestCircuit(
color="primary"
:label="$t('circuit.ask')"
@click="
- requestToEnterCircuit = true;
-groupnameSel = null;
+ requestToEnterCircuit = true;
+ groupnameSel = null;
"
/>
@@ -415,9 +471,17 @@ groupnameSel = null;
-
+
-
+
Chiedi di Entrare nei Circuiti:
-
+
-
+
@@ -704,7 +775,11 @@ groupnameSel = group;
})
}}:
-
+
-
+
@@ -742,7 +831,8 @@ groupnameSel = group;
`background-color: ` +
tools.getColorByCircuit(circuit)
"
- >{{ tools.getSymbolByCircuit(circuit) }}
+ >{{ tools.getSymbolByCircuit(circuit) }}
@@ -832,8 +922,7 @@ groupnameSel = group;
? t('dialog.yes')
: t('dialog.no')
}}
- {{
- }}
+ {{}}