Campo Citta di Nascita (nel profilo nuova maniera), manca ancora da sistemare l'edit

Se seleziono la Provincia , mi deve comparire la lista dei comuni

src/server/router/index_router.js

@@ -46,15 +46,19 @@ const {Contribtype} = require('../models/contribtype');
 const {PaymentType} = require('../models/paymenttype');
 const {Discipline} = require('../models/discipline');
 const {Skill} = require('../models/skill');
+const {Good} = require('../models/good');
 const {SubSkill} = require('../models/subskill');
 const {MySkill} = require('../models/myskill');
+const {MyGood} = require('../models/mygood');
 const {StatusSkill} = require('../models/statusSkill');
 const {City} = require('../models/city');
 const {Province} = require('../models/province');
 const {Sector} = require('../models/sector');
+const {SectorGood} = require('../models/sectorgood');
 const {CatGrp} = require('../models/catgrp');
 const {Level} = require('../models/level');
 const {AdType} = require('../models/adtype');
+const {AdTypeGood} = require('../models/adtypegood');
 const Pickup = require('../models/pickup');
 const {Newstosent} = require('../models/newstosent');
 const {MyPage} = require('../models/mypage');
@@ -1021,10 +1025,13 @@ function load(req, res, version) {
   // SKILLS:
   let levels = Level.findAllIdApp(idapp);
   let adtypes = AdType.findAllIdApp(idapp);
+  let adtypegoods = AdTypeGood.findAllIdApp(idapp);
   let skills = Skill.findAllIdApp(idapp);
-  let subSkills = SubSkill.findAllIdApp(idapp);
+  let goods = Good.findAllIdApp(idapp);
+  //let subSkills = SubSkill.findAllIdApp(idapp);
   let statusSkills = StatusSkill.findAllIdApp(idapp);
   let sectors = Sector.findAllIdApp(idapp);
+  let sectorgoods = SectorGood.findAllIdApp(idapp);
   let catgrps = CatGrp.findAllIdApp(idapp);
   let cities = City.findAllIdApp(idapp);
   let cart = null;
@@ -1078,19 +1085,22 @@ function load(req, res, version) {
     internalpages,
     levels,
     skills,
-    subSkills,
+    //subSkills,
+    myuserextra,
     sectors,
     statusSkills,
     cities,
-    myuserextra,
     catgrps,
     adtypes,
+    adtypegoods,
+    sectorgoods,
+    goods,
   ]).then((arrdata) => {
     // console.table(arrdata);
     let myuser = req.user;
     if (myuser) {
       try {
-        myuser = arrdata[30];
+        myuser = arrdata[26];
         if (myuser) {
           myuser.password = '';
           myuser._doc.calcstat = arrdata[13];
@@ -1152,13 +1162,16 @@ function load(req, res, version) {
         internalpages: arrdata[23],
         levels: arrdata[24],
         skills: arrdata[25],
-        subSkills: arrdata[26],
+        // subSkills: arrdata[26],
+        // myuser arrdata[26]
         sectors: arrdata[27],
         statusSkills: arrdata[28],
         cities: arrdata[29],
-        // myuser arrdata[30]
-        catgrps: arrdata[31],
-        adtypes: arrdata[32],
+        catgrps: arrdata[30],
+        adtypes: arrdata[31],
+        adtypegoods: arrdata[32],
+        sectorgoods: arrdata[33],
+        goods: arrdata[34],
       });
     }
 

src/server/router/mygoods_router.js

@@ -0,0 +1,50 @@
+const shared_consts = require('../tools/shared_nodejs');
+
+const express = require('express');
+const router = express.Router();
+
+const tools = require('../tools/general');
+
+var server_constants = require('../tools/server_constants');
+
+var {authenticate, auth_default} = require('../middleware/authenticate');
+
+var mongoose = require('mongoose').set('debug', false);
+const Subscription = mongoose.model('subscribers');
+
+const _ = require('lodash');
+const {MyGood} = require('../models/mygood');
+var {User} = require('../models/user');
+
+const {ObjectID} = require('mongodb');
+
+//GET orders
+router.post('/page', authenticate, function(req, res, next) {
+  let idGood = req.body.idGood;
+  let idapp = req.body.idapp;
+
+  return MyGood.getMyGoodByIdkill(idapp, idGood).
+      then((ris) => {
+
+        if (ris) {
+          res.send(ris);
+          /*
+          const userId = ris.userId;
+          return User.getUsernameById(idapp, userId).then((username) =>
+          {
+            res.send({...ris, username});
+          });
+          */
+
+        } else {
+          res.status(400).send();
+        }
+      }).catch((e) => {
+        console.error('Err', e);
+        res.status(400).send(e);
+      })
+
+
+});
+
+module.exports = router;

src/server/router/users_router.js

@@ -872,15 +872,15 @@ async function eseguiDbOp(idapp, mydata, locale) {
         */
     } else if (mydata.dbop === 'CorreggiTabHours') {
 
-      await Hours.correggiHours(idapp);
+      ris = await Hours.correggiHours(idapp);
 
     } else if (mydata.dbop === 'setVerifiedByAportadorToALL') {
 
-      await User.setVerifiedByAportadorToALL();
+      ris = await User.setVerifiedByAportadorToALL();
 
     } else if (mydata.dbop === 'RewriteContribType') {
 
-      populate.rewriteTable('contribtypes');
+      ris = populate.rewriteTable('contribtypes');
 
     } else if (mydata.dbop === 'copyFrom1To13') {
       const idapporig = 1;
@@ -906,27 +906,50 @@ async function eseguiDbOp(idapp, mydata, locale) {
                 numrectot += numrec;
               });
         }
+
+        ris = numrectot;
+
       } catch (e) {
         console.log('e', e);
       }
 
+    } else if (mydata.dbop === 'emptyTabCatServiziBeni') {
+
+      const {Sector} = require('../models/sector');
+      const {SectorGood} = require('../models/sectorgood');
+      const {Skill} = require('../models/skill');
+      const {Good} = require('../models/good');
+
+      await Sector.deleteMany({});
+      await SectorGood.deleteMany({});
+      await Skill.deleteMany({});
+      ris = await Good.deleteMany({});
+
     } else if (mydata.dbop === 'emptyDbSkill') {
 
       // Svuota e Ricrea
 
       const {Sector} = require('../models/sector');
+      const {SectorGood} = require('../models/sectorgood');
       const {Skill} = require('../models/skill');
+      const {Good} = require('../models/good');
       const {SubSkill} = require('../models/subskill');
       const {Contribtype} = require('../models/contribtype');
       const {AdType} = require('../models/adtype');
+      const {AdTypeGood} = require('../models/adtypegood');
+      const {StatusSkill} = require('../models/statusSkill');
 
       await Sector.deleteMany({});
+      await SectorGood.deleteMany({});
       await Skill.deleteMany({});
+      await Good.deleteMany({});
       await SubSkill.deleteMany({});
       await Contribtype.deleteMany({});
       await AdType.deleteMany({});
+      await AdTypeGood.deleteMany({});
+      await StatusSkill.deleteMany({});
 
-      await populate.popolaTabelleNuove();
+      ris = await populate.popolaTabelleNuove();
 
     } else if (mydata.dbop === 'ricreaTabCitiesProvinces') {
 
@@ -938,22 +961,22 @@ async function eseguiDbOp(idapp, mydata, locale) {
       await City.deleteMany({});
       await Province.deleteMany({});
 
-      await populate.popolaTabelleNuove();
+      ris = await populate.popolaTabelleNuove();
 
     } else if (mydata.dbop === 'PopulateTables') {
 
-      populate.popolaTabelleNuove();
+      ris = populate.popolaTabelleNuove();
 
     } else if (mydata.dbop === 'RewriteCitiesTable') {
 
-      populate.rewriteTable('cities');
-    } else if (mydata.dbop === 'RewriteLevelTable') {
-
-      populate.rewriteTable('levels');
-
+      ris = populate.rewriteTable('cities');
     } else if (mydata.dbop === 'RewriteLevelsTable') {
 
-      populate.rewriteTable('provinces');
+      ris = populate.rewriteTable('levels');
+
+    } else if (mydata.dbop === 'RewriteProvincesTable') {
+
+      ris = populate.rewriteTable('provinces');
 
     } else if (mydata.dbop === 'emptyCityProvinces') {
 
@@ -1005,9 +1028,17 @@ router.post('/dbop', authenticate, async (req, res) => {
   idapp = req.body.idapp;
   locale = req.body.locale;
 
-  const ris = await eseguiDbOp(idapp, mydata, locale);
+  try{
+    const ris = await eseguiDbOp(idapp, mydata, locale);
 
-  res.send(ris);
+    res.send(ris);
+
+  } catch (e) {
+    res.status(400).send();
+    res.send({code: server_constants.RIS_CODE_ERR, msg: e});
+
+    console.log(e.message);
+  }
 
 });