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

src/model/Calendar.ts

@@ -47,7 +47,9 @@ export interface IEvents {
 export interface IBookedEvent {
   _id?: any
   userId: string
+  username: string
   id_bookedevent?: any
+  tableType?: number
   numpeople: number
   numpeopleLunch?: number
   numpeopleDinner?: number

src/model/GlobalStore.ts

@@ -967,6 +967,7 @@ export interface IMySkill extends IMyMain {
   NumLevel: number
   adType: number
   note: string
+  groupname: string,
   // **ADDFIELD_MYSKILL
   website: string
   descr: string
@@ -993,6 +994,7 @@ export interface IMyGoods extends IMyMain {
   NumLevel: number
   adType: number
   note: string
+  groupname: string,
   // **ADDFIELD_MYSKILL
   website: string
   descr: string
@@ -1014,6 +1016,14 @@ export interface IMyBacheca extends IMyMain {
   NumLevel: number
   adType: number
   note: string
+  organisedBy: string,
+  address: string,
+  min_partecip: number,
+  max_partecip: number,
+  contribstr: string,
+  groupname: string,
+  mygrp?: IMyGroup
+
   // **ADDFIELD_MYBACHECAS
   website: string
   descr: string
@@ -1042,6 +1052,8 @@ export interface IMyHosp extends IMyMain {
   website: string
   date_created?: Date,
   date_updated?: Date,
+  groupname: string,
+  //**ADDFIELD_MYHOSPS
 }
 
 

src/model/MessageStore.ts

@@ -35,14 +35,8 @@ export const MsgDefault: IMessage = {
     infoevent: '',
     page: '',
   },
-  origin: {
-    username: '',
-    idapp: '',
-  },
-  dest: {
-    idapp: '',
-    username: '',
-  },
+  origin: '',
+  dest: '',
   message: '',
   datemsg: new Date(),
   read: false,
@@ -71,8 +65,8 @@ export interface IMessage {
   _id?: any
   idapp?: string
   source?: ISource
-  origin?: IIdentity
-  dest?: IIdentity
+  origin: string
+  dest: string
   message: string
   datemsg?: Date
   read?: boolean

src/model/UserStore.ts

@@ -1,6 +1,7 @@
 import { IToken } from '@model/other'
 import { ICart, IOrderCart, IShareWithUs } from '@src/model/Products'
 import { IAccount, ICircuit, IGallery, IImgGallery, IMyCircuit } from '@model/GlobalStore'
+import { IBookedEvent } from './Calendar'
 
 const enum ESexType {
   None = 0,
@@ -71,6 +72,12 @@ export interface ISeen {
   tab: number
 }
 
+export interface IAttend {
+  id: string
+  tab: number
+  num: number
+}
+
 export interface IFavBook {
   username: string
 }
@@ -137,9 +144,14 @@ export interface IUserProfile {
   bookmark: IBookmark[]
   favorite: IFavorite[]
   seen: ISeen[]
+  attend: IAttend[]
+
+  // Query
   myfav: IFavBook[]
   mybook: IFavBook[]
   myseen: IFavBook[]
+  myattend: IFavBook[]
+  mybookings: IBookedEvent[]
 
   // in memory
   asked_friends: any[]