surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Export Email

Browse Source 
- Etichetta Facilitatori
This commit is contained in:
Paolo Arena
2022-07-11 23:19:52 +02:00
parent 42cb624f41
commit 7f25ca4717
31 changed files with 114 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/store/Modules/fieldsTable.ts
View File

@@ -1494,7 +1494,7 @@ const colnavi = [
AddCol({ name: 'num_tess', label_trans: 'num_tess', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'note', label_trans: 'note', fieldtype: costanti.FieldType.string }),
// AddCol({ name: 'note_interne', label_trans: 'note_interne', fieldtype: costanti.FieldType.string }),
// AddCol({ name: 'tutor', label_trans: 'tutor', fieldtype: costanti.FieldType.string }),
// AddCol({ name: 'facilitatore', label_trans: 'facilitatore', fieldtype: costanti.FieldType.string }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
]
@@ -1516,7 +1516,7 @@ const colnavepersistente = [
AddCol({ name: 'DoniConfermati', label_trans: 'note_bot', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'DoniTotali', label_trans: 'note_bot', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'note_interne', label_trans: 'note_interne', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'tutor', label_trans: 'tutor', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'facilitatore', label_trans: 'facilitatore', fieldtype: costanti.FieldType.string }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
]

18
src/store/Modules/tools.ts
View File

@@ -1735,10 +1735,10 @@ export const tools = {
|| (elem.onlySocioResidente && userStore.my.profile.socioresidente)
|| (elem.onlyConsiglio && userStore.my.profile.consiglio)
|| (elem.onlyNotSoci && !userStore.my.profile.socio)
|| (elem.onlyTutor && userStore.isTutor)
|| (elem.onlyFacilitatore && userStore.isTutor)
|| (elem.onlyEditor && userStore.isEditor)
|| (elem.onlyDepartment && userStore.isDepartment)
|| ((!elem.onlyAdmin) && (!elem.onlyManager) && (!elem.onlyTutor) && (!elem.onlyEditor) && (!elem.onlyDepartment)
|| ((!elem.onlyAdmin) && (!elem.onlyManager) && (!elem.onlyFacilitatore) && (!elem.onlyEditor) && (!elem.onlyDepartment)
&& (!elem.onlySocioResidente) && (!elem.onlyConsiglio) && (!elem.onlyNotSoci))) && elem.active
if (!this.isLoggedToSystem()) {
@@ -5487,7 +5487,7 @@ export const tools = {
return []
},
loadrecProfile() {
async loadrecProfile() {
const userStore = useUserStore()
const globalStore = useGlobalStore()
@@ -5499,7 +5499,7 @@ export const tools = {
console.log('loadrecProfile', params)
return globalStore.loadExp(params)
return await globalStore.loadExp(params)
},
@@ -5507,6 +5507,8 @@ export const tools = {
let myrec = await this.loadrecProfile()
console.log('myrec', myrec)
const sep = ';'
let mystr = ''
@@ -5516,11 +5518,11 @@ export const tools = {
for (const rec of myrec) {
mystr += rec.username + sep
mystr += rec.profile.username_telegram + sep
mystr += rec.profile.firstname_telegram + sep
mystr += rec.profile.lastname_telegram + sep
mystr += !!rec.profile.firstname_telegram ? rec.profile.firstname_telegram + sep : sep
mystr += !!rec.profile.lastname_telegram ? rec.profile.lastname_telegram + sep : sep
mystr += rec.email + sep
mystr += (rec.profile.teleg_id) ? 'SI' : 'NO'
mystr += (rec.verified_by_aportador) ? 'SI' : 'NO'
mystr += ((rec.profile.teleg_id) ? 'SI' : 'NO') + sep
mystr += ((rec.verified_by_aportador) ? 'SI' : 'NO') + sep
mystr += '\n'
index++
}

2
src/store/UserStore.ts
View File

@@ -528,7 +528,7 @@ export const useUserStore = defineStore('UserStore', {
this.isAdmin = tools.isBitActive(this.my.perm, shared_consts.Permissions.Admin.value)
this.isManager = tools.isBitActive(this.my.perm, shared_consts.Permissions.Manager.value)
this.isTutor = tools.isBitActive(this.my.perm, shared_consts.Permissions.Tutor.value)
this.isTutor = tools.isBitActive(this.my.perm, shared_consts.Permissions.Facilitatore.value)
this.isZoomeri = tools.isBitActive(this.my.perm, shared_consts.Permissions.Zoomeri.value)
this.isDepartment = tools.isBitActive(this.my.perm, shared_consts.Permissions.Department.value)
this.isTeacher = tools.isBitActive(this.my.perm, shared_consts.Permissions.Teacher.value)

2
src/store/globalStore.ts
View File

@@ -1571,7 +1571,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
getTableJoinByName(table: string, addall?: boolean, addnone?: boolean, filter?: any) {
let myarr: any = []
if (table === 'permissions') myarr = [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher, shared_consts.Permissions.Tutor, shared_consts.Permissions.Editor, shared_consts.Permissions.Zoomeri, shared_consts.Permissions.Department]
if (table === 'permissions') myarr = [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher, shared_consts.Permissions.Facilitatore, shared_consts.Permissions.Editor, shared_consts.Permissions.Zoomeri, shared_consts.Permissions.Department]
else if (table === 'accepted') myarr = [shared_consts.Accepted.CHECK_READ_GUIDELINES, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI]
else if (table === 'fieldstype') myarr = costanti.FieldTypeArr
else if (table === 'metodo_pagamento') myarr = tools.SelectMetodiPagamento