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

✨✨✨ AGGIORNAMENTO SITO ✨✨✨

Browse Source 
👉🏻 E' possibile ora visualizzare la Posizione Reale d'imbarco di quando si verrà aggiunti alle prossime Navi Definitive.
Le posizioni verranno aggiornate ogni ora in automatico!

👉🏻 Ora gli imbarchi comprendono anche le navi provvisorie, pertanto è possibile annullarli oppure cambiare l'Invitante, dalla lista imbarchi.

 👉🏻 E' ora possibile spostare gli invitati solo se si hanno piu' di 2 invitati per ogni Nave già partita.

👨🏻‍💻 Per i Tutor:
👉🏻- Sostituzioni : Cliccando su "Cerca il Primo Disponibile" vi suggerirà in automatico il primo passeggero disponibile per la sostituzione.

✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨✨
This commit is contained in:
Paolo Arena
2020-05-19 00:18:55 +02:00
parent d2bf9eb202
commit 3fb1de9b70
29 changed files with 430 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -539,7 +539,10 @@ namespace Actions {
// If is not already stored in DB, then show the message to the user.
if (!state.wasAlreadySubscribed || notreg) {
options = {
title: tools.translate('notification.title_subscribed', [{strin: 'sitename', strout: translate('ws.sitename')}]),
title: tools.translate('notification.title_subscribed', [{
strin: 'sitename',
strout: translate('ws.sitename')
}]),
content: translate('notification.subscribed'),
openUrl: '/'
}
@@ -766,6 +769,18 @@ namespace Actions {
})
}
async function askFunz(context, { mydata }) {
// console.log('saveFieldValue', mydata)
return await Api.SendReq(`/askfunz`, 'PATCH', { data: mydata })
.then((ris) => {
return ris.data.out
})
.catch((error) => {
return null
})
}
async function DeleteRec(context, { table, id }) {
console.log('DeleteRec', table, id)
@@ -787,7 +802,7 @@ namespace Actions {
async function DeleteFile(context, { filename }) {
console.log('DeleteFile', filename)
return await Api.SendReq('/delfile', 'DELETE', {filename})
return await Api.SendReq('/delfile', 'DELETE', { filename })
.then((res) => {
if (res.status === 200) {
if (res.data.code === serv_constants.RIS_CODE_OK) {
@@ -848,6 +863,7 @@ namespace Actions {
return null
})
}
async function GetArrNavi(context) {
console.log('GetArrNavi')
@@ -1119,6 +1135,7 @@ namespace Actions {
checkUpdates: b.dispatch(checkUpdates),
saveFieldValue: b.dispatch(saveFieldValue),
callFunz: b.dispatch(callFunz),
askFunz: b.dispatch(askFunz),
sendPushNotif: b.dispatch(sendPushNotif),
loadTable: b.dispatch(loadTable),
saveTable: b.dispatch(saveTable),

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

@@ -63,6 +63,8 @@ namespace Actions {
state.datastat = res.data.datastat
state.datastat.arr_nations = JSON.parse(state.datastat.arr_nations)
state.datastat.reg_daily = JSON.parse(state.datastat.reg_daily)
state.datastat.imbarcati_daily = JSON.parse(state.datastat.imbarcati_daily)
state.datastat.imbarcati_weekly = JSON.parse(state.datastat.imbarcati_weekly)
state.datastat.reg_weekly = JSON.parse(state.datastat.reg_weekly)
state.datastat.checkuser = JSON.parse(state.datastat.checkuser)

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

@@ -161,6 +161,7 @@ const colpaymenttype = [
const colnavi = [
AddCol({ name: '_id', label_trans: 'others.value' }),
AddCol({ name: 'idListaIngresso', label_trans: 'idListaIngresso' }),
AddCol({ name: 'riga', label_trans: 'reg.riga' }),
AddCol({ name: 'col', label_trans: 'reg.col' }),
AddCol({ name: 'ind_order', label_trans: 'ind_order' }),
@@ -175,6 +176,7 @@ const colnavi = [
AddCol({ name: 'date_made_gift', label_trans: 'date_made_gift', fieldtype: tools.FieldType.date }),
// AddCol({ name: 'received_gift', label_trans: 'received_gift', fieldtype: tools.FieldType.boolean }),
// AddCol({ name: 'date_received_gift', label_trans: 'date_received_gift', fieldtype: tools.FieldType.date }),
AddCol({ name: 'offerta_al_fondo', label_trans: 'offerta_al_fondo', fieldtype: tools.FieldType.number }),
AddCol({ name: 'num_tess', label_trans: 'num_tess', fieldtype: tools.FieldType.number }),
AddCol({ name: 'note', label_trans: 'note', fieldtype: tools.FieldType.string }),
// AddCol({ name: 'note_interne', label_trans: 'note_interne', fieldtype: tools.FieldType.string }),
@@ -211,6 +213,26 @@ const collistaingresso = [
AddCol(DeleteRec)
]
const colgraduatoria = [
AddCol({ name: 'index', label_trans: 'index' }),
AddCol({ name: 'punteggio', label_trans: 'Punt', fieldtype: tools.FieldType.number }),
AddCol({ name: 'ind_order', label_trans: 'ind_order' }),
AddCol({ name: 'num_tess', label_trans: 'num_tess', fieldtype: tools.FieldType.number }),
AddCol({ name: 'username', label_trans: 'reg.username_short' }),
AddCol({ name: 'name', label_trans: 'reg.name' }),
AddCol({ name: 'surname', label_trans: 'reg.surname' }),
AddCol({ name: 'numNaviEntrato', label_trans: 'Navi', fieldtype: tools.FieldType.number }),
AddCol({ name: 'indimbarco', label_trans: 'Imbarco', fieldtype: tools.FieldType.number }),
// AddCol({ name: 'numinvitati', label_trans: 'Inv.', fieldtype: tools.FieldType.number }),
// AddCol({ name: 'numinvitatiattivi', label_trans: 'Att.', fieldtype: tools.FieldType.number }),
AddCol({ name: 'numinvitatiTot', label_trans: 'Inv (Tot)', fieldtype: tools.FieldType.number }),
AddCol({ name: 'numinvitatiattiviTot', label_trans: 'Att. Tot', fieldtype: tools.FieldType.number }),
AddCol({ name: 'invitante_username', label_trans: 'reg.aportador_solidario' }),
AddCol({ name: 'date_added', label_trans: 'date_added', fieldtype: tools.FieldType.date }),
AddCol(DuplicateRec),
AddCol(DeleteRec)
]
const coldisciplines = [
AddCol({ name: 'typol_code', label_trans: 'disc.typol_code' }),
AddCol({ name: 'order', label_trans: 'disc.order', fieldtype: tools.FieldType.number }),
@@ -479,7 +501,7 @@ export const fieldsTable = {
colTableUsers: [
// AddCol({ name: '_id', label_trans: 'reg.id' }),
AddCol({ name: 'index', label_trans: 'reg.index', fieldtype: tools.FieldType.number }),
AddCol({ name: 'ind_order', label_trans: 'reg.ind_order' }),
// AddCol({ name: 'ind_order', label_trans: 'reg.ind_order' }),
AddCol({ name: 'old_order', label_trans: 'old_order' }),
AddCol({ name: 'sospeso', label_trans: 'reg.sospeso', fieldtype: tools.FieldType.boolean }),
AddCol({ name: 'deleted', label_trans: 'reg.deleted', fieldtype: tools.FieldType.boolean }),
@@ -643,6 +665,13 @@ export const fieldsTable = {
colkey: '_id',
collabel: 'ind_order',
},
{
value: 'graduatorias',
label: 'Graduatoria',
columns: colgraduatoria,
colkey: '_id',
collabel: 'index',
},
{
value: 'disciplines',
label: 'Discipline',

1
src/store/Modules/lists.ts
View File

@@ -29,6 +29,7 @@ export const lists = {
DONO_RICEVUTO: 370,
AGGIUNGI_NUOVO_IMBARCO: 380,
CANCELLA_IMBARCO: 385,
DAMMI_PRIMO_UTENTE_LIBERO: 390,
CAN_EDIT_TABLE: 400,
SHOW_PREV_REC: 401

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

@@ -91,6 +91,7 @@ export const tools = {
TABUSER: 'users',
TABNAVI: 'navi',
TABLISTAINGRESSO: 'listaingressos',
TABGRADUATORIA: 'graduatorias',
TABEVENTS: 'myevents',
TABEXTRALIST: 'extralist',
TABNEWSLETTER: 'newstosent',
@@ -1480,7 +1481,7 @@ export const tools = {
table: '',
fieldsvalue: {},
notifBot: {}
};
}
if (!!par.param1.invitante_username) {
mydatatosave = {
@@ -1548,6 +1549,7 @@ export const tools = {
if (func === lists.MenuAction.CANCELLA_IMBARCO) {
mydatatosave.ind_order = par.param1.ind_order
mydatatosave.data.id = par.param2.rec._id
}
if (func === lists.MenuAction.AGGIUNGI_NUOVO_IMBARCO) {
mydatatosave.invitante_username = par.param1.invitante_username
@@ -3396,55 +3398,19 @@ export const tools = {
if (langin === '')
return ''
try {
let lang = langin.toUpperCase()
if (lang === 'IT')
return 'fa-flag-it'
else if (lang === 'ES')
return 'fa-flag-es'
else if (lang === 'PT')
return 'fa-flag-pt'
else if (lang === 'BR')
return 'fa-flag-br'
else if (lang === 'US')
return 'fa-flag-us'
else if ((lang === 'GB') || (lang === 'UK'))
return 'fa-flag-gb'
else if (lang === 'DE')
return 'fa-flag-de'
else if (lang === 'FR')
return 'fa-flag-fr'
else if (lang === 'SI')
return 'fa-flag-si'
else if (lang === 'MD')
return 'fa-flag-md'
else if (lang === 'NG')
return 'fa-flag-ng'
else if (lang === 'SK')
return 'fa-flag-sk'
else if (lang === 'CH')
return 'fa-flag-ch'
else if (lang === 'CM')
return 'fa-flag-cm'
else if (lang === 'CO')
return 'fa-flag-co'
else if (lang === 'PE')
return 'fa-flag-pe'
else if (lang === 'SM')
return 'fa-flag-sm'
else if (lang === 'HR')
return 'fa-flag-hr'
else if (lang === 'RO')
return 'fa-flag-ro'
else if (lang === 'VE')
return 'fa-flag-ve'
else if (lang === 'CL')
return 'fa-flag-cl'
else if (lang === 'PL')
return 'fa-flag-pl'
else if (lang === 'EG')
return 'fa-flag-eg'
const lang = langin.toUpperCase()
const arrlang = ['IT', 'ES', 'PT', 'BR', 'US', 'GB', 'UK', 'DE', 'FR', 'SI', 'MD',
'NG', 'SK', 'CH', 'CM', 'CO', 'CG', 'PE', 'MS', 'SM', 'HR', 'RO', 'VE', 'CL', 'PL', 'EG', 'AR', 'MX', 'SN', 'PK', 'AT', 'NP',
'CU', 'MA', 'PH', 'BA', 'UA', 'BE', 'NL', 'CI']
const flag = arrlang.find((mylang) => mylang === lang)
if (!!flag) {
return 'fa-flag-' + flag.toLowerCase()
}
return ''
} catch (e) {
return ''
}
@@ -3528,6 +3494,36 @@ export const tools = {
return 'Egypt'
} else if (nat === 'BR') {
return 'Brazil'
} else if (nat === 'CG') {
return 'Congo'
} else if (nat === 'AR') {
return 'Argentina'
} else if (nat === 'MX') {
return 'Mexico'
} else if (nat === 'SN') {
return 'Senegal'
} else if (nat === 'PK') {
return 'Pakistan'
} else if (nat === 'AT') {
return 'Austria'
} else if (nat === 'NP') {
return 'Nepal'
} else if (nat === 'CU') {
return 'Cuba'
} else if (nat === 'MA') {
return 'Morocco'
} else if (nat === 'PH') {
return 'Philippines'
} else if (nat === 'BA') {
return 'Bosnia and Herzegovina'
} else if (nat === 'BE') {
return 'Belgium'
} else if (nat === 'NL') {
return 'Netherlands'
} else if (nat === 'MS') {
return 'Montserrat'
} else if (nat === 'CI') {
return 'Cote d\'Ivoire'
}
},