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

Reportistica Ore 1

Browse Source
This commit is contained in:
Paolo Arena
2021-02-21 02:05:39 +01:00
parent 5568547784
commit f8ad20d1ae
41 changed files with 2803 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/store/Modules/ApiTables.ts
View File

@@ -7,7 +7,8 @@ import { tools } from '@src/store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
export const OtherTables = ['categories', 'config', 'swmsg']
export const MainTables = ['todos', 'projects']
// export const MainTables = ['todos', 'projects']
export const MainTables = []
export const allMethod = ['sync_post_', 'sync_patch_', 'delete_', 'hide_']
export function getLinkByTableName(nametable) {
@@ -44,7 +45,7 @@ export function allTables() {
async function dbInsertSave(call, item, method) {
let ret = true
if (!('serviceWorker' in navigator)) {
if (!useServiceWorker()) {
console.log('dbInsertSave', item, method)
@@ -76,7 +77,8 @@ async function dbInsertSave(call, item, method) {
async function dbDeleteItem(call, item) {
if (!('serviceWorker' in navigator)) {
let res = true
if (!useServiceWorker()) {
// console.log('dbdeleteItem', item)
if (UserStore.getters.isUserInvalid) {
return false
@@ -84,9 +86,10 @@ async function dbDeleteItem(call, item) {
call = '/' + call
const res = await Api.SendReq(call + item._id, 'DELETE', null)
res = await Api.SendReq(call + '/' + item._id, 'DELETE', null)
.then((myres) => {
console.log('dbdeleteItem to the Server')
// tools.showPositiveNotif(this.$q, 'Riga cancellata')
return myres
})
.catch((error) => {
@@ -96,11 +99,13 @@ async function dbDeleteItem(call, item) {
return res
}
return res
}
async function dbHideItem(call, item) {
if (!('serviceWorker' in navigator)) {
if (!useServiceWorker()) {
// console.log('dbdeleteItem', item)
if (UserStore.getters.isUserInvalid) {
return false
@@ -150,7 +155,7 @@ async function Sync_Execute(cmd, tablesync, nametab, method, item: ITodo, id, ms
// console.log('serviceWorker NON PRESENTE !')
// }
if ('serviceWorker' in navigator) {
if (useServiceWorker()) {
return await navigator.serviceWorker.ready
.then((sw) => {
// console.log('---------------------- navigator.serviceWorker.ready')
@@ -210,17 +215,18 @@ async function Sync_ExecuteCmd(cmd, nametab: string, method, item: ITodo, id, ms
const risdata = await Sync_Execute(cmd, tablesync, nametab, method, item, id, msg)
let ris = false
if (cmd === DB.CMD_SYNC_NEW) {
if ((method === 'POST') || (method === 'PATCH')) {
await dbInsertSave(nametab, item, method)
ris = await dbInsertSave(nametab, item, method)
}
} else if (cmd === DB.CMD_DELETE) {
await dbDeleteItem(nametab, item)
ris = await dbDeleteItem(nametab, item)
} else if (cmd === DB.CMD_HIDE) {
await dbHideItem(nametab, item)
ris = await dbHideItem(nametab, item)
}
return risdata
return ris
}
export async function Sync_SaveItem(nametab: string, method, item) {
@@ -246,7 +252,7 @@ export async function aftercalling(ris, checkPending: boolean, nametabindex: str
} else {
tools.consolelogpao('NETWORK UNREACHABLE ! (Error in fetch)', UserStore.getters.getServerCode, ris.status)
}
if ('serviceWorker' in navigator) {
if (useServiceWorker()) {
// Read all data from IndexedDB Store into Memory
await updatefromIndexedDbToState(nametabindex)
}
@@ -296,11 +302,16 @@ async function checkPendingMsg() {
}
function useServiceWorker() {
return false
// return 'serviceWorker' in navigator
}
// If something in the call of Service Worker went wrong (Network or Server Down), then retry !
async function sendSwMsgIfAvailable() {
let something = false
if ('serviceWorker' in navigator) {
if (useServiceWorker()) {
console.log(' -------- sendSwMsgIfAvailable')
const count = await checkPendingMsg()
@@ -344,7 +355,7 @@ async function sendSwMsgIfAvailable() {
})
}
async function waitAndRefreshData() {
export async function waitAndRefreshData() {
// #Todo++ waitAndRefreshData: Check if is OK
await Projects.actions.dbLoad({ checkPending: false, onlyiffirsttime: false })
return await Todos.actions.dbLoad({ checkPending: false })
@@ -428,14 +439,14 @@ function setmodifiedIfchanged(recOut, recIn, field) {
}
export async function table_ModifyRecord(nametable, myitem, listFieldsToChange, field) {
console.log('table_ModifyRecord ... ', nametable)
// console.log('table_ModifyRecord ... ', nametable)
if (myitem === null) {
return new Promise((resolve, reject) => {
resolve()
})
}
// console.log('--> table_ModifyRecord', nametable, myitem.descr)
console.log('--> table_ModifyRecord', nametable, myitem)
if ((field === 'status') && (nametable === 'todos') && (myitem.status === tools.Status.COMPLETED)) {
myitem.completed_at = tools.getDateNow()
@@ -443,16 +454,24 @@ export async function table_ModifyRecord(nametable, myitem, listFieldsToChange,
const myobjsaved = tools.jsonCopy(myitem)
// get record from IndexedDb
const miorec = await globalroutines(null, 'read', nametable, null, myobjsaved._id)
if (miorec === undefined) {
console.log('~~~~~~~~~~~~~~~~~~~~ !!!!!!!!!!!!!!!!!! Record not Found !!!!!! id=', myobjsaved._id)
return
}
let miorec = null
if (useServiceWorker()) {
// get record from IndexedDb
miorec = await globalroutines(null, 'read', nametable, null, myobjsaved._id)
if (miorec === undefined) {
console.log('~~~~~~~~~~~~~~~~~~~~ !!!!!!!!!!!!!!!!!! Record not Found !!!!!! id=', myobjsaved._id)
listFieldsToChange.forEach((myfield) => {
setmodifiedIfchanged(miorec, myobjsaved, myfield)
})
// Prova cmq a salvarlo sul server
return Sync_SaveItem(nametable, 'PATCH', miorec)
}
listFieldsToChange.forEach((myfield) => {
setmodifiedIfchanged(miorec, myobjsaved, myfield)
})
} else {
miorec = myitem
miorec.modified = true
}
console.log( ' ... 4 ')
@@ -464,17 +483,21 @@ export async function table_ModifyRecord(nametable, myitem, listFieldsToChange,
// 1) Permit to Update the Views
tools.notifyarraychanged(miorec)
// 2) Modify on IndexedDb
console.log('// 2) Modify on IndexedDb', miorec)
return globalroutines(null, 'write', nametable, miorec)
.then((ris) => {
if (useServiceWorker()) {
// 2) Modify on IndexedDb
console.log('// 2) Modify on IndexedDb', miorec)
return globalroutines(null, 'write', nametable, miorec)
.then((ris) => {
// 3) Modify on the Server (call)
return Sync_SaveItem(nametable, 'PATCH', miorec)
// 3) Modify on the Server (call)
return Sync_SaveItem(nametable, 'PATCH', miorec)
})
// } else {
// console.log(' ', miorec.descr, 'NON MODIF!')
})
// } else {
// console.log(' ', miorec.descr, 'NON MODIF!')
} else {
return Sync_SaveItem(nametable, 'PATCH', miorec)
}
}
}

19
src/store/Modules/GlobalStore.ts
View File

@@ -48,6 +48,7 @@ const state: IGlobalState = {
rightCartOpen: false,
stateConnection: stateConnDefault,
networkDataReceived: false,
clickcmd: '',
cfgServer: [],
testp1: { contatore: 0, mioarray: [] },
category: 'personal',
@@ -240,6 +241,10 @@ namespace Getters {
return mystate.settings.find((rec) => rec.key === key)
}, 'getrecSettingsByKey')
const getCmdClick = b.read((mystate: IGlobalState) => (): string => {
return mystate.clickcmd
}, 'getCmdClick')
const getValueSettingsByKey = b.read((mystate: IGlobalState) => (key, serv): any => {
const myrec = getters.getrecSettingsByKey(key, serv)
@@ -247,7 +252,7 @@ namespace Getters {
if (!!myrec) {
if ((myrec.type === tools.FieldType.date) || (myrec.type === tools.FieldType.onlydate))
return myrec.value_date
else if (myrec.type === tools.FieldType.number)
else if ((myrec.type === tools.FieldType.number) || (myrec.type === tools.FieldType.hours))
return myrec.value_num
else if (myrec.type === tools.FieldType.boolean)
return myrec.value_bool
@@ -303,6 +308,10 @@ namespace Getters {
return getListByTable()
},
get getCmdClick() {
return getCmdClick()
},
get getValueSettingsByKey() {
return getValueSettingsByKey()
},
@@ -354,6 +363,11 @@ namespace Mutations {
state.testp1.mioarray = newarr
}
function changeCmdClick(mystate: IGlobalState, value: string) {
console.log('changeCmdClick', value)
mystate.clickcmd = value
}
function setPaoArray_Delete(state: IGlobalState) {
state.testp1.mioarray.pop()
}
@@ -439,7 +453,7 @@ namespace Mutations {
if (!!myrec) {
if ((myrec.type === tools.FieldType.date) || (myrec.type === tools.FieldType.onlydate))
myrec.value_date = value
else if (myrec.type === tools.FieldType.number)
else if ((myrec.type === tools.FieldType.number) || (myrec.type === tools.FieldType.hours))
myrec.value_num = value
else if (myrec.type === tools.FieldType.boolean)
myrec.value_bool = value
@@ -457,6 +471,7 @@ namespace Mutations {
setCategorySel: b.commit(setCategorySel),
setStateConnection: b.commit(setStateConnection),
SetwasAlreadySubOnDb: b.commit(SetwasAlreadySubOnDb),
changeCmdClick: b.commit(changeCmdClick),
saveConfig: b.commit(saveConfig),
setPaoArray: b.commit(setPaoArray),
setPaoArray_Delete: b.commit(setPaoArray_Delete),

86
src/store/Modules/Projects.ts
View File

@@ -37,6 +37,19 @@ const listFieldsUpdateCalculation: string [] = ['hoursplanned', 'hoursleft', 'ho
const b = storeBuilder.module<IProjectsState>('Projects', stateglob)
const stateGetter = b.state()
function getFirstInherited(proj, idparent, state) {
let myprojtocheck = null
while (proj.privacyread === Privacy.inherited) {
myprojtocheck = state.projects.find((rec) => rec._id === idparent)
if (!myprojtocheck)
return null
idparent = myprojtocheck.id_parent
proj = myprojtocheck
}
return myprojtocheck
}
function getarrByCategory(category: string) {
if (!stateglob.projects) {
return []
@@ -66,7 +79,7 @@ function getproj(projects, idproj, tipoproj: string) {
else if (tipoproj === RouteNames.projectsshared)
ris = projects.filter((proj) => (proj.id_parent === idproj) && (proj.userId === UserStore.state.my._id) && (proj.privacyread !== Privacy.onlyme))
else if (tipoproj === RouteNames.projectsall)
ris = projects.filter((proj) => (proj.id_parent === idproj) && (proj.userId !== UserStore.state.my._id) )
ris = projects.filter((proj) => (proj.id_parent === idproj) && (proj.userId !== UserStore.state.my._id))
if (ris)
ris = ris.sort((a, b) => a.pos - b.pos)
@@ -105,8 +118,8 @@ namespace Getters {
hoursplanned: 0,
hoursleft: 0,
progressCalc: 0,
privacyread: 'onlyme',
privacywrite: 'onlyme',
privacyread: 'inherited',
privacywrite: 'inherited',
begin_development: tools.getDateNull(),
begin_test: tools.getDateNull(),
hoursweeky_plannedtowork: 0,
@@ -147,6 +160,33 @@ namespace Getters {
}
}, 'listaprojects')
const listagerarchia = b.read((state: IProjectsState) => (tipoproj: string, idparent: string): IMenuList[] => {
if (state.projects) {
// console.log('listagerarchia', idparent)
const myarrgerarchia: IMenuList[] = []
let myidparent = idparent
let precmyparent = '-1'
while (state.projects && myidparent) {
const proj = state.projects.find((rec) => rec._id === myidparent)
if (proj) {
myarrgerarchia.push({ nametranslate: '', description: proj.descr, idelem: proj._id })
} else {
break
}
if (myidparent === proj.id_parent || (!proj.id_parent && (precmyparent === myidparent)))
break
precmyparent = myidparent
myidparent = proj.id_parent
}
// console.log(' myarrgerarchia', myarrgerarchia)
return myarrgerarchia.reverse()
} else {
return []
}
}, 'listagerarchia')
const getDescrById = b.read((state: IProjectsState) => (id: string): string => {
if (id === process.env.PROJECT_ID_MAIN)
return 'Projects'
@@ -177,9 +217,19 @@ namespace Getters {
if (UserStore.state.my._id === proj.userId) // If it's the owner
return true
return (proj.privacyread === Privacy.all) ||
(proj.privacyread === Privacy.friends) && (UserStore.getters.IsMyFriend(proj.userId))
|| ((proj.privacyread === Privacy.mygroup) && (UserStore.getters.IsMyGroup(proj.userId)))
let myprojtocheck = proj
if (proj.privacyread === Privacy.inherited) {
myprojtocheck = getFirstInherited(proj, proj.id_parent, state)
if (!myprojtocheck)
return true
}
console.log('privacyread', myprojtocheck.privacyread)
return (UserStore.state.my._id === myprojtocheck.userId) || (myprojtocheck.privacyread === Privacy.all) ||
(myprojtocheck.privacyread === Privacy.friends) && (UserStore.getters.IsMyFriend(myprojtocheck.userId))
|| ((myprojtocheck.privacyread === Privacy.mygroup) && (UserStore.getters.IsMyGroup(myprojtocheck.userId)))
} else {
return false
}
@@ -191,8 +241,18 @@ namespace Getters {
return false
if (!!UserStore) {
let myprojtocheck = proj
if (proj.privacywrite === Privacy.inherited) {
myprojtocheck = getFirstInherited(proj, proj.id_parent, state)
if (!myprojtocheck)
return true
}
if (!!UserStore.state)
return ((UserStore.state.my._id === proj.userId) || (proj.privacywrite === Privacy.all)) // If it's the owner
return (UserStore.state.my._id === myprojtocheck.userId) || (myprojtocheck.privacywrite === Privacy.all) ||
(myprojtocheck.privacywrite === Privacy.friends) && (UserStore.getters.IsMyFriend(myprojtocheck.userId))
|| ((myprojtocheck.privacywrite === Privacy.mygroup) && (UserStore.getters.IsMyGroup(myprojtocheck.userId)))
else
return false
}
@@ -215,6 +275,9 @@ namespace Getters {
get listaprojects() {
return listaprojects()
},
get listagerarchia() {
return listagerarchia()
},
get getDescrById() {
return getDescrById()
},
@@ -236,17 +299,16 @@ namespace Mutations {
}
if (atfirst) {
state.projects.unshift(objproj)
}
else {
} else {
state.projects.push(objproj)
}
}
function updateProject(state: IProjectsState, { objproj }) {
if (!!objproj) {
console.log('updateProject', objproj)
// console.log('updateProject', objproj)
const index = tools.getIndexById(state.projects, objproj._id)
console.log('index', index)
// console.log('index', index)
if (index >= 0) {
updateDataCalculated(state.projects[index], objproj)
@@ -263,7 +325,7 @@ namespace Mutations {
ApiTables.removeitemfromarray(state.projects, ind)
}
async function movemyitem(state: IProjectsState, { myitemorig, myitemdest } ) {
async function movemyitem(state: IProjectsState, { myitemorig, myitemdest }) {
const indorig = tools.getIndexById(state.projects, myitemorig._id)
state.projects.splice(indorig, 1)

6
src/store/Modules/Store/calendar/CalendarStore.ts
View File

@@ -54,8 +54,8 @@ namespace Getters {
return mystate.bookedevent.find((bookedevent) => (bookedevent.id_bookedevent === myevent._id) && (bookedevent.userId === UserStore.state.my._id) && ((isconfirmed && bookedevent.booked) || (!isconfirmed)))
}, 'findEventBooked')
const getNumParticipants = b.read((mystate: ICalendarState) => (myevent: IEvents, showall) => {
const myarr = mystate.bookedevent.filter((bookedevent) => (bookedevent.id_bookedevent === myevent._id) && (bookedevent.booked) && (showall || (!showall && bookedevent.userId === UserStore.state.my._id) ))
const getNumParticipants = b.read((mystate: ICalendarState) => (myevent: IEvents, showall, tipo) => {
const myarr = mystate.bookedevent.filter((bookedevent) => (bookedevent.id_bookedevent === myevent._id) && (bookedevent.booked) && (showall || (!showall && bookedevent.userId === UserStore.state.my._id) ) && ((tipo === '') || ((tipo === 'lunch' && bookedevent.numpeopleLunch) || (tipo === 'dinner' && bookedevent.numpeopleDinner) )))
if (myarr)
return myarr.reduce((sum, bookedevent) => sum + bookedevent.numpeople, 0)
else
@@ -157,6 +157,8 @@ namespace Actions {
id_bookedevent: bookevent.id_bookedevent,
infoevent: bookevent.infoevent,
numpeople: bookevent.numpeople,
numpeopleLunch: bookevent.numpeopleLunch,
numpeopleDinner: bookevent.numpeopleDinner,
msgbooking: bookevent.msgbooking,
datebooked: bookevent.datebooked,
userId: UserStore.state.my._id,

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

@@ -113,7 +113,7 @@ namespace Getters {
const todos_completati = b.read((stateparam: ITodosState) => (cat: string): ITodo[] => {
const indcat = getindexbycategory(cat)
console.log('todos_completati', cat, 'indcat=', indcat, 'state.categories=', state.categories)
// console.log('todos_completati', cat, 'indcat=', indcat, 'state.categories=', state.categories)
if (stateparam.todos[indcat]) {
let arrout = []
if (stateparam.showtype === costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED) { // Show only the first N completed
@@ -234,7 +234,7 @@ namespace Mutations {
console.log('stateparam.categories', stateparam.categories)
console.log('myitemdest', myitemdest)
console.log('indcat', indcat, 'indcatdest', indcatdest, 'indorig', indorig)
// console.log('indcat', indcat, 'indcatdest', indcatdest, 'indorig', indorig)
if (indcatdest === -1) {
stateparam.categories.push(myitemdest.category)
@@ -288,7 +288,7 @@ namespace Actions {
// console.log('ARRAY TODOS = ', state.todos)
if (process.env.DEBUG === '1') {
console.log('dbLoad', 'state.todos', state.todos, 'state.categories', state.categories)
// console.log('dbLoad', 'state.todos', state.todos, 'state.categories', state.categories)
}
return res
@@ -438,7 +438,7 @@ namespace Actions {
}
async function modify(context, { myitem, field }) {
return await ApiTables.table_ModifyRecord(nametable, myitem, listFieldsToChange, field)
return ApiTables.table_ModifyRecord(nametable, myitem, listFieldsToChange, field)
}
async function swapElems(context, itemdragend: IDrag) {

14
src/store/Modules/UserStore.ts
View File

@@ -394,7 +394,6 @@ namespace Mutations {
}
function setusersList(mystate: IUserState, usersList: IUserFields[]) {
// console.log('setusersList', usersList)
mystate.usersList = [...usersList]
@@ -411,7 +410,6 @@ namespace Mutations {
localStorage.setItem(tools.localStorage.lang, state.lang)
}
function UpdatePwd(mystate: IUserState, x_auth_token: string) {
mystate.x_auth_token = x_auth_token
if (!mystate.my.tokens) {
@@ -670,6 +668,17 @@ namespace Actions {
})
}
async function reportload(context, paramquery) {
return await Api.SendReq('/report/load', 'POST', paramquery)
.then((res) => {
// console.log('res', res)
return res.data
}).catch((error) => {
return null
})
}
async function newsletter_setactivate(context, paramquery) {
return await Api.SendReq('/news/setactivate', 'POST', paramquery)
@@ -1065,6 +1074,7 @@ namespace Actions {
execDbOp: b.dispatch(execDbOp),
setLangServer: b.dispatch(setLangServer),
newsletterload: b.dispatch(newsletterload),
reportload: b.dispatch(reportload),
newsletter_setactivate: b.dispatch(newsletter_setactivate),
getDashboard: b.dispatch(getDashboard),
getDownline: b.dispatch(getDownline)

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

@@ -14,5 +14,7 @@ export const costanti = {
CANCEL_BOOKING: 1
},
DRAGULA: false,
MAX_PHASES: 5,
}

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

@@ -74,6 +74,8 @@ export const colgallery = [
fieldtype: tools.FieldType.listimages,
jointable: ''
}),
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
export const colmsg_templates = [
@@ -90,7 +92,7 @@ export const colmsg_templates = [
AddCol({ name: 'title_pt', label_trans: 'Tit POR', fieldtype: tools.FieldType.string }),
AddCol({ name: 'msg_pt', label_trans: 'POR', fieldtype: tools.FieldType.html }),
AddCol({ name: 'title_fr', label_trans: 'Tit FRA', fieldtype: tools.FieldType.string }),
AddCol({ name: 'msg_fr', label_trans: 'FRA', fieldtype: tools.FieldType.html }),
AddCol({ name: 'msg_fr', label_trans: 'FRA', fieldtype: tools.FieldType.html })
]
export const colmypage = [
@@ -173,6 +175,8 @@ export const colTableProducer = [
AddCol({ name: 'city', label_trans: 'producer.city' }),
AddCol({ name: 'img', label_trans: 'producer.img' }),
AddCol({ name: 'website', label_trans: 'producer.website' }),
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
export const getcolorderscart = [
@@ -182,42 +186,50 @@ export const getcolorderscart = [
AddCol({ name: 'items', label_trans: 'order.items' }),
AddCol({ name: 'userId', label_trans: 'order.users', fieldtype: tools.FieldType.select, jointable: 'users' }),
AddCol({ name: 'note', label_trans: 'order.note' }),
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
export const colTableShareWithUs = [
AddCol({ name: 'description', label_trans: 'share.description' }),
AddCol({ name: 'numshared', label_trans: 'share.numshared', fieldtype: tools.FieldType.number }),
AddCol({ name: 'rating', label_trans: 'share.rating', fieldtype: tools.FieldType.number }),
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
export const colTableHours = [
// AddCol({ name: 'userId', label_trans: 'hours.userId' }),
// AddCol({ name: 'todoId', label_trans: 'hours.todoId' }),
AddCol({ name: 'descr', label_trans: 'hours.descr' }),
AddCol({ name: 'username', label_trans: 'reg.username_short', notShowInNewRec: true }),
AddCol({ name: 'date', label_trans: 'hours.date', fieldtype: tools.FieldType.onlydate }),
AddCol({ name: 'hours', label_trans: 'hours.hours', fieldtype: tools.FieldType.hours }),
AddCol({ name: 'time_start', label_trans: 'hours.time_start', fieldtype: tools.FieldType.number }),
AddCol({ name: 'time_end', label_trans: 'hours.time_end', fieldtype: tools.FieldType.number }),
AddCol({ name: 'hours', label_trans: 'hours.hours', fieldtype: tools.FieldType.number }),
AddCol({ name: 'descr', label_trans: 'hours.note' }),
AddCol({ name: 'username', label_trans: 'reg.username_short', notShowInNewRec: true }),
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
export const colTablegroups = [
AddCol({ name: 'descr', label_trans: 'share.description' }),
AddCol({ name: 'descr', label_trans: 'proj.longdescr' }),
AddCol({ name: 'resp', label_trans: 'reg.resp' }),
AddCol({ name: 'viceResp', label_trans: 'reg.viceResp' }),
AddCol({
name: 'assignedToUsers',
label_trans: 'reg.userslist',
fieldtype: tools.FieldType.multiselect,
jointable: 'users'
jointable: 'workers'
}),
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
export const colTabledepartments = [
AddCol({ name: 'name', label_trans: 'store.name' }),
AddCol({ name: 'username', label_trans: 'store.username' })
AddCol({ name: 'username', label_trans: 'store.username' }),
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
export const colTableStorehouse = [
@@ -229,6 +241,8 @@ export const colTableStorehouse = [
AddCol({ name: 'region', label_trans: 'store.region' }),
AddCol({ name: 'img', label_trans: 'store.img' }),
AddCol({ name: 'website', label_trans: 'store.website' }),
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
export const colTableProducts = [
@@ -267,20 +281,23 @@ export const colTableProducts = [
AddCol({ name: 'weight', label_trans: 'products.weight', fieldtype: tools.FieldType.number }),
AddCol({ name: 'stars', label_trans: 'products.stars', fieldtype: tools.FieldType.number }),
AddCol({ name: 'date', label_trans: 'products.date', fieldtype: tools.FieldType.date }),
AddCol(DeleteRec)
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
const colcontribtype = [
AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
AddCol({ name: 'showprice', label_trans: 'event.showprice', fieldtype: tools.FieldType.boolean }),
AddCol(DeleteRec)
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
const colpaymenttype = [
AddCol({ name: '_id', label_trans: 'others.value' }),
AddCol({ name: 'key', label_trans: 'reg.key' }),
AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
AddCol(DeleteRec)
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
const colworkers = [
@@ -288,7 +305,8 @@ const colworkers = [
AddCol({ name: 'username', label_trans: 'reg.username' }),
AddCol({ name: 'name', label_trans: 'reg.name' }),
AddCol({ name: 'surname', label_trans: 'reg.surname' }),
AddCol(DeleteRec)
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
const colflotte = [
@@ -408,7 +426,8 @@ const coldisciplines = [
const colTablePermission = [
AddCol({ name: '_id', label_trans: 'others.value' }),
AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
AddCol(DeleteRec)
AddCol(DeleteRec),
AddCol(DuplicateRec)
]
const colTableOperator = [
@@ -464,6 +483,7 @@ const colTableEvents = [
AddCol({ name: 'linkpage', label_trans: 'event.linkpage' }),
AddCol({ name: 'linkpdf', label_trans: 'event.linkpdf' }),
AddCol({ name: 'nobookable', label_trans: 'event.nobookable', fieldtype: tools.FieldType.boolean }),
AddCol({ name: 'internal', label_trans: 'event.internal', fieldtype: tools.FieldType.boolean }),
AddCol({ name: 'news', label_trans: 'event.news', fieldtype: tools.FieldType.boolean }),
AddCol({ name: 'canceled', label_trans: 'event.canceled', fieldtype: tools.FieldType.boolean }),
AddCol({ name: 'deleted', label_trans: 'event.deleted', fieldtype: tools.FieldType.boolean }),
@@ -529,7 +549,6 @@ export const fieldsTable = {
risultato = myris[collab]
}
if (key === 'username') {
console.log('key=', key, 'collab', collab, 'val', val)
console.log('myris', risultato)
@@ -625,7 +644,7 @@ export const fieldsTable = {
AddCol({ name: 'id_conf_zoom', label_trans: 'zoom.id_conf_zooom' }),
AddCol({ name: 'note', label_trans: 'zoom.note' }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
AddCol(DuplicateRec)
],
colTableUsersBase: [
@@ -1096,7 +1115,7 @@ export const fieldsTable = {
label: 'Lista Ingresso',
columns: collistaingresso,
colkey: '_id',
collabel: 'ind_order',
collabel: 'ind_order'
},
{
value: 'graduatorias',

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

@@ -184,11 +184,13 @@ export const tools = {
multiselect: 256,
password: 512,
listimages: 1024,
image: 2048,
exact: 2048,
image: 3000,
nationality: 4096,
intcode: 5000,
multioption: 6000,
onlydate: 7000
onlydate: 7000,
hours: 8000
},
FieldTypeArr: [
@@ -201,7 +203,70 @@ export const tools = {
{ label: 'Number', value: 64 }
],
SelectHours: [
{
id: 0,
label: '0',
value: 0
},
{
id: 5,
label: '0.5',
value: 0.5
},
{
id: 10,
label: '1',
value: 1
},
{
id: 15,
label: '1.5',
value: 1.5
},
{
id: 20,
label: '2',
value: 2
},
{
id: 25,
label: '2.5',
value: 2.5
},
{
id: 30,
label: '3',
value: 3
},
{
id: 35,
label: '3.5',
value: 3.5
},
{
id: 40,
label: '4',
value: 4
},
{
id: 45,
label: '4.5',
value: 4.5
},
{
id: 50,
label: '5',
value: 5
}
],
SelectListNumPeople: [
{
id: 0,
label: '0',
value: 0
},
{
id: 1,
label: '1',
@@ -320,6 +385,11 @@ export const tools = {
id: 4,
label: translation.it.privacy.onlyme,
value: Privacy.onlyme
},
{
id: 5,
label: translation.it.privacy.inherited,
value: Privacy.inherited
}
],
es: [
@@ -342,6 +412,11 @@ export const tools = {
id: 4,
label: translation.es.privacy.onlyme,
value: Privacy.onlyme
},
{
id: 5,
label: translation.es.privacy.inherited,
value: Privacy.inherited
}
],
enUs: [
@@ -364,6 +439,11 @@ export const tools = {
id: 4,
label: translation.enUs.privacy.onlyme,
value: Privacy.onlyme
},
{
id: 5,
label: translation.enUs.privacy.inherited,
value: Privacy.inherited
}
]
},
@@ -1346,7 +1426,7 @@ export const tools = {
tools.notifyarraychanged(myarr)
console.log('arr FINALE', tools.logga_arrproj(myarr))
// console.log('arr FINALE', tools.logga_arrproj(myarr))
// Update the records:
}
@@ -1883,6 +1963,7 @@ export const tools = {
mycolor = 'primary'
}
q.notify({
// group: '',
message: msg,
icon: myicon,
classes: 'my-notif-class',
@@ -2561,14 +2642,14 @@ export const tools = {
getprivacyreadbytipoproj(tipoproj) {
if (tipoproj === RouteNames.myprojects)
return Privacy.onlyme
return Privacy.inherited
else
return Privacy.all
}
,
getprivacywritebytipoproj(tipoproj) {
return Privacy.onlyme
return Privacy.inherited
}
,
@@ -2736,13 +2817,13 @@ export const tools = {
} else if (Screen.width < 600) {
return '450'
} else if (Screen.width < 800) {
return '500'
return '550'
} else if (Screen.width < 900) {
return '700'
} else if (Screen.width < 1000) {
return '900'
return '800'
} else if (Screen.width < 1100) {
return '1000'
return '900'
} else {
return Screen.width - 200
}
@@ -4103,6 +4184,13 @@ export const tools = {
}
return mylist
},
IsLogged() {
if (!!UserStore)
return UserStore.state.isLogged
else
return false
}
// getLocale() {

9
src/store/Modules/translation.ts
View File

@@ -5,7 +5,8 @@ export const translation = {
all: 'Tutti',
friends: 'Amici',
mygroup: 'Gruppo',
onlyme: 'Solo io'
onlyme: 'Solo io',
inherited: 'Ereditato'
},
proj: {
newproj: 'Nuovo Progetto',
@@ -27,7 +28,8 @@ export const translation = {
all: 'Todos',
friends: 'Amigos',
mygroup: 'Grupos',
onlyme: 'Solo yo'
onlyme: 'Solo yo',
inherited: 'Ereditato'
},
proj: {
newproj: 'Nuevo Projecto',
@@ -49,7 +51,8 @@ export const translation = {
all: 'All',
friends: 'Friends',
mygroup: 'Group',
onlyme: 'Only me'
onlyme: 'Only me',
inherited: 'Inherited'
},
proj: {
newproj: 'New Project',