Aggiunto il filtro per Provincia

src/server/router/index_router.js

@@ -21,6 +21,8 @@ const {Graduatoria} = require('../models/graduatoria');
 const mongoose = require('mongoose').set('debug', false);
 const cfgserver = mongoose.model('cfgserver');
 
+const uuidv4 = require('uuid/v4'); // I chose v4 ‒ you can select others
+
 const ftp = require('../ftp/FTPClient'),
     formidable = require('formidable'),
     folder = path.join(__dirname, 'upload');
@@ -48,6 +50,7 @@ const {SubSkill} = require('../models/subskill');
 const {MySkill} = require('../models/myskill');
 const {StatusSkill} = require('../models/statusSkill');
 const {City} = require('../models/city');
+const {Province} = require('../models/province');
 const {Sector} = require('../models/sector');
 const {Level} = require('../models/level');
 const Pickup = require('../models/pickup');
@@ -313,14 +316,16 @@ function getTableByTableName(tablename) {
     mytable = StatusSkill;
   else if (tablename === 'cities')
     mytable = City;
+  else if (tablename === 'provinces')
+    mytable = Province;
   else if (tablename === 'sectors')
     mytable = Sector;
   else if (tablename === 'levels')
     mytable = Level;
   else if (shared_consts.TablePickup.includes(tablename))
     mytable = Pickup;
-  else if (shared_consts.TableCities.includes(tablename))
-    mytable = City;
+  //else if (shared_consts.TableCities.includes(tablename))
+  // mytable = City;
 
   return mytable;
 }
@@ -1602,16 +1607,29 @@ function uploadFile(req, res, version) {
 
         // Create Dir if doesn't exist:
         tools.mkdirpath(mydir);
+
+        let filename = file.name;
+        let ext = path.extname(filename);
+
+        //++Todo: Modifica del nomefile... da passare al frontend
+        //if (mydir.includes('profile')) {
+        //  filename = uuidv4() + ext;
+        //}
+
+        file.name = filename
         let newname = mydir + '/' + file.name;
-        let resized_img = mydir + '/' + server_constants.PREFIX_IMG + file.name;
+        let resized_img = mydir + '/' + server_constants.PREFIX_IMG + filename;
 
         console.log('move from ', file.path, 'to :', newname);
 
         // For local: ... resolve this... sending through the static folder...
-        // res.sendFile(path.resolve(file.name));
+        // res.sendFile(path.resolve(filename));
+
+        oldpath = file.path
+        file.path = newname;
 
         // Move in the folder application !
-        tools.move(file.path, newname, (err) => {
+        tools.move(oldpath, newname, (err) => {
           if (err)
             console.log('err:', err);
 
@@ -1644,7 +1662,8 @@ function uploadFile(req, res, version) {
             })
 
           })();
-          res.end();
+          // res.end();
+          // return res.send({filename: newname });
 
         });
 
@@ -1654,6 +1673,10 @@ function uploadFile(req, res, version) {
       }
     });
 
+    form.on('end', function() {
+      console.log('-> upload done');
+    });
+
     form.on('aborted', () => {
       console.error('Request aborted by the user');
       res.status(400).send();
@@ -1670,7 +1693,7 @@ function uploadFile(req, res, version) {
 }
 
 router.post('/upload/:dir', authenticate, (req, res) => {
-  uploadFile(req, res, 0);
+  return uploadFile(req, res, 0);
 
 });
 
@@ -1679,7 +1702,7 @@ router.post('/uploadnew/:vers/:dir/', authenticate, (req, res) => {
   let version = tools.getVersionint(versionstr);
 
   try {
-    uploadFile(req, res, version);
+    return uploadFile(req, res, version);
 
   } catch (e) {
     console.log('error', e);