+
-
+ class="shadow-5 q-mb-md"
+ dense
+ >
{{ myevent.title }}
-
+
+ rounded
+ v-if="!myevent.nobookable && site.confpages.bookingEvents"
+ color="primary"
+ @click="addBookEventMenu(myevent)"
+ :disable="!isEventEnabled(myevent)"
+ :label="$t('cal.booking')"
+ >
-
@@ -128,35 +190,44 @@
-
-
+
+ :options="globalStore.disciplines"
+ :useinput="false"
+ >
-
-
-
+
-
-
+
-
+ :readonly="false"
+ >
+ :readonly="false"
+ >
-
-
-
@@ -362,124 +535,227 @@
+ style="height: 200px"
+ :alt="myevent.title"
+ >
-
- {{ $t('cal.teacher') }}:
+ {{ $t('cal.teacher') }}:
-
- ![Località]()
-
-
-
- {{ getWhereName(myevent.wherecode) }}
-
-
+
+
+ ![Località]()
+
+
+
+ {{
+ getWhereName(myevent.wherecode)
+ }}
+
+
-
+
{{ $t('event.price') }}:
- {{ getPrice(myevent) }}
+ {{
+ getPrice(myevent)
+ }}
- {{ $t('cal.when') }}:
-
-
+ {{ $t('cal.when') }}:
+
+
- +
-
-
+ v-model="eventForm.bgcolor"
+ >
-
+
-
-
-
+ optval="username"
+ :optlab="(item) => item.name + ' ' + item.surname"
+ :options="calendarStore.operators"
+ :useinput="false"
+ >
+ optval="username"
+ :optlab="(item) => item.name + ' ' + item.surname"
+ :options="calendarStore.operators"
+ :useinput="false"
+ >
+ optval="username"
+ :optlab="(item) => item.name + ' ' + item.surname"
+ :options="calendarStore.operators"
+ :useinput="false"
+ >
+ optval="username"
+ :optlab="(item) => item.name + ' ' + item.surname"
+ :options="calendarStore.operators"
+ :useinput="false"
+ >
+ :options="calendarStore.wheres"
+ :useinput="false"
+ >
-
+ class="myflex wrap"
+ dense
+ v-model="eventForm.canceled"
+ :label="$t('event.canceled')"
+ >
+
-
+ :newvaluefunc="createContribType"
+ :options="calendarStore.contribtype"
+ >
-
+ optval="path"
+ optlab="title"
+ :options="calendarStore.internalpages"
+ :useinput="false"
+ >
-
+
+
-
+
+ class="shadow-5 q-mb-md"
+ dense
+ >
{{ myevent.title }}
- {{ $t('cal.when') }}:
-
-
+ {{ $t('cal.when') }}:
+
+
-
+
-
-
+
+ :disable="
+ (bookEventpage.bookedevent &&
+ bookEventpage.bookedevent.booked) ||
+ bookEventpage.bookedevent === undefined ||
+ !isEventEnabled(myevent)
+ "
+ style="color: black"
+ v-model="bookEventForm.booked"
+ :label="$t('cal.bookingtextdefault')"
+ color="green"
+ >
-
+ v-if="bookEventForm.booked"
+ class="q-gutter-xs q-mx-xs"
+ style="min-width: 140px"
+ >
+ :label="$t('cal.selnumpeople')"
+ emit-value
+ map-options
+ >
-
-
-
{{ $t('cal.selnumpeopleLunch') }}
+
+
-
+
+ {{ $t('cal.selnumpeopleLunch') }}
+
+ style="min-width: 140px; margin-left: 10px"
+ >
+ :label="$t('cal.Lunch')"
+ emit-value
+ map-options
+ >
-
-
-
+
+
+
+
+
diff --git a/src/components/CShareSocial/index.ts b/src/components/CShareSocial/index.ts
new file mode 100755
index 00000000..551ab325
--- /dev/null
+++ b/src/components/CShareSocial/index.ts
@@ -0,0 +1 @@
+export {default as CShareSocial} from './CShareSocial.vue'
diff --git a/src/components/index.ts b/src/components/index.ts
index 65447dfc..fd4ce25b 100755
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -14,6 +14,7 @@ export * from './CImgTitle'
export * from './CMyAvatar'
export * from './CMyCart'
export * from './CMyFieldDb'
+export * from './CShareSocial'
export * from './CBarSelection'
export * from './CMyFieldRec'
export * from './CImgPoster'
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 492617a2..96bd372e 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -669,6 +669,14 @@ export interface IParamsQuery {
extrapar?: string
}
+export interface ISocial {
+ description: string
+ network: string
+ title: string
+ url: string
+ quote: string
+}
+
export interface ISpecialField {
findsubkey?: any
paramtosetsubkey?: any
diff --git a/src/root/evento/evento.ts b/src/root/evento/evento.ts
index c885c578..3c6ae3de 100755
--- a/src/root/evento/evento.ts
+++ b/src/root/evento/evento.ts
@@ -140,6 +140,7 @@ export default defineComponent({
setmeta,
myevent,
selected,
+ tools,
}
}
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 0ea61175..d63405b4 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -734,7 +734,7 @@ const msg_it = {
booked_error: 'Prenotazione non avvenuta. Riprovare più tardi',
sendmsg_error: 'Messaggio non inviato. Riprovare più tardi',
sendmsg_sent: 'Messaggio Inviato',
- sendmsg_sent_sharedlink: 'Il Messaggio da inviare lo trovi nella Chat Telegram',
+ sendmsg_sent_sharedlink: 'Condividi il messaggio che ti è appena arrivato sulla Chat Telegram',
sendmsgs_sent: 'Messaggi Inviati',
err_sendmsg: 'Errore durante l\'invio del Messaggio',
booking: 'Prenota Evento',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 1e83b698..a56314bf 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -4467,6 +4467,12 @@ export const tools = {
},
+ copyStringToClipboardSilent(mystr: string) {
+
+ copyToClipboard(mystr)
+
+ },
+
getlinkhref(mylink: string, text: string) {
return '' + text + ''
},
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index c0e420a5..356e9cff 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -1047,7 +1047,7 @@ export const useUserStore = defineStore('UserStore', {
}
},
- async loadUserProfile({username, idnotif}: {username: string, idnotif?: string}) {
+ async loadUserProfile({ username, idnotif }: { username: string, idnotif?: string }) {
const data = {
username,
idnotif
@@ -1104,9 +1104,9 @@ export const useUserStore = defineStore('UserStore', {
return Api.SendReq('/mygroup/load', 'POST', data)
.then((res) => {
- return {data: res.data, status: res.status}
+ return { data: res.data, status: res.status }
}).catch((error) => {
- return {data: null, status: error.status}
+ return { data: null, status: error.status }
})
},
@@ -1119,9 +1119,9 @@ export const useUserStore = defineStore('UserStore', {
return Api.SendReq('/circuit/load', 'POST', data)
.then((res) => {
- return {data: res.data, status: res.status}
+ return { data: res.data, status: res.status }
}).catch((error) => {
- return {data: null, status: error.status}
+ return { data: null, status: error.status }
})
},
@@ -1237,9 +1237,16 @@ export const useUserStore = defineStore('UserStore', {
let msgok = (res.data.nummsgsent === 1) ? res.data.nummsgsent + ' ' + t('cal.sendmsg_sent') : res.data.nummsgsent + ' ' + t('cal.sendmsgs_sent')
if (mydata.cmd === shared_consts.MsgTeleg.SHARE_MSGREG) {
msgok = t('cal.sendmsg_sent_sharedlink') + ' ' + tools.getBotName()
+ showmsgsent = true
}
+
if (showmsgsent && res.data.nummsgsent >= 0) {
tools.showPositiveNotif($q, msgok)
+ if (mydata.cmd === shared_consts.MsgTeleg.SHARE_MSGREG) {
+ if (res.data.textsent) {
+ return res.data.textsent
+ }
+ }
return true
}
return false
diff --git a/src/views/messages/messages.vue b/src/views/messages/messages.vue
index 88bfada8..0715ac63 100755
--- a/src/views/messages/messages.vue
+++ b/src/views/messages/messages.vue
@@ -1,49 +1,55 @@
+ view="hHh Lpr lff"
+ container
+ :style="`height: ` + getheight + `px`"
+ class="shadow-2 rounded-borders messages_page"
+ >
-
+ content-class="bg-grey-3"
+ >
- {{ $t('msgs.messages') }}
+ {{
+ $t('msgs.messages')
+ }}
-
{{ $t('msgs.nomessage') }}
-
-
+ @click="selChat(msg)"
+ >
- ![]()
+ ![]()
- {{ getUsernameChatByMsg(msg) }}
+ {{
+ getUsernameChatByMsg(msg)
+ }}
{{ getMsgText(msg, false) }}
@@ -54,18 +60,22 @@
-
-
{{ $t('cal.selnumpeopleDinner') }}
-
+
+
@@ -497,41 +773,57 @@
+ style="height: 150px"
+ :alt="myevent.title"
+ >
-
+
+ +
+
+
+ :label="$t('cal.Dinner')"
+ emit-value
+ map-options
+ >
+ {{ $t('cal.selnumpeopleDinner') }}
+
+
-
-
-
-
- {{ $t('cal.selnumpeopleDinnerShared') }}
-
+ v-if="myevent.dinnerSharedAvailable"
+ class="q-px-xs centermydiv"
+ style="display: inline-flex"
+ >
+
+
+ :label="$t('cal.DinnerShared')"
+ emit-value
+ map-options
+ >
+ {{ $t('cal.selnumpeopleDinnerShared') }}
+
+ +
-
+
+ class="shadow-5 q-mb-md"
+ dense
+ >
{{ myevent.title }}
+ v-model="askInfoForm.message"
+ :label="$t('cal.writemsg') + ':'"
+ autofocus
+ debounce="500"
+ type="textarea"
+ input-class="myinput-area"
+ >
-
@@ -539,15 +831,28 @@
-
-
+
-
-
- {{ $t('cal.when') }}:
-
-
+ {{ $t('cal.when') }}:
+
+
+
-
+ @EditBookEvent="EditBookEvent"
+ >
diff --git a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue
index c9166580..ea17cbf6 100644
--- a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue
+++ b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue
@@ -95,7 +95,7 @@
{})
const neworder = ref(0)
@@ -227,6 +231,21 @@ export default defineComponent({
$router.replace('/signin')
}
+ async function clickshare() {
+ let mytext = await tools.sendMsgTelegramCmd(
+ $q,
+ t,
+ shared_consts.MsgTeleg.SHARE_MSGREG,
+ true
+ )
+
+ if (false) {
+ social.value.description = mytext
+ visushare.value = true
+ }
+
+ }
+
onMounted(mounted)
return {
@@ -256,6 +275,9 @@ export default defineComponent({
dupElem,
globalStore,
PagLogin,
+ visushare,
+ social,
+ clickshare,
}
},
diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue
index af1f4a80..bad55539 100755
--- a/src/components/CMyElem/CMyElem.vue
+++ b/src/components/CMyElem/CMyElem.vue
@@ -466,14 +466,7 @@
"
rounded
:label="$t('reg.link_reg_and_msg')"
- @click="
- tools.sendMsgTelegramCmd(
- $q,
- $t,
- shared_consts.MsgTeleg.SHARE_MSGREG,
- true
- )
- "
+ @click="clickshare"
>
@@ -513,9 +506,7 @@
size="xs"
/>
-
+
+
-
{{ getTitleEv(event) }}
-
+
![]()
+ class="text-center listaev__tdimg_small"
+ :alt="event.title"
+ />
@@ -714,226 +1058,358 @@
-
-
+
-
-
+
+
+ v-if="getImgEvent(event)"
+ class="row justify-center"
+ style="margin-top: 30px; width: 100%"
+ >
- ![]()
+ style="
+ margin-top: -25px;
+ margin-bottom: 10px;
+ font-size: 60px;
+ max-height: 50px;
+ "
+ >
+ ![]()
{{ tools.getstrTime(event.dateTimeStart) }}
+ v-if="getTitleEv(event)"
+ class="col-12 q-px-xs text-white"
+ style="font-size: 0.75rem"
+ >
-
+ :draggable="tools.isManager()"
+ >
- {{ getTitleEv(event) }}
- + {{ getTitleEv(event) }}
- + {{ getTitleEv(event) }}
-
+
-
-
-
+
+ rounded
+ type="a"
+ to="/calendario-eventi"
+ color="primary"
+ icon="event"
+ size="lg"
+ :label="$t('cal.showlastschedule')"
+ >
-
-
LISTA PROSSIMI {{ showfirstN }} - EVENTI:
++ LISTA PROSSIMI + {{ showfirstN }} EVENTI: +
-
- ![]()
- {{ $t('cal.booked') }}
-
-
-
-
-
-
-
-
- Tra 1 Settimana
-
-
- Tra 2 Settimane
-
-
- 4 Eventi ogni Settimana
-
-
-
-
-
-
- {{ $t('event.news') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Evento Interno:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('cal.teacher') }}:
-
-
- {{ $t('cal.where') }}: - -
-
- ![]()
-
-
-
- {{ getWhereName(event.wherecode) }}
-
-
-
- - {{ $t('cal.where') }}: - -
- {{ $t('event.price') }}:
-
-
- {{ getContribtypeById(event.contribtype) }}
-
-
+
+
+
-
+
+ ![]()
+ {{ $t('cal.booked') }}
+
- {{ getPrice(event) }}
+ v-if="event === myevent && !displayEvent && editable"
+ class="text-center shadow-5 glossy bg-blue chipmodif"
+ >
+
+
+
+
+ Tra 1 Settimana
+
+
+ Tra 2 Settimane
+
+
+ 4 Eventi ogni Settimana
+
+
+
+
+
+
+ {{ $t('event.news') }}
+
+
+
-
-
+
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cal.teacher') }}:
+
+
+
+ {{ $t('cal.where') }}: + + +
+
+ ![]()
+
+
+
+ {{
+ getWhereName(event.wherecode)
+ }}
+
+
+
+ + {{ $t('cal.where') }}: + + +
+ {{ $t('event.price') }}:
+
+
+ {{
+ getContribtypeById(event.contribtype)
+ }}
+
+
+
+
+ {{
+ getPrice(event)
+ }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+ -->
@@ -600,6 +591,21 @@
+
+ @click="miniState = true"
+ >
@@ -75,36 +85,53 @@
+ clickable
+ v-for="(msg, index) in msgchat_records()"
+ :key="index"
+ >
-
-
+
-
-
+
- {{ getUserByUsername(chatsel.username) }}
+ {{
+ getUserByUsername(chatsel.username)
+ }}
- {{ func_tools.getDateTimeShortStr(chatsel.lasttimeActive) }}
+ {{
+ func_tools.getDateTimeShortStr(chatsel.lasttimeActive)
+ }}
-
-
-
+
+ :text-color="$q.dark.isActive ? `white` : `black`"
+ bg-color="grey-2"
+ >
- ![]()
+ ![]()
@@ -115,37 +142,32 @@
:text="getMsgText(msg, true)"
:stamp="tools.getstrDateTimeShort(msg.datemsg)"
sent
- bg-color="blue-2">
+ bg-color="blue-2"
+ >
-
-
-
-
+
+
-
+
+ input-style="max-height: 95px;"
+ >
-
diff --git a/src/views/user/mygroups/mygroups.vue b/src/views/user/mygroups/mygroups.vue
index 323f2de7..0e495fe0 100755
--- a/src/views/user/mygroups/mygroups.vue
+++ b/src/views/user/mygroups/mygroups.vue
@@ -1,5 +1,5 @@
-
-
-
+
+
+