- Duplicate Event (1,2 4 times).

- Updated Calendar on database
This commit is contained in:
Paolo Arena
2019-11-01 19:58:52 +01:00
parent cdfc32c620
commit f30e6afd9e
6 changed files with 102 additions and 36 deletions

View File

@@ -199,15 +199,15 @@ namespace Getters {
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
@@ -564,7 +564,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.profile.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))

View File

@@ -1719,7 +1719,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 = `<span class="cal__where-content">${tools.getstrDate(myevent.dateTimeStart)}</span>
@@ -1783,10 +1783,7 @@ export const tools = {
},
// mystrdate "26.04.2013"
convertstrtoDate(mystrdate
:
string
) {
convertstrtoDate(mystrdate: string) {
if (mystrdate.length < 10) {
return null
}
@@ -2552,10 +2549,14 @@ export const tools = {
else
return 'primary'
},
getCookie(mytok) {
getCookie(mytok, oldval?) {
const ris = Cookies.get(mytok)
console.log('getToken', ris)
return ris
console.log('getCookie', ris)
if (!!ris) {
return ris
} else {
return oldval
}
},
setCookie(mytok, value: string) {
@@ -2564,6 +2565,17 @@ export const tools = {
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
}
// getLocale() {