++ aggiunta la prenotazione negli eventi. con la lista degli utenti.

src/server/router/booking_router.js

@@ -78,7 +78,7 @@ router.delete('/:id/:notify/:idapp', authenticate, (req, res) => {
   const id = req.params.id;
   const notify = req.params.notify;
   const idapp = req.params.idapp;
-
+  
   Booking.findByIdAndRemove(id).then((recbooking) => {
     if (!recbooking) {
       return res.status(404).send();

src/server/router/sendmsg_router.js

@@ -10,7 +10,7 @@ const { User } = require('../models/user');
 const { Operator } = require('../models/operator');
 const { SendMsg } = require('../models/sendmsg');
 
-const {SendNotif} = require('../models/sendnotif');
+const { SendNotif } = require('../models/sendnotif');
 
 const { ObjectID } = require('mongodb');
 
@@ -35,7 +35,7 @@ router.post('/', authenticate, (req, res) => {
     User.setOnLine(req.user.idapp, req.user.username);
   }
 
-  const check = tools.checkUserOk(myrecmsg.origin.username, req.user.username, res);
+  const check = tools.checkUserOk(myrecmsg.origin, req.user.username, res);
   if (check.exit) return check.ret;
 
   // console.log('fieldtochange', fieldtochange);
@@ -49,26 +49,37 @@ router.post('/', authenticate, (req, res) => {
 
       return SendMsg.findById(idobj)
         .then(async (recmsg) => {
+          const myrecsend = new SendNotif(
+            {
+              title: recmsg.source.infoevent,
+              sender: recmsg.origin,
+              dest: recmsg.dest,            
+              openUrl: '',
+            });
           // Add this field because I don't want to add into the database
-          recmsg.source.infoevent = body.source.infoevent;
+          // myrecsend.source.infoevent = body.source.infoevent;
 
-          recmsg.typedir = shared_consts.TypeNotifs.TYPEDIR_EVENTS;
-          recmsg.typeid = shared_consts.TypeNotifs.ID_EVENTS_REMOVE_REC;
+          myrecsend.typedir = shared_consts.TypeNotifs.TYPEDIR_EVENTS;
+          myrecsend.typeid = shared_consts.TypeNotifs.ID_EVENTS_SEND_MSG;
+          myrecsend.msg = recmsg.message;
+          let myid = recmsg._id;
           // ##Todo !! DA SISTEMARE !!!
-          return await SendNotif.saveAndSendNotif(recmsg, req, res).then((out) => {
+          return await SendNotif.saveAndSendNotif(myrecsend, req, res).then((out) => {
             if (out)
-              return res.send({ code: server_constants.RIS_CODE_OK, msg: '', id: recmsg._id });
+              return res.send({ code: server_constants.RIS_CODE_OK, msg: '', id: myid });
             else
               return res.send({ code: server_constants.RIS_CODE_ERR, msg: '' });
           })
 
         });
     }).catch((e) => {
-      console.log(e.message);
+      console.error(e.message);
       // res.status(400).send(e);
-      return res.send({ code: server_constants.RIS_CODE_ERR, msg: '' });
+      // return res.send({ code: server_constants.RIS_CODE_ERR, msg: '' });
     })
 
+  let fine = '';
+
 });
 
 router.get('/:username/:lastdataread/:idapp', authenticate, (req, res) => {

src/server/router/users_router.js

@@ -1547,12 +1547,14 @@ router.post('/cmd', authenticate, async (req, res) => {
   const cmd = req.body.cmd;
   const id = req.body.id;
   const tab = req.body.tab;
+  const num = req.body.num;
   const value = req.body.value;
 
   try {
     const username = req.user.username;
 
     let ris = null;
+    let record = null;
 
     if (cmd === shared_consts.CMD_USER.SET_FAVORITE) {
       if (tab) {
@@ -1568,16 +1570,29 @@ router.post('/cmd', authenticate, async (req, res) => {
         else
           ris = await User.removeBookmark(idapp, username, id, tab);
       }
-    } else if (cmd === shared_consts.CMD_USER.SET_SEEN) {
+    } else if (cmd === shared_consts.CMD_USER.SET_ATTEND) {
       if (tab) {
         if (value)
+          ris = await User.addAttend(req, idapp, username, id, tab, num);
+        else
+          ris = await User.removeAttend(idapp, username, id, tab);
+      }
+    } else if (cmd === shared_consts.CMD_USER.SET_SEEN) {
+      if (tab) {
+        if (value) {
           ris = await User.addSeen(idapp, username, id, tab);
+        }
+        const tabtofind = tools.getNumTabByTable('mybachecas');
+        if (tab === tabtofind) {
+          const { MyBacheca } = require('../models/mybacheca');
+          record = await MyBacheca.getCompleteRecord(idapp, id);
+        }
       }
     }
 
     let state = (value && ris && ris.ok === 1) ? 1 : ((!value && ris && ris.ok === 1) ? -1 : 0);
 
-    return res.send({ state });
+    return res.send({ state, record });
 
   } catch (e) {
     res.status(400).send();