ver 0.5.51

src/model/GlobalStore.ts

@@ -1,5 +1,5 @@
 import { IAction } from '@src/model/Projects'
-import { IFriends, IMyGroup, IPaymentType } from '@src/model/UserStore'
+import { IFriends, IGroupShort, IMyGroup, IPaymentType } from '@src/model/UserStore'
 import {
   IDepartment, IProducer, IShareWithUs, IStorehouse,
 } from '@src/model/Products'
@@ -1033,10 +1033,6 @@ export interface IMyHosp extends IMyMain {
   date_updated?: Date,
 }
 
-export interface ICircuitList {
-  _id: string,
-  inscription_date?: Date
-}
 
 export interface IMyCircuit {
   _id: string
@@ -1048,6 +1044,8 @@ export interface ISendCoin {
   circuitname: string
   qty: number
   dest: string
+  groupdest: string
+  grouporig: string
   causal: string
   symbol: string
 }
@@ -1072,6 +1070,8 @@ export interface ICircuit {
   valuta_per_euro?: number
   fido_scoperto_default?: number
   qta_max_default?: number
+  fido_scoperto_default_grp?: number
+  qta_max_default_grp?: number
   data_costituz?: Date
   deperimento: boolean
   transactionsEnabled: boolean
@@ -1090,6 +1090,10 @@ export interface ICircuit {
   createdBy?: string
   regulation?: string
   numMembers?: number
+  req_users?: IFriends[]
+  refused_users?: IFriends[]
+  req_groups?: IGroupShort[]
+  refused_groups?: IGroupShort[]
   // --- Mem:
   movements: IMovement[]
 }

src/model/UserStore.ts

@@ -1,6 +1,6 @@
 import { IToken } from '@model/other'
 import { ICart, IOrderCart, IShareWithUs } from '@src/model/Products'
-import { IAccount, ICircuit, ICircuitList, IGallery, IImgGallery, IMyCircuit } from '@model/GlobalStore'
+import { IAccount, ICircuit, IGallery, IImgGallery, IMyCircuit } from '@model/GlobalStore'
 
 const enum ESexType {
   None = 0,
@@ -12,6 +12,16 @@ export interface IFriends {
   username: string
   date?: Date
 }
+export interface IGroupShort {
+  groupname: string
+  date?: Date
+}
+
+export interface IUserAdmins {
+  username: string
+  perm?: number
+  date?: Date
+}
 
 export interface IMyGroup {
   _id: string
@@ -30,7 +40,7 @@ export interface IMyGroup {
   username_who_block?: string
   date_blocked?: Date
   createdBy?: string
-  circuits_list?: ICircuitList[]
+  mycircuits?: IMyCircuit[]
 }
 
 export interface ICalcStat {
@@ -98,8 +108,8 @@ export interface IUserProfile {
 
   // in memory
   asked_friends: any[]
-  asked_groups: any[]
-  refused_groups: any[]
+  asked_groups: IGroupShort[]
+  refused_groups: IGroupShort[]
   list_usersgroup?: IFriends[]
 
   asked_circuits: any[]