{{myop.name}}
{{myop.qualification}}
@@ -9,7 +9,7 @@
{{myop.certifications}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CCardCarousel/index.ts b/src/components/CCardCarousel/index.ts
new file mode 100644
index 0000000..9162173
--- /dev/null
+++ b/src/components/CCardCarousel/index.ts
@@ -0,0 +1 @@
+export {default as CCardCarousel} from './CCardCarousel.vue'
diff --git a/src/components/CCardDiscipline/CCardDiscipline.scss b/src/components/CCardDiscipline/CCardDiscipline.scss
new file mode 100644
index 0000000..4dd0743
--- /dev/null
+++ b/src/components/CCardDiscipline/CCardDiscipline.scss
@@ -0,0 +1,110 @@
+$heightBtn: 100%;
+$grayshadow: #555;
+
+.text-subtitle-carica {
+ font-size: 1rem;
+ font-weight: 400;
+ line-height: 1.75rem;
+ letter-spacing: .00937em;
+ text-shadow: .1rem .1rem .1rem $grayshadow;
+}
+
+.text-subtitle-certificato {
+ font-size: 0.75rem;
+ line-height: 1rem;
+}
+
+@media (max-width: 718px) {
+ // PER VERSIONE MOBILE
+ .text-subtitle-carica {
+ font-size: 1rem;
+ }
+}
+
+.my-card-discipline {
+ width: 100%;
+ max-width: 350px;
+ min-width: 300px;
+ padding: 0;
+
+ box-shadow: none;
+ border-radius: 30px;
+}
+
+.my-card-shadow {
+ width: 100%;
+ max-width: 350px;
+ min-width: 300px;
+ padding-bottom: 20px;
+ margin-left: 0;
+ margin-right: 0;
+ margin-top: 1rem;
+ margin-bottom: 1rem;
+ border-radius: 30px;
+
+ transition: transform .2s ease-out;
+}
+
+.yes_shadow {
+ -webkit-box-shadow: 0 0 24px 0 rgba(0, 0, 0, 0.16);
+ box-shadow: 0 0 24px 0 rgba(0, 0, 0, 0.16);
+}
+
+
+.my-card-shadow:hover {
+ transition: transform .2s ease-in;
+ transform: scale(1.03);
+}
+
+.disc {
+ text-align: center !important;
+ font-size: 1rem;
+ font-weight: 400;
+ line-height: 1.75rem;
+ letter-spacing: .00937em;
+ text-shadow: .1rem .1rem .1rem $grayshadow;
+
+ &__title {
+ //color: white;
+ text-shadow: .125rem .125rem .125rem #2d2260;
+ }
+
+ &__cell {
+ font-size: 1rem;
+ color: red;
+ }
+
+ &__email {
+ font-size: 1rem;
+ color: #3b5998;
+ }
+
+ &__description {
+ font-size: 1rem;
+ color: #000000;
+ height: 150px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ &__email a {
+ text-decoration: none;
+ }
+
+}
+
+.myimg {
+ height: 200px;
+ border-radius: 30px !important;
+}
+
+.q-img {
+ &__image {
+ border-radius: 30px !important;
+ }
+}
+
+
+.q-card__section{
+ padding: 4px !important;
+}
diff --git a/src/components/CCardDiscipline/CCardDiscipline.ts b/src/components/CCardDiscipline/CCardDiscipline.ts
new file mode 100644
index 0000000..99a4f25
--- /dev/null
+++ b/src/components/CCardDiscipline/CCardDiscipline.ts
@@ -0,0 +1,55 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+
+import { tools } from '../../store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { IDiscipline, IEvents } from '../../model'
+import MixinBase from '../../mixins/mixin-base'
+import MixinOperator from '../../mixins/mixin-operator'
+import MixinUsers from '../../mixins/mixin-users'
+import { CMyTeacher } from '../CMyTeacher'
+import { CalendarStore } from '../../store/Modules'
+
+@Component({
+ mixins: [MixinBase, MixinOperator, MixinUsers],
+ name: 'CCardDiscipline',
+ components: { CMyTeacher }
+})
+
+export default class CCardDiscipline extends Vue {
+ @Prop({ required: true }) public discipline: IDiscipline
+ @Prop({ required: false, default: '' }) public mystyle: string
+ @Prop({ required: false, default: false }) public autoplay: boolean
+
+ public nextlesson: IEvents
+
+ @Watch('discipline')
+ public disciplinechanged(value) {
+ this.nextlesson = this.getNextLesson(value.typol_code)
+ // console.log('nextlesson', this.nextlesson)
+ }
+
+ public getNextLesson(typol) {
+ // Get next lesson
+ const datenow = tools.addDays(tools.getDateNow(), -1)
+ return CalendarStore.state.eventlist.find((myevent) => (myevent.typol === typol) && (new Date(myevent.dateTimeEnd) >= datenow))
+ // return CalendarStore.state.eventlist.find((myevent) => (myevent.typol === typol))
+ }
+
+ public ExistLesson() {
+ return !!this.nextlesson
+ }
+
+ public NextEventDate() {
+ return tools.getstrDateTimeEventSimple(this, this.nextlesson)
+ }
+
+ get getLinkEvent() {
+ return `event/${this.nextlesson.typol}/${this.nextlesson._id}`
+ }
+
+ public created() {
+ this.disciplinechanged(this.discipline)
+ }
+
+}
diff --git a/src/components/CCardDiscipline/CCardDiscipline.vue b/src/components/CCardDiscipline/CCardDiscipline.vue
new file mode 100644
index 0000000..231e8ce
--- /dev/null
+++ b/src/components/CCardDiscipline/CCardDiscipline.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+ Discipline Offerte:
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{disc.label}}
+
+
+
+
+
+
+
+
+ {{index + 1}}.
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cal.nextevent') }}:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CCardDiscipline/index.ts b/src/components/CCardDiscipline/index.ts
new file mode 100644
index 0000000..df98f1c
--- /dev/null
+++ b/src/components/CCardDiscipline/index.ts
@@ -0,0 +1 @@
+export {default as CCardDiscipline} from './CCardDiscipline.vue'
diff --git a/src/components/CDateTime/CDateTime.ts b/src/components/CDateTime/CDateTime.ts
index c7a1277..07c31b6 100644
--- a/src/components/CDateTime/CDateTime.ts
+++ b/src/components/CDateTime/CDateTime.ts
@@ -40,6 +40,10 @@ export default class CDateTime extends Vue {
// console.log('Opening', 'myvalue', this.myvalue, 'value', this.value)
this.saveit = false
this.valueprec = this.myvalue
+ if (this.myvalue === undefined) {
+ this.valueDate = new Date()
+ this.myvalue = tools.getstrYYMMDDDateTime(this.valueDate)
+ }
this.$emit('show')
}
@@ -55,7 +59,8 @@ export default class CDateTime extends Vue {
@Watch('valueDate')
public changevalueDate() {
- this.myvalue = tools.getstrYYMMDDDateTime(this.valueDate)
+ if (this.valueDate)
+ this.myvalue = tools.getstrYYMMDDDateTime(this.valueDate)
// console.log('changevalueDate myvalue', this.myvalue)
}
@Watch('value')
@@ -67,7 +72,7 @@ export default class CDateTime extends Vue {
public savetoclose() {
this.saveit = true
this.showDateTimeScroller = false
- this.$emit('savetoclose', this.myvalue, this.valueprec)
+ // this.$emit('savetoclose', this.myvalue, this.valueprec)
}
get scrollerPopupStyle280() {
@@ -95,7 +100,7 @@ export default class CDateTime extends Vue {
else
this.myvalue = tools.getstrYYMMDDDateTime(this.valueDate)
- // console.log('myvalue', this.myvalue)
+ console.log('created myvalue', this.myvalue)
}
public changeval(newval) {
diff --git a/src/components/CDateTime/CDateTime.vue b/src/components/CDateTime/CDateTime.vue
index 6201f78..d047d89 100644
--- a/src/components/CDateTime/CDateTime.vue
+++ b/src/components/CDateTime/CDateTime.vue
@@ -39,21 +39,22 @@
+
+
+
+ {{discipline.label}}
+
+
+
+
+
-
-
-
-
-
-
-
-
- {{ $t('cal.event') }}
-
-
-
-
-
- Tra 1 Settimana
-
-
- Tra 2 Settimane
-
-
- 4 Eventi ogni Settimana
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ $t('cal.event') }}
+
+
+
+
+
+ Tra 1 Settimana
+
+
+ Tra 2 Settimane
+
+
+ 4 Eventi ogni Settimana
+
+
+
+
+
+
+
+
+
+
-
- {{myevent.title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ addOrUpdateEvent }} {{ $t('cal.event') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('cal.booking')}}
-
-
-
-
-
-
-
- {{$t('cal.teacher')}}:
-
-
-
-
-
-
-
-
-
-
-
- {{$t('cal.where')}}:
-
+
+ {{myevent.title}}
+
+
+
-
-
+ {{$t('cal.teacher')}}:
+
+
+
+
+ {{$t('cal.where')}}:
+
- ![]()
+ ![Località]()
-
+
{{getWhereName(myevent.wherecode)}}
-
-
- {{$t('event.price')}}:
-
- {{getPrice(myevent)}}
-
-
-
- {{$t('cal.when')}}:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{myevent.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ addOrUpdateEvent }} {{ $t('cal.event') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('event.price')}}:
+
+ {{getPrice(myevent)}}
-
+
+
+
+
{{$t('cal.when')}}:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('cal.booking')}}
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
- {{$t('cal.booking')}}
-
-
+
+
+
+
+ {{$t('cal.booking')}}
+
+
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{myevent.title}}
+
+
-
+
+ {{$t('cal.when')}}:
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -399,6 +430,7 @@
-->
{{ getTitleEv(event) }}
![]()
+ class="text-center listaev__tdimg_small" :alt="event.title">
@@ -467,23 +499,6 @@
+
+
+
+
+
+
+
diff --git a/src/components/CGoogleMap/index.ts b/src/components/CGoogleMap/index.ts
new file mode 100644
index 0000000..4394732
--- /dev/null
+++ b/src/components/CGoogleMap/index.ts
@@ -0,0 +1 @@
+export {default as CGoogleMap} from './CGoogleMap.vue'
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index 6625bcf..21c2bc5 100644
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -12,13 +12,14 @@ import { lists } from '../../store/Modules/lists'
import { IParamsQuery } from '../../model/GlobalStore'
import { fieldsTable } from '../../store/Modules/fieldsTable'
import { CMyPopupEdit } from '../CMyPopupEdit'
+import { CTitleBanner } from '../CTitleBanner'
@Component({
- components: { CMyPopupEdit }
+ components: { CMyPopupEdit, CTitleBanner }
})
export default class CGridTableRec extends Vue {
- @Prop({ required: false }) public prop_mytable: string
@Prop({ required: true }) public prop_mytitle: string
+ @Prop({ required: false }) public prop_mytable: string
@Prop({ required: false, default: null }) public prop_mycolumns: any[]
@Prop({ required: false, default: '' }) public prop_colkey: string
@Prop({ required: false, default: '' }) public nodataLabel: string
@@ -52,7 +53,7 @@ export default class CGridTableRec extends Vue {
public valPrec: string = ''
public separator: 'horizontal'
- public filter = undefined
+ public myfilter = undefined
public rowsel: any
public dark: boolean = true
public canEdit: boolean = false
@@ -62,6 +63,11 @@ export default class CGridTableRec extends Vue {
public colVisib: any[] = []
public colExtra: any[] = []
+ public rowclicksel: any = null
+ public colclicksel: any = null
+
+ public selected: any = []
+
get lists() {
return lists
}
@@ -96,16 +102,36 @@ export default class CGridTableRec extends Vue {
}
- public SaveValue(newVal, valinitial) {
- console.log('SaveValue', newVal, 'rowsel', this.rowsel)
+ public SaveValdb(newVal, valinitial) {
+ // console.log('SaveValdb', newVal)
+ // console.log('SaveValue', newVal, 'rowsel', this.rowsel)
- // Update value in table memory
- if (this.colsel.subfield !== '') {
- if (this.rowsel[this.colsel.field] === undefined)
- this.rowsel[this.colsel.field] = {}
- this.rowsel[this.colsel.field][this.colsel.subfield] = newVal
- } else {
- this.rowsel[this.colsel.field] = newVal
+ this.colsel = this.colclicksel
+ // console.log('this.colsel', this.colsel)
+ this.SaveValue(newVal, valinitial)
+ this.colsel = null
+ }
+
+ public showandsel(row, col, newval, valinitial) {
+ // console.log('showandsel', row, col, newval)
+ this.rowsel = row
+ this.colsel = col
+ this.idsel = row._id
+ this.SaveValue(newval, valinitial)
+ }
+
+ public SaveValue(newVal, valinitial) {
+ // console.log('SaveValue', newVal, 'rowsel', this.rowsel)
+
+ if (this.colsel) {
+ // Update value in table memory
+ if (this.colsel.subfield !== '') {
+ if (this.rowsel[this.colsel.field] === undefined)
+ this.rowsel[this.colsel.field] = {}
+ this.rowsel[this.colsel.field][this.colsel.subfield] = newVal
+ } else {
+ this.rowsel[this.colsel.field] = newVal
+ }
}
const mydata = {
@@ -140,7 +166,7 @@ export default class CGridTableRec extends Vue {
}
public updatedcol() {
- console.log('updatedcol')
+ // console.log('updatedcol')
if (this.mycolumns) {
this.colVisib = []
this.colExtra = []
@@ -160,9 +186,9 @@ export default class CGridTableRec extends Vue {
}
public onRequest(props) {
- console.log('onRequest', 'filter = ' , this.filter)
+ console.log('onRequest', 'myfilter = ', this.myfilter)
const { page, rowsPerPage, rowsNumber, sortBy, descending } = props.pagination
- const filter = this.filter
+ const myfilter = this.myfilter
if (!this.mytable)
return
@@ -180,21 +206,27 @@ export default class CGridTableRec extends Vue {
const startRow = (page - 1) * rowsPerPage
const endRow = startRow + fetchCount
- // fetch data from "server"
- this.fetchFromServer(startRow, endRow, filter, sortBy, descending).then((ris) => {
+ console.log('startRow', startRow)
- this.pagination.rowsNumber = this.getRowsNumberCount(filter)
+ this.serverData = []
+
+ // fetch data from "server"
+ this.fetchFromServer(startRow, endRow, myfilter, sortBy, descending).then((ris) => {
+
+ this.pagination.rowsNumber = this.getRowsNumberCount(myfilter)
// clear out existing data and add new
if (this.returnedData === []) {
this.serverData = []
} else {
- if (this.serverData.length > 0)
- this.serverData.splice(0, this.serverData.length, ...this.returnedData)
- else
- this.serverData = [...this.returnedData]
+ // if (this.serverData.length > 0)
+ // this.serverData.splice(0, this.serverData.length, ...this.returnedData)
+ // else
+ this.serverData = [...this.returnedData]
}
+ console.log('this.serverData', this.serverData)
+
// don't forget to update local pagination object
this.pagination.page = page
this.pagination.rowsPerPage = rowsPerPage
@@ -209,7 +241,7 @@ export default class CGridTableRec extends Vue {
// emulate ajax call
// SELECT * FROM ... WHERE...LIMIT...
- public async fetchFromServer(startRow, endRow, filter, sortBy, descending) {
+ public async fetchFromServer(startRow, endRow, myfilter, sortBy, descending) {
let myobj = null
if (sortBy) {
@@ -224,7 +256,7 @@ export default class CGridTableRec extends Vue {
table: this.mytable,
startRow,
endRow,
- filter,
+ filter: myfilter,
sortBy: myobj,
descending
}
@@ -241,15 +273,15 @@ export default class CGridTableRec extends Vue {
return true
- // if (!filter) {
+ // if (!myfilter) {
// data = this.original.slice(startRow, startRow + count)
// }
// else {
// let found = 0
// for (let index = startRow, items = 0; index < this.original.length && items < count; ++index) {
// let row = this.original[index]
- // // match filter?
- // if (!row['name'].includes(filter)) {
+ // // match myfilter?
+ // if (!row['name'].includes(myfilter)) {
// // get a different row, until one is found
// continue
// }
@@ -279,14 +311,14 @@ export default class CGridTableRec extends Vue {
}
// emulate 'SELECT count(*) FROM ...WHERE...'
- public getRowsNumberCount(filter) {
+ public getRowsNumberCount(myfilter) {
- // if (!filter) {
+ // if (!myfilter) {
// return this.original.length
// }
// let count = 0
// this.original.forEach((treat) => {
- // if (treat['name'].includes(filter)) {
+ // if (treat['name'].includes(myfilter)) {
// ++count
// }
// })
@@ -331,9 +363,11 @@ export default class CGridTableRec extends Vue {
public mounted() {
- this.canEdit = tools.getCookie(tools.CAN_EDIT, this.canEdit) === 'true'
+ if (!!this.tablesList) {
+ this.canEdit = tools.getCookie(tools.CAN_EDIT, this.canEdit) === 'true'
+ this.tablesel = tools.getCookie('tablesel', this.tablesel)
+ }
- this.tablesel = tools.getCookie('tablesel', this.tablesel)
if (this.tablesel === '') {
if (!!this.tablesList)
this.tablesel = this.tablesList[0].value
@@ -351,14 +385,18 @@ export default class CGridTableRec extends Vue {
console.log('refresh')
// console.log('this.search', this.search)
if (!!this.search && this.search !== '')
- this.filter = this.search
+ this.myfilter = this.search
else
- this.filter = undefined
+ this.myfilter = undefined
- // console.log('this.filter', this.filter)
+ // console.log('this.myfilter', this.myfilter)
+ this.refresh_table()
+ }
+
+ public refresh_table() {
this.onRequest({
- pagination: this.pagination,
+ pagination: this.pagination
})
}
@@ -370,8 +408,10 @@ export default class CGridTableRec extends Vue {
public ActionAfterYes(action, item, data) {
if (action === lists.MenuAction.DELETE_RECTABLE) {
- if (this.serverData.length > 0)
+ if (this.serverData.length > 0) {
this.serverData.splice(this.serverData.indexOf(item), 1)
+ this.refresh_table()
+ }
} else if (action === lists.MenuAction.DUPLICATE_RECTABLE) {
// Add record duplicated
// this.serverData.push(data)
@@ -399,7 +439,9 @@ export default class CGridTableRec extends Vue {
if (this.tablesel === undefined || this.tablesel === '')
return
- console.log('changeTable mysel=', mysel, 'tablesel', this.tablesel)
+ // console.log('changeTable mysel=', mysel, 'tablesel', this.tablesel)
+ // console.log('this.tablesList=')
+ // console.table(this.tablesList)
let mytab = null
if (this.tablesList) {
@@ -445,6 +487,11 @@ export default class CGridTableRec extends Vue {
const myselcol = tools.getCookie(this.mytable, '')
if (!!myselcol && myselcol.length > 0) {
this.colVisib = myselcol.split('|')
+ } else {
+ this.mycolumns.forEach((elem) => {
+ if (elem.field !== tools.NOFIELD)
+ this.colVisib.push(elem.field + elem.subfield)
+ })
}
}
@@ -467,4 +514,21 @@ export default class CGridTableRec extends Vue {
tools.setCookie(tools.CAN_EDIT, newval)
}
+ public clickrowcol(row, col) {
+ if (!this.canEdit) {
+ if (this.rowclicksel) {
+ this.rowclicksel = null
+ } else {
+ this.rowclicksel = row
+ this.colclicksel = col
+ }
+ }
+ }
+
+ public getclrow(myrow) {
+ if (this.rowclicksel === myrow)
+ return 'colsel'
+ else
+ return ''
+ }
}
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index fde4e86..e142087 100644
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -4,7 +4,7 @@
Rows: {{ getrows }}-->
-
+
-
-
+
+
+
+
+
+
+
diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue
index e7de09e..df08efc 100644
--- a/src/components/CMySelect/CMySelect.vue
+++ b/src/components/CMySelect/CMySelect.vue
@@ -1,5 +1,5 @@
-
-
- {{myevent.title}}
-
-
-
-
-
+
+
+
+ {{myevent.title}}
+
+
-
-
{{$t('cal.when')}}:
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/js/storage.js___jb_tmp___ b/src/components/CFacebookFrame/CFacebookFrame.scss
similarity index 100%
rename from src/js/storage.js___jb_tmp___
rename to src/components/CFacebookFrame/CFacebookFrame.scss
diff --git a/src/components/CFacebookFrame/CFacebookFrame.ts b/src/components/CFacebookFrame/CFacebookFrame.ts
new file mode 100644
index 0000000..349d98b
--- /dev/null
+++ b/src/components/CFacebookFrame/CFacebookFrame.ts
@@ -0,0 +1,55 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+import { tools } from '@src/store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+
+import { date } from 'quasar'
+import { CalendarStore } from '../../store/Modules'
+import MixinBase from '../../mixins/mixin-base'
+
+import VueScrollReveal from 'vue-scroll-reveal'
+import { CImgText } from '../CImgText'
+
+
+Vue.use(VueScrollReveal, {
+ class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
+ duration: 1200,
+ scale: 0.95,
+ distance: '10px',
+ rotate: {
+ x: 0,
+ y: 0,
+ z: 0
+ }
+ // mobile: true
+})
+
+
+@Component({
+ name: 'CFacebookFrame',
+ components: { CImgText },
+ mixins: [MixinBase]
+})
+
+export default class CFacebookFrame extends Vue {
+ public $q
+ public $t
+ @Prop({ required: true }) public urlfbpage: string
+ @Prop({ required: true }) public title: string
+ @Prop({ required: true }) public fbimage: string
+ @Prop({ required: false, default: '' }) public myclass: string
+
+ public geturlfbpageEncoded() {
+ return encodeURIComponent(this.urlfbpage)
+ }
+
+ get mywidth() {
+ let myw = 340
+ if (tools.getwidth(this) < 400)
+ return myw
+ if ((tools.getwidth(this) > 400) && (tools.getwidth(this) < 1100))
+ return Math.round((tools.getwidth(this) / 3) - 30)
+ else
+ return myw
+ }
+}
diff --git a/src/components/CFacebookFrame/CFacebookFrame.vue b/src/components/CFacebookFrame/CFacebookFrame.vue
new file mode 100644
index 0000000..63a2aae
--- /dev/null
+++ b/src/components/CFacebookFrame/CFacebookFrame.vue
@@ -0,0 +1,29 @@
+
+
+
+
@@ -519,215 +576,194 @@
+
+ ![]()
+
+
+
+ {{ tools.getstrTime(event.dateTimeStart) }}
+
+
+
+ {{ getTitleEv(event) }}
+ +
+
+ + +
-
LISTA PROSSIMI EVENTI:
+
+
+
+
+
+
-
-
-
-
-
-
+
+
LISTA PROSSIMI {{ showfirstN }} + EVENTI:
+
+ ![]()
+ {{$t('cal.booked')}}
+
-
-
-
-
-
+
+
+
+
-
- ![]()
- {{$t('cal.booked')}}
-
+
-
+
+
+
+
+ Tra 1 Settimana
+
+
+ Tra 2 Settimane
+
+
+ 4 Eventi ogni Settimana
+
+
+
+
+
+
+ {{$t('event.news')}}
+
-
-
-
-
- Tra 1 Settimana
-
-
- Tra 2 Settimane
-
-
- 4 Eventi ogni Settimana
-
-
-
-
-
-
- {{$t('event.news')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- {{event.title}}
-
-
- {{event.title}}
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{$t('cal.teacher')}}:
-
-
-
-
-
+
{{$t('cal.where')}}:
- ![]()
+ ![]()
{{getWhereName(event.wherecode)}}
-
- {{$t('cal.where')}}:
+
+
{{$t('event.price')}}:
-
+
{{getContribtypeById(event.contribtype)}}
-
- {{getPrice(event)}}
-
+
+ {{getPrice(event)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CFacebookFrame/index.ts b/src/components/CFacebookFrame/index.ts
new file mode 100644
index 0000000..ff3a74f
--- /dev/null
+++ b/src/components/CFacebookFrame/index.ts
@@ -0,0 +1 @@
+export {default as CFacebookFrame} from './CFacebookFrame.vue'
diff --git a/src/components/CGoogleMap/CGoogleMap.scss b/src/components/CGoogleMap/CGoogleMap.scss
new file mode 100644
index 0000000..09d48a3
--- /dev/null
+++ b/src/components/CGoogleMap/CGoogleMap.scss
@@ -0,0 +1,4 @@
+#map {
+ height: 400px;
+ width: 90%;
+}
diff --git a/src/components/CGoogleMap/CGoogleMap.ts b/src/components/CGoogleMap/CGoogleMap.ts
new file mode 100644
index 0000000..f9623b1
--- /dev/null
+++ b/src/components/CGoogleMap/CGoogleMap.ts
@@ -0,0 +1,28 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+
+import { toolsext } from '@src/store/Modules/toolsext'
+
+@Component({
+ name: 'CGoogleMap'
+})
+
+export default class CGoogleMap extends Vue {
+ @Prop({ required: true, default: 'one' }) public tab
+
+ public map = null
+
+ public initMap() {
+
+ // this.map = new window.google.maps.Map(document.getElementById('map'), {
+ // center: { lat: -34.397, lng: 150.644 },
+ // zoom: 8
+ // })
+ }
+
+ public async mounted() {
+ // await this.$google()
+ // this.initMap()
+ }
+
+}
diff --git a/src/components/CGoogleMap/CGoogleMap.vue b/src/components/CGoogleMap/CGoogleMap.vue
new file mode 100644
index 0000000..4efe53d
--- /dev/null
+++ b/src/components/CGoogleMap/CGoogleMap.vue
@@ -0,0 +1,12 @@
+
+
+
-
+
+
@@ -119,6 +124,38 @@
-->
+
+
+
+
diff --git a/src/components/CMyFieldDb/index.ts b/src/components/CMyFieldDb/index.ts
new file mode 100644
index 0000000..04e1799
--- /dev/null
+++ b/src/components/CMyFieldDb/index.ts
@@ -0,0 +1 @@
+export {default as CMyFieldDb} from './CMyFieldDb.vue'
diff --git a/src/components/CMyPage/CMyPage.ts b/src/components/CMyPage/CMyPage.ts
index fb44dd4..547b606 100644
--- a/src/components/CMyPage/CMyPage.ts
+++ b/src/components/CMyPage/CMyPage.ts
@@ -10,45 +10,35 @@ import { toolsext } from '@src/store/Modules/toolsext'
import { Screen } from 'quasar'
import { CImgTitle } from '../../components/CImgTitle/index'
import { CTitle } from '../../components/CTitle/index'
-
-// Vue.use(VueScrollReveal, {
-// class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
-// duration: 1200,
-// scale: 0.95,
-// distance: '10px',
-// rotate: {
-// x: 0,
-// y: 0,
-// z: 0
-// }
-// // mobile: true
-// })
+import MixinsMetaTags from '../../mixins/mixin-metatags'
@Component({
name: 'CMyPage',
+ mixins: [MixinsMetaTags],
components: { Footer, CImgTitle, CTitle }
})
export default class CMyPage extends Vue {
@Prop({ required: true, default: '' }) public title: string
- @Prop({ required: true, default: '' }) public keywords: string
- @Prop({ required: true, default: '' }) public description: string
@Prop({ required: false, default: '' }) public img: string
@Prop({ required: false, default: '' }) public imgbackground: string
@Prop({ required: false, default: '' }) public sizes: string
+ @Prop({ required: false, default: '' }) public styleadd: string
+ @Prop({ required: false, default: false }) public nofooter: boolean
public $t
public $q
- public meta() {
- return {
- title: this.$t('msg.myAppName'),
- titleTemplate: (title) => `${this.title} - ${this.$t('msg.myAppName')}`,
- meta: {
- keywords: { name: 'keywords', content: this.keywords },
- description: { name: 'description', content: this.description },
- equiv: { 'http-equiv': 'Content-Type', 'content': 'text/html; charset=UTF-8' }
- }
- }
- }
+ // public metaInfo() {
+ // return {
+ // // title: this.$t('msg.myAppName'),
+ // title: 'PROVA TITOLOOOOOOO!!!!!!!!!!!!!!!!!!!!**************************',
+ // titleTemplate: (title) => `${this.title} - ${this.$t('msg.myAppName')}`,
+ // meta: {
+ // keywords: { name: 'keywords', content: this.keywords },
+ // description: { name: 'description', content: this.description },
+ // equiv: { 'http-equiv': 'Content-Type', 'content': 'text/html; charset=UTF-8' }
+ // }
+ // }
+ // }
public mounted() {
// console.log('CMYPage title=', this.title)
diff --git a/src/components/CMyPage/CMyPage.vue b/src/components/CMyPage/CMyPage.vue
index cc33c69..06362e8 100644
--- a/src/components/CMyPage/CMyPage.vue
+++ b/src/components/CMyPage/CMyPage.vue
@@ -1,13 +1,15 @@
+
+
+
+
+
+
+
+
+
+ {{mycol.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ visuValByType(myvalue, col, row) }}
@@ -55,6 +74,15 @@
+
@@ -74,10 +102,13 @@
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CMySingleEvent/CMySingleEvent.scss b/src/components/CMySingleEvent/CMySingleEvent.scss
new file mode 100644
index 0000000..b72af56
--- /dev/null
+++ b/src/components/CMySingleEvent/CMySingleEvent.scss
@@ -0,0 +1,168 @@
+$graytext: #555;
+
+.listaev {
+ color: black;
+ font-size: 0.75rem;
+ font-weight: 400;
+ line-height: 1.25rem;
+ letter-spacing: 0.03333em;
+
+ &__date {
+ color: #061220;
+ font-size: 1rem;
+ }
+
+ &__title {
+ color: red;
+ font-weight: 700;
+ letter-spacing: 0.066em;
+ }
+
+ &__details {
+ color: black;
+ }
+
+ &__tdimg {
+ width: 150px;
+ height: 150px;
+ }
+
+ &__tdimg_small {
+ width: auto;
+ height: 50px !important;
+ @media (max-width: 800px) {
+ height: 40px !important;
+ }
+ }
+
+ &__table {
+ margin: 10px;
+ border: solid 1px #4198ef;
+ border-radius: 1rem;
+ padding: 2px;
+ }
+ &__table tr {
+ border: solid 1px #4198ef;
+ border-radius: 1rem;
+ }
+
+
+ &__align_center_mobile {
+ text-align: center;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ }
+
+ &__align_chips {
+ text-align: center;
+ display: flex;
+ flex-direction: column-reverse;
+ align-items: center;
+ }
+
+ &__img {
+ padding: 0.25rem !important;
+ float: left;
+ width: 150px;
+ height: 150px;
+ border-radius: 1rem;
+
+ @media (max-width: 718px) {
+ // PER VERSIONE MOBILE
+ float: none;
+ text-align: center;
+ margin: 0 auto;
+ }
+ }
+
+ &__img:hover {
+ transition: transform .2s;
+ transform: scale(1.05);
+ border: inset;
+ border-color: blue;
+ border-width: 1px;
+ }
+
+}
+
+.cal {
+ color: black;
+ font-size: 0.75rem;
+ font-weight: 400;
+ line-height: 1.25rem;
+ letter-spacing: 0.03333em;
+
+ &__title {
+ color: white;
+ font-weight: 700;
+ font-size: 1rem;
+ padding-bottom: 10px;
+ }
+
+ &__details {
+ color: black;
+ }
+
+ &__hours {
+ color: blue;
+ &-title {
+ color: $graytext;
+ }
+ &-content {
+ font-weight: 400;
+ }
+ }
+
+ &__where {
+ margin-top: 5px;
+ color: blue;
+
+ &-title {
+ color: $graytext;
+ }
+ &-content {
+ color: darkblue;
+ }
+ }
+
+ &__when {
+ margin-top: 5px;
+ color: blue;
+
+ &-title {
+ color: $graytext;
+ }
+ &-content {
+ color: darkblue;
+ }
+ }
+
+ &__teacher {
+ margin-top: 5px;
+ &-title {
+ color: $graytext;
+ }
+ &-content {
+ color: darkblue;
+ }
+ }
+
+ &__quota {
+ margin-top: 5px;
+ &-title {
+ color: $graytext;
+ }
+ &-content {
+
+ }
+ }
+
+ &__img {
+ width: 100px;
+ height: 100px;
+ padding: 10px;
+ }
+
+}
+
diff --git a/src/components/CMySingleEvent/CMySingleEvent.ts b/src/components/CMySingleEvent/CMySingleEvent.ts
new file mode 100644
index 0000000..983c9e8
--- /dev/null
+++ b/src/components/CMySingleEvent/CMySingleEvent.ts
@@ -0,0 +1,77 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+import { CalendarStore, GlobalStore, UserStore } from '@store'
+
+import { Logo } from '../../components/logo/index'
+
+import { Footer } from '../../components/Footer/index'
+
+import { tools } from '../../store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { static_data } from '@src/db/static_data'
+import { Screen } from 'quasar'
+
+import { CImgText } from '../../components/CImgText/index'
+import { CCard, CMyAvatar, CMyTeacher, CMyPage } from '@components'
+import MixinOperator from '@src/mixins/mixin-operator'
+import MixinEvents from '../../mixins/mixin-events'
+import { IEvents } from '@src/model'
+import MixinBase from '@src/mixins/mixin-base'
+import MixinUsers from '@src/mixins/mixin-users'
+
+@Component({
+ name: 'CMySingleEvent',
+ mixins: [MixinOperator, MixinBase, MixinEvents, MixinUsers],
+ components: { Logo, Footer, CImgText, CCard, CMyPage, CMyAvatar, CMyTeacher }
+})
+export default class CMySingleEvent extends MixinEvents {
+ @Prop({ required: true }) public myevent: IEvents
+ public $q
+ public $t
+ public selected: boolean = false
+
+ public selectEvent(eventparam: IEvents) {
+ this.selected = !this.selected
+ }
+
+ public getTextEvent(myevent: IEvents) {
+ if (myevent.bodytext === '') {
+ return myevent.details
+ } else {
+ return myevent.bodytext
+ }
+ }
+
+ public mounted() {
+ // console.log('MYSINGLEEVENT: myevent', this.myevent)
+ }
+
+ get static_data() {
+ return static_data
+ }
+
+ public duplicateEvent(event, numgg) {
+ this.$emit('duplicateEvent', event, numgg)
+ }
+
+ public askForInfoEventMenu(event) {
+ this.$emit('askForInfoEventMenu', event)
+ }
+
+ public deleteEvent(event) {
+ this.$emit('deleteEvent', event)
+ }
+
+ public editEvent(event) {
+ this.$emit('editEvent', event)
+ }
+
+ public addBookEventMenu(event) {
+ this.$emit('addBookEventMenu', event)
+ }
+
+ public EditBookEvent(event) {
+ this.$emit('EditBookEvent', event)
+ }
+
+}
diff --git a/src/components/CMySingleEvent/CMySingleEvent.vue b/src/components/CMySingleEvent/CMySingleEvent.vue
new file mode 100644
index 0000000..a53a915
--- /dev/null
+++ b/src/components/CMySingleEvent/CMySingleEvent.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+ {{myop.name}} {{myop.surname}}
+
+
+
+
+ + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CMyTeacher/index.ts b/src/components/CMyTeacher/index.ts
new file mode 100644
index 0000000..6da701e
--- /dev/null
+++ b/src/components/CMyTeacher/index.ts
@@ -0,0 +1 @@
+export {default as CMyTeacher} from './CMyTeacher.vue'
diff --git a/src/components/COpenStreetMap/COpenStreetMap.scss b/src/components/COpenStreetMap/COpenStreetMap.scss
new file mode 100644
index 0000000..09d48a3
--- /dev/null
+++ b/src/components/COpenStreetMap/COpenStreetMap.scss
@@ -0,0 +1,4 @@
+#map {
+ height: 400px;
+ width: 90%;
+}
diff --git a/src/components/COpenStreetMap/COpenStreetMap.ts b/src/components/COpenStreetMap/COpenStreetMap.ts
new file mode 100644
index 0000000..01eba01
--- /dev/null
+++ b/src/components/COpenStreetMap/COpenStreetMap.ts
@@ -0,0 +1,26 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+
+import { toolsext } from '@src/store/Modules/toolsext'
+import { tools } from '../../store/Modules/tools'
+
+@Component({
+ name: 'COpenStreetMap'
+})
+
+export default class COpenStreetMap extends Vue {
+ @Prop({required: true}) public title: string
+ @Prop({required: false, default: ''}) public coordinates: string
+ @Prop({required: false, default: '' }) public coord_big: string
+ @Prop({required: false, default: ''}) public urlmap: string
+ @Prop({required: false, default: ''}) public imgmap: string
+
+ get mywidth() {
+ return tools.getwidth(this) - 20
+ }
+
+ get myheight() {
+ return 450
+ }
+
+}
diff --git a/src/components/COpenStreetMap/COpenStreetMap.vue b/src/components/COpenStreetMap/COpenStreetMap.vue
new file mode 100644
index 0000000..b21f305
--- /dev/null
+++ b/src/components/COpenStreetMap/COpenStreetMap.vue
@@ -0,0 +1,34 @@
+
+
diff --git a/src/components/CTitle/CTitle.ts b/src/components/CTitle/CTitle.ts
index d30fbe1..88c1c82 100644
--- a/src/components/CTitle/CTitle.ts
+++ b/src/components/CTitle/CTitle.ts
@@ -10,10 +10,11 @@ import { Screen } from 'quasar'
name: 'CTitle'
})
export default class CTitle extends Vue {
+ @Prop({ required: true }) public headtitle: string
@Prop({ required: false, default: '' }) public imgbackground: string
@Prop({ required: false, default: '' }) public imghead: string
@Prop({ required: false, default: '' }) public sizes: string
- @Prop({ required: true }) public headtitle: string
+ @Prop({ required: false, default: '' }) public styleadd: string
get tools() {
return tools
@@ -26,4 +27,9 @@ export default class CTitle extends Vue {
return tools.getimgbysize(filefull.path, filefull.file)
}
+ get getaltimg() {
+ const filefull = tools.getimgFullpathbysize(this.imgbackground)
+ return tools.getaltimg(filefull.path, filefull.file, this.headtitle)
+ }
+
}
diff --git a/src/components/CTitle/CTitle.vue b/src/components/CTitle/CTitle.vue
index 699b130..e8ebf82 100644
--- a/src/components/CTitle/CTitle.vue
+++ b/src/components/CTitle/CTitle.vue
@@ -1,10 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CMySingleEvent/index.ts b/src/components/CMySingleEvent/index.ts
new file mode 100644
index 0000000..002c163
--- /dev/null
+++ b/src/components/CMySingleEvent/index.ts
@@ -0,0 +1 @@
+export {default as CMySingleEvent} from './CMySingleEvent.vue'
diff --git a/src/components/CMyTeacher/CMyTeacher.scss b/src/components/CMyTeacher/CMyTeacher.scss
new file mode 100644
index 0000000..254acd3
--- /dev/null
+++ b/src/components/CMyTeacher/CMyTeacher.scss
@@ -0,0 +1,92 @@
+$heightBtn: 100%;
+$grayshadow: #555;
+
+.text-subtitle-carica {
+ font-size: 1rem;
+ font-weight: 400;
+ line-height: 1.75rem;
+ letter-spacing: .00937em;
+ text-shadow: .1rem .1rem .1rem $grayshadow;
+}
+
+.text-subtitle-certificato {
+ font-size: 0.75rem;
+ line-height: 1rem;
+}
+
+@media (max-width: 718px) {
+ // PER VERSIONE MOBILE
+ .text-subtitle-carica {
+ font-size: 1rem;
+ }
+}
+
+.op {
+ text-align: center !important;
+ font-size: 1rem;
+ font-weight: 400;
+ line-height: 1.75rem;
+ letter-spacing: .00937em;
+ text-shadow: .1rem .1rem .1rem $grayshadow;
+
+ &__cell {
+ font-size: 1rem;
+ color: red;
+ }
+
+ &__email {
+ font-size: 1rem;
+ color: #3b5998;
+ }
+
+ &__email a {
+ text-decoration: none;
+ }
+
+ &__facebook a {
+ font-size: 1rem;
+ text-decoration: none;
+ }
+
+ &__storia {
+ margin-top: 1rem;
+ margin-bottom: 1rem;
+ text-align: justify;
+ }
+}
+
+.myimg {
+ border-radius: 300px !important;
+}
+
+.q-img {
+ &__image {
+ border-radius: 300px !important;
+ }
+}
+
+.myflex {
+ display: flex;
+ flex: 1;
+}
+
+.mybase {
+ color: black;
+ font-size: 0.75rem;
+ font-weight: 400;
+ line-height: 1.25rem;
+ letter-spacing: 0.03333em;
+
+ &__teacher {
+ margin-top: 5px;
+
+ &-content {
+ color: darkblue;
+ }
+
+ &-content:hover {
+
+ }
+ }
+
+}
diff --git a/src/components/CMyTeacher/CMyTeacher.ts b/src/components/CMyTeacher/CMyTeacher.ts
new file mode 100644
index 0000000..bbde801
--- /dev/null
+++ b/src/components/CMyTeacher/CMyTeacher.ts
@@ -0,0 +1,43 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+
+import { tools } from '../../store/Modules/tools'
+import { GlobalStore, UserStore } from '../../store/Modules'
+import { CMyAvatar } from '../CMyAvatar'
+import MixinBase from '../../mixins/mixin-base'
+import MixinOperator from '../../mixins/mixin-operator'
+import MixinUsers from '../../mixins/mixin-users'
+
+
+@Component({
+ name: 'CMyTeacher',
+ mixins: [MixinBase, MixinOperator, MixinUsers],
+ components: { CMyAvatar }
+})
+
+export default class CMyTeacher extends MixinOperator {
+ @Prop({ required: true, default: '' }) public username
+
+ public showuserdetails = false
+ public autoplaydiscsaved: number
+ public tab: string = 'one'
+
+ @Watch('showuserdetails')
+ public changeshowuserdetails() {
+ if (!this.showuserdetails) {
+ GlobalStore.state.autoplaydisc = this.autoplaydiscsaved
+ }
+ }
+
+ public executeclick(event) {
+ console.log('executeclick')
+ this.showuserdetails = true
+
+ this.autoplaydiscsaved = GlobalStore.state.autoplaydisc
+ GlobalStore.state.autoplaydisc = 0
+ }
+
+ get myop() {
+ return this.getOperatorByUsername(this.username)
+ }
+}
diff --git a/src/components/CMyTeacher/CMyTeacher.vue b/src/components/CMyTeacher/CMyTeacher.vue
new file mode 100644
index 0000000..d0f90dc
--- /dev/null
+++ b/src/components/CMyTeacher/CMyTeacher.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+ ![]()
+ {{$t('cal.booked')}}
+
+
+ {{$t('event.news')}}
+
+
+
+
+
+
+
+
+
+
+
+ Tra 1 Settimana
+
+
+ Tra 2 Settimane
+
+
+ 4 Eventi ogni Settimana
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{myevent.title}}
+
+
+
+ {{myevent.title}}
+
+
+ {{$t('cal.teacher')}}:
+
+
+ {{$t('cal.where')}}: + +
+
+ ![località]()
+
+
+
+ {{getWhereName(myevent.wherecode)}}
+
+
+
+ + {{$t('cal.where')}}: + +
+ {{$t('event.price')}}:
+
+
+ {{getContribtypeById(myevent.contribtype)}}
+
+
+
+
+ {{getPrice(myevent)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{myop.name}} {{myop.surname}}
+ {{myop.qualification}}
+ {{myop.disciplines}}
+ {{myop.certifications}}
+
+
+
+
+
+
+
+ + + + + + + + +
+
+
+ - ({{$t('showbigmap')}})
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/COpenStreetMap/index.ts b/src/components/COpenStreetMap/index.ts
new file mode 100644
index 0000000..fd183f7
--- /dev/null
+++ b/src/components/COpenStreetMap/index.ts
@@ -0,0 +1 @@
+export {default as COpenStreetMap} from './COpenStreetMap.vue'
diff --git a/src/components/CPreloadImages/CPreloadImages.ts b/src/components/CPreloadImages/CPreloadImages.ts
index 9303774..9b09345 100644
--- a/src/components/CPreloadImages/CPreloadImages.ts
+++ b/src/components/CPreloadImages/CPreloadImages.ts
@@ -26,4 +26,8 @@ export default class CPreloadImages extends Vue {
}
}
+ public getaltimg(recimg: IPreloadImages) {
+ return recimg.alt
+ }
+
}
diff --git a/src/components/CPreloadImages/CPreloadImages.vue b/src/components/CPreloadImages/CPreloadImages.vue
index 704f450..c7b2a70 100644
--- a/src/components/CPreloadImages/CPreloadImages.vue
+++ b/src/components/CPreloadImages/CPreloadImages.vue
@@ -1,7 +1,7 @@
+
+
+
+
+
+ + + - Apri Mappa +
+ +
- ![]()
+ ![]()
-
-
-
{{headtitle}}
+
+
diff --git a/src/components/CTitleBanner/CTitleBanner.scss b/src/components/CTitleBanner/CTitleBanner.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/CTitleBanner/CTitleBanner.ts b/src/components/CTitleBanner/CTitleBanner.ts
new file mode 100644
index 0000000..f1e686e
--- /dev/null
+++ b/src/components/CTitleBanner/CTitleBanner.ts
@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import { Component, Prop } from 'vue-property-decorator'
+import { GlobalStore, UserStore } from '@store'
+
+import VueScrollReveal from 'vue-scroll-reveal'
+import { tools } from '@src/store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { Screen } from 'quasar'
+
+// Vue.use(VueScrollReveal, {
+// class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
+// duration: 1200,
+// scale: 0.95,
+// distance: '10px',
+// rotate: {
+// x: 0,
+// y: 0,
+// z: 0
+// }
+// // mobile: true
+// })
+
+@Component({
+ name: 'CTitleBanner'
+})
+export default class CTitleBanner extends Vue {
+ @Prop({ required: true}) public title: string
+ @Prop({ required: false, default: 'bg-primary' }) public bgcolor: string
+ @Prop({ required: false, default: 'primary' }) public color: string
+
+}
diff --git a/src/components/CTitleBanner/CTitleBanner.vue b/src/components/CTitleBanner/CTitleBanner.vue
new file mode 100644
index 0000000..61fe274
--- /dev/null
+++ b/src/components/CTitleBanner/CTitleBanner.vue
@@ -0,0 +1,16 @@
+
+ {{headtitle}}
+
+
+
+
+
+
+
+
diff --git a/src/components/CTitleBanner/index.ts b/src/components/CTitleBanner/index.ts
new file mode 100644
index 0000000..ef17a23
--- /dev/null
+++ b/src/components/CTitleBanner/index.ts
@@ -0,0 +1 @@
+export {default as CTitleBanner} from './CTitleBanner.vue'
diff --git a/src/components/Footer/Footer.scss b/src/components/Footer/Footer.scss
index addaaae..04485ec 100644
--- a/src/components/Footer/Footer.scss
+++ b/src/components/Footer/Footer.scss
@@ -37,7 +37,7 @@ $textcol_scuro: darkblue;
.landing__footer-icons {
- font-size: 1.75rem
+ font-size: 2rem
}
.landing__footer-icons a {
@@ -171,6 +171,7 @@ $textcol_scuro: darkblue;
}
.mycontacts_text {
+ font-size: 1rem;
color: #999;
letter-spacing: normal !important;
}
@@ -183,3 +184,12 @@ $textcol_scuro: darkblue;
.footer_link:hover {
color:white;
}
+
+
+.margin_buttons_footer {
+ margin: -4px -4px;
+}
+
+.margin_buttons_footer > * {
+ margin: 4px 8px;
+}
diff --git a/src/components/Footer/Footer.ts b/src/components/Footer/Footer.ts
index efcd5a7..7fde0c2 100644
--- a/src/components/Footer/Footer.ts
+++ b/src/components/Footer/Footer.ts
@@ -14,11 +14,12 @@ import Quasar from 'quasar'
import { FormNewsletter } from '../FormNewsletter'
import { IUserState } from '../../model'
import MixinBase from '../../mixins/mixin-base'
+import { CFacebookFrame } from '../CFacebookFrame'
@Component({
mixins: [MixinBase],
name: 'Footer',
- components: { Logo, FormNewsletter }
+ components: { Logo, FormNewsletter, CFacebookFrame }
})
export default class Footer extends Vue {
@@ -30,26 +31,34 @@ export default class Footer extends Vue {
return tools
}
- get mythis() {
+ get mythisfoot() {
return this
}
get TelegramSupport() {
- return GlobalStore.getters.getValueSettingsByKey('TELEGRAM_SUPPORT')
+ return GlobalStore.getters.getValueSettingsByKey('TELEGRAM_SUPPORT', false)
}
get Whatsapp_Cell() {
- return GlobalStore.getters.getValueSettingsByKey('WHATSAPP_CELL')
+ return GlobalStore.getters.getValueSettingsByKey('WHATSAPP_CELL', false)
+ }
+
+ get Telegram_UsernameHttp() {
+
+ return tools.getHttpForTelegram(GlobalStore.getters.getValueSettingsByKey('TELEGRAM_USERNAME', false))
}
get FBPage() {
- const fb = GlobalStore.getters.getValueSettingsByKey('URL_FACEBOOK')
+ const fb = GlobalStore.getters.getValueSettingsByKey('URL_FACEBOOK', false)
return fb
}
get InstagramPage() {
- const insta = GlobalStore.getters.getValueSettingsByKey('URL_INSTAGRAM')
- return insta
+ return GlobalStore.getters.getValueSettingsByKey('URL_INSTAGRAM', false)
+ }
+
+ get TwitterPage() {
+ return GlobalStore.getters.getValueSettingsByKey('URL_TWITTER', false)
}
get static_data() {
diff --git a/src/components/Footer/Footer.vue b/src/components/Footer/Footer.vue
index b893f9c..a7b5e60 100644
--- a/src/components/Footer/Footer.vue
+++ b/src/components/Footer/Footer.vue
@@ -3,16 +3,52 @@
+
+
- ![]()
+ ![Immagine Logo]()
- {{tools.getappname()}}
+
@@ -83,7 +83,7 @@
v-for="langrec in static_data.lang_available" :key="langrec.value"
@click="lang = langrec.value">
- ![]()
+ ![flag]()
{{langrec.label}}
@@ -128,12 +128,11 @@
-
+ style="height: 150px" alt="section page">
+
-
diff --git a/src/components/FormNewsletter/FormNewsletter.ts b/src/components/FormNewsletter/FormNewsletter.ts
index 9e81c92..4ad28f0 100644
--- a/src/components/FormNewsletter/FormNewsletter.ts
+++ b/src/components/FormNewsletter/FormNewsletter.ts
@@ -8,12 +8,13 @@ import Quasar, { Screen } from 'quasar'
import { Prop } from 'vue-property-decorator'
import { Api } from '../../store'
import { serv_constants } from '../../store/Modules/serv_constants'
+import MixinBase from '../../mixins/mixin-base'
@Component({
name: 'FormNewsletter'
})
-export default class FormNewsletter extends Vue {
+export default class FormNewsletter extends MixinBase {
public $t
public $q
public name: string = null
@@ -24,10 +25,6 @@ export default class FormNewsletter extends Vue {
@Prop() public idwebsite: string
@Prop() public locale: string
- get tools() {
- return tools
- }
-
public async onSubmit() {
if (this.accept !== true) {
@@ -44,14 +41,16 @@ export default class FormNewsletter extends Vue {
firstName: this.name,
lastName: this.surname,
idwebsite: this.idwebsite,
- locale: this.locale
+ locale: this.locale,
+ settomailchimp: this.getValDb('MAILCHIMP_ON', true, false)
}
console.log(usertosend)
- return await Api.SendReq('/signup_news', 'POST', usertosend, false)
+ return await Api.SendReq('/news/signup', 'POST', usertosend, false)
.then((res) => {
- if (res.data.result === serv_constants.RIS_SUBSCRIBED_OK) {
+ console.log('res', res)
+ if (res.data.code === serv_constants.RIS_SUBSCRIBED_OK) {
this.$q.notify({
color: 'green-4',
textColor: 'white',
@@ -59,7 +58,7 @@ export default class FormNewsletter extends Vue {
// message: this.$t('newsletter.submitted')
message: res.data.msg
})
- } else if (res.data.result === serv_constants.RIS_SUBSCRIBED_ALREADYEXIST) {
+ } else if (res.data.code === serv_constants.RIS_SUBSCRIBED_ALREADYEXIST) {
this.$q.notify({
color: 'orange-4',
textColor: 'white',
diff --git a/src/components/FormNewsletter/FormNewsletter.vue b/src/components/FormNewsletter/FormNewsletter.vue
index 8fbcc2c..74e2376 100644
--- a/src/components/FormNewsletter/FormNewsletter.vue
+++ b/src/components/FormNewsletter/FormNewsletter.vue
@@ -10,6 +10,7 @@
+
+ {{tools.getLabelByItem(myitemmenu, mythisfoot)}}
-
+
-
+
+
+ {{tools.getLabelByItem(myitemmenu, mythisfoot)}}
{{getappname}}
{{$t('msg.myDescriz')}} {{ getAppVersion() }}
diff --git a/src/components/index.ts b/src/components/index.ts
index e091501..6833cfc 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -3,6 +3,8 @@ export * from './todos'
export * from './logo'
export * from './CProgress'
export * from './CCard'
+export * from './CCardCarousel'
+export * from './CCardDiscipline'
export * from './CBook'
export * from './CMyPage'
export * from './CTitle'
@@ -12,16 +14,23 @@ export * from './CMyPopupEdit'
export * from './CMyToggleList'
export * from './CMyChipList'
export * from './CMyEditor'
+export * from './CMyFieldDb'
+export * from './CMyTeacher'
export * from './CImgText'
export * from './CImgTitle'
export * from './CPreloadImages'
export * from './CSignIn'
export * from './CSignUp'
export * from './CEventsCalendar'
+export * from './CMySingleEvent'
export * from './CDate'
export * from './CDateTime'
export * from './BannerCookies'
export * from './PagePolicy'
export * from './FormNewsletter'
export * from './CGridTableRec'
+export * from './CFacebookFrame'
export * from './Shen/CTesseraElettronica'
+export * from './CGoogleMap'
+export * from './COpenStreetMap'
+export * from './CTitleBanner'
diff --git a/src/layouts/menuone/menuOne.scss b/src/layouts/menuone/menuOne.scss
index baf8709..395b2d5 100644
--- a/src/layouts/menuone/menuOne.scss
+++ b/src/layouts/menuone/menuOne.scss
@@ -61,6 +61,10 @@
color: red;
}
+.isCalendar {
+ color: #fff241;
+}
+
.isManager {
color: green;
}
diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts
index e92c85e..a6d194c 100644
--- a/src/layouts/menuone/menuOne.ts
+++ b/src/layouts/menuone/menuOne.ts
@@ -20,6 +20,10 @@ export default class MenuOne extends Vue {
// return this.$route.path
// }
+ get isfinishLoading() {
+ return GlobalStore.state.finishLoading
+ }
+
get tools() {
return tools
}
@@ -32,11 +36,6 @@ export default class MenuOne extends Vue {
return GlobalStore.getters.getmenu
}
- public visumenu(elem) { // : IListRoutes
- return (elem.onlyAdmin && UserStore.state.isAdmin) || (elem.onlyManager && UserStore.state.isManager)
- || ((!elem.onlyAdmin) && (!elem.onlyManager))
- }
-
public setParentVisibilityBasedOnRoute(parent) {
parent.routes.forEach((item) => {
if (this.$route.path === item.path) {
@@ -74,6 +73,9 @@ export default class MenuOne extends Vue {
if (elem.onlyManager)
menu += ' isManager'
+ if (elem.extraclass)
+ menu += ' ' + elem.extraclass
+
return menu
}
}
diff --git a/src/layouts/menuone/menuOne.vue b/src/layouts/menuone/menuOne.vue
index 3eebf2c..86faa1a 100644
--- a/src/layouts/menuone/menuOne.vue
+++ b/src/layouts/menuone/menuOne.vue
@@ -1,10 +1,10 @@
-
+
-
+
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
diff --git a/src/layouts/toolbar/messagePopover/messagePopover.vue b/src/layouts/toolbar/messagePopover/messagePopover.vue
index 3efcc93..6a3e658 100644
--- a/src/layouts/toolbar/messagePopover/messagePopover.vue
+++ b/src/layouts/toolbar/messagePopover/messagePopover.vue
@@ -19,7 +19,7 @@
- ![]()
+ ![]()
diff --git a/src/mixins/mixin-base.ts b/src/mixins/mixin-base.ts
index 72975e3..93f728e 100644
--- a/src/mixins/mixin-base.ts
+++ b/src/mixins/mixin-base.ts
@@ -5,6 +5,8 @@ import { func_tools } from '../store/Modules/toolsext'
import { tools } from '../store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
import { GlobalStore } from '../store/Modules'
+import { fieldsTable } from '@src/store/Modules/fieldsTable'
+import { CalendarStore } from '@store'
// You can declare a mixin as the same style as components.
@Component
@@ -17,6 +19,10 @@ export default class MixinBase extends Vue {
return toolsext
}
+ get db_fieldsTable() {
+ return fieldsTable
+ }
+
get func_tools() {
return func_tools
}
@@ -25,19 +31,87 @@ export default class MixinBase extends Vue {
return tools
}
- public getValDb(keystr) {
- return GlobalStore.getters.getValueSettingsByKey(keystr)
+ public getValDb(keystr, serv, def?) {
+ const ris = GlobalStore.getters.getValueSettingsByKey(keystr, serv)
+ if (ris === '')
+ if (def !== undefined)
+ return def
+ else
+ return ''
+ else
+ return ris
}
- public getarrValDb(keystr) {
- const myval = GlobalStore.getters.getValueSettingsByKey(keystr)
+
+ public async setValDb(key, value, type, serv: boolean) {
+
+ console.log('setValDb', key, value, serv)
+ GlobalStore.mutations.setValueSettingsByKey({ key, value, serv })
+
+ let myrec = GlobalStore.getters.getrecSettingsByKey(key, serv)
+ if (myrec === undefined) {
+ myrec = {
+ idapp: process.env.APP_ID,
+ key,
+ type
+ }
+ myrec.serv = serv
+ if (myrec.type === tools.FieldType.date)
+ myrec.value_date = value
+ else if (myrec.type === tools.FieldType.number)
+ myrec.value_num = value
+ else if (myrec.type === tools.FieldType.boolean)
+ myrec.value_bool = value
+ else
+ myrec.value_str = value
+
+ myrec = await tools.createNewRecord(this, 'settings', myrec).then((myrecris) => {
+ // console.log('myrec')
+ let recsett = null
+ if (serv)
+ recsett = GlobalStore.state.serv_settings
+ else
+ recsett = GlobalStore.state.settings
+
+ recsett.push(myrecris)
+ return recsett.find((rec) => rec.key === key)
+ })
+ }
+ console.log('myrec', myrec)
+
+ const mydatatosave = {
+ id: myrec._id,
+ table: 'settings',
+ fieldsvalue: myrec
+ }
+
+ console.log('mydatatosave', mydatatosave)
+
+ GlobalStore.actions.saveFieldValue(mydatatosave).then((esito) => {
+ if (esito) {
+ tools.showPositiveNotif(this.$q, this.$t('db.recupdated'))
+ } else {
+ tools.showNegativeNotif(this.$q, this.$t('db.recfailed'))
+ // Undo...
+ }
+ })
+
+ }
+
+ public getarrValDb(keystr, serv) {
+ const myval = GlobalStore.getters.getValueSettingsByKey(keystr, serv)
// console.log('myval', myval)
- if (myval) {
- const myrec = JSON.parse(myval)
- // console.log('*************** getarrValDb')
- // console.table(myrec)
- return myrec
- } else {
+ try {
+ if (myval) {
+ const myrec = JSON.parse(myval)
+ // console.log('*************** getarrValDb')
+ // console.table(myrec)
+ return myrec
+ } else {
+ return []
+ }
+ } catch (e) {
return []
}
}
+
}
diff --git a/src/mixins/mixin-events.ts b/src/mixins/mixin-events.ts
new file mode 100644
index 0000000..e24b2d4
--- /dev/null
+++ b/src/mixins/mixin-events.ts
@@ -0,0 +1,119 @@
+import Vue from 'vue'
+
+import Component from 'vue-class-component'
+import { func_tools } from '../store/Modules/toolsext'
+import { tools } from '../store/Modules/tools'
+import { IMessage } from '@src/model'
+import { IEvents } from '../model'
+import { CalendarStore, GlobalStore } from '@store'
+import translate from '@src/globalroutines/util'
+
+// You can declare a mixin as the same style as components.
+@Component
+export default class MixinEvents extends Vue {
+
+ public getImgEvent(event: IEvents) {
+ if (!!event.img)
+ return 'statics/' + event.img
+ else
+ return 'statics/images/noimg.png'
+ }
+
+
+ public getStyleByEvent(event: IEvents, visu: boolean) {
+ let myst = 'border: inset; border-color: darkblue; border-width: 3px; padding: 5px !important; '
+
+ if (!this.isEventEnabled(event)) {
+ myst += ' opacity: 0.5'
+ }
+
+ return myst
+ }
+
+ public isAlreadyBooked(eventparam: IEvents) {
+ return CalendarStore.getters.findEventBooked(eventparam, true)
+ }
+
+ public getWhereIcon(where) {
+ const whererec = CalendarStore.getters.getWhereRec(where)
+ return (whererec) ? whererec.whereicon : ''
+ }
+
+ public getWhereName(where) {
+ const whererec = CalendarStore.getters.getWhereRec(where)
+ return (whererec) ? whererec.placename : ''
+ }
+
+ get editable() {
+ return CalendarStore.state.editable
+ }
+
+ public getContribtypeById(id) {
+ return CalendarStore.getters.getContribtypeById(id)
+ }
+
+ public getPrice(event: IEvents) {
+ let myprice = (event.price > 0) ? event.price + ' €' : ''
+ myprice = (event.price === -1) ? translate('event.askinfo') : myprice
+
+ if (event.infoafterprice)
+ myprice += ' ' + event.infoafterprice
+
+ return myprice
+ }
+
+ public isShowPrice(event: IEvents) {
+ const rec = CalendarStore.getters.getContribtypeRec(event.contribtype)
+ return (rec) ? rec.showprice : true
+ }
+
+ public isEventEnabled(myevent) {
+ // check if event is in the past
+ const datenow = tools.addDays(tools.getDateNow(), -1)
+
+ // console.log('datenow', datenow, 'end', myevent.dateTimeEnd)
+
+ return (new Date(myevent.dateTimeEnd) >= datenow)
+ }
+
+ public findEventIndex(eventparam) {
+ for (let i = 0; i < CalendarStore.state.eventlist.length; ++i) {
+ if (eventparam) {
+ if (eventparam.title === CalendarStore.state.eventlist[i].title &&
+ eventparam.details === CalendarStore.state.eventlist[i].details &&
+ eventparam.dateTimeStart === CalendarStore.state.eventlist[i].dateTimeStart &&
+ eventparam.dateTimeEnd === CalendarStore.state.eventlist[i].dateTimeEnd) {
+ return i
+ }
+ }
+ }
+ }
+
+ public UpdateDbByFields(self, myrec, undo?) {
+
+ const mydatatosave = {
+ id: myrec._id,
+ table: tools.TABEVENTS,
+ fieldsvalue: myrec
+ }
+
+ GlobalStore.actions.saveFieldValue(mydatatosave).then((esito) => {
+ if (esito) {
+ tools.showPositiveNotif(this.$q, this.$t('db.recupdated'))
+ } else {
+ tools.showNegativeNotif(this.$q, this.$t('db.recfailed'))
+ // Undo...
+ if (undo) {
+ const index = self.findEventIndex(self.contextDay)
+ if (index >= 0) {
+ // @ts-ignore
+ CalendarStore.state.eventlist.splice(index, 1, { ...self.contextDay })
+ }
+ }
+ }
+ })
+
+ }
+
+
+}
diff --git a/src/mixins/mixin-metatags.ts b/src/mixins/mixin-metatags.ts
new file mode 100644
index 0000000..484904c
--- /dev/null
+++ b/src/mixins/mixin-metatags.ts
@@ -0,0 +1,22 @@
+import Vue from 'vue'
+import Component from 'vue-class-component'
+import { IMetaTags } from '@src/model'
+import { tools } from '@src/store/Modules/tools'
+
+// You can declare a mixin as the same style as components.
+@Component
+export default class MixinMetaTags extends Vue {
+ public mymeta: IMetaTags = {title: '', description: '', keywords: ''}
+
+ public setmeta(mymeta: IMetaTags) {
+ this.mymeta = mymeta
+ }
+
+ public getsrcbyimg(myimg) {
+ // return this.src
+ const filefull = tools.getimgFullpathbysize(myimg)
+
+ return tools.getimgbysize(filefull.path, filefull.file)
+ }
+
+}
diff --git a/src/model/Calendar.ts b/src/model/Calendar.ts
index a20aae8..32ac880 100644
--- a/src/model/Calendar.ts
+++ b/src/model/Calendar.ts
@@ -6,6 +6,7 @@ export interface IEvents {
short_tit?: string
title?: string
details?: string
+ bodytext?: string
dateTimeStart?: Date
dateTimeEnd?: Date
side?: string
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 8d3bee1..8c53ccd 100644
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -26,12 +26,82 @@ export interface ICfgData {
userId?: string
}
+export interface ITemplEmail {
+ _id?: string
+ subject?: string
+ content?: string
+ options?: ISettings[]
+}
+
export interface ISettings {
+ _id?: string
+ idapp?: string
key?: string
type?: number
value_str?: string
value_date?: Date,
value_num?: number
+ value_bool?: boolean
+ serv?: boolean
+}
+
+export interface ITeachUname {
+ username?: string
+}
+
+export interface IMyPage {
+ _id?: string
+ author_username?: string
+ title?: string
+ icon?: string
+ path?: string
+ keywords?: string
+ description?: string
+ content?: string
+ active?: boolean
+ inmenu?: boolean
+ submenu?: boolean
+ l_par?: number,
+ l_child?: number,
+ infooter?: boolean
+}
+
+export interface INewsToSent {
+ _id: string
+ idapp?: string
+ label?: string
+ templemail_str?: string
+ numemail_tot?: number
+ numemail_sent?: number
+ datetoSent?: Date
+ datestartJob?: Date
+ datefinishJob?: Date
+ lastemailsent_Job?: Date
+ starting_job?: boolean
+ finish_job?: boolean
+ error_job?: string
+}
+
+export interface IMailinglist {
+ name?: string
+ surname?: string
+ email: string
+ lastid_newstosent?: string
+}
+
+export interface IDiscipline {
+ typol_code?: string
+ order?: number
+ label?: string
+ description?: string
+ linkpage?: string
+ color?: string
+ icon?: string
+ img_small?: string
+ showinhome?: boolean
+ showinnewsletter?: boolean
+ img?: string
+ teachers?: ITeachUname[]
}
export interface ITestp1 {
@@ -47,6 +117,12 @@ export interface IConfig {
value: string
}
+export interface IMetaTags {
+ title?: string
+ keywords?: string
+ description?: string
+}
+
export interface IGlobalState {
finishLoading: boolean
conta: number
@@ -69,7 +145,15 @@ export interface IGlobalState {
listatodo: IMenuList[]
arrConfig: IConfig[]
lastaction: IAction
+ serv_settings: ISettings[],
settings: ISettings[],
+ disciplines: IDiscipline[],
+ newstosent: INewsToSent[],
+ mypage: IMyPage[],
+ templemail: ITemplEmail[],
+ opzemail: ISettings[],
+ mailinglist: IMailinglist[],
+ autoplaydisc: number
}
export interface IMenuList {
@@ -96,6 +180,7 @@ export interface IListRoutes {
submenu?: boolean
onlyAdmin?: boolean
onlyManager?: boolean
+ extraclass?: string
meta?: any
idelem?: string
urlroute?: string
@@ -118,6 +203,7 @@ export interface IOperators {
certifications?: string
img?: string
cell?: string
+ usertelegram?: string
paginaweb?: string
paginafb?: string
intro?: string
@@ -128,6 +214,7 @@ export interface IOperators {
export interface IPreloadImages {
imgname: string
+ alt: string
mobile: boolean
}
@@ -254,6 +341,8 @@ export interface ITableRec {
colkey: string
collabel: string
colicon?: string
+ onlyAdmin?: boolean
+ noshow: boolean
}
export interface IDataPass {
@@ -261,3 +350,21 @@ export interface IDataPass {
table: string
fieldsvalue: object
}
+
+export interface INewsState {
+ lastnewstosent: INewsToSent
+ nextnewstosent: INewsToSent
+ totemail: number
+ totsubscribed: number
+ totunsubscribed: number
+ totsentlastid: number
+}
+
+export const DefaultNewsState: INewsState = {
+ lastnewstosent: null,
+ nextnewstosent: null,
+ totemail: 0,
+ totsubscribed: 0,
+ totunsubscribed: 0,
+ totsentlastid: 0,
+}
diff --git a/src/statics/i18n.js b/src/statics/i18n.js
index d1d71b6..2b949aa 100644
--- a/src/statics/i18n.js
+++ b/src/statics/i18n.js
@@ -10,12 +10,17 @@ const msgglobal = {
tableslist: 'Tabelle',
},
otherpages: {
+ error404: 'error404',
+ error404def: 'error404def',
admin : {
menu: 'Amministrazione',
eventlist: 'Le tue Prenotazioni',
usereventlist: 'Prenotazioni Utenti',
userlist: 'Lista Utenti',
tableslist: 'Lista Tabelle',
+ newsletter: 'Newsletter',
+ pages: 'Pagine',
+ media: 'Media',
},
manage: {
menu: 'Gestione',
@@ -30,6 +35,7 @@ const msgglobal = {
write: 'scrive'
},
dialog: {
+ close: 'Chiudi',
ok: 'Ok',
yes: 'Si',
no: 'No',
@@ -73,7 +79,9 @@ const msgglobal = {
verify_email: 'Verifica la tua email',
go_login: 'Torna al Login',
incorrect_input: 'Inserimento incorretto.',
- link_sent: 'Ora leggi la tua email e conferma la registrazione'
+ link_sent: 'Ora leggi la tua email e conferma la registrazione',
+ title_unsubscribe: 'Disiscrizione alla newsletter',
+ title_unsubscribe_done: 'Disiscrizione completata correttamente',
}
}
},
@@ -86,6 +94,15 @@ const msgglobal = {
notregistered: 'Devi registrarti al servizio prima di porter memorizzare i dati',
loggati: 'Utente non loggato'
},
+ templemail: {
+ subject: 'Oggetto Email',
+ testoheadermail: 'Intestazione Email',
+ content: 'Contenuto',
+ img: 'Immagine 1',
+ img2: 'Immagine 2',
+ content2: 'Contenuto 2',
+ options: 'Opzioni',
+ },
reg: {
page_title: 'Registrazione',
incorso: 'Registrazione in corso...',
@@ -130,6 +147,7 @@ const msgglobal = {
},
op: {
qualification: 'Qualifica',
+ usertelegram: 'Username Telegram',
disciplines: 'Discipline',
certifications: 'Certificazioni',
intro: 'Introduzione',
@@ -163,6 +181,7 @@ const msgglobal = {
undefined: 'non definito'
}
},
+ showbigmap: 'Mostra la mappa più grande',
todo: {
titleprioritymenu: 'Priorità:',
inserttop: 'Inserisci il Task in cima',
@@ -214,7 +233,13 @@ const msgglobal = {
code: 'Id',
whereicon: 'Icona',
},
+ col: {
+ label: 'Etichetta',
+ value: 'Valore',
+ type: 'Tipo'
+ },
cal: {
+ num: 'Numero',
booked: 'Prenotato',
booked_error: 'Prenotazione non avvenuta. Riprovare più tardi',
sendmsg_error: 'Messaggio non inviato. Riprovare più tardi',
@@ -230,6 +255,8 @@ const msgglobal = {
cancelederrorevent: 'Cancellazione Evento non effettuata, Riprovare',
event: 'Evento',
starttime: 'Dalle',
+ nextevent: 'Prossimo Evento',
+ readall: 'Leggi tutto',
enddate: 'al',
endtime: 'alle',
duration: 'Durata',
@@ -246,12 +273,13 @@ const msgglobal = {
selnumpeople: 'Partecipanti',
selnumpeople_short: 'Num',
msgbooking: 'Messaggio da inviare',
- showinfo: 'Vedi Info',
- bookingtextdefault: 'Mi prenoto all\'evento',
+ showpdf: 'Vedi PDF',
+ bookingtextdefault: 'Prenoto per',
bookingtextdefault_of: 'di',
data: 'Data',
teachertitle: 'Insegnante',
peoplebooked: 'Prenotaz.',
+ showlastschedule: 'Vedi tutto il Calendario',
},
msgs: {
message: 'Messaggio',
@@ -264,6 +292,7 @@ const msgglobal = {
short_tit: 'Titolo Breve',
title: 'Titolo',
details: 'Dettagli',
+ bodytext: 'Testo Evento',
dateTimeStart: 'Data Inizio',
dateTimeEnd: 'Data Fine',
bgcolor: 'Colore Sfondo',
@@ -275,6 +304,7 @@ const msgglobal = {
contribtype: 'Tipo Contributo',
price: 'Contributo',
askinfo: 'Chiedi Info',
+ showpage: 'Vedi Pagina',
infoafterprice: 'Note dopo la Quota',
teacher: 'Insegnante', // teacherid
teacher2: 'Insegnante2', // teacherid2
@@ -288,7 +318,14 @@ const msgglobal = {
deleted: 'Eliminato',
duplicate: 'Duplica',
notempty: 'Il campo non può essere vuoto',
- modified: 'Modificato'
+ modified: 'Modificato',
+ showinhome: 'Mostra nella Home',
+ showinnewsletter: 'Mostra nella Newsletter',
+ color: 'Colore del titolo',
+ },
+ disc: {
+ typol_code: 'Codice Tipologia',
+ order: 'Ordinamento',
},
newsletter: {
title: 'Desideri ricevere la nostra Newsletter?',
@@ -303,6 +340,27 @@ const msgglobal = {
acceptlicense: 'Accetto la licenza e i termini',
license: 'Devi prima accettare la licenza e i termini',
submitted: 'Iscritto',
+ menu: 'Newsletter1',
+ template: 'Modelli Email',
+ sendemail: 'Invia',
+ check: 'Controlla',
+ sent: 'Già Inviate',
+ mailinglist: 'Lista Contatti',
+ settings: 'Impostazioni',
+ serversettings: 'Server',
+ others: 'Altro',
+ templemail: 'Modello Email',
+ datetoSent: 'DataOra Invio',
+ activate: 'Attivato',
+ numemail_tot: 'Email Totali',
+ numemail_sent: 'Email Inviate',
+ datestartJob: 'Inizio Invio',
+ datefinishJob: 'Fine Invio',
+ lastemailsent_Job: 'Ultima Inviata',
+ starting_job: 'Invio Iniziato',
+ finish_job: 'Invio Terminato',
+ error_job: 'Info Errori',
+ statesub: 'Sottoscritto',
},
privacy_policy:'Privacy Policy',
cookies: 'Usiamo i Cookie per una migliore prestazione web.'
@@ -322,6 +380,9 @@ const msgglobal = {
usereventlist: 'Reserva Usuarios',
userlist: 'Lista de usuarios',
tableslist: 'Listado de tablas',
+ newsletter: 'Newsletter',
+ pages: 'Páginas',
+ media: 'Medios',
},
manage: {
menu: 'Gestionar',
@@ -336,6 +397,7 @@ const msgglobal = {
write: 'escribe'
},
dialog: {
+ close: 'Cerrar',
ok: 'Vale',
yes: 'Sí',
no: 'No',
@@ -379,7 +441,9 @@ const msgglobal = {
verify_email: 'Revisa tu email',
go_login: 'Vuelve al Login',
incorrect_input: 'Entrada correcta.',
- link_sent: 'Ahora lea su correo electrónico y confirme el registro'
+ link_sent: 'Ahora lea su correo electrónico y confirme el registro',
+ title_unsubscribe: 'Anular suscripción al boletín',
+ title_unsubscribe_done: 'Suscripción completada con éxito',
}
}
},
@@ -392,6 +456,15 @@ const msgglobal = {
notregistered: 'Debe registrarse en el servicio antes de poder almacenar los datos',
loggati: 'Usuario no ha iniciado sesión'
},
+ templemail: {
+ subject: 'Objecto Email',
+ testoheadermail: 'Encabezamiento Email',
+ content: 'Contenido',
+ img: 'Imagen 1',
+ img2: 'Imagen 2',
+ content2: 'Contenuto 2',
+ options: 'Opciones',
+ },
reg: {
page_title: 'Registro',
incorso: 'Registro en curso...',
@@ -429,6 +502,7 @@ const msgglobal = {
},
op: {
qualification: 'Calificación',
+ usertelegram: 'Username Telegram',
disciplines: 'Disciplinas',
certifications: 'Certificaciones',
intro: 'Introducción',
@@ -462,6 +536,7 @@ const msgglobal = {
undefined: 'no definido'
}
},
+ showbigmap: 'Mostrar el mapa más grande',
todo: {
titleprioritymenu: 'Prioridad:',
inserttop: 'Ingrese una nueva Tarea arriba',
@@ -514,7 +589,13 @@ const msgglobal = {
code: 'Id',
whereicon: 'Icono',
},
+ col: {
+ label: 'Etichetta',
+ value: 'Valore',
+ type: 'Tipo'
+ },
cal: {
+ num: 'Número',
booked: 'Reservado',
booked_error: 'Reserva fallida. Intenta nuevamente más tarde',
sendmsg_error: 'Mensaje no enviado Intenta nuevamente más tarde',
@@ -527,6 +608,8 @@ const msgglobal = {
cancelederrorbooking: 'Cancelación no realizada, intente nuevamente más tarde',
event: 'Evento',
starttime: 'Inicio',
+ nextevent: 'Próximo evento',
+ readall: 'Lee todo',
enddate: 'a',
endtime: 'fin',
duration: 'Duración',
@@ -543,12 +626,13 @@ const msgglobal = {
selnumpeople: 'Partecipantes',
selnumpeople_short: 'Num',
msgbooking: 'Mensaje para enviar',
- showinfo: 'Ver Info',
- bookingtextdefault: 'Reservo el evento',
+ showpdf: 'Ver PDF',
+ bookingtextdefault: 'Reservo para',
bookingtextdefault_of: 'de',
data: 'Fecha',
teachertitle: 'Maestro',
peoplebooked: 'Reserv.',
+ showlastschedule: 'Ver todo el calendario',
},
msgs: {
message: 'Mensaje',
@@ -561,6 +645,7 @@ const msgglobal = {
short_tit: 'Título Corto',
title: 'Título',
details: 'Detalles',
+ bodytext: 'Texto del evento',
dateTimeStart: 'Fecha de Inicio',
dateTimeEnd: 'Fecha Final',
bgcolor: 'Color de fondo',
@@ -572,6 +657,7 @@ const msgglobal = {
contribtype: 'Tipo de Contribución',
price: 'Precio',
askinfo: 'Solicitar información',
+ showpage: 'Ver página',
infoafterprice: 'notas después del precio',
teacher: 'Profesor', // teacherid
teacher2: 'Profesor2', // teacherid2
@@ -585,7 +671,14 @@ const msgglobal = {
deleted: 'Eliminado',
duplicate: 'Duplica',
notempty: 'El campo no puede estar vacío.',
- modified: 'Modificado'
+ modified: 'Modificado',
+ showinhome: 'Mostrar en la Home',
+ showinnewsletter: 'Mostrar en el boletín',
+ color: 'Titulo Color',
+ },
+ disc: {
+ typol_code: 'Código Tipologìa',
+ order: 'Clasificación',
},
newsletter: {
title: '¿Desea recibir nuestro boletín informativo?',
@@ -599,7 +692,28 @@ const msgglobal = {
typesomething: 'Llenar el campo',
acceptlicense: 'Acepto la licencia y los términos',
license: 'Necesitas aceptar la licencia y los términos primero',
- submitted: 'Subscrito'
+ submitted: 'Subscrito',
+ menu: 'Newsletter1',
+ template: 'Plantillas de Email',
+ sendemail: 'Enviar',
+ check: 'Verificar',
+ sent: 'Ya eniado',
+ mailinglist: 'Lista de contactos',
+ settings: 'Configuración',
+ serversettings: 'Servidor',
+ others: 'Otro',
+ templemail: 'Plantilla de Email',
+ datetoSent: 'Fecha y Ora de Envio',
+ activate: 'Activado',
+ numemail_tot: 'Email Total',
+ numemail_sent: 'Email Enviados',
+ datestartJob: 'Inicio Envio',
+ datefinishJob: 'Fin Envio',
+ lastemailsent_Job: 'Ùltimo enviado',
+ starting_job: 'Comenzó a enviar',
+ finish_job: 'Envio terminado',
+ error_job: 'Info Error',
+ statesub: 'Subscribir',
},
privacy_policy:'Política de privacidad',
cookies: 'Utilizamos cookies para un mejor rendimiento web.'
@@ -619,6 +733,9 @@ const msgglobal = {
usereventlist: 'Réservation Utilisateur',
userlist: 'Liste d\'utilisateurs',
tableslist: 'Liste des tables',
+ newsletter: 'Newsletter',
+ pages: 'Pages',
+ media: 'Médias',
},
manage: {
menu: 'Gérer',
@@ -633,6 +750,7 @@ const msgglobal = {
write: 'écrit'
},
dialog: {
+ close: 'Fermer',
ok: 'Bien',
yes: 'Oui',
no: 'Non',
@@ -676,7 +794,9 @@ const msgglobal = {
verify_email: 'Vérifiez votre email',
go_login: 'Retour à la connexion',
incorrect_input: 'Entrée correcte.',
- link_sent: 'Maintenant, lisez votre email et confirmez votre inscription'
+ link_sent: 'Maintenant, lisez votre email et confirmez votre inscription',
+ title_unsubscribe: 'Se désabonner de la newsletter',
+ title_unsubscribe_done: 'Abonnement terminé avec succès',
}
}
},
@@ -689,6 +809,15 @@ const msgglobal = {
notregistered: 'Vous devez vous inscrire auprès du service avant de pouvoir stocker les données.',
loggati: 'L\'utilisateur n\'est pas connecté'
},
+ templemail: {
+ subject: 'Objet Email',
+ testoheadermail: 'en-tête de courrier électronique',
+ content: 'Contenu',
+ img: 'Image 1',
+ img2: 'Image 2',
+ content2: 'Contenu 2',
+ options: 'Options',
+ },
reg: {
incorso: 'Inscription en cours...',
richiesto: 'Champ obligatoire',
@@ -725,6 +854,7 @@ const msgglobal = {
},
op: {
qualification: 'Qualification',
+ usertelegram: 'Username Telegram',
disciplines: 'Disciplines',
certifications: 'Certifications',
intro: 'Introduction',
@@ -758,6 +888,7 @@ const msgglobal = {
undefined: 'non défini'
}
},
+ showbigmap: 'Montrer la plus grande carte',
todo: {
titleprioritymenu: 'Prioridad:',
inserttop: 'Ingrese una nueva Tarea arriba',
@@ -810,7 +941,13 @@ const msgglobal = {
code: 'Id',
whereicon: 'icône',
},
+ col: {
+ label: 'Etichetta',
+ value: 'Valore',
+ type: 'Tipo'
+ },
cal: {
+ num: 'Nombre',
booked: 'Réservé',
booked_error: 'La réservation a échoué. Réessayez plus tard',
sendmsg_error: 'Message non envoyé. Réessayez plus tard',
@@ -823,6 +960,8 @@ const msgglobal = {
cancelederrorbooking: 'Annulation non effectuée, réessayez plus tard',
event: 'événement',
starttime: 'Accueil',
+ nextevent: 'Prochain événement',
+ readall: 'Tout lire',
enddate: 'au',
endtime: 'fin',
duration: 'Durée',
@@ -839,12 +978,13 @@ const msgglobal = {
selnumpeople: 'Participants',
selnumpeople_short: 'Num',
msgbooking: 'Message à envoyer',
- showinfo: 'Voir Info',
- bookingtextdefault: 'Je réserve l\'événement',
+ showpdf: 'Voir PDF',
+ bookingtextdefault: 'Je réserve',
bookingtextdefault_of: 'du',
data: 'Date',
teachertitle: 'Professeur',
peoplebooked: 'Réserv.',
+ showlastschedule: 'Voir tout le calendrier',
},
msgs: {
message: 'Message',
@@ -857,6 +997,7 @@ const msgglobal = {
short_tit: 'Titre abrégé\'',
title: 'Titre',
details: 'Détails',
+ bodytext: 'texte de l\'événement',
dateTimeStart: 'Data Initiale',
dateTimeEnd: 'Date de fin',
bgcolor: 'Couleur de fond',
@@ -868,6 +1009,7 @@ const msgglobal = {
contribtype: 'Type de contribution',
price: 'Prix',
askinfo: 'Demander des infos',
+ showpage: 'Voir la page',
infoafterprice: 'Notes après le prix',
teacher: 'Enseignant', // teacherid
teacher2: 'Enseignant2', // teacherid2
@@ -881,7 +1023,14 @@ const msgglobal = {
deleted: 'Supprimé',
duplicate: 'Duplique',
notempty: 'Le champ ne peut pas être vide',
- modified: 'modifié'
+ modified: 'modifié',
+ showinhome: 'Montrer à la Home',
+ showinnewsletter: 'Afficher dans la Newsletter',
+ color: 'Couleur du titre',
+ },
+ disc: {
+ typol_code: 'Type de code',
+ order: 'Ordre',
},
newsletter: {
title: 'Souhaitez-vous recevoir notre newsletter?',
@@ -895,7 +1044,28 @@ const msgglobal = {
typesomething: 'Remplir le champ',
acceptlicense: 'J\'accepte la licence et les termes',
license: 'Vous devez d\'abord accepter la licence et les termes',
- submitted: 'Abonné'
+ submitted: 'Abonné',
+ menu: 'Newsletter1',
+ template: 'Modeles Email',
+ sendemail: 'Envoyer',
+ check: 'Chèque',
+ sent: 'Dèjà envoyé',
+ mailinglist: 'Leste de contacts',
+ settings: 'Paramèters',
+ serversettings: 'Serveur',
+ others: 'Autres',
+ templemail: 'Model Email',
+ datetoSent: 'Date et heure d\'envoi',
+ activate: 'Activé',
+ numemail_tot: 'Total Email',
+ numemail_sent: 'Emails envoyés',
+ datestartJob: 'Inizio Invio',
+ datefinishJob: 'Fin envoi',
+ lastemailsent_Job: 'Dernier envoyé',
+ starting_job: 'Envoyé',
+ finish_job: 'Envoy Terminé',
+ error_job: 'info d\'erreur',
+ statesub: 'Abonné',
},
privacy_policy:'Politique de confidentialité',
cookies: 'Nous utilisons des cookies pour améliorer les performances Web.'
@@ -915,6 +1085,9 @@ const msgglobal = {
usereventlist: 'Users Booking',
userlist: 'Users List',
tableslist: 'List of tables',
+ newsletter: 'Newsletter',
+ pages: 'Pages',
+ media: 'Medias',
},
manage: {
menu: 'Manage',
@@ -929,6 +1102,7 @@ const msgglobal = {
write: 'write'
},
dialog: {
+ close: 'Close',
ok: 'Ok',
yes: 'Yes',
no: 'No',
@@ -972,7 +1146,9 @@ const msgglobal = {
verify_email: 'Verify your email',
go_login: 'Back to Login',
incorrect_input: 'Incorrect input.',
- link_sent: 'Now read your email and confirm registration'
+ link_sent: 'Now read your email and confirm registration',
+ title_unsubscribe: 'Unsubscribe to the newsletter',
+ title_unsubscribe_done: 'Subscription completed successfully',
}
}
},
@@ -985,6 +1161,15 @@ const msgglobal = {
notregistered: 'You need first to SignUp before storing data',
loggati: 'User not logged in'
},
+ templemail: {
+ subject: 'Subject Email',
+ testoheadermail: 'Header Email',
+ content: 'Content',
+ img: 'Image 1',
+ img2: 'Image 2',
+ content2: 'Content 2',
+ options: 'Options',
+ },
reg: {
incorso: 'Registration please wait...',
richiesto: 'Field Required',
@@ -1021,6 +1206,7 @@ const msgglobal = {
},
op: {
qualification: 'Qualification',
+ usertelegram: 'Username Telegram',
disciplines: 'Disciplines',
certifications: 'Certifications',
intro: 'Introduction',
@@ -1053,6 +1239,7 @@ const msgglobal = {
undefined: 'undefined'
}
},
+ showbigmap: 'Show the largest map',
todo: {
titleprioritymenu: 'Priority:',
inserttop: 'Insert Task at the top',
@@ -1105,7 +1292,13 @@ const msgglobal = {
code: 'Id',
whereicon: 'Icon',
},
+ col: {
+ label: 'Etichetta',
+ value: 'Valore',
+ type: 'Tipo'
+ },
cal: {
+ num: 'Number',
booked: 'Booked',
booked_error: 'Reservation failed. Try again later',
sendmsg_error: 'Message not sent. Try again later',
@@ -1118,6 +1311,8 @@ const msgglobal = {
cancelederrorbooking: 'Cancellation unsuccessfully, try again later',
event: 'Event',
starttime: 'From',
+ nextevent: 'Next Event',
+ readall: 'Read All',
enddate: 'to',
endtime: 'to',
duration: 'Duration',
@@ -1134,12 +1329,13 @@ const msgglobal = {
selnumpeople: 'Participants',
selnumpeople_short: 'Num',
msgbooking: 'Message to send',
- showinfo: 'Show Info',
- bookingtextdefault: 'I book the event',
+ showpdf: 'Show PDF',
+ bookingtextdefault: 'I book for',
bookingtextdefault_of: 'of',
data: 'Date',
teachertitle: 'Teacher',
peoplebooked: 'Booked',
+ showlastschedule: 'See Full Schedule',
},
msgs: {
message: 'Messaggio',
@@ -1152,6 +1348,7 @@ const msgglobal = {
short_tit: 'Short Title',
title: 'Title',
details: 'Details',
+ bodytext: 'Event Text',
dateTimeStart: 'Date Start',
dateTimeEnd: 'Date End',
bgcolor: 'Background color',
@@ -1163,6 +1360,7 @@ const msgglobal = {
contribtype: 'Contribute Type',
price: 'Price',
askinfo: 'Ask for Info',
+ showpage: 'Show Page',
infoafterprice: 'Info after Price',
teacher: 'Teacher', // teacherid
teacher2: 'Teacher2', // teacherid2
@@ -1176,7 +1374,14 @@ const msgglobal = {
deleted: 'Deleted',
duplicate: 'Duplicate',
notempty: 'Field cannot be empty',
- modified: 'Modified'
+ modified: 'Modified',
+ showinhome: 'Show in Home',
+ showinnewsletter: 'Show in the Newsletter',
+ color: 'Title Color',
+ },
+ disc: {
+ typol_code: 'Tipology Code',
+ order: 'Order',
},
newsletter: {
title: 'Would you like to receive our Newsletter?',
@@ -1190,7 +1395,28 @@ const msgglobal = {
typesomething: 'Please type something',
acceptlicense: 'I accept the license and terms',
license: 'You need to accept the license and terms first',
- submitted: 'Subscribed'
+ submitted: 'Subscribed',
+ menu: 'Newsletter1',
+ template: 'Template Email',
+ sendemail: 'Send',
+ check: 'Check',
+ sent: 'Already Sent',
+ mailinglist: 'Mailing List',
+ settings: 'Settings',
+ serversettings: 'Server',
+ others: 'Others',
+ templemail: 'Templates Email',
+ datetoSent: 'DateTime Send',
+ activate: 'Activate',
+ numemail_tot: 'Email Total',
+ numemail_sent: 'Email Sent',
+ datestartJob: 'Start Job',
+ datefinishJob: 'End Job',
+ lastemailsent_Job: 'Last Sent',
+ starting_job: 'Job started',
+ finish_job: 'Sent terminated',
+ error_job: 'Info Error',
+ statesub: 'Subscribed',
},
privacy_policy:'Privacy Policy',
cookies: 'We use cookies for better web performance.'
@@ -1210,6 +1436,9 @@ const msgglobal = {
usereventlist: 'Users Booking',
userlist: 'Users List',
tableslist: 'List of tables',
+ newsletter: 'Newsletter',
+ pages: 'Pages',
+ media: 'Medias',
},
manage: {
menu: 'Manage',
@@ -1224,6 +1453,7 @@ const msgglobal = {
write: 'write'
},
dialog: {
+ close: 'Close',
ok: 'Ok',
yes: 'Yes',
no: 'No',
@@ -1267,7 +1497,9 @@ const msgglobal = {
verify_email: 'Verify your email',
go_login: 'Back to Login',
incorrect_input: 'Incorrect input.',
- link_sent: 'Now read your email and confirm registration'
+ link_sent: 'Now read your email and confirm registration',
+ title_unsubscribe: 'Disiscrizione alla newsletter',
+ title_unsubscribe_done: 'Disiscrizione completata correttamente',
}
}
},
@@ -1280,6 +1512,15 @@ const msgglobal = {
notregistered: 'You need first to SignUp before storing data',
loggati: 'User not logged in'
},
+ templemail: {
+ subject: 'Subject Email',
+ testoheadermail: 'Header Email',
+ content: 'Content',
+ img: 'Image 1',
+ img2: 'Image 2',
+ content2: 'Content 2',
+ options: 'Options',
+ },
reg: {
page_title: 'Registration',
incorso: 'Registration please wait...',
@@ -1317,6 +1558,7 @@ const msgglobal = {
},
op: {
qualification: 'Qualification',
+ usertelegram: 'Username Telegram',
disciplines: 'Disciplines',
certifications: 'Certifications',
intro: 'Introduction',
@@ -1350,6 +1592,7 @@ const msgglobal = {
undefined: 'undefined'
}
},
+ showbigmap: 'Show the largest map',
todo: {
titleprioritymenu: 'Priority:',
inserttop: 'Insert Task at the top',
@@ -1402,7 +1645,13 @@ const msgglobal = {
code: 'Id',
whereicon: 'Icon',
},
+ col: {
+ label: 'Etichetta',
+ value: 'Valore',
+ type: 'Tipo'
+ },
cal: {
+ num: 'Number',
booked: 'Booked',
booked_error: 'Reservation failed. Try again later',
sendmsg_error: 'Message not sent. Try again later',
@@ -1415,6 +1664,8 @@ const msgglobal = {
cancelederrorbooking: 'Cancellation unsuccessfully, try again later',
event: 'Event',
starttime: 'From',
+ nextevent: 'Next Event',
+ readall: 'Read All',
enddate: 'to',
endtime: 'to',
duration: 'Duration',
@@ -1431,12 +1682,13 @@ const msgglobal = {
selnumpeople: 'Participants',
selnumpeople_short: 'Num',
msgbooking: 'Message to send',
- showinfo: 'Show Info',
- bookingtextdefault: 'I book the event',
+ showpdf: 'Show PDF',
+ bookingtextdefault: 'I book for',
bookingtextdefault_of: 'of',
data: 'Date',
teachertitle: 'Teacher',
peoplebooked: 'Booked',
+ showlastschedule: 'See Full Schedule',
},
msgs: {
message: 'Messaggio',
@@ -1449,6 +1701,7 @@ const msgglobal = {
short_tit: 'Short Title',
title: 'Title',
details: 'Details',
+ bodytext: 'Event Text',
dateTimeStart: 'Date Start',
dateTimeEnd: 'Date End',
bgcolor: 'Background color',
@@ -1460,6 +1713,7 @@ const msgglobal = {
contribtype: 'Contribute Type',
price: 'Price',
askinfo: 'Ask for Info',
+ showpage: 'Show Page',
infoafterprice: 'Info after Price',
teacher: 'Teacher', // teacherid
teacher2: 'Teacher2', // teacherid2
@@ -1473,7 +1727,14 @@ const msgglobal = {
deleted: 'Deleted',
duplicate: 'Duplicate',
notempty: 'Field cannot be empty',
- modified: 'Modified'
+ modified: 'Modified',
+ showinhome: 'Show in Home',
+ showinnewsletter: 'Show in the Newsletter',
+ color: 'Title Color',
+ },
+ disc: {
+ typol_code: 'Tipology Code',
+ order: 'Order',
},
newsletter: {
title: 'Would you like to receive our Newsletter?',
@@ -1487,7 +1748,28 @@ const msgglobal = {
typesomething: 'Please type something',
acceptlicense: 'I accept the license and terms',
license: 'You need to accept the license and terms first',
- submitted: 'Subscribed'
+ submitted: 'Subscribed',
+ menu: 'Newsletter1',
+ template: 'Template Email',
+ sendemail: 'Send',
+ check: 'Check',
+ sent: 'Already Sent',
+ mailinglist: 'Mailing List',
+ settings: 'Settings',
+ serversettings: 'Server',
+ others: 'Others',
+ templemail: 'Templates Email',
+ datetoSent: 'DateTime Send',
+ activate: 'Activate',
+ numemail_tot: 'Email Total',
+ numemail_sent: 'Email Sent',
+ datestartJob: 'Start Job',
+ datefinishJob: 'End Job',
+ lastemailsent_Job: 'Last Sent',
+ starting_job: 'Job started',
+ finish_job: 'Sent terminated',
+ error_job: 'Info Error',
+ statesub: 'Subscribed',
},
privacy_policy:'Privacy Policy',
cookies: 'Wir verwenden Cookies für eine bessere Webleistung.'
diff --git a/src/statics/js/track.js b/src/statics/js/track.js
index 7f5bd2c..f2ebec2 100644
--- a/src/statics/js/track.js
+++ b/src/statics/js/track.js
@@ -2,12 +2,12 @@ function geturl() {
const miaurl = document.location.href
if (miaurl.includes('test.')) {
- return 'https://test.freeplanet.app/'
+ return 'https://test.associazioneshen.it/'
} else {
if (miaurl.includes('localhost')) {
return 'http://localhost:8080/'
} else {
- return 'https://freeplanet.app/'
+ return 'https://associazioneshen.it/'
}
}
}
@@ -18,12 +18,12 @@ function getidtrack() {
if (miaurl.includes('test.') || miaurl.includes('localhost')) {
return '4c40a07bc88a9c50c9b70dc9c5cd8e2e'
} else {
- return '9853abef079fc8330ab188a9cbf07a0c'
+ return 'ccfd6c90e17b6809f9717675764c3f5d' // Associazione Shen
}
}
-var owa_baseUrl = geturl() + 'owa/';
+let owa_baseUrl = geturl() + 'owa/';
if (owa_cmds)
var owa_cmds = [];
else
@@ -33,11 +33,11 @@ owa_cmds.push(['trackPageView']);
// owa_cmds.push(['trackClicks']);
(function () {
- var _owa = document.createElement('script');
+ const _owa = document.createElement('script');
_owa.type = 'text/javascript';
_owa.async = true;
owa_baseUrl = ('https:' == document.location.protocol ? window.owa_baseSecUrl || owa_baseUrl.replace(/http:/, 'https:') : owa_baseUrl);
_owa.src = owa_baseUrl + 'modules/base/js/owa.tracker-combined-min.js';
- var _owa_s = document.getElementsByTagName('script')[0];
+ const _owa_s = document.getElementsByTagName('script')[0];
_owa_s.parentNode.insertBefore(_owa, _owa_s);
}());
diff --git a/src/store/Api/Instance.ts b/src/store/Api/Instance.ts
index cec05e5..9a77ba0 100644
--- a/src/store/Api/Instance.ts
+++ b/src/store/Api/Instance.ts
@@ -51,7 +51,8 @@ export const removeAuthHeaders = () => {
async function Request(type: string, path: string, payload: any): Promise {
let ricevuto = false
try {
- console.log('Axios Request', path, type, tools.notshowPwd(payload))
+ if (tools.isDebug())
+ console.log('Axios Request', path, type, tools.notshowPwd(payload))
let response: AxiosResponse
if (type === 'post' || type === 'put' || type === 'patch') {
response = await axiosInstance[type](path, payload, {
diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts
index 1bafb88..761782b 100644
--- a/src/store/Modules/GlobalStore.ts
+++ b/src/store/Modules/GlobalStore.ts
@@ -1,4 +1,4 @@
-import { ICfgServer, IConfig, IGlobalState, IListRoutes, IMenuList, StateConnection } from 'model'
+import { ICfgServer, IConfig, IGlobalState, IListRoutes, IMenuList, ISettings, StateConnection } from 'model'
import { storeBuilder } from './Store/Store'
import Vue from 'vue'
@@ -24,6 +24,7 @@ import { serv_constants } from '@src/store/Modules/serv_constants'
import { IUserState } from '@src/model'
import { Calendar } from 'element-ui'
import { fieldsTable } from '@src/store/Modules/fieldsTable'
+import router from '@router'
// import { static_data } from '@src/db/static_data'
let stateConnDefault = 'online'
@@ -68,7 +69,15 @@ const state: IGlobalState = {
type: 0,
_id: 0
},
- settings: []
+ serv_settings: [],
+ templemail: [],
+ opzemail: [],
+ settings: [],
+ disciplines: [],
+ autoplaydisc: 8000,
+ newstosent: [],
+ mailinglist: [],
+ mypage: []
}
async function getConfig(id) {
@@ -124,6 +133,12 @@ namespace Getters {
}, 'showtype')
+ const getPage = b.read((mystate: IGlobalState) => (path) => {
+ // const config = state.arrConfig.find(item => item._id === cat + costanti.CONFIG_ID_SHOW_TYPE_TODOS)
+ return mystate.mypage.find((page) => (`/` + page.path) === path)
+
+ }, 'getPage')
+
const getmenu = b.read((state) => {
// console.log('getmenu', cfgrouter.getmenu())
@@ -163,6 +178,18 @@ namespace Getters {
return CalendarStore.state.wheres
else if (table === 'contribtype')
return CalendarStore.state.contribtype
+ else if (table === 'disciplines')
+ return GlobalStore.state.disciplines
+ else if (table === tools.TABNEWSLETTER)
+ return GlobalStore.state.newstosent
+ else if (table === tools.TABTEMPLEMAIL)
+ return GlobalStore.state.templemail
+ else if (table === tools.TABOPZEMAIL)
+ return GlobalStore.state.opzemail
+ else if (table === tools.TABMAILINGLIST)
+ return GlobalStore.state.mailinglist
+ else if (table === tools.TABMYPAGE)
+ return GlobalStore.state.mypage
else if (table === 'bookings')
return CalendarStore.state.bookedevent
else if (table === 'users')
@@ -178,13 +205,24 @@ namespace Getters {
}, 'getListByTable')
- const getValueSettingsByKey = b.read((mystate: IGlobalState) => (key): any => {
- const myrec = mystate.settings.find((rec) => rec.key === key)
+ const getrecSettingsByKey = b.read((mystate: IGlobalState) => (key, serv): ISettings => {
+ if (serv)
+ return mystate.serv_settings.find((rec) => rec.key === key)
+ else
+ return mystate.settings.find((rec) => rec.key === key)
+ }, 'getrecSettingsByKey')
+
+ const getValueSettingsByKey = b.read((mystate: IGlobalState) => (key, serv): any => {
+
+ const myrec = getters.getrecSettingsByKey(key, serv)
+
if (!!myrec) {
if (myrec.type === tools.FieldType.date)
return myrec.value_date
- if (myrec.type === tools.FieldType.number)
+ else if (myrec.type === tools.FieldType.number)
return myrec.value_num
+ else if (myrec.type === tools.FieldType.boolean)
+ return myrec.value_bool
else
return myrec.value_str
} else {
@@ -193,6 +231,11 @@ namespace Getters {
}, 'getValueSettingsByKey')
+ const gettemplemailbyId = b.read((mystate: IGlobalState) => (templid): string => {
+ const myrec = mystate.templemail.find((rec) => rec._id === templid)
+ return (!!myrec) ? myrec.subject : ''
+ }, 'gettemplemailbyId')
+
export const getters = {
get testpao1_getter_contatore() {
return testpao1_getter_contatore()
@@ -236,6 +279,18 @@ namespace Getters {
return getValueSettingsByKey()
},
+ get getrecSettingsByKey() {
+ return getrecSettingsByKey()
+ },
+
+ get gettemplemailbyId() {
+ return gettemplemailbyId()
+ },
+
+ get getPage() {
+ return getPage()
+ },
+
get t() {
return t()
},
@@ -343,6 +398,31 @@ namespace Mutations {
}
}
+ function setValueSettingsByKey(mystate: IGlobalState, { key, value, serv }) {
+ // Update the Server
+
+ // Update in Memory
+ let myrec = null
+ if (serv)
+ myrec = mystate.serv_settings.find((rec) => rec.key === key)
+ else
+ myrec = mystate.settings.find((rec) => rec.key === key)
+
+ if (!!myrec) {
+ if (myrec.type === tools.FieldType.date)
+ myrec.value_date = value
+ else if (myrec.type === tools.FieldType.number)
+ myrec.value_num = value
+ else if (myrec.type === tools.FieldType.boolean)
+ myrec.value_bool = value
+ else
+ myrec.value_str = value
+
+ console.log('setValueSettingsByKey value', value, 'myrec', myrec)
+ }
+
+ }
+
export const mutations = {
setConta: b.commit(setConta),
setleftDrawerOpen: b.commit(setleftDrawerOpen),
@@ -354,7 +434,8 @@ namespace Mutations {
setPaoArray_Delete: b.commit(setPaoArray_Delete),
NewArray: b.commit(NewArray),
setShowType: b.commit(setShowType),
- UpdateValuesInMemory: b.commit(UpdateValuesInMemory)
+ UpdateValuesInMemory: b.commit(UpdateValuesInMemory),
+ setValueSettingsByKey: b.commit(setValueSettingsByKey)
}
}
@@ -365,7 +446,6 @@ namespace Actions {
}
function createPushSubscription(context) {
- console.log('createPushSubscription')
// If Already subscribed, don't send to the Server DB
// if (state.wasAlreadySubOnDb) {
@@ -384,7 +464,7 @@ namespace Actions {
return
}
- // console.log('createPushSubscription')
+ console.log('createPushSubscription')
let reg
const mykey = process.env.PUBLICKEY_PUSH
@@ -676,12 +756,12 @@ namespace Actions {
async function loadSite(context) {
// console.log('CalendarStore: loadAfterLogin')
// Load local data
- CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager
-
const showall = UserStore.state.isAdmin || UserStore.state.isManager ? '1' : '0'
const myuserid = (UserStore.state.my._id) ? UserStore.state.my._id : '0'
+ CalendarStore.state.editable = false
+
return await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + showall, 'GET', null)
.then((res) => {
CalendarStore.state.bookedevent = (res.data.bookedevent) ? res.data.bookedevent : []
@@ -690,6 +770,15 @@ namespace Actions {
CalendarStore.state.wheres = (res.data.wheres) ? res.data.wheres : []
CalendarStore.state.contribtype = (res.data.contribtype) ? res.data.contribtype : []
GlobalStore.state.settings = (res.data.settings) ? [...res.data.settings] : []
+ GlobalStore.state.disciplines = (res.data.disciplines) ? [...res.data.disciplines] : []
+
+ if (showall) {
+ GlobalStore.state.newstosent = (res.data.newstosent) ? [...res.data.newstosent] : []
+ GlobalStore.state.mailinglist = (res.data.mailinglist) ? [...res.data.mailinglist] : []
+ GlobalStore.state.mypage = (res.data.mypage) ? [...res.data.mypage] : []
+ }
+
+ CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager
})
.catch((error) => {
@@ -700,6 +789,60 @@ namespace Actions {
}
+ async function sendEmailTest(context, { previewonly }) {
+ const usertosend = {
+ locale: tools.getLocale(),
+ previewonly
+ }
+ console.log(usertosend)
+
+ return await Api.SendReq('/news/testemail', 'POST', usertosend)
+ .then((res) => {
+ return res
+ })
+ }
+
+ async function addDynamicPages(context) {
+
+ const arrpagesroute: IListRoutes[] = []
+ for (const page of state.mypage) {
+ arrpagesroute.push({
+ path: '/' + page.path,
+ name: undefined,
+ text: page.title,
+ materialIcon: page.icon,
+ component: () => import('@/root/mypage/mypage.vue'),
+ inmenu: page.inmenu,
+ infooter: page.infooter,
+ level_child: page.l_child,
+ level_parent: page.l_par,
+ })
+ }
+
+ const last = {
+ path: '*',
+ materialIcon: 'fas fa-calendar-plus',
+ name: 'otherpages.error404def',
+ component: () => import('@/root/My404page/My404page.vue'),
+ inmenu: false,
+ infooter: false
+ }
+
+ static_data.routes = [...static_data.routes, ...arrpagesroute, last]
+
+ router.addRoutes([...arrpagesroute, last])
+ }
+
+ async function sendFile(context, formdata) {
+ try {
+ const { data } = await Api.postFormData('/upload', formdata)
+ console.log(data)
+
+ } catch (e) {
+ console.log('Error sendFile: ', e)
+ }
+ }
+
export const actions = {
setConta: b.dispatch(setConta),
createPushSubscription: b.dispatch(createPushSubscription),
@@ -714,7 +857,9 @@ namespace Actions {
loadTable: b.dispatch(loadTable),
saveTable: b.dispatch(saveTable),
DeleteRec: b.dispatch(DeleteRec),
- DuplicateRec: b.dispatch(DuplicateRec)
+ sendEmailTest: b.dispatch(sendEmailTest),
+ DuplicateRec: b.dispatch(DuplicateRec),
+ addDynamicPages: b.dispatch(addDynamicPages)
}
}
diff --git a/src/store/Modules/UserStore.ts b/src/store/Modules/UserStore.ts
index 6280707..526b8b1 100644
--- a/src/store/Modules/UserStore.ts
+++ b/src/store/Modules/UserStore.ts
@@ -419,6 +419,57 @@ namespace Actions {
})
}
+ async function unsubscribe(context, paramquery) {
+
+ return await Api.SendReq('/news/unsubscribe', 'POST', paramquery)
+ .then((res) => {
+ // console.log("RITORNO 2 ");
+ // mutations.setServerCode(myres);
+ if (res.data.code === serv_constants.RIS_UNSUBSCRIBED_OK) {
+ console.log('DESOTTOSCRITTO ALLA NEWSLETTER !!')
+ } else {
+ console.log('Risultato di unsubscribe: ', res.data.code)
+ }
+ return { code: res.data.code, msg: res.data.msg }
+ }).catch((error) => {
+ return UserStore.getters.getServerCode
+ })
+ }
+
+ async function importemail(context, paramquery) {
+
+ return await Api.SendReq('/news/import', 'POST', paramquery)
+ .then((res) => {
+ // console.log("RITORNO 2 ");
+ // mutations.setServerCode(myres);
+ return res
+ }).catch((error) => {
+ return { numtot: 0, numadded: 0, numalreadyexisted: 0}
+ })
+ }
+
+ async function newsletterload(context, paramquery) {
+
+ return await Api.SendReq('/news/load', 'POST', paramquery)
+ .then((res) => {
+ console.log('res', res)
+ return res.data
+ }).catch((error) => {
+ return null
+ })
+ }
+
+ async function newsletter_setactivate(context, paramquery) {
+
+ return await Api.SendReq('/news/setactivate', 'POST', paramquery)
+ .then((res) => {
+ console.log('res', res)
+ return res.data
+ }).catch((error) => {
+ return null
+ })
+ }
+
async function signup(context, authData: ISignupOptions) {
console.log('SIGNUP')
@@ -637,28 +688,42 @@ namespace Actions {
async function setGlobal(isLogged: boolean) {
console.log('setGlobal')
- // state.isLogged = true
- if (isLogged) {
- // console.log('state.isLogged', state.isLogged)
+ try {
+ // state.isLogged = true
+ if (isLogged) {
+ // console.log('state.isLogged', state.isLogged)
- GlobalStore.mutations.setleftDrawerOpen(localStorage.getItem(tools.localStorage.leftDrawerOpen) === 'true')
- GlobalStore.mutations.setCategorySel(localStorage.getItem(tools.localStorage.categorySel))
+ GlobalStore.mutations.setleftDrawerOpen(localStorage.getItem(tools.localStorage.leftDrawerOpen) === 'true')
+ GlobalStore.mutations.setCategorySel(localStorage.getItem(tools.localStorage.categorySel))
- GlobalStore.actions.checkUpdates()
+ GlobalStore.actions.checkUpdates()
+ }
+
+ const p3 = await GlobalStore.actions.loadAfterLogin()
+
+ state.isLogged = isLogged
+
+ if (static_data.functionality.ENABLE_TODOS_LOADING)
+ await Todos.actions.dbLoad({ checkPending: true })
+
+ if (static_data.functionality.ENABLE_PROJECTS_LOADING)
+ await Projects.actions.dbLoad({ checkPending: true, onlyiffirsttime: true })
+
+ console.log('add routes')
+
+ GlobalStore.actions.addDynamicPages()
+
+ GlobalStore.state.finishLoading = true
+ if (tools.isDebug())
+ console.log('finishLoading', GlobalStore.state.finishLoading)
+
+ // document.dispatchEvent(new Event('custom-post-render-event'))
+
+ } catch (e) {
+ console.error('Error', e)
+ GlobalStore.state.finishLoading = true
}
- const p3 = await GlobalStore.actions.loadAfterLogin()
-
- state.isLogged = isLogged
-
- if (static_data.functionality.ENABLE_TODOS_LOADING)
- await Todos.actions.dbLoad({ checkPending: true })
-
- if (static_data.functionality.ENABLE_PROJECTS_LOADING)
- await Projects.actions.dbLoad({ checkPending: true, onlyiffirsttime: true })
-
- GlobalStore.state.finishLoading = true
-
return true
// console.log('setGlobal: END')
}
@@ -740,7 +805,11 @@ namespace Actions {
resetpwd: b.dispatch(resetpwd),
signin: b.dispatch(signin),
signup: b.dispatch(signup),
- vreg: b.dispatch(vreg)
+ vreg: b.dispatch(vreg),
+ unsubscribe: b.dispatch(unsubscribe),
+ importemail: b.dispatch(importemail),
+ newsletterload: b.dispatch(newsletterload),
+ newsletter_setactivate: b.dispatch(newsletter_setactivate),
}
}
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index c5c6105..6c4fc45 100644
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -2,7 +2,7 @@ import { IColGridTable } from '../../model'
import { lists } from './lists'
import { tools } from '@src/store/Modules/tools'
import { shared_consts } from '@src/common/shared_vuejs'
-import { GlobalStore } from '@store'
+import { GlobalStore, UserStore } from '@store'
const DeleteRec = {
name: 'deleterec',
@@ -17,6 +17,19 @@ const DeleteRec = {
visuonlyEditVal: true
}
+const DuplicateRec = {
+ name: 'copyrec',
+ label_trans: 'event.duplicate',
+ align: 'right',
+ field: tools.NOFIELD,
+ sortable: false,
+ icon: 'fas fa-copy',
+ action: lists.MenuAction.DUPLICATE_RECTABLE,
+ askaction: 'db.duplicatedrecord',
+ visuonlyEditVal: true,
+ visible: true
+}
+
function AddCol(params: IColGridTable) {
return {
name: params.name,
@@ -40,9 +53,78 @@ function AddCol(params: IColGridTable) {
}
}
+export const colmailinglist = [
+ AddCol({ name: 'name', label_trans: 'reg.name' }),
+ AddCol({ name: 'surname', label_trans: 'reg.surname' }),
+ AddCol({ name: 'email', label_trans: 'reg.email' }),
+ AddCol({ name: 'statesub', label_trans: 'newsletter.statesub', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'lastid_newstosent', label_trans: 'reg.lastid_newstosent', fieldtype: tools.FieldType.string }),
+ AddCol(DeleteRec)
+]
+
+export const colmypage = [
+ AddCol({ name: 'title', label_trans: 'pages.title' }),
+ AddCol({ name: 'path', label_trans: 'pages.path' }),
+ AddCol({ name: 'icon', label_trans: 'pages.icon' }),
+ AddCol({ name: 'keywords', label_trans: 'pages.keywords' }),
+ AddCol({ name: 'description', label_trans: 'pages.description' }),
+ AddCol({ name: 'heightimg', label_trans: 'pages.heightimg', fieldtype: tools.FieldType.number }),
+ AddCol({ name: 'imgback', label_trans: 'pages.imgback', fieldtype: tools.FieldType.string }),
+ AddCol({ name: 'content', label_trans: 'pages.content', fieldtype: tools.FieldType.html }),
+ AddCol({ name: 'active', label_trans: 'pages.active', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'inmenu', label_trans: 'pages.inmenu', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'submenu', label_trans: 'pages.submenu', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'l_par', label_trans: 'pages.l_par', fieldtype: tools.FieldType.number }),
+ AddCol({ name: 'l_child', label_trans: 'pages.l_child', fieldtype: tools.FieldType.number }),
+ AddCol({ name: 'infooter', label_trans: 'pages.infooter', fieldtype: tools.FieldType.boolean }),
+ AddCol(DeleteRec),
+ AddCol(DuplicateRec)
+]
+
+export const colopzemail = [
+ AddCol({ name: 'key', label_trans: 'col.key' }),
+ AddCol({ name: 'label_it', label_trans: 'col.label' }),
+ AddCol(DeleteRec),
+ AddCol(DuplicateRec)
+]
+
+export const coltemplemail = [
+ AddCol({ name: 'subject', label_trans: 'templemail.subject' }),
+ AddCol({ name: 'testoheadermail', label_trans: 'templemail.testoheadermail', fieldtype: tools.FieldType.html }),
+ AddCol({ name: 'content', label_trans: 'templemail.content', fieldtype: tools.FieldType.html }),
+ AddCol({ name: 'img', label_trans: 'templemail.img' }),
+ AddCol({ name: 'content2', label_trans: 'templemail.content2', fieldtype: tools.FieldType.html }),
+ AddCol({ name: 'img2', label_trans: 'templemail.img2' }),
+ AddCol({
+ name: 'options',
+ label_trans: 'templemail.options',
+ fieldtype: tools.FieldType.multiselect,
+ jointable: 'opzemail'
+ }),
+ AddCol(DeleteRec),
+ AddCol(DuplicateRec)
+]
+// SHOW_LAST_N_EV
+export const colnewstosent = [
+ AddCol({ name: 'label', label_trans: 'event.title' }),
+ AddCol({ name: 'templemail_str', label_trans: 'newsletter.templemail' }),
+ AddCol({ name: 'datetoSent', label_trans: 'newsletter.datetoSent', fieldtype: tools.FieldType.date }),
+ AddCol({ name: 'activate', label_trans: 'newsletter.activate', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'numemail_tot', label_trans: 'newsletter.numemail_tot', fieldtype: tools.FieldType.number }),
+ AddCol({ name: 'numemail_sent', label_trans: 'newsletter.numemail_sent', fieldtype: tools.FieldType.number }),
+ AddCol({ name: 'datestartJob', label_trans: 'newsletter.datestartJob', fieldtype: tools.FieldType.date }),
+ AddCol({ name: 'datefinishJob', label_trans: 'newsletter.datefinishJob', fieldtype: tools.FieldType.date }),
+ AddCol({ name: 'lastemailsent_Job', label_trans: 'newsletter.lastemailsent_Job', fieldtype: tools.FieldType.date }),
+ AddCol({ name: 'starting_job', label_trans: 'newsletter.starting_job', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'finish_job', label_trans: 'newsletter.finish_job', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'error_job', label_trans: 'newsletter.error_job', fieldtype: tools.FieldType.string }),
+ AddCol(DeleteRec),
+ AddCol(DuplicateRec)
+]
+
const colTableWhere = [
AddCol({ name: 'code', label_trans: 'where.code' }),
- AddCol({ name: 'placename', label_trans: 'cal.where'} ),
+ AddCol({ name: 'placename', label_trans: 'cal.where' }),
AddCol({ name: 'whereicon', label_trans: 'where.whereicon' }),
AddCol(DeleteRec)
]
@@ -53,13 +135,26 @@ const colcontribtype = [
AddCol(DeleteRec)
]
-const colsettings = [
- AddCol({ name: 'key', label_trans: 'col.label' }),
- AddCol({ name: 'type', label_trans: 'col.type', fieldtype: tools.FieldType.select, jointable: 'fieldstype' }),
- AddCol({ name: 'value_str', label_trans: 'col.value', fieldtype: tools.FieldType.string }),
- AddCol({ name: 'value_date', label_trans: 'cal.data', fieldtype: tools.FieldType.date }),
- AddCol({ name: 'value_num', label_trans: 'cal.num', fieldtype: tools.FieldType.number }),
- AddCol(DeleteRec)
+const coldisciplines = [
+ AddCol({ name: 'typol_code', label_trans: 'disc.typol_code' }),
+ AddCol({ name: 'order', label_trans: 'disc.order', fieldtype: tools.FieldType.number }),
+ AddCol({ name: 'label', label_trans: 'event.title' }),
+ AddCol({ name: 'description', label_trans: 'proj.longdescr' }),
+ AddCol({ name: 'linkpage', label_trans: 'event.linkpage' }),
+ AddCol({ name: 'color', label_trans: 'event.color' }),
+ AddCol({ name: 'icon', label_trans: 'event.icon' }),
+ AddCol({ name: 'img', label_trans: 'event.img' }),
+ AddCol({ name: 'img_small', label_trans: 'event.img_small' }),
+ AddCol({ name: 'showinhome', label_trans: 'event.showinhome', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'showinnewsletter', label_trans: 'event.showinnewsletter', fieldtype: tools.FieldType.boolean }),
+ AddCol({
+ name: 'teachers',
+ label_trans: 'event.teacher',
+ fieldtype: tools.FieldType.multiselect,
+ jointable: 'operators'
+ }),
+ AddCol(DeleteRec),
+ AddCol(DuplicateRec)
]
const colTablePermission = [
@@ -68,6 +163,7 @@ const colTablePermission = [
AddCol(DeleteRec)
]
+
const colTableOperator = [
AddCol({ name: 'username', label_trans: 'reg.username' }),
AddCol({ name: 'name', label_trans: 'reg.name' }),
@@ -75,22 +171,26 @@ const colTableOperator = [
AddCol({ name: 'email', label_trans: 'reg.email' }),
AddCol({ name: 'img', label_trans: 'event.img' }),
AddCol({ name: 'cell', label_trans: 'reg.cell' }),
+ AddCol({ name: 'usertelegram', label_trans: 'op.usertelegram' }),
AddCol({ name: 'qualification', label_trans: 'op.qualification' }),
AddCol({ name: 'disciplines', label_trans: 'op.disciplines' }),
AddCol({ name: 'certifications', label_trans: 'op.certifications' }),
- AddCol({ name: 'intro', label_trans: 'op.intro' , fieldtype: tools.FieldType.html }),
+ AddCol({ name: 'intro', label_trans: 'op.intro', fieldtype: tools.FieldType.html }),
AddCol({ name: 'info', label_trans: 'op.info', fieldtype: tools.FieldType.html }),
AddCol({ name: 'webpage', label_trans: 'op.webpage' }),
AddCol({ name: 'days_working', label_trans: 'op.days_working' }),
AddCol({ name: 'facebook', label_trans: 'op.facebook' }),
- AddCol(DeleteRec)]
+ AddCol(DeleteRec),
+ AddCol(DuplicateRec)
+]
const colTableEvents = [
AddCol({ name: '_id', label_trans: 'event._id' }),
- AddCol({ name: 'typol', label_trans: 'event.typol' }),
+ AddCol({ name: 'typol', label_trans: 'event.typol', fieldtype: tools.FieldType.select, jointable: 'disciplines' }),
AddCol({ name: 'short_tit', label_trans: 'event.short_tit' }),
AddCol({ name: 'title', label_trans: 'event.title' }),
- AddCol({ name: 'details', label_trans: 'event.details' }),
+ AddCol({ name: 'details', label_trans: 'event.details', fieldtype: tools.FieldType.html }),
+ AddCol({ name: 'bodytext', label_trans: 'event.bodytext', fieldtype: tools.FieldType.html }),
AddCol({ name: 'dateTimeStart', label_trans: 'event.dateTimeStart', fieldtype: tools.FieldType.date }),
AddCol({ name: 'dateTimeEnd', label_trans: 'event.dateTimeEnd', fieldtype: tools.FieldType.date }),
AddCol({ name: 'bgcolor', label_trans: 'event.bgcolor' }),
@@ -98,11 +198,21 @@ const colTableEvents = [
AddCol({ name: 'img_small', label_trans: 'event.img_small' }),
AddCol({ name: 'img', label_trans: 'event.img' }),
AddCol({ name: 'wherecode', label_trans: 'event.where', fieldtype: tools.FieldType.select, jointable: 'wheres' }),
- AddCol({ name: 'contribtype', label_trans: 'event.contribtype', fieldtype: tools.FieldType.select, jointable: 'contribtype' }),
+ AddCol({
+ name: 'contribtype',
+ label_trans: 'event.contribtype',
+ fieldtype: tools.FieldType.select,
+ jointable: 'contribtype'
+ }),
AddCol({ name: 'price', label_trans: 'event.price' }),
AddCol({ name: 'infoafterprice', label_trans: 'event.infoafterprice' }),
AddCol({ name: 'teacher', label_trans: 'event.teacher', fieldtype: tools.FieldType.select, jointable: 'operators' }),
- AddCol({ name: 'teacher2', label_trans: 'event.teacher2', fieldtype: tools.FieldType.select, jointable: 'operators' }),
+ AddCol({
+ name: 'teacher2',
+ label_trans: 'event.teacher2',
+ fieldtype: tools.FieldType.select,
+ jointable: 'operators'
+ }),
AddCol({ name: 'infoextra', label_trans: 'event.infoextra' }),
AddCol({ name: 'linkpage', label_trans: 'event.linkpage' }),
AddCol({ name: 'linkpdf', label_trans: 'event.linkpdf' }),
@@ -113,21 +223,24 @@ const colTableEvents = [
AddCol({ name: 'dupId', label_trans: 'event.dupId' }),
AddCol({ name: 'modified', label_trans: 'event.modified', fieldtype: tools.FieldType.boolean }),
AddCol(DeleteRec),
- AddCol({
- name: 'copyrec',
- label_trans: 'event.duplicate',
- align: 'right',
- field: tools.NOFIELD,
- sortable: false,
- icon: 'fas fa-copy',
- action: lists.MenuAction.DUPLICATE_RECTABLE,
- askaction: 'db.duplicatedrecord',
- visuonlyEditVal: true,
- required: true,
- visible: true
- })
+ AddCol(DuplicateRec)
]
+export const fields = {
+ colSettings: [
+ AddCol({ name: 'key', label_trans: 'col.label' }),
+ AddCol({ name: 'type', label_trans: 'col.type', fieldtype: tools.FieldType.select, jointable: 'fieldstype' }),
+ AddCol({ name: 'value_str', label_trans: 'col.value', fieldtype: tools.FieldType.string }),
+ AddCol({ name: 'value_date', label_trans: 'cal.data', fieldtype: tools.FieldType.date }),
+ AddCol({ name: 'value_num', label_trans: 'cal.num', fieldtype: tools.FieldType.number }),
+ AddCol({ name: 'value_bool', label_trans: 'cal.bool', fieldtype: tools.FieldType.boolean }),
+ AddCol({ name: 'serv', label_trans: 'cal.serv', fieldtype: tools.FieldType.boolean }),
+ AddCol(DeleteRec),
+ AddCol(DuplicateRec)
+ ]
+
+}
+
export const fieldsTable = {
getArrStrByValueBinary(mythis, col: IColGridTable, val) {
const arr = this.getArrByValueBinary(mythis, col, val)
@@ -175,6 +288,32 @@ export const fieldsTable = {
}
},
+ getMultiValueByTable(col: IColGridTable, arrval) {
+ if (col.jointable) {
+ const mylist = this.getTableJoinByName(col.jointable)
+ const key = this.getKeyByTable(col.jointable)
+ const collab = this.getLabelByTable(col.jointable)
+
+ // console.table(mylist)
+ // console.log('key=', key, 'collab', collab, 'val', val)
+
+ const myris = mylist.filter((myrec) => arrval.includes(myrec[key]))
+ // console.log('myris', myris)
+ if (myris) {
+ console.log('collab', collab)
+ if (tools.isObject(collab))
+ return myris.map(collab)
+ else
+ return myris.map((rec) => rec[collab])
+ } else {
+ return ''
+ }
+
+ } else {
+ return ''
+ }
+ },
+
getColByTable(table) {
if (table === 'permissions') {
return ['value', 'label']
@@ -206,6 +345,10 @@ export const fieldsTable = {
else
return 'label'
},
+ getTitleByTable(mytable): string {
+ const myrec = this.getrecTableList(mytable)
+ return myrec.label
+ },
getIconByTable(mytable): string {
const myrec = this.getrecTableList(mytable)
if (myrec)
@@ -213,13 +356,30 @@ export const fieldsTable = {
else
return ''
},
+
+
+
+
+ // IColGridTable
+ colTableUsers: [
+ AddCol({ name: 'username', label_trans: 'reg.username' }),
+ AddCol({ name: 'name', label_trans: 'reg.name' }),
+ AddCol({ name: 'surname', label_trans: 'reg.surname' }),
+ AddCol({ name: 'email', label_trans: 'reg.email' }),
+ AddCol({ name: 'cell', label_trans: 'reg.cell' }),
+ AddCol({ name: 'profile.img', field: 'profile', subfield: 'img', label_trans: 'reg.img', sortable: false }),
+ AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: tools.FieldType.date }),
+ AddCol({ name: 'perm', label_trans: 'reg.perm', fieldtype: tools.FieldType.binary, jointable: 'permissions' }),
+ AddCol(DeleteRec)
+ ],
+
tablesList: [
{
value: 'operators',
label: 'Insegnanti',
columns: colTableOperator,
colkey: 'username',
- collabel: 'username'
+ collabel: (rec) => rec.name + ' ' + rec.surname
},
{
value: 'wheres',
@@ -242,51 +402,73 @@ export const fieldsTable = {
colkey: '_id',
collabel: 'label'
},
+ {
+ value: 'disciplines',
+ label: 'Discipline',
+ columns: coldisciplines,
+ colkey: 'typol_code',
+ collabel: 'label'
+ },
+
+ {
+ value: 'newstosent',
+ label: 'Newsletter da Inviare',
+ columns: colnewstosent,
+ colkey: '_id',
+ collabel: 'label',
+ onlyAdmin: true
+ },
+ {
+ value: 'templemail',
+ label: 'Template Email',
+ columns: coltemplemail,
+ colkey: '_id',
+ collabel: 'subject',
+ onlyAdmin: true
+ },
+ {
+ value: 'opzemail',
+ label: 'Opzioni Email',
+ columns: colopzemail,
+ colkey: 'key',
+ collabel: (rec) => rec.label_it,
+ onlyAdmin: true
+ },
+ {
+ value: 'mailinglist',
+ label: 'MailingList',
+ columns: colmailinglist,
+ colkey: '_id',
+ collabel: (rec) => rec.name + ' ' + rec.surname
+ },
{
value: 'permissions',
label: 'Permessi',
columns: colTablePermission,
colkey: 'value',
collabel: 'label',
- colicon: 'icon'
+ colicon: 'icon',
+ noshow: true,
},
{
value: 'fieldstype',
label: 'Tipi di Campi',
colkey: 'value',
- collabel: 'label'
+ collabel: 'label',
+ noshow: true,
},
{
value: 'settings',
label: 'Impostazioni',
- columns: colsettings,
+ columns: fields.colSettings,
colkey: 'key',
collabel: 'key'
- },
- ],
-
- // IColGridTable
- colTableUsers: [
- AddCol({ name: 'username', label_trans: 'reg.username' }),
- AddCol({ name: 'name', label_trans: 'reg.name' }),
- AddCol({ name: 'surname', label_trans: 'reg.surname' }),
- AddCol({ name: 'email', label_trans: 'reg.email' }),
- AddCol({ name: 'cell', label_trans: 'reg.cell' }),
- AddCol({ name: 'profile.img', field: 'profile', subfield: 'img', label_trans: 'reg.img', sortable: false }),
- AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: tools.FieldType.date }),
- AddCol({ name: 'perm', label_trans: 'reg.perm', fieldtype: tools.FieldType.binary, jointable: 'permissions' }),
- AddCol(DeleteRec),
- AddCol({
- name: 'copyrec',
- label_trans: 'event.duplicate',
- align: 'right',
- field: tools.NOFIELD,
- sortable: false,
- icon: 'fas fa-copy',
- action: lists.MenuAction.DUPLICATE_RECTABLE,
- askaction: 'db.duplicatedrecord',
- visuonlyEditVal: true,
- visible: true
- })
+ }
]
}
+
+export const func = {
+ gettablesList() {
+ return fieldsTable.tablesList.filter((rec) => (rec.onlyAdmin === UserStore.state.isAdmin) || (!rec.onlyAdmin) && (!rec.noshow))
+ }
+}
diff --git a/src/store/Modules/serv_constants.ts b/src/store/Modules/serv_constants.ts
index 1823665..e1ee7df 100644
--- a/src/store/Modules/serv_constants.ts
+++ b/src/store/Modules/serv_constants.ts
@@ -5,18 +5,22 @@ export const serv_constants = {
RIS_CODE_ERR: -99,
RIS_CODE_EMAIL_ALREADY_VERIFIED: -5,
RIS_CODE_EMAIL_VERIFIED: 1,
-
RIS_CODE_ERR_UNAUTHORIZED: -30,
- RIS_CODE_LOGIN_ERR_GENERIC: -20,
+ RIS_CODE_LOGIN_ERR_GENERIC: -20,
RIS_CODE_LOGIN_ERR: -10,
+
RIS_CODE_OK: 1,
RIS_CODE_LOGIN_OK: 1,
-
RIS_CODE__HTTP_FORBIDDEN_INVALID_TOKEN: 403,
RIS_SUBSCRIBED_OK: 1,
RIS_SUBSCRIBED_ALREADYEXIST: 2,
- RIS_SUBSCRIBED_ERR: -1
+ RIS_SUBSCRIBED_ERR: -1,
+ RIS_SUBSCRIBED_STR: 'subscribed',
+
+ RIS_UNSUBSCRIBED_OK: 5,
+ RIS_UNSUBSCRIBED_STR: 'unsubscribed',
+ RIS_UNSUBSCRIBED_NOT_EXIST: -5,
}
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 3e7e1e7..165cdf6 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -5,6 +5,7 @@ import { toolsext } from './toolsext'
import { translation } from './translation'
import Quasar, { colors, date, Screen } from 'quasar'
import { scroll } from 'quasar'
+
const { getScrollTarget, setScrollPosition } = scroll
import {
@@ -64,6 +65,11 @@ export const tools = {
],
TABEVENTS: 'myevents',
+ TABNEWSLETTER: 'newstosent',
+ TABMAILINGLIST: 'mailinglist',
+ TABMYPAGE: 'mypage',
+ TABTEMPLEMAIL: 'templemail',
+ TABOPZEMAIL: 'opzemail',
MAX_CHARACTERS: 60,
projects: 'projects',
@@ -131,6 +137,8 @@ export const tools = {
select: 32,
number: 64,
typeinrec: 128,
+ multiselect: 256,
+ password: 512,
},
FieldTypeArr: [
@@ -1371,6 +1379,11 @@ export const tools = {
return result
},
+ visumenu(elem) { // : IListRoutes
+ return (elem.onlyAdmin && UserStore.state.isAdmin) || (elem.onlyManager && UserStore.state.isManager)
+ || ((!elem.onlyAdmin) && (!elem.onlyManager))
+ },
+
executefunc(myself: any, table, func: number, par: IParamDialog) {
if (func === lists.MenuAction.DELETE) {
console.log('param1', par.param1)
@@ -1724,6 +1737,62 @@ export const tools = {
return ''
},
+ getstrShortDate(mydate) {
+ const DateFormatter = new Intl.DateTimeFormat(func_tools.getLocale() || void 0, {
+ weekday: 'long',
+ day: 'numeric',
+ month: 'short',
+ year: 'numeric'
+ // timeZone: 'UTC'
+ })
+ try {
+ if (DateFormatter) {
+ const date1 = new Date(mydate)
+ return DateFormatter.format(date1)
+ }
+ return mydate
+ } catch (e) {
+ return ''
+ }
+
+ },
+ getstrVeryShortDate(mydate) {
+ const DateFormatter = new Intl.DateTimeFormat(func_tools.getLocale() || void 0, {
+ weekday: 'short',
+ day: 'numeric',
+ month: 'short',
+ // timeZone: 'UTC'
+ })
+ try {
+ if (DateFormatter) {
+ const date1 = new Date(mydate)
+ return DateFormatter.format(date1)
+ }
+ return mydate
+ } catch (e) {
+ return ''
+ }
+
+ },
+
+ getstrVeryVeryShortDate(mydate) {
+ const DateFormatter = new Intl.DateTimeFormat(func_tools.getLocale() || void 0, {
+ weekday: 'long',
+ day: 'numeric',
+ // timeZone: 'UTC'
+ })
+ try {
+ if (DateFormatter) {
+ const date1 = new Date(mydate)
+ return DateFormatter.format(date1)
+ }
+ return mydate
+ } catch (e) {
+ return ''
+ }
+
+ },
+
getstrDateTimeEvent(mythis, myevent, withhtml) {
let mystr = ''
// is same day?
@@ -1741,7 +1810,7 @@ export const tools = {
mystr = `${tools.getstrDate(myevent.dateTimeStart)}
${mythis.$t('cal.starttime')} ${ tools.getstrTime(myevent.dateTimeStart) }
${ mythis.$t('cal.enddate')} ${tools.getstrDate(myevent.dateTimeEnd)}
- ${ mythis.$t('cal.endtime')}: ${ tools.getstrTime(myevent.dateTimeEnd) } `
+ ${ mythis.$t('cal.endtime')} ${ tools.getstrTime(myevent.dateTimeEnd) } `
}
if (myevent.infoextra) {
@@ -1754,6 +1823,34 @@ export const tools = {
return mystr
},
+ getstrDateTimeEventSimple(mythis, myevent) {
+ let mystr = ''
+ // is same day?
+ if (tools.getstrShortDate(myevent.dateTimeStart) === tools.getstrShortDate(myevent.dateTimeEnd)) {
+ mystr = `${tools.getstrShortDate(myevent.dateTimeStart)}
+ - ${ tools.getstrTime(myevent.dateTimeStart) }`
+ } else {
+ mystr = `${tools.getstrVeryVeryShortDate(myevent.dateTimeStart)} - ${ tools.getstrShortDate(myevent.dateTimeEnd) }`
+
+ }
+
+ return mystr
+ },
+
+ getstrDateTimeEventShort(mythis, myevent) {
+ let mystr = ''
+ // is same day?
+ if (tools.getstrShortDate(myevent.dateTimeStart) === tools.getstrShortDate(myevent.dateTimeEnd)) {
+ mystr = `${tools.getstrVeryShortDate(myevent.dateTimeStart)}
+ h. ${ tools.getstrTime(myevent.dateTimeStart) }`
+ } else {
+ mystr = `${tools.getstrVeryShortDate(myevent.dateTimeStart)} - ${ tools.getstrVeryShortDate(myevent.dateTimeEnd) }`
+
+ }
+
+ return mystr
+ },
+
getstrDateTime(mytimestamp) {
// console.log('getstrDate', mytimestamp)
if (!!mytimestamp)
@@ -1762,6 +1859,22 @@ export const tools = {
return ''
},
+ getstrDateTimeAll(mytimestamp) {
+ // console.log('getstrDate', mytimestamp)
+ if (!!mytimestamp)
+ return date.formatDate(mytimestamp, 'DD/MM/YYYY HH:mm:ss')
+ else
+ return ''
+ },
+
+ getstrTimeAll(mytimestamp) {
+ // console.log('getstrDate', mytimestamp)
+ if (!!mytimestamp)
+ return date.formatDate(mytimestamp, 'HH:mm:ss')
+ else
+ return ''
+ },
+
getstrDateTimeShort(mytimestamp) {
// console.log('getstrDate', mytimestamp)
if (!!mytimestamp)
@@ -1812,7 +1925,7 @@ export const tools = {
} else {
return null
}
- console.log('mystrdate', mystrdate, strdate, mydate)
+ // console.log('mystrdate', mystrdate, strdate, mydate)
return mydate
}
,
@@ -1844,8 +1957,10 @@ export const tools = {
getDateNow() {
const mydate = new Date()
return mydate
- }
- ,
+ },
+ getDateNowEvent() {
+ return tools.addDays(tools.getDateNow(), -1)
+ },
getDateNull() {
return new Date(0)
}
@@ -2078,8 +2193,7 @@ export const tools = {
} else {
return '500'
}
- }
- ,
+ },
styles_imgtitle(sized ?: string) {
if (!!sized) {
@@ -2277,6 +2391,15 @@ export const tools = {
},
+ getimgev(ev) {
+ if (!!ev.img_small)
+ return `statics/` + ev.img_small
+ else if (!!ev.img)
+ return `statics/` + ev.img
+ else
+ return ''
+ },
+
getimgbysize(dir: string, file: string) {
const myimage = dir + file
// console.log('includes = ', static_data.preLoadImages.map((a) => a.imgname).includes(myimage), myimage)
@@ -2292,6 +2415,15 @@ export const tools = {
return ris
},
+ getaltimg(dir: string, file: string, alt?: string) {
+ const myimage = dir + file
+ const myrec = static_data.preLoadImages.find((rec) => rec.imgname === myimage)
+ if (myrec)
+ return (myrec) ? myrec.alt : 'my image'
+ else
+ return alt
+ },
+
getimgFullpathbysize(fileimg: string) {
const ind = fileimg.lastIndexOf('/')
if (ind > 0) {
@@ -2502,7 +2634,7 @@ export const tools = {
const mydata = {
table,
- data
+ data,
}
return await
@@ -2522,7 +2654,38 @@ export const tools = {
},
getwidth(mythis) {
// return height()
- return mythis.$q.screen.width
+ let myw = mythis.$q.screen.width
+ if (GlobalStore.state.leftDrawerOpen)
+ myw -= 300
+ // if (GlobalStore.state.RightDrawerOpen)
+ // myw -= 300
+ return myw
+
+ },
+
+ getwidthscale(mythis, mywidth, maxwidth) {
+ if (this.isMobile()) {
+ if (mywidth > this.getwidth(mythis) - 20)
+ mywidth = this.getwidth(mythis) - 20
+
+ return mywidth
+ } else {
+ // console.log('this.getwidth(mythis) = ', this.getwidth(mythis))
+ let myw = mywidth + ((this.getwidth(mythis) - mywidth) * 0.6)
+ // console.log('myw1 = ', myw)
+ if (myw > maxwidth)
+ myw = maxwidth
+ if (myw > this.getwidth(mythis) - 20)
+ myw = this.getwidth(mythis) - 20
+
+ // console.log('myw = ', myw)
+ return myw
+ }
+ },
+
+ getheightbywidth(mythis, mywidth, myheight, maxwidth) {
+ const myw = this.getwidthscale(mythis, mywidth, maxwidth)
+ return myw * (myheight / mywidth)
},
isIsoDate(str) {
@@ -2566,13 +2729,13 @@ export const tools = {
else
return 'primary'
},
- getCookie(mytok, oldval?) {
+ getCookie(mytok, def?) {
const ris = Cookies.get(mytok)
console.log('getCookie', ris)
if (!!ris) {
return ris
} else {
- return oldval
+ return def
}
},
@@ -2610,8 +2773,10 @@ export const tools = {
setScrollPosition(target, offset, duration)
},
getCellForWhatsapp(numbercell) {
+ if (!numbercell)
+ return ''
let mynum = numbercell.replace(/\-/g, '')
- const intcode = GlobalStore.getters.getValueSettingsByKey('INT_CODE')
+ const intcode = GlobalStore.getters.getValueSettingsByKey('INT_CODE', false)
if (numbercell.substring(0, 1) !== '+')
mynum = intcode + mynum
else
@@ -2621,12 +2786,46 @@ export const tools = {
},
getHttpForWhatsapp(numbercell) {
+ if (!numbercell)
+ return ''
const mynum = this.getCellForWhatsapp(numbercell)
if (mynum)
return 'https://wa.me/' + mynum
else
return ''
- }
+ },
+
+ getHttpForTelegram(usertelegram) {
+ if (usertelegram)
+ return 'https://t.me/' + usertelegram
+ else
+ return ''
+ },
+ metafunc(mythis) {
+ return {
+ title: mythis.$t('msg.myAppName'),
+ titleTemplate: (title) => `${mythis.mymeta.title} - ${mythis.$t('msg.myAppName')}`,
+ meta: {
+ keywords: {
+ name: 'keywords',
+ content: mythis.mymeta.keywords
+ },
+ description: {
+ name: 'description',
+ content: mythis.mymeta.description
+ },
+ equiv: { 'http-equiv': 'Content-Type', 'content': 'text/html; charset=UTF-8' }
+ }
+ }
+ },
+ isObject(anything) {
+ //Object.create(null) instanceof Object → false
+ return Object(anything) === anything
+ },
+ isDebug() {
+ return process.env.DEV
+ },
+
// getLocale() {
// if (navigator.languages && navigator.languages.length > 0) {
diff --git a/src/typings/libs/axios.d.ts b/src/typings/libs/axios.d.ts
index 006888b..a9404d4 100644
--- a/src/typings/libs/axios.d.ts
+++ b/src/typings/libs/axios.d.ts
@@ -5,4 +5,3 @@ declare module 'vue/types/vue' {
$axios: axios
}
}
-
diff --git a/src/typings/libs/globalroutines.d.ts b/src/typings/libs/globalroutines.d.ts
index 265acb3..447fc1c 100644
--- a/src/typings/libs/globalroutines.d.ts
+++ b/src/typings/libs/globalroutines.d.ts
@@ -5,4 +5,3 @@ declare module 'vue/types/vue' {
$globalroutines: globalroutines
}
}
-
diff --git a/src/views/admin/TableOnlyView/tableOnlyView.ts b/src/views/admin/TableOnlyView/tableOnlyView.ts
index 5fbc8a6..74e9c96 100644
--- a/src/views/admin/TableOnlyView/tableOnlyView.ts
+++ b/src/views/admin/TableOnlyView/tableOnlyView.ts
@@ -3,7 +3,6 @@ import { Component } from 'vue-property-decorator'
import { GlobalStore, UserStore } from '@store'
-
@Component({})
export default class TableOnlyView extends Vue {
public loading: boolean = false
@@ -28,8 +27,7 @@ export default class TableOnlyView extends Vue {
public filter: string = ''
public selected: any[] = []
-
- request(props) {
+ public request(props) {
this.loading = true
setTimeout(() => {
this.serverPagination = props.pagination
@@ -53,7 +51,7 @@ export default class TableOnlyView extends Vue {
}, 1500)
}
- mounted() {
+ public mounted() {
this.request({
pagination: this.serverPagination,
filter: this.filter
diff --git a/src/views/admin/cfgServer/cfgServer.ts b/src/views/admin/cfgServer/cfgServer.ts
index 6b0a6be..ec7dd90 100644
--- a/src/views/admin/cfgServer/cfgServer.ts
+++ b/src/views/admin/cfgServer/cfgServer.ts
@@ -52,7 +52,7 @@ export default class CfgServer extends Vue {
}
public SaveValue(newVal, valinitial) {
- console.log('SaveValue', newVal, 'selected', this.selected)
+ // console.log('SaveValue', newVal, 'selected', this.selected)
const mydata = {
chiave: this.keysel,
diff --git a/src/views/admin/testp1/testp1.ts b/src/views/admin/testp1/testp1.ts
index 8d16fde..8aeab2a 100644
--- a/src/views/admin/testp1/testp1.ts
+++ b/src/views/admin/testp1/testp1.ts
@@ -23,11 +23,12 @@ export default class Testp1 extends Vue {
public testpao1_array: (state: IGlobalState, miorec: ICfgServer) => ICfgServer[]
@Watch('GlobalStore.state.testp1.mioarray', { immediate: true, deep: true })
- array_changed() {
+ public array_changed() {
console.log('*** array_changed *** ', GlobalStore.state.testp1.mioarray[GlobalStore.state.testp1.mioarray.length - 1])
}
- @Watch('$route.params.category') changecat() {
+ @Watch('$route.params.category')
+ public changecat() {
// this.mytypetransgroup = ''
console.log('PRIMA this.paramcategory', this.paramcategory)
this.paramcategory = this.$route.params.category
diff --git a/src/views/messages/messages.vue b/src/views/messages/messages.vue
index d9900c0..cf44daa 100644
--- a/src/views/messages/messages.vue
+++ b/src/views/messages/messages.vue
@@ -36,7 +36,7 @@
- ![]()
+ ![]()
@@ -101,7 +101,7 @@
bg-color="grey-2">
- ![]()
+ ![]()