diff --git a/src/components/CNextZoom/CNextZoom.scss b/src/components/CNextZoom/CNextZoom.scss new file mode 100644 index 0000000..45944f3 --- /dev/null +++ b/src/components/CNextZoom/CNextZoom.scss @@ -0,0 +1,15 @@ +.zoom_data{ + font-size:1rem; +} + +.title { + font-weight: bold; +} + +.id_conf{ + font-weight: normal; +} + +.note{ + font-style: italic; +} diff --git a/src/components/CNextZoom/CNextZoom.ts b/src/components/CNextZoom/CNextZoom.ts new file mode 100644 index 0000000..a1a38db --- /dev/null +++ b/src/components/CNextZoom/CNextZoom.ts @@ -0,0 +1,30 @@ +import { Component, Prop, Watch } from 'vue-property-decorator' +import { INotData } from '../../model/index' +import { tools } from '../../store/Modules/tools' +import { NotevoleStore } from '@store' +import MixinBase from '@src/mixins/mixin-base' +import { validationMixin } from 'vuelidate' +import { validations } from '../CSignUpNotevole/CSignUp-validate' +import { CTitleBanner } from '@components' +import { CCardState } from '../CCardState' +import { UserStore } from '../../store/Modules' +import { GlobalStore } from '../../store' + +@Component({ + name: 'CStatusReg', + components: { CTitleBanner, CCardState } +}) + +export default class CNextZoom extends MixinBase { + public $t + + get listacalzoom() { + return GlobalStore.state.calzoom + } + + get nextconf() { + if (!!this.listacalzoom) { + return tools.getstrTime(this.listacalzoom[0].date_start) + } + } +} diff --git a/src/components/CNextZoom/CNextZoom.vue b/src/components/CNextZoom/CNextZoom.vue new file mode 100644 index 0000000..a2c88a9 --- /dev/null +++ b/src/components/CNextZoom/CNextZoom.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/src/components/CNextZoom/index.ts b/src/components/CNextZoom/index.ts new file mode 100644 index 0000000..64955e9 --- /dev/null +++ b/src/components/CNextZoom/index.ts @@ -0,0 +1 @@ +export {default as CNextZoom} from './CNextZoom.vue' diff --git a/src/components/CStatusReg/CStatusReg.ts b/src/components/CStatusReg/CStatusReg.ts index 000563b..f643d83 100644 --- a/src/components/CStatusReg/CStatusReg.ts +++ b/src/components/CStatusReg/CStatusReg.ts @@ -124,20 +124,6 @@ export default class CStatusReg extends MixinBase { return 0 } - public geticon(reg) { - if (reg.profile.nationality === 'IT') - return 'fa-flag-it' - else if (reg.profile.nationality === 'ES') - return 'fa-flag-es' - else if (reg.profile.nationality === 'US') - return 'fa-flag-us' - else if ((reg.profile.nationality === 'GB') || (reg.profile.nationality === 'UK')) - return 'fa-flag-gb' - else if (reg.profile.nationality === 'DE') - return 'fa-flag-de' - - return '' - } get visustat() { return this.datastat.num_reg > 0 || this.datastat.num_reg_lista > 0 diff --git a/src/components/CStatusReg/CStatusReg.vue b/src/components/CStatusReg/CStatusReg.vue index 686d85c..c6d272f 100644 --- a/src/components/CStatusReg/CStatusReg.vue +++ b/src/components/CStatusReg/CStatusReg.vue @@ -19,7 +19,7 @@ - + diff --git a/src/components/index.ts b/src/components/index.ts index 49a1103..b698b46 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -43,3 +43,4 @@ export * from './CStatus' export * from './CStatusReg' export * from './CCardState' export * from './CMyInnerPage' +export * from './CNextZoom' diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 818d4d8..9937500 100644 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -85,6 +85,16 @@ export interface INewsToSent { error_job?: string } +export interface ICalZoom { + lang?: string + title?: string + typeconf?: string + date_start?: string + date_end?: Date + id_conf_zoom?: number + note?: string +} + export interface IMailinglist { name?: string surname?: string @@ -158,6 +168,7 @@ export interface IGlobalState { templemail: ITemplEmail[], opzemail: ISettings[], mailinglist: IMailinglist[], + calzoom: ICalZoom[], autoplaydisc: number } diff --git a/src/rootgen/admin/extraList/extraList.scss b/src/rootgen/admin/extraList/extraList.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/rootgen/admin/extraList/extraList.ts b/src/rootgen/admin/extraList/extraList.ts new file mode 100644 index 0000000..714f363 --- /dev/null +++ b/src/rootgen/admin/extraList/extraList.ts @@ -0,0 +1,17 @@ +import Vue from 'vue' +import { Component } from 'vue-property-decorator' + +import { CGridTableRec } from '@components' +import { CMyPage } from '../../../components/CMyPage/index' +import { fieldsTable } from '@src/store/Modules/fieldsTable' + +@Component({ + components: { CGridTableRec, CMyPage } +}) + +export default class ExtraList extends Vue { + + get db_fieldsTable() { + return fieldsTable + } +} diff --git a/src/rootgen/admin/extraList/extraList.vue b/src/rootgen/admin/extraList/extraList.vue new file mode 100644 index 0000000..1957556 --- /dev/null +++ b/src/rootgen/admin/extraList/extraList.vue @@ -0,0 +1,18 @@ + + + + diff --git a/src/rootgen/admin/extraList/index.ts b/src/rootgen/admin/extraList/index.ts new file mode 100644 index 0000000..8679250 --- /dev/null +++ b/src/rootgen/admin/extraList/index.ts @@ -0,0 +1 @@ +export {default as extraList} from './extraList.vue' diff --git a/src/rootgen/admin/zoomList/index.ts b/src/rootgen/admin/zoomList/index.ts new file mode 100644 index 0000000..cff9486 --- /dev/null +++ b/src/rootgen/admin/zoomList/index.ts @@ -0,0 +1 @@ +export {default as zoomList} from './zoomList.vue' diff --git a/src/rootgen/admin/zoomList/zoomList.scss b/src/rootgen/admin/zoomList/zoomList.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/rootgen/admin/zoomList/zoomList.ts b/src/rootgen/admin/zoomList/zoomList.ts new file mode 100644 index 0000000..452d1da --- /dev/null +++ b/src/rootgen/admin/zoomList/zoomList.ts @@ -0,0 +1,17 @@ +import Vue from 'vue' +import { Component } from 'vue-property-decorator' + +import { CGridTableRec } from '@components' +import { CMyPage } from '../../../components/CMyPage/index' +import { fieldsTable } from '@src/store/Modules/fieldsTable' + +@Component({ + components: { CGridTableRec, CMyPage } +}) + +export default class ZoomList extends Vue { + + get db_fieldsTable() { + return fieldsTable + } +} diff --git a/src/rootgen/admin/zoomList/zoomList.vue b/src/rootgen/admin/zoomList/zoomList.vue new file mode 100644 index 0000000..49cb05d --- /dev/null +++ b/src/rootgen/admin/zoomList/zoomList.vue @@ -0,0 +1,20 @@ + + + + + + diff --git a/src/statics/i18n.js b/src/statics/i18n.js index 9ea9e81..1e3cffd 100644 --- a/src/statics/i18n.js +++ b/src/statics/i18n.js @@ -18,6 +18,7 @@ const msgglobal = { eventlist: 'Le tue Prenotazioni', usereventlist: 'Prenotazioni Utenti', userlist: 'Lista Utenti', + zoomlist: 'Calendario Zoom', extralist: 'Lista Extra', tableslist: 'Lista Tabelle', newsletter: 'Newsletter', @@ -41,7 +42,7 @@ const msgglobal = { paymenttype: 'Modalità di Pagamento', paymenttype_long: 'Scegliere almeno 2 Modalità di Pagamento, per permettere alle persone di poter scegliere come inviare il dono.', zoom: 'Partecipo agli Zoom (Video Conferenza)', - zoom_long: 'Si richiede di oartecipare ad almeno 1 Zoom, ma è consigliato prendere parte al movimento in maniera più attiva.', + zoom_long: 'Si richiede di partecipare ad almeno 1 Zoom, ma è consigliato prendere parte al movimento in maniera più attiva.', sharemovement: 'Condivido il Movimento', sharemovement_long: 'Condivido il Movimento con almeno 2 amici e li guido alla registrazione e agli zoom', enter_prog: 'Entro in Programmazione', diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts index 32fe706..a15ae5e 100644 --- a/src/store/Modules/GlobalStore.ts +++ b/src/store/Modules/GlobalStore.ts @@ -79,7 +79,8 @@ const state: IGlobalState = { newstosent: [], gallery: [], mailinglist: [], - mypage: [] + mypage: [], + calzoom: [], } async function getConfig(id) { @@ -194,6 +195,8 @@ namespace Getters { return GlobalStore.state.mailinglist else if (table === tools.TABMYPAGE) return GlobalStore.state.mypage + else if (table === tools.TABCALZOOM) + return GlobalStore.state.calzoom else if (table === 'paymenttypes') return GlobalStore.state.paymenttypes else if (table === 'bookings') @@ -807,6 +810,7 @@ namespace Actions { GlobalStore.state.disciplines = (res.data.disciplines) ? [...res.data.disciplines] : [] GlobalStore.state.paymenttypes = (res.data.paymenttypes) ? [...res.data.paymenttypes] : [] GlobalStore.state.gallery = (res.data.gallery) ? [...res.data.gallery] : [] + GlobalStore.state.calzoom = (res.data.calzoom) ? [...res.data.calzoom] : [] if (showall) { GlobalStore.state.newstosent = (res.data.newstosent) ? [...res.data.newstosent] : [] diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 680e0ac..f0cf174 100644 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -391,7 +391,20 @@ export const fieldsTable = { return '' }, - // IColGridTable + colTableCalZoom: [ + // AddCol({ name: '_id', label_trans: 'reg.id' }), + AddCol({ name: 'title', label_trans: 'event.title' }), + AddCol({ name: 'lang', label_trans: 'pages.lang' }), + AddCol({ name: 'typeconf', label_trans: 'zoom.typeconf' }), + AddCol({ name: 'date_start', label_trans: 'event.dateTimeStart', fieldtype: tools.FieldType.date }), + AddCol({ name: 'date_end', label_trans: 'event.dateTimeEnd' , fieldtype: tools.FieldType.date }), + AddCol({ name: 'id_conf_zoom', label_trans: 'zoom.id_conf_zooom' }), + AddCol({ name: 'note', label_trans: 'zoom.note' }), + AddCol(DeleteRec), + AddCol(DuplicateRec), + ], + + // IColGridTable colTableUsers: [ // AddCol({ name: '_id', label_trans: 'reg.id' }), AddCol({ name: 'username', label_trans: 'reg.username_short' }), diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 33320cc..ea3d376 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -75,6 +75,7 @@ export const tools = { TABGALLERY: 'gallery', TABMAILINGLIST: 'mailinglist', TABMYPAGE: 'mypage', + TABCALZOOM: 'calzoom', TABTEMPLEMAIL: 'templemail', TABOPZEMAIL: 'opzemail', @@ -1896,10 +1897,19 @@ export const tools = { return '' }, + getstrDateTimeShort(mytimestamp) { // console.log('getstrDate', mytimestamp) if (!!mytimestamp) - return date.formatDate(mytimestamp, 'DD/MM HH:mm') + return date.formatDate(mytimestamp, 'DD/MM HH:mm'); + else + return '' + }, + + getstrDateMonthTimeShort(mytimestamp) { + // console.log('getstrDate', mytimestamp) + if (!!mytimestamp) + return date.formatDate(mytimestamp, 'DD MMM HH:mm') else return '' }, @@ -3046,6 +3056,22 @@ export const tools = { return copy }, + geticon(langin) { + let lang = langin.toUpperCase() + if (lang === 'IT') + return 'fa-flag-it' + else if (lang === 'ES') + return 'fa-flag-es' + else if (lang === 'US') + return 'fa-flag-us' + else if ((lang === 'GB') || (lang === 'UK')) + return 'fa-flag-gb' + else if (lang === 'DE') + return 'fa-flag-de' + + return '' + }, + // getLocale() { // if (navigator.languages && navigator.languages.length > 0) {