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

- Gruppi (2)

Browse Source
This commit is contained in:
paoloar77
2022-02-04 23:48:53 +01:00
parent 45a771fab2
commit 498c28773f
26 changed files with 332 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/store/Modules/costanti.ts
View File

@@ -11,6 +11,11 @@ export const costanti = {
SHOW_USERINFO: 1,
SHOW_GROUPINFO: 5,
BINARY_CHECK: 1,
RISERVATO_PASSWORD: 1,
NASCOSTO_CERCA: 2,
VISUTABLE_SCHEDA_USER: -1,
VISUTABLE_SCHEDA_GROUP: -3,
@@ -42,6 +47,8 @@ export const costanti = {
DRAGULA: false,
ALLOWCHAR_CODE: 1,
showWhen: {
NewRec: 1,
InPage: 2,
@@ -84,6 +91,7 @@ export const costanti = {
onlydate: 7000,
hours: 8000,
crypted: 9000,
object: 10000,
},
FieldTypeArr: [

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

@@ -48,6 +48,9 @@ function AddCol(params: IColGridTable) {
required: (params.required === undefined) ? false : params.required,
label: (params.label === undefined) ? '' : params.label,
label_trans: (params.label_trans === undefined) ? '' : params.label_trans,
visibleif: (params.visibleif === undefined) ? 0 : params.visibleif,
visib_field: (params.visib_field === undefined) ? '' : params.visib_field,
visib_value: (params.visib_value === undefined) ? '' : params.visib_value,
align: (params.align === undefined) ? 'left' : params.align,
field: (params.field === undefined) ? params.name : params.field,
subfield: (params.subfield === undefined) ? '' : params.subfield,
@@ -62,6 +65,7 @@ function AddCol(params: IColGridTable) {
action: (params.action === undefined) ? '' : params.action,
foredit: (params.foredit === undefined) ? true : params.foredit,
fieldtype: (params.fieldtype === undefined) ? costanti.FieldType.string : params.fieldtype,
field_outtype: (params.field_outtype === undefined) ? costanti.FieldType.string : params.field_outtype,
tipovisu: (params.tipovisu === undefined) ? costanti.TipoVisu.TESTO : params.tipovisu,
link: (params.link === undefined) ? '' : params.link,
askaction: (params.askaction === undefined) ? '' : params.askaction,
@@ -69,6 +73,7 @@ function AddCol(params: IColGridTable) {
jointable: (params.jointable === undefined) ? '' : params.jointable,
addall: (params.addall === undefined) ? false : params.addall,
filter: (params.filter === undefined) ? null : params.filter,
allowchar: (params.allowchar === undefined) ? null : params.allowchar,
showWhen: (params.showWhen === undefined) ? costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView : params.showWhen,
noshowlabel: (params.noshowlabel === undefined) ? false : params.noshowlabel,
notsave: (params.notsave === undefined) ? false : params.notsave,
@@ -328,6 +333,24 @@ export const colSectors = [
AddCol(DuplicateRec),
]
export const colCatGrps = [
AddCol({ name: '_id', label_trans: 'index', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'descr', label_trans: 'store.description' }),
AddCol({
name: 'idCatGrp',
label_trans: 'sectors.name',
fieldtype: costanti.FieldType.select,
jointable: 'catgrps',
}),
AddCol({ name: 'main', label_trans: 'store.main', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'color', label_trans: 'products.color' }),
AddCol({ name: 'theme', label_trans: 'products.theme' }),
AddCol({ name: 'img', label_trans: 'store.img' }),
AddCol({ name: 'icon', label_trans: 'store.icon' }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
]
export const colLevels = [
AddCol({ name: '_id', label_trans: 'index', fieldtype: costanti.FieldType.number }),
@@ -431,24 +454,36 @@ export const colmyUserPeople = [
export const colmyUserGroup = [
// AddCol({ name: '_id', label_trans: 'reg.id' }),
AddCol({ name: 'groupname', label_trans: 'reg.groupname', required: true }),
AddCol({ name: 'title', label_trans: 'reg.name', required: true }),
AddCol({ name: 'groupname', label_trans: 'reg.groupname', required: true,
maxlength: 30,
allowchar: costanti.ALLOWCHAR_CODE,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
}),
AddCol({ name: 'title', label_trans: 'reg.name', required: true, noshowlabel: true, }),
AddCol({
name: 'idSector',
label_trans: 'sectors.name',
name: 'idCatGrp',
label_trans: 'catgrps.name',
fieldtype: costanti.FieldType.select,
required: true,
jointable: 'sectors',
jointable: 'catgrps',
visible: true,
icon: 'category',
noshowlabel: true,
}),
AddCol({ name: 'descr', label_trans: 'proj.longdescr', required: true, noshowlabel: true, }),
AddCol({ name: 'visibility', label_trans: 'bot.visibility', fieldtype: costanti.FieldType.multiselect, jointable: 'visibilGroup',
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
}),
AddCol({ name: 'pwd', label_trans: 'groups.pwd', fieldtype: costanti.FieldType.crypted,
visibleif: costanti.BINARY_CHECK, visib_field: 'visibility', visib_value: costanti.RISERVATO_PASSWORD,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
}),
AddCol({ name: 'descr', label_trans: 'proj.longdescr', required: true }),
AddCol({ name: 'visibility', label_trans: 'bot.visibility', fieldtype: costanti.FieldType.select, jointable: 'visibilGroup', required: true }),
AddCol({
name: 'admins',
label_trans: 'groups.admins',
fieldtype: costanti.FieldType.multiselect,
jointable: 'friendsandme',
field_outtype: costanti.FieldType.object,
}),
AddCol({
name: 'photos',
@@ -472,6 +507,10 @@ export const colmyUserGroup = [
}),
AddCol({ name: 'date_created', label_trans: 'reg.date_created', fieldtype: costanti.FieldType.onlydate,
showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist }),
AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
titlepopupedit: 'Dettagli', field_extra1: 'groupname', subfield_extra1: '' }),
AddCol(ModifRec),
AddCol(DeleteRec),
]
@@ -1928,6 +1967,13 @@ export const fieldsTable = {
colkey: '_id',
collabel: 'descr',
},
{
value: 'catgrps',
label: 'Categorie',
columns: colCatGrps,
colkey: '_id',
collabel: 'descr',
},
{
value: 'levels',
label: 'Livello',

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

@@ -1912,8 +1912,8 @@ export const tools = {
this.showNotif(q, msg, { color: 'negative', icon: 'notifications' }, 10000)
},
showNeutralNotif(q: any, msg: string) {
this.showNotif(q, msg, { color: 'info', icon: 'notifications' }, 10000)
showNeutralNotif(q: any, msg: string, time = 10000) {
this.showNotif(q, msg, { color: 'info', icon: 'notifications' }, time)
},
showNotif(q: any, msg: string, data ?: INotify | null, time?: number) {
@@ -4437,7 +4437,7 @@ export const tools = {
userStore.setGroupsCmd($q, t, username, groupnameDest, shared_consts.GROUPSCMD.SETGROUP, null)
.then((res: any) => {
if (res) {
userStore.my.profile.groups = [...userStore.my.profile.groups, res]
userStore.my.profile.mygroups = [...userStore.my.profile.mygroups, res]
tools.showPositiveNotif($q, t('db.addedgroup'))
}
})

10
src/store/UserStore.ts
View File

@@ -50,7 +50,7 @@ export const DefaultUser: IUserFields = {
myshares: [],
friends: [],
req_friends: [],
groups: [],
mygroups: [],
asked_friends: [],
asked_groups: [],
},
@@ -94,7 +94,7 @@ export const DefaultProfile: IUserProfile = {
myshares: [],
friends: [],
req_friends: [],
groups: [],
mygroups: [],
asked_friends: [],
asked_groups: [],
}
@@ -178,7 +178,7 @@ export const useUserStore = defineStore('UserStore', {
IsMyGroupByGroupname(groupname: string): boolean {
if (this.my.profile.friends)
return this.my.profile.groups.findIndex((rec) => rec.groupname === groupname) >= 0
return this.my.profile.mygroups.findIndex((rec) => rec.groupname === groupname) >= 0
else
return false
},
@@ -234,7 +234,7 @@ export const useUserStore = defineStore('UserStore', {
try {
//++Todo: Sistemare!
return costanti.DIR_UPLOAD + 'groups/' + group.groupname + '/' + group.photos[0].directory
return costanti.DIR_UPLOAD + 'mygroups/' + group.groupname + '/' + group.photos[0].imagefile
} catch (e) {
}
return 'images/noimg.png'
@@ -856,7 +856,7 @@ export const useUserStore = defineStore('UserStore', {
verified_by_aportador,
made_gift,
perm,
profile: { img, teleg_id, myshares: [], friends: [], req_friends: [], asked_friends: [], groups: [], asked_groups: [] },
profile: { img, teleg_id, myshares: [], friends: [], req_friends: [], asked_friends: [], mygroups: [], asked_groups: [] },
})
isLogged = true

6
src/store/globalStore.ts
View File

@@ -121,6 +121,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
subSkills: [],
statusSkills: [],
sectors: [],
catgrps: [],
cities: [],
}),
@@ -239,6 +240,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
return state.statusSkills
else if (table === 'sectors')
return state.sectors
else if (table === 'catgrps')
return state.catgrps
else {
return ris
}
@@ -1223,6 +1226,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
this.statusSkills = (res.data.statusSkills) ? [...res.data.statusSkills] : []
this.sectors = (res.data.sectors) ? [...res.data.sectors] : []
this.cities = (res.data.cities) ? [...res.data.cities] : []
this.catgrps = (res.data.catgrps) ? [...res.data.catgrps] : []
// console.log('res.data.cart', res.data.cart)
@@ -1390,6 +1394,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
myarr = myarr.filter(filter)
}
// console.log('myarr', table, myarr)
return myarr
},