Sorting fixed

- added tables Skills, Sectors,

src/server/router/index_router.js

@@ -40,6 +40,9 @@ const { MyEvent } = require('../models/myevent');
 const { Contribtype } = require('../models/contribtype');
 const { PaymentType } = require('../models/paymenttype');
 const { Discipline } = require('../models/discipline');
+const { Skill } = require('../models/skill');
+const { Sector } = require('../models/sector');
+const { Level } = require('../models/level');
 const { Newstosent } = require('../models/newstosent');
 const { MyPage } = require('../models/mypage');
 const { CalZoom } = require('../models/calzoom');
@@ -281,6 +284,12 @@ function getTableByTableName(tablename) {
     mytable = ListaIngresso;
   else if (tablename === 'graduatorias')
     mytable = Graduatoria;
+  else if (tablename === 'skills')
+    mytable = Skill;
+  else if (tablename === 'sectors')
+    mytable = Sector;
+  else if (tablename === 'levels')
+    mytable = Level;
 
   return mytable
 }
@@ -292,7 +301,8 @@ router.post('/settable', authenticate, (req, res) => {
 
   mydata.idapp = req.user.idapp;
 
-  if (params.table === 'permissions') {
+
+  if (shared_consts.TABLES_ID_NUMBER.includes(params.table)) {
     if (mydata["_id"] === undefined) {
       mydata._id = 1;
     }
@@ -306,7 +316,7 @@ router.post('/settable', authenticate, (req, res) => {
 
 
   let mytablerec = new mytable(mydata);
-  console.log('mytablerec', mytablerec);
+  // console.log('mytablerec', mytablerec);
 
   const mytablestrutt = getTableByTableName(params.table);
 
@@ -1137,11 +1147,11 @@ router.get('/loadsite/:userId/:idapp', authenticate_noerror, (req, res) => {
 });
 
 router.get('/loadsite/:userId/:idapp/:vers', authenticate_noerror, (req, res) => {
-  let version = req.params.vers;
-  version = version.replace('.', '');
-  version = version.replace('.', '');
+  let versionstr = req.params.vers;
 
-  load(req, res, parseInt(version));
+  let version = tools.getVersionint(versionstr);
+
+  load(req, res, version);
 });
 
 function load(req, res, version) {
@@ -1201,6 +1211,9 @@ function load(req, res, version) {
   let workers = User.getusersWorkersList(idapp);
   let storehouses = Storehouse.findAllIdApp(idapp);
   let departments = Department.findAllIdApp(idapp);
+  let levels = Level.findAllIdApp(idapp);
+  let skills = Skill.findAllIdApp(idapp);
+  let sectors = Sector.findAllIdApp(idapp);
   let cart = null;
   let orderscart = null;
   if (sall) {
@@ -1220,7 +1233,8 @@ function load(req, res, version) {
   }
 
 
-  return Promise.all([bookedevent, eventlist, operators, wheres, contribtype, settings, permissions, disciplines, newstosent, mailinglist, mypage, gallery, paymenttype, calcstat, calzoom, producers, cart, storehouses, departments, orderscart, groups, resps, workers, internalpages])
+  return Promise.all([bookedevent, eventlist, operators, wheres, contribtype, settings, permissions, disciplines, newstosent, mailinglist, mypage, gallery, paymenttype, calcstat, calzoom, producers, cart, storehouses, departments, orderscart, groups, resps, workers, internalpages,
+    levels, skills, sectors ])
     .then((arrdata) => {
       // console.table(arrdata);
       const myuser = req.user;
@@ -1254,6 +1268,9 @@ function load(req, res, version) {
         workers: arrdata[22],
         myuser,
         internalpages: arrdata[23],
+        levels: arrdata[24],
+        skills: arrdata[25],
+        sectors: arrdata[26],
       });
     })
     .catch((e) => {
@@ -1377,17 +1394,20 @@ router.post('/upload_from_other_server/:dir', authenticate, (req, res) => {
 
 });
 
-
-router.post('/upload/:dir', authenticate, (req, res) => {
+function uploadFile(req, res, version) {
+  // console.log('/upload dir:' + dir);
   const dir = req.params.dir;
   const idapp = req.user.idapp;
 
-  // console.log('/upload dir:' + dir);
-
   const form = new formidable.IncomingForm();
 
   form.parse(req);
 
+  let dirmain = '/statics';
+  if (version > 0) {
+    dirmain = '';
+  }
+
   form.uploadDir = folder + '/' + dir;
   try {
 
@@ -1398,7 +1418,7 @@ router.post('/upload/:dir', authenticate, (req, res) => {
     form.on('file', async function (name, file) {
       try {
         console.log('Uploaded ' + file.name);
-        const mydir = tools.getdirByIdApp(idapp) + '/statics/upload/' + dir;
+        const mydir = tools.getdirByIdApp(idapp) + dirmain + '/upload/' + dir;
 
         // Create Dir if doesn't exist:
         tools.mkdirpath(mydir);
@@ -1435,6 +1455,20 @@ router.post('/upload/:dir', authenticate, (req, res) => {
   } catch (e) {
     console.log('Error', e)
   }
+}
+
+
+router.post('/upload/:dir', authenticate, (req, res) => {
+  uploadFile(req, res, 0);
+
+});
+
+
+router.post('/upload/:dir/:vers', authenticate, (req, res) => {
+  let versionstr = req.params.vers;
+  let version = tools.getVersionint(versionstr);
+
+  uploadFile(req, res, version);
 
 });