{{myop.sub2}}
- {{myop.sub3}}
+ {{myop.disciplines}}
+ {{myop.certifications}}
-
{{myop.name}}
- {{myop.sub1}}
+ {{myop.name}} {{myop.surname}}
+ {{myop.qualification}}
{{myop.sub2}}
- {{myop.sub3}}
+ {{myop.disciplines}}
+ {{myop.certifications}}
+
+
-
-
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ tools.getstrDateTime(myvalue) }}
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CMyPopupEdit/index.ts b/src/components/CMyPopupEdit/index.ts
new file mode 100644
index 0000000..be462fe
--- /dev/null
+++ b/src/components/CMyPopupEdit/index.ts
@@ -0,0 +1 @@
+export {default as CMyPopupEdit} from './CMyPopupEdit.vue'
diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts
index e11cbdc..715b34d 100644
--- a/src/components/CMySelect/CMySelect.ts
+++ b/src/components/CMySelect/CMySelect.ts
@@ -3,7 +3,6 @@ import { Component, Prop, Watch } from 'vue-property-decorator'
import { tools } from '../../store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
-import { IPerson } from '../../model/GlobalStore'
@Component({
name: 'CMySelect'
@@ -26,14 +25,7 @@ export default class CMySelect extends Vue {
return tools
}
- public nothing() {
-
- }
-
public changeval(newval) {
- // console.log('changeval', newval)
- // const newvallab = newval[`${this.optval}`]
- // this.myvalue = newvallab
this.$emit('update:value', newval)
}
diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue
index 1014b7a..e7de09e 100644
--- a/src/components/CMySelect/CMySelect.vue
+++ b/src/components/CMySelect/CMySelect.vue
@@ -2,8 +2,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ visuValByType(myvalue, col, row) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ visuValByType(myvalue, col, row) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('homepage.titlecontatti')}}
- +
+
+ {{ getValDb('MAIN_EMAIL')
+ }}
+
+
+ {{ rec.name }}: {{ rec.phone }}
+
+
+
+ {{rec.email}}
+
+
+
orari per chiamate:
+
+
+
+
-
+
-
@@ -136,9 +137,8 @@
-
- ![]()
-
+
diff --git a/src/components/index.ts b/src/components/index.ts
index f52577b..e091501 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -7,6 +7,8 @@ export * from './CBook'
export * from './CMyPage'
export * from './CTitle'
export * from './CMySelect'
+export * from './CMyAvatar'
+export * from './CMyPopupEdit'
export * from './CMyToggleList'
export * from './CMyChipList'
export * from './CMyEditor'
diff --git a/src/mixins/mixin-base.ts b/src/mixins/mixin-base.ts
new file mode 100644
index 0000000..72975e3
--- /dev/null
+++ b/src/mixins/mixin-base.ts
@@ -0,0 +1,43 @@
+import Vue from 'vue'
+
+import Component from 'vue-class-component'
+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'
+
+// You can declare a mixin as the same style as components.
+@Component
+export default class MixinBase extends Vue {
+ public mythis() {
+ return this
+ }
+
+ get toolsext() {
+ return toolsext
+ }
+
+ get func_tools() {
+ return func_tools
+ }
+
+ get tools() {
+ return tools
+ }
+
+ public getValDb(keystr) {
+ return GlobalStore.getters.getValueSettingsByKey(keystr)
+ }
+ public getarrValDb(keystr) {
+ const myval = GlobalStore.getters.getValueSettingsByKey(keystr)
+ // console.log('myval', myval)
+ if (myval) {
+ const myrec = JSON.parse(myval)
+ // console.log('*************** getarrValDb')
+ // console.table(myrec)
+ return myrec
+ } else {
+ return []
+ }
+ }
+}
diff --git a/src/mixins/mixin-operator.ts b/src/mixins/mixin-operator.ts
new file mode 100644
index 0000000..7aa741c
--- /dev/null
+++ b/src/mixins/mixin-operator.ts
@@ -0,0 +1,30 @@
+import Vue from 'vue'
+
+import Component from 'vue-class-component'
+import { CalendarStore } from '../store/Modules'
+import { UserStore } from '@modules'
+
+@Component
+export default class MixinOperator extends Vue {
+ public getOperators() {
+ return CalendarStore.state.operators
+ }
+
+ public getOperatorByUsername(username) {
+ return CalendarStore.getters.getOperatorByUsername(username)
+ }
+
+ public getImgTeacherByUsername(username) {
+ return `statics/images/` + CalendarStore.getters.getImgTeacherByUsername(username)
+ }
+
+ public getTeacherByUsername(username) {
+ const op = this.getOperatorByUsername(username)
+ if (!!op) {
+ return op.name + ' ' + op.surname
+ } else {
+ return ''
+ }
+ }
+
+}
diff --git a/src/mixins/mixin-users.ts b/src/mixins/mixin-users.ts
index bc76c28..caa19d5 100644
--- a/src/mixins/mixin-users.ts
+++ b/src/mixins/mixin-users.ts
@@ -1,7 +1,6 @@
import Vue from 'vue'
import { GlobalStore, UserStore, MessageStore } from '../store/Modules'
-
import Component from 'vue-class-component'
import { func_tools } from '../store/Modules/toolsext'
import { tools } from '../store/Modules/tools'
@@ -30,6 +29,10 @@ export default class MixinUsers extends Vue {
return `statics/` + UserStore.getters.getImgByUsername(username)
}
+ public isValidUsername(username) {
+ return username && username !== 'nessuno' && username !== 'none'
+ }
+
public getMyUsername() {
return UserStore.state.my.username
}
@@ -50,7 +53,8 @@ export default class MixinUsers extends Vue {
}
get getMyImg() {
- return 'statics/' + UserStore.getters.getImgByUsername(UserStore.state.my.username)
+ const ris = UserStore.getters.getImgByUsername(UserStore.state.my.username)
+ return (ris !== '') ? 'statics/' + ris : ''
}
get MenuCollapse() {
diff --git a/src/model/Calendar.ts b/src/model/Calendar.ts
index 103e567..a20aae8 100644
--- a/src/model/Calendar.ts
+++ b/src/model/Calendar.ts
@@ -1,3 +1,4 @@
+import { IOperators } from '@src/model/GlobalStore'
export interface IEvents {
_id?: any
@@ -41,18 +42,6 @@ export interface IBookedEvent {
booked: boolean
}
-export interface IOperators {
- username: string
- cell: string
- webpage?: string
- img: string
- skype?: string
- days_working?: string
- facebook?: string
- disciplines?: string
- offers?: string
-}
-
export interface IWheres {
code: string
placename: string
@@ -75,7 +64,6 @@ export interface IBookedEventPage {
state: EState
}
-
export interface ICalendarState {
editable: boolean
eventlist: IEvents[]
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 130d40c..8d3bee1 100644
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -26,6 +26,14 @@ export interface ICfgData {
userId?: string
}
+export interface ISettings {
+ key?: string
+ type?: number
+ value_str?: string
+ value_date?: Date,
+ value_num?: number
+}
+
export interface ITestp1 {
contatore: number
mioarray: ICfgServer[]
@@ -40,6 +48,7 @@ export interface IConfig {
}
export interface IGlobalState {
+ finishLoading: boolean
conta: number
wasAlreadySubOnDb: boolean
wasAlreadySubscribed: boolean
@@ -60,6 +69,7 @@ export interface IGlobalState {
listatodo: IMenuList[]
arrConfig: IConfig[]
lastaction: IAction
+ settings: ISettings[],
}
export interface IMenuList {
@@ -98,21 +108,22 @@ export interface IListRoutes {
separator?: boolean
}
-export interface IPerson {
- index?: number
- tab?: string
+export interface IOperators {
+ username: string
name: string
- sub1: string
- sub2?: string
- sub3?: string
- img: string
- cell?: string
+ surname: string
email?: string
+ qualification?: string
+ disciplines?: string
+ certifications?: string
+ img?: string
+ cell?: string
paginaweb?: string
paginafb?: string
intro?: string
info?: string
vario?: string
+ tab?: string
}
export interface IPreloadImages {
@@ -201,6 +212,7 @@ export interface IFunctionality {
ENABLE_PROJECTS_LOADING?: boolean
SHOW_NEWSLETTER?: boolean
SHOW_ONLY_POLICY?: boolean
+ SHOW_MESSAGES?: boolean
BOOKING_EVENTS?: boolean
}
@@ -215,6 +227,7 @@ export interface IParamsQuery {
export interface IColGridTable {
name: string
+ subfield?: string
required?: boolean
label?: string
label_trans?: string
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 8a34cb0..9a59682 100644
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -1,11 +1,16 @@
import { IToken } from 'model/other'
-export const DefaultUser: IUserFields = {
- email: '',
- username: '',
- name: '',
- surname: '',
- password: ''
+const enum ESexType {
+ None = 0,
+ Male = 1,
+ Female = 2
+}
+
+export interface IUserProfile {
+ img?: string
+ cell?: string
+ dateofbirth?: Date
+ sex?: ESexType
}
export interface IUserFields {
@@ -17,10 +22,10 @@ export interface IUserFields {
password?: string
ipaddr?: string
perm?: number
- img?: string
verified_email?: boolean
tokens?: IToken[]
lasttimeonline?: Date
+ profile?: IUserProfile
}
/*
diff --git a/src/statics/i18n.js b/src/statics/i18n.js
index fbfb566..d1d71b6 100644
--- a/src/statics/i18n.js
+++ b/src/statics/i18n.js
@@ -91,7 +91,7 @@ const msgglobal = {
incorso: 'Registrazione in corso...',
richiesto: 'Campo Richiesto',
email: 'Email',
- cell: 'Móvil',
+ cell: 'Telefono',
img: 'Immagine',
date_reg: 'Data Reg.',
perm: 'Permessi',
@@ -128,12 +128,23 @@ const msgglobal = {
}
},
+ op: {
+ qualification: 'Qualifica',
+ disciplines: 'Discipline',
+ certifications: 'Certificazioni',
+ intro: 'Introduzione',
+ info: 'Biografia',
+ webpage: 'Pagina Web',
+ days_working: 'Giorni Lavorativi',
+ facebook: 'Pagina Facebook',
+ },
login: {
page_title: 'Login',
incorso: 'Login in corso',
enter: 'Login',
errato: "Username o password errata. Riprovare",
completato: 'Login effettuato!',
+ needlogin: 'E\' necessario effettuare il login prima di continuare'
},
reset: {
title_reset_pwd: "Reimposta la tua Password",
@@ -253,7 +264,8 @@ const msgglobal = {
short_tit: 'Titolo Breve',
title: 'Titolo',
details: 'Dettagli',
- date: 'Data',
+ dateTimeStart: 'Data Inizio',
+ dateTimeEnd: 'Data Fine',
bgcolor: 'Colore Sfondo',
days: 'Giorni',
icon: 'Icona',
@@ -275,6 +287,7 @@ const msgglobal = {
canceled: 'Cancellato',
deleted: 'Eliminato',
duplicate: 'Duplica',
+ notempty: 'Il campo non può essere vuoto',
modified: 'Modificato'
},
newsletter: {
@@ -384,7 +397,7 @@ const msgglobal = {
incorso: 'Registro en curso...',
richiesto: 'Campo requerido',
email: 'Email',
- cell: 'Telefono',
+ cell: 'Móvil',
img: 'File image',
date_reg: 'Fecha Reg.',
perm: 'Permisos',
@@ -414,12 +427,23 @@ const msgglobal = {
sameaspassword: 'Las contraseñas deben ser idénticas',
}
},
+ op: {
+ qualification: 'Calificación',
+ disciplines: 'Disciplinas',
+ certifications: 'Certificaciones',
+ intro: 'Introducción',
+ info: 'Biografia',
+ webpage: 'Página web',
+ days_working: 'Días laborables',
+ facebook: 'Página de Facebook',
+ },
login: {
page_title: 'Login',
incorso: 'Login en curso',
enter: 'Entra',
errato: "Nombre de usuario, correo o contraseña incorrectos. inténtelo de nuevo",
completato: 'Login realizado!',
+ needlogin: 'Debes iniciar sesión antes de continuar',
},
reset: {
title_reset_pwd: "Restablece tu contraseña",
@@ -537,7 +561,8 @@ const msgglobal = {
short_tit: 'Título Corto',
title: 'Título',
details: 'Detalles',
- date: 'Fecha',
+ dateTimeStart: 'Fecha de Inicio',
+ dateTimeEnd: 'Fecha Final',
bgcolor: 'Color de fondo',
days: 'Días',
icon: 'Icono',
@@ -559,6 +584,7 @@ const msgglobal = {
canceled: 'Cancelado',
deleted: 'Eliminado',
duplicate: 'Duplica',
+ notempty: 'El campo no puede estar vacío.',
modified: 'Modificado'
},
newsletter: {
@@ -697,12 +723,23 @@ const msgglobal = {
sameaspassword: 'Les mots de passe doivent être identiques',
}
},
+ op: {
+ qualification: 'Qualification',
+ disciplines: 'Disciplines',
+ certifications: 'Certifications',
+ intro: 'Introduction',
+ info: 'Biographie',
+ webpage: 'Page Web',
+ days_working: 'Jours ouvrés',
+ facebook: 'Page Facebook',
+ },
login: {
page_title: 'Login',
incorso: 'Connexion en cours',
enter: 'Entrez',
errato: "Nom d'utilisateur, email ou mot de passe incorrect. réessayer",
completato: 'Connexion faite!',
+ needlogin: 'Vous devez vous connecter avant de continuer',
},
reset: {
title_reset_pwd: "Réinitialiser votre mot de passe",
@@ -820,7 +857,8 @@ const msgglobal = {
short_tit: 'Titre abrégé\'',
title: 'Titre',
details: 'Détails',
- date: 'Date',
+ dateTimeStart: 'Data Initiale',
+ dateTimeEnd: 'Date de fin',
bgcolor: 'Couleur de fond',
days: 'Journées',
icon: 'Icône',
@@ -842,6 +880,7 @@ const msgglobal = {
canceled: 'Annulé',
deleted: 'Supprimé',
duplicate: 'Duplique',
+ notempty: 'Le champ ne peut pas être vide',
modified: 'modifié'
},
newsletter: {
@@ -980,11 +1019,22 @@ const msgglobal = {
sameaspassword: 'Passwords must be identical',
}
},
+ op: {
+ qualification: 'Qualification',
+ disciplines: 'Disciplines',
+ certifications: 'Certifications',
+ intro: 'Introduction',
+ info: 'Biography',
+ webpage: 'Web Page',
+ days_working: 'Working Days',
+ facebook: 'Facebook Page',
+ },
login: {
incorso: 'Login...',
enter: 'Login',
errato: "Username or password wrong. Please retry again",
completato: 'Login successfully!',
+ needlogin: 'You must login before continuing',
},
reset: {
title_reset_pwd: "Reset your Password",
@@ -1102,7 +1152,8 @@ const msgglobal = {
short_tit: 'Short Title',
title: 'Title',
details: 'Details',
- date: 'Date',
+ dateTimeStart: 'Date Start',
+ dateTimeEnd: 'Date End',
bgcolor: 'Background color',
days: 'Days',
icon: 'Icon',
@@ -1124,6 +1175,7 @@ const msgglobal = {
canceled: 'Canceled',
deleted: 'Deleted',
duplicate: 'Duplicate',
+ notempty: 'Field cannot be empty',
modified: 'Modified'
},
newsletter: {
@@ -1263,12 +1315,23 @@ const msgglobal = {
sameaspassword: 'Passwords must be identical',
}
},
+ op: {
+ qualification: 'Qualification',
+ disciplines: 'Disciplines',
+ certifications: 'Certifications',
+ intro: 'Introduction',
+ info: 'Biography',
+ webpage: 'Web Page',
+ days_working: 'Working Days',
+ facebook: 'Facebook Page',
+ },
login: {
page_title: 'Login',
incorso: 'Login...',
enter: 'Login',
errato: "Username or password wrong. Please retry again",
completato: 'Login successfully!',
+ needlogin: 'You must login before continuing',
},
reset: {
title_reset_pwd: "Reset your Password",
@@ -1386,7 +1449,8 @@ const msgglobal = {
short_tit: 'Short Title',
title: 'Title',
details: 'Details',
- date: 'Date',
+ dateTimeStart: 'Date Start',
+ dateTimeEnd: 'Date End',
bgcolor: 'Background color',
days: 'Days',
icon: 'Icon',
@@ -1408,6 +1472,7 @@ const msgglobal = {
canceled: 'Canceled',
deleted: 'Deleted',
duplicate: 'Duplicate',
+ notempty: 'Field cannot be empty',
modified: 'Modified'
},
newsletter: {
diff --git a/src/store/Api/Instance.ts b/src/store/Api/Instance.ts
index fd8a4f2..cec05e5 100644
--- a/src/store/Api/Instance.ts
+++ b/src/store/Api/Instance.ts
@@ -51,7 +51,7 @@ export const removeAuthHeaders = () => {
async function Request(type: string, path: string, payload: any): Promise {
let ricevuto = false
try {
- console.log('Axios Request', path, type, payload)
+ 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 cca45dc..1bafb88 100644
--- a/src/store/Modules/GlobalStore.ts
+++ b/src/store/Modules/GlobalStore.ts
@@ -34,6 +34,7 @@ getstateConnSaved()
})
const state: IGlobalState = {
+ finishLoading: false,
conta: 0,
wasAlreadySubscribed: false,
wasAlreadySubOnDb: false,
@@ -66,7 +67,8 @@ const state: IGlobalState = {
table: '',
type: 0,
_id: 0
- }
+ },
+ settings: []
}
async function getConfig(id) {
@@ -152,6 +154,45 @@ namespace Getters {
return ris
}, 't')
+ const getListByTable = b.read((state) => (table) => {
+ if (table === tools.TABEVENTS)
+ return CalendarStore.state.eventlist
+ else if (table === 'operators')
+ return CalendarStore.state.operators
+ else if (table === 'wheres')
+ return CalendarStore.state.wheres
+ else if (table === 'contribtype')
+ return CalendarStore.state.contribtype
+ else if (table === 'bookings')
+ return CalendarStore.state.bookedevent
+ else if (table === 'users')
+ return UserStore.state.usersList
+ else if (table === 'sendmsgs')
+ return MessageStore.state.last_msgs
+ else if (table === 'settings')
+ return UserStore.state.settings
+ else if (table === 'permissions')
+ return UserStore.state.permissionsList
+ else
+ return null
+
+ }, 'getListByTable')
+
+ const getValueSettingsByKey = b.read((mystate: IGlobalState) => (key): any => {
+ const myrec = mystate.settings.find((rec) => rec.key === key)
+ if (!!myrec) {
+ if (myrec.type === tools.FieldType.date)
+ return myrec.value_date
+ if (myrec.type === tools.FieldType.number)
+ return myrec.value_num
+ else
+ return myrec.value_str
+ } else {
+ return ''
+ }
+
+ }, 'getValueSettingsByKey')
+
export const getters = {
get testpao1_getter_contatore() {
return testpao1_getter_contatore()
@@ -187,6 +228,14 @@ namespace Getters {
return getmenu()
},
+ get getListByTable() {
+ return getListByTable()
+ },
+
+ get getValueSettingsByKey() {
+ return getValueSettingsByKey()
+ },
+
get t() {
return t()
},
@@ -270,43 +319,23 @@ namespace Mutations {
}
- function getListByTable(table): any[] {
- if (table === tools.TABEVENTS)
- return CalendarStore.state.eventlist
- else if (table === 'operators')
- return CalendarStore.state.operators
- else if (table === 'wheres')
- return CalendarStore.state.wheres
- else if (table === 'contribtype')
- return CalendarStore.state.contribtype
- else if (table === 'bookings')
- return CalendarStore.state.bookedevent
- else if (table === 'users')
- return UserStore.state.usersList
- else if (table === 'sendmsgs')
- return MessageStore.state.last_msgs
- else if (table === 'permissions')
- return UserStore.state.permissionsList
- else
- return null
-
- }
-
function UpdateValuesInMemory(mystate: IGlobalState, mydata: IDataPass) {
const id = mydata.id
const table = mydata.table
try {
- const mylist = getListByTable(table)
+ const mylist = Getters.getters.getListByTable(table)
const mykey = fieldsTable.getKeyByTable(table)
- const myrec = mylist.find((event) => event[mykey] === id)
- // console.log('myrec', myrec)
- if (myrec) {
- for (const [key, value] of Object.entries(mydata.fieldsvalue)) {
- console.log('key', value, myrec[key])
- myrec[key] = value
+ if (!!mylist) {
+ const myrec = mylist.find((event) => event[mykey] === id)
+ // console.log('myrec', myrec)
+ if (myrec) {
+ for (const [key, value] of Object.entries(mydata.fieldsvalue)) {
+ console.log('key', value, myrec[key])
+ myrec[key] = value
+ }
}
}
} catch (e) {
@@ -653,13 +682,14 @@ namespace Actions {
const myuserid = (UserStore.state.my._id) ? UserStore.state.my._id : '0'
- const ris = await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + showall, 'GET', null)
+ return await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + showall, 'GET', null)
.then((res) => {
CalendarStore.state.bookedevent = (res.data.bookedevent) ? res.data.bookedevent : []
CalendarStore.state.eventlist = (res.data.eventlist) ? res.data.eventlist : []
CalendarStore.state.operators = (res.data.operators) ? res.data.operators : []
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] : []
})
.catch((error) => {
@@ -668,8 +698,6 @@ namespace Actions {
return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, tools.ERR_GENERICO, error)
})
- return ris
-
}
export const actions = {
diff --git a/src/store/Modules/MessageStore.ts b/src/store/Modules/MessageStore.ts
index 66aec22..2e9ad5b 100644
--- a/src/store/Modules/MessageStore.ts
+++ b/src/store/Modules/MessageStore.ts
@@ -122,7 +122,7 @@ namespace Actions {
data.datemsg = tools.getDateNow()
data.status = StatusMessage.WaitingToSend
// Options
- // data.options = tools.SetBit(data.options, shared_consts.MessageOptions.Notify_ByEmail)
+ data.options = tools.SetBit(data.options, shared_consts.MessageOptions.Notify_ByEmail)
data.options = tools.SetBit(data.options, shared_consts.MessageOptions.Notify_ByPushNotification)
console.log('DOPO:')
diff --git a/src/store/Modules/Store/calendar/CalendarStore.ts b/src/store/Modules/Store/calendar/CalendarStore.ts
index d3bc490..823e7f7 100644
--- a/src/store/Modules/Store/calendar/CalendarStore.ts
+++ b/src/store/Modules/Store/calendar/CalendarStore.ts
@@ -9,8 +9,9 @@ import { tools } from '../../tools'
import translate from '../../../../globalroutines/util'
import * as Types from '../../../Api/ApiTypes'
import { db_data } from '@src/db/db_data'
-import { GlobalStore, UserStore } from '@store'
+import { CalendarStore, GlobalStore, UserStore } from '@store'
import { lists } from '@src/store/Modules/lists'
+import { IUserState } from '@src/model'
// State
const state: ICalendarState = {
@@ -36,10 +37,10 @@ const state: ICalendarState = {
showWorkWeeks: false,
intervalRange: { min: 9, max: 23 },
intervalRangeStep: 1,
- intervalHeight: 35,
- resourceHeight: 60,
+ intervalHeight: 35, // 35
+ resourceHeight: 80, // 60
resourceWidth: 100,
- dayHeight: 100,
+ dayHeight: 150,
enableThemes: false,
theme: {}
}
@@ -77,6 +78,24 @@ namespace Getters {
}, 'getContribtypeRec')
+ const getOperatorByUsername = b.read((mystate: ICalendarState) => (username) => {
+ const ctrec = mystate.operators.find((rec) => rec.username === username)
+ return (ctrec)
+
+ }, 'getOperatorByUsername')
+
+ const getImgTeacherByUsername = b.read((mystate: ICalendarState) => (username): string => {
+ if (username === '')
+ return ''
+ // Check if is this User!
+ const myop = CalendarStore.getters.getOperatorByUsername(username)
+ if (myop && !!myop.img && myop.img !== '' && myop.img !== 'undefined') {
+ return myop.img
+ } else {
+ return ''
+ }
+ }, 'getImgTeacherByUsername')
+
const getContribtypeById = b.read((mystate: ICalendarState) => (id) => {
const ctrec = mystate.contribtype.find((mycontr) => mycontr._id === id)
return (ctrec) ? ctrec.label : ''
@@ -109,6 +128,12 @@ namespace Getters {
},
get getContribtypeRecByLabel() {
return getContribtypeRecByLabel()
+ },
+ get getOperatorByUsername() {
+ return getOperatorByUsername()
+ },
+ get getImgTeacherByUsername() {
+ return getImgTeacherByUsername()
}
}
}
diff --git a/src/store/Modules/UserStore.ts b/src/store/Modules/UserStore.ts
index e0502b2..6280707 100644
--- a/src/store/Modules/UserStore.ts
+++ b/src/store/Modules/UserStore.ts
@@ -20,18 +20,23 @@ import { shared_consts } from '../../common/shared_vuejs'
const bcrypt = require('bcryptjs')
+const DefaultUser: IUserFields = {
+ _id: '',
+ email: '',
+ username: '',
+ name: '',
+ surname: '',
+ password: '',
+ tokens: [],
+ verified_email: false,
+ profile: {
+ img: ''
+ }
+}
+
// State
const state: IUserState = {
- my: {
- _id: '',
- email: '',
- username: '',
- name: '',
- surname: '',
- password: '',
- tokens: [],
- verified_email: false
- },
+ my: DefaultUser,
lang: process.env.LANG_DEFAULT,
repeatPassword: '',
categorySel: 'personal',
@@ -140,13 +145,14 @@ namespace Getters {
const getImgByUsername = b.read((mystate: IUserState) => (username): string => {
if (username === '')
- return 'images/avatar/avatar3_small.png'
+ return ''
// Check if is this User!
const myrec = UserStore.getters.getUserByUsername(username)
- if (myrec && !!myrec.img && myrec.img !== '' && myrec.img !== 'undefined') {
- return myrec.img
+ // console.log('myrec', myrec)
+ if (myrec && myrec.profile && !!myrec.profile.img && myrec.profile.img !== '' && myrec.profile.img !== 'undefined') {
+ return myrec.profile.img
} else {
- return 'images/avatar/avatar3_small.png'
+ return ''
}
}, 'getImgByUsername')
@@ -189,22 +195,22 @@ namespace Getters {
},
get getUsersList() {
return getUsersList()
- }
+ },
}
}
namespace Mutations {
function authUser(mystate: IUserState, data: IUserFields) {
- mystate.my = {...data}
+ mystate.my = { ...data }
mystate.isAdmin = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Admin.value)
mystate.isManager = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Manager.value)
mystate.isTeacher = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Teacher.value)
// console.log('authUser', 'state.isAdmin', mystate.isAdmin)
- console.table(mystate)
- console.table(data)
+ // console.table(mystate)
+ // console.table(data)
// if (data.my.verified_email) {
// mystate.my.verified_email = data.my.verified_email
@@ -561,7 +567,10 @@ namespace Actions {
localStorage.setItem(tools.localStorage.name, myuser.name)
localStorage.setItem(tools.localStorage.surname, myuser.surname)
localStorage.setItem(tools.localStorage.perm, String(myuser.perm) || '')
- localStorage.setItem(tools.localStorage.img, String(myuser.img) || '')
+ if (myuser.profile !== undefined)
+ localStorage.setItem(tools.localStorage.img, (!!myuser.profile.img) ? String(myuser.profile.img) || '' : '')
+ else
+ localStorage.setItem(tools.localStorage.img, '')
localStorage.setItem(tools.localStorage.token, state.x_auth_token)
localStorage.setItem(tools.localStorage.expirationDate, expirationDate.toString())
localStorage.setItem(tools.localStorage.isLogged, String(true))
@@ -607,6 +616,7 @@ namespace Actions {
localStorage.removeItem(tools.localStorage.wasAlreadySubOnDb)
state.isLogged = false
+ state.my = { ...DefaultUser }
await GlobalStore.actions.clearDataAfterLogout()
@@ -628,7 +638,6 @@ namespace Actions {
async function setGlobal(isLogged: boolean) {
console.log('setGlobal')
// state.isLogged = true
- state.isLogged = isLogged
if (isLogged) {
// console.log('state.isLogged', state.isLogged)
@@ -640,12 +649,17 @@ namespace Actions {
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')
}
@@ -685,18 +699,18 @@ namespace Actions {
surname,
verified_email,
perm,
- img
+ profile: { img }
})
isLogged = true
}
}
- await setGlobal(isLogged)
+ return await setGlobal(isLogged)
// console.log('autologin _id STATE ', state._id)
- return true
+ // return true
} catch (e) {
console.error('ERR autologin ', e.message)
return false
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 1b2e3e9..c5c6105 100644
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -2,6 +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'
const DeleteRec = {
name: 'deleterec',
@@ -24,6 +25,7 @@ function AddCol(params: IColGridTable) {
label_trans: (params.label_trans === undefined) ? '' : params.label_trans,
align: (params.align === undefined) ? 'left' : params.align,
field: (params.field === undefined) ? params.name : params.field,
+ subfield: (params.subfield === undefined) ? '' : params.subfield,
sortable: (params.sortable === undefined) ? true : params.sortable,
disable: (params.disable === undefined) ? false : params.disable,
titlepopupedit: (params.titlepopupedit === undefined) ? '' : params.titlepopupedit,
@@ -40,7 +42,7 @@ function AddCol(params: IColGridTable) {
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)
]
@@ -51,6 +53,15 @@ 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 colTablePermission = [
AddCol({ name: '_id', label_trans: 'others.value' }),
AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
@@ -59,12 +70,19 @@ const colTablePermission = [
const colTableOperator = [
AddCol({ name: 'username', label_trans: 'reg.username' }),
- // AddCol({ name: 'name', label_trans: 'reg.name' }),
- // AddCol({ name: 'surname', label_trans: 'reg.surname' }),
- // AddCol({ name: 'webpage', label_trans: 'reg.webpage' }),
- // AddCol({ name: 'email', label_trans: 'reg.email' }),
- // AddCol({ name: 'cell', label_trans: 'reg.cell' }),
- // AddCol({ name: 'img', label_trans: 'reg.img' }),
+ AddCol({ name: 'name', label_trans: 'reg.name' }),
+ AddCol({ name: 'surname', label_trans: 'reg.surname' }),
+ AddCol({ name: 'email', label_trans: 'reg.email' }),
+ AddCol({ name: 'img', label_trans: 'event.img' }),
+ AddCol({ name: 'cell', label_trans: 'reg.cell' }),
+ 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: '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)]
const colTableEvents = [
@@ -74,17 +92,17 @@ const colTableEvents = [
AddCol({ name: 'title', label_trans: 'event.title' }),
AddCol({ name: 'details', label_trans: 'event.details' }),
AddCol({ name: 'dateTimeStart', label_trans: 'event.dateTimeStart', fieldtype: tools.FieldType.date }),
- AddCol({ name: 'dateTimeEnd', label_trans: 'event.dateTimeEnd' }),
+ AddCol({ name: 'dateTimeEnd', label_trans: 'event.dateTimeEnd', fieldtype: tools.FieldType.date }),
AddCol({ name: 'bgcolor', label_trans: 'event.bgcolor' }),
AddCol({ name: 'icon', label_trans: 'event.icon' }),
AddCol({ name: 'img_small', label_trans: 'event.img_small' }),
AddCol({ name: 'img', label_trans: 'event.img' }),
- AddCol({ name: 'wherecode', label_trans: 'event.where' }),
- AddCol({ name: 'contribtype', label_trans: 'event.contribtype' }),
+ 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: 'price', label_trans: 'event.price' }),
AddCol({ name: 'infoafterprice', label_trans: 'event.infoafterprice' }),
- AddCol({ name: 'teacher', label_trans: 'event.teacher' }),
- AddCol({ name: 'teacher2', label_trans: 'event.teacher2' }),
+ 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: 'infoextra', label_trans: 'event.infoextra' }),
AddCol({ name: 'linkpage', label_trans: 'event.linkpage' }),
AddCol({ name: 'linkpdf', label_trans: 'event.linkpdf' }),
@@ -135,15 +153,41 @@ export const fieldsTable = {
}
},
+ getValueByTable(col: IColGridTable, val) {
+ 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.find((myrec) => myrec[key] === val)
+ // console.log('myris', myris)
+ if (myris) {
+ return myris[collab]
+ } else {
+ return ''
+ }
+
+ } else {
+ return ''
+ }
+ },
+
getColByTable(table) {
if (table === 'permissions') {
return ['value', 'label']
}
},
getTableJoinByName(table) {
- if (table === 'permissions') {
+ if (table === 'permissions')
return [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher]
- }
+ else if (table === 'fieldstype')
+ return tools.FieldTypeArr
+ else
+ return GlobalStore.getters.getListByTable(table)
+
},
getrecTableList(mytable) {
return this.tablesList.find((rec) => rec.value === mytable)
@@ -174,14 +218,14 @@ export const fieldsTable = {
value: 'operators',
label: 'Insegnanti',
columns: colTableOperator,
- colkey: '_id',
+ colkey: 'username',
collabel: 'username'
},
{
value: 'wheres',
label: 'Luoghi',
columns: colTableWhere,
- colkey: '_id',
+ colkey: 'code',
collabel: 'placename'
},
{
@@ -205,7 +249,20 @@ export const fieldsTable = {
colkey: 'value',
collabel: 'label',
colicon: 'icon'
- }
+ },
+ {
+ value: 'fieldstype',
+ label: 'Tipi di Campi',
+ colkey: 'value',
+ collabel: 'label'
+ },
+ {
+ value: 'settings',
+ label: 'Impostazioni',
+ columns: colsettings,
+ colkey: 'key',
+ collabel: 'key'
+ },
],
// IColGridTable
@@ -214,9 +271,10 @@ export const fieldsTable = {
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({ name: 'img', label_trans: 'reg.img', sortable: false }),
AddCol(DeleteRec),
AddCol({
name: 'copyrec',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 1c6efaa..3e7e1e7 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -4,6 +4,9 @@ import { costanti } from './costanti'
import { toolsext } from './toolsext'
import { translation } from './translation'
import Quasar, { colors, date, Screen } from 'quasar'
+import { scroll } from 'quasar'
+const { getScrollTarget, setScrollPosition } = scroll
+
import {
IBookedEvent,
ICollaborations,
@@ -30,6 +33,10 @@ import { dom } from 'quasar'
const { height, width } = dom
+import Cookies from 'js-cookie'
+
+const TokenKey = 'Admin-Token'
+
export interface INotify {
color?: string | 'primary'
textColor?: string
@@ -37,6 +44,8 @@ export interface INotify {
}
export const tools = {
+ CAN_EDIT: 'q-ce',
+
listBestColor: [
'blue',
'green',
@@ -117,9 +126,23 @@ export const tools = {
boolean: 1,
date: 2,
string: 4,
- binary: 8
+ binary: 8,
+ html: 16,
+ select: 32,
+ number: 64,
+ typeinrec: 128,
},
+ FieldTypeArr: [
+ { label: 'Boolean', value: 1 },
+ { label: 'Date', value: 2 },
+ { label: 'String', value: 4 },
+ { label: 'Binary', value: 8 },
+ { label: 'Html', value: 16 },
+ { label: 'Select', value: 32 },
+ { label: 'Number', value: 64 }
+ ],
+
SelectListNumPeople: [
{
id: 1,
@@ -1356,7 +1379,7 @@ export const tools = {
notify: par.param2 === true ? '1' : '0'
}).then((ris) => {
if (ris) {
- tools.showPositiveNotif(myself.$q, myself.$t('cal.canceledbooking') + ' "' + par.param1.title + '"')
+ tools.showPositiveNotif(myself.$q, myself.$t('cal.canceledbooking') + ' "' + par.param3 + '"')
if (myself.bookEventpage)
myself.bookEventpage.show = false
} else
@@ -1423,7 +1446,7 @@ export const tools = {
},
showNeutralNotif(q: any, msg) {
- tools.showNotif(q, msg, { color: 'warning', icon: 'notifications' })
+ tools.showNotif(q, msg, { color: 'info', icon: 'notifications' })
},
showNotif(q: any, msg, data ?: INotify | null
@@ -1712,7 +1735,7 @@ export const tools = {
} else {
mystr = `${tools.getstrDate(myevent.dateTimeStart)}
${mythis.$t('cal.starttime')} ${ tools.getstrTime(myevent.dateTimeStart) }
- ${ mythis.$t('cal.endtime')}: ${ tools.getstrTime(myevent.dateTimeEnd) }`
+ ${ mythis.$t('cal.endtime')} ${ tools.getstrTime(myevent.dateTimeEnd) }`
}
} else {
mystr = `${tools.getstrDate(myevent.dateTimeStart)}
@@ -1776,10 +1799,7 @@ export const tools = {
},
// mystrdate "26.04.2013"
- convertstrtoDate(mystrdate
- :
- string
- ) {
+ convertstrtoDate(mystrdate: string) {
if (mystrdate.length < 10) {
return null
}
@@ -2456,7 +2476,8 @@ export const tools = {
console.log('CancelBookingEvent ', eventparam)
tools.askConfirm(mythis.$q, translate('cal.titlebooking'), translate('cal.cancelbooking') + ' ' + tools.gettextevent(mythis, eventparam) + '?', translate('dialog.yes'), translate('dialog.no'), mythis, '', lists.MenuAction.DELETE, 0, {
param1: bookeventid,
- param2: notify
+ param2: notify,
+ param3: eventparam.title
})
}
,
@@ -2544,6 +2565,67 @@ export const tools = {
return this.listBestColor[index]
else
return 'primary'
+ },
+ getCookie(mytok, oldval?) {
+ const ris = Cookies.get(mytok)
+ console.log('getCookie', ris)
+ if (!!ris) {
+ return ris
+ } else {
+ return oldval
+ }
+ },
+
+ setCookie(mytok, value: string) {
+ return Cookies.set(mytok, value)
+ },
+
+ removeCookie(mytok) {
+ return Cookies.remove(mytok)
+ },
+ notshowPwd(payload) {
+ const mypay = { ...payload }
+ try {
+ if (!!mypay.password) {
+ mypay.password = '**********'
+ }
+ } catch (e) {
+ console.log('error', e)
+ }
+ return mypay
+ },
+ scrollToTop() {
+ const element = document.getElementById('mypage')
+ this.scrollToElement(element)
+ },
+ scrollToElementId(myid) {
+ const element = document.getElementById(myid)
+ this.scrollToElement(element)
+ },
+ scrollToElement(el) {
+ const target = getScrollTarget(el)
+ const offset = el.offsetTop
+ const duration = 500
+ console.log('target', target, 'offset', offset, 'duration', duration)
+ setScrollPosition(target, offset, duration)
+ },
+ getCellForWhatsapp(numbercell) {
+ let mynum = numbercell.replace(/\-/g, '')
+ const intcode = GlobalStore.getters.getValueSettingsByKey('INT_CODE')
+ if (numbercell.substring(0, 1) !== '+')
+ mynum = intcode + mynum
+ else
+ mynum = mynum.substring(1)
+
+ return mynum
+ },
+
+ getHttpForWhatsapp(numbercell) {
+ const mynum = this.getCellForWhatsapp(numbercell)
+ if (mynum)
+ return 'https://wa.me/' + mynum
+ else
+ return ''
}
// getLocale() {
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 3c0906f..8d0e6d6 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -2,14 +2,14 @@ import Cookies from 'js-cookie'
const TokenKey = 'Admin-Token'
-export function getToken() {
+export function getCookie() {
return Cookies.get(TokenKey)
}
-export function setToken(token: string) {
+export function setCookie(token: string) {
return Cookies.set(TokenKey, token)
}
-export function removeToken() {
+export function removeCookie() {
return Cookies.remove(TokenKey)
}
diff --git a/src/views/messages/messages.ts b/src/views/messages/messages.ts
index d157a4d..b2800cb 100644
--- a/src/views/messages/messages.ts
+++ b/src/views/messages/messages.ts
@@ -9,10 +9,7 @@ import { IChat, IMessage, IUserState, MsgDefault, StatusMessage } from '../../mo
import { Getter } from 'vuex-class'
import { IMsgUsers } from '../../model/MessageStore'
import MixinUsers from '../../mixins/mixin-users'
-
-import { scroll } from 'quasar'
-
-const { getScrollTarget, setScrollPosition } = scroll
+import { CMyAvatar } from '../../components/CMyAvatar'
// import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
@@ -21,7 +18,7 @@ const namespace = 'MessageModule'
@Component({
name: 'Messages',
mixins: [MixinUsers],
- components: {}
+ components: { CMyAvatar }
})
export default class Messages extends Vue {
@@ -81,14 +78,6 @@ export default class Messages extends Vue {
return mystr
}
- public scrollToElement(el) {
- const target = getScrollTarget(el)
- const offset = el.offsetTop
- const duration = 1000
- // console.log('target', target, 'offset', offset, 'duration', duration)
- setScrollPosition(target, offset, duration)
- }
-
public refreshdata(username: string) {
this.loading = true
@@ -103,7 +92,7 @@ export default class Messages extends Vue {
this.loading = false
const element = document.getElementById('last')
- this.scrollToElement(element)
+ tools.scrollToElement(element)
// this.changemsgs('', '')
@@ -224,7 +213,7 @@ export default class Messages extends Vue {
data.status = StatusMessage.Sending
const element = document.getElementById('last')
- this.scrollToElement(element)
+ tools.scrollToElement(element)
if (!ris)
tools.showNegativeNotif(self.$q, self.$t('cal.sendmsg_error'))
diff --git a/src/views/messages/messages.vue b/src/views/messages/messages.vue
index 31948a4..d9900c0 100644
--- a/src/views/messages/messages.vue
+++ b/src/views/messages/messages.vue
@@ -76,9 +76,7 @@
-
- ![]()
-
+
@@ -116,9 +114,7 @@
sent
bg-color="blue-2">
-
- ![]()
-
+