- Table of Disciplines #101

- Insert Facebook bar to the Site #97
This commit is contained in:
Paolo Arena
2019-11-12 21:34:03 +01:00
parent 0d776589f0
commit 049e882210
8 changed files with 115 additions and 1 deletions

View File

@@ -16,6 +16,7 @@ const { Operator } = require('../models/operator');
const { Where } = require('../models/where');
const { MyEvent } = require('../models/myevent');
const { Contribtype } = require('../models/contribtype');
const { Discipline } = require('../models/discipline');
const { Settings } = require('../models/settings');
const { SendMsg } = require('../models/sendmsg');
const { Permission } = require('../models/permission');
@@ -143,6 +144,8 @@ function getTableByTableName(tablename) {
mytable = MyEvent;
else if (tablename === 'contribtype')
mytable = Contribtype;
else if (tablename === 'disciplines')
mytable = Discipline;
else if (tablename === 'settings')
mytable = Settings;
else if (tablename === 'permissions')
@@ -339,11 +342,12 @@ router.get('/loadsite/:userId/:idapp/:sall', authenticate_noerror, (req, res) =>
const operators = Operator.findAllIdApp(idapp);
const wheres = Where.findAllIdApp(idapp);
const contribtype = Contribtype.findAllIdApp(idapp);
const disciplines = Discipline.findAllIdApp(idapp);
const settings = Settings.findAllIdApp(idapp);
const permissions = Permission.findAllIdApp();
return Promise.all([bookedevent, eventlist, operators, wheres, contribtype, settings, permissions])
return Promise.all([bookedevent, eventlist, operators, wheres, contribtype, settings, permissions, disciplines])
.then((arrdata) => {
// console.table(arrdata);
res.send({
@@ -354,6 +358,7 @@ router.get('/loadsite/:userId/:idapp/:sall', authenticate_noerror, (req, res) =>
contribtype: arrdata[4],
settings: arrdata[5],
permissions: arrdata[6],
disciplines: arrdata[7],
});
})
.catch((e) => {