sito Terra Della Visione...3

Pagina Operatori

src/store/Modules/costanti.ts

@@ -105,7 +105,7 @@ export const costanti = {
       small: false,
     },
     {
-      visible: true,
+      visible: false,
       strsingolo: 'Idea',
       title: 'Tue Idee',
       to: '/ideas',
@@ -118,16 +118,16 @@ export const costanti = {
     },
     {
       visible: true,
-      title: 'Help',
-      to: '/help',
+      title: 'Help (Faq)',
+      to: '/faq',
       icon: 'fas fa-users',
       color: 'green-6',
       hint: '',
-      disable: true,
+      disable: false,
       small: true,
     },
     {
-      visible: true,
+      visible: false,
       title: 'Social',
       to: '/socialising',
       icon: 'fas fa-users',
@@ -136,6 +136,16 @@ export const costanti = {
       disable: true,
       small: true,
     },
+    {
+      visible: true,
+      title: 'Per sostienere il Progetto?',
+      to: '/fundraising',
+      icon: 'fas fa-hand-holding',
+      color: 'blue-6',
+      hint: '',
+      disable: false,
+      small: false,
+    },
     {
       visible: false,
       title: 'Gruppi',

src/store/Modules/fieldsTable.ts

@@ -68,6 +68,7 @@ function AddCol(params: IColGridTable) {
     icon: (params.icon === undefined) ? '' : params.icon,
     action: (params.action === undefined) ? '' : params.action,
     foredit: (params.foredit === undefined) ? true : params.foredit,
+    isInModif: (params.isInModif === undefined) ? false : params.isInModif,
     fieldtype: (params.fieldtype === undefined) ? costanti.FieldType.string : params.fieldtype,
     fieldtype_real: (params.fieldtype_real === undefined) ? ((params.fieldtype === undefined) ? costanti.FieldType.string : params.fieldtype) : params.fieldtype_real,
     field_outtype: (params.field_outtype === undefined) ? costanti.FieldType.string : params.field_outtype,
@@ -112,6 +113,8 @@ export const colgallery = [
     label_trans: 'gallery.list',
     fieldtype: costanti.FieldType.listimages,
     jointable: '',
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+    isInModif: true,
   }),
   AddCol(DeleteRec),
   AddCol(DuplicateRec),
@@ -1558,10 +1561,17 @@ const colTableGeneric = [
   AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
 ]
 
-const colTableOperator = [
+export const colTableOperator = [
   AddCol({ name: 'username', label_trans: 'reg.username_short' }),
   AddCol({ name: 'name', label_trans: 'reg.name' }),
   AddCol({ name: 'surname', label_trans: 'reg.surname' }),
+  AddCol({ name: 'showInTeam', label_trans: 'op.showInTeam', fieldtype: costanti.FieldType.boolean }),
+  AddCol({
+    name: 'arrDisciplines',
+    label_trans: 'op.arrDisciplines',
+    fieldtype: costanti.FieldType.multiselect,
+    jointable: 'disciplines',
+  }),
   AddCol({ name: 'email', label_trans: 'reg.email' }),
   AddCol({ name: 'img', label_trans: 'event.img' }),
   AddCol({ name: 'cell', label_trans: 'reg.cell' }),
@@ -2485,6 +2495,14 @@ export const fieldsTable = {
     return colTableMovement
   },
 
+  colOperators() {
+    return colTableOperator
+  },
+
+  colDisciplines() {
+    return coldisciplines
+  },
+
   userlist() {
     if (static_data.functionality.ENABLE_REG_AYNI) {
       return colTableUsers
@@ -2582,34 +2600,6 @@ export const fieldsTable = {
       colkey: '_id',
       collabel: (rec: any) => `${rec.name} ${rec.surname}`,
     },
-    {
-      value: 'navi',
-      label: 'Navi',
-      columns: colnavi,
-      colkey: '_id',
-      collabel: (rec: any) => `${rec.riga}.${rec.col}`,
-    },
-    {
-      value: 'flotte',
-      label: 'Flotte',
-      columns: colflotte,
-      colkey: '_id',
-      collabel: (rec: any) => `${rec.riga}.${rec.col_prima} ${rec.riga}.${rec.col_ultima}`,
-    },
-    {
-      value: 'navepersistente',
-      label: 'Navi Persistenti',
-      columns: colnavepersistente,
-      colkey: '_id',
-      collabel: (rec: any) => `${rec.riga}.${rec.col}`,
-    },
-    {
-      value: 'listaingressos',
-      label: 'Lista Ingresso',
-      columns: collistaingresso,
-      colkey: '_id',
-      collabel: 'ind_order',
-    },
     {
       value: 'graduatorias',
       label: 'Graduatoria',
@@ -2927,7 +2917,7 @@ export const fieldsTable = {
     },
     {
       value: 'friendsandme',
-      label: 'Amici',
+      label: 'Amici_and_me',
       columns: colTableUsersGeneric,
       colkey: 'username',
       collabel: 'username',

src/store/Modules/tools.ts

@@ -2953,14 +2953,18 @@ export const tools = {
   },
 
   getimgev(ev: IEvents) {
-    if (!!ev.img_small)
-      return '' + ev.img_small
-    else if (!!ev.img)
-      return '' + ev.img
-    else
-      return ''
+    if (!!ev) {
+      if (!!ev.img_small)
+        return '' + ev.img_small
+      else if (!!ev.img)
+        return '' + ev.img
+      else
+        return ''
+    }
+    return ''
   },
 
+
   convertHTMLtoText(myhtml: string) {
     let msg = myhtml
     msg = msg.replace('"', '"')

src/store/UserStore.ts

@@ -210,9 +210,16 @@ export const useUserStore = defineStore('UserStore', {
       // Check if is this User!
       if (this.my.username === username) return this.my
 
-      let trovato = null
+      let trovato:any = null
       if (this.usersList) trovato = this.usersList.find((item: any) => item.username === username)
 
+      if (trovato) {
+        if (trovato.surname === 'undefined')
+          trovato.surname = ''
+        if (trovato.name === 'undefined')
+          trovato.name = ''
+      }
+
       return (trovato) || null
     },
 
@@ -280,13 +287,13 @@ export const useUserStore = defineStore('UserStore', {
     getNameSurnameByUserId(userId: string): string {
 
       const user = this.getUserByUserId(userId)
-      if (user) return `${user.name} ${user.surname}`
+      if (user) return `${user.name} ` + !!user.surname ? user.surname : ''
       return `(${userId})`
     },
 
     getNameSurnameByUsername(username: string): string {
-      const user = this.getUserByUsername(username)
-      if (user) return `${user.name} ${user.surname}`
+      let user = this.getUserByUsername(username)
+      if (user) return `${user.name} ` + !!user.surname ? user.surname : ''
       return `(${username})`
     },
 
@@ -294,10 +301,17 @@ export const useUserStore = defineStore('UserStore', {
       // Check if is this User!
       if (this.my._id === userId) return this.my
 
-      let trovato = null
+      let trovato:any = null
 
       if (this.usersList) trovato = this.usersList.find((item: any) => item._id === userId)
 
+      if (trovato) {
+        if (trovato.surname === undefined)
+          trovato.surname = ''
+        if (trovato.name === undefined)
+          trovato.name = ''
+      }
+
       return (trovato) || null
     },
 

src/store/globalStore.ts

@@ -750,8 +750,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
           this.networkDataReceived = true
 
           // console.log('******* checkUpdates RES :', res.data.cfgServer)
-          if (res.data.cfgServer) {
-            this.cfgServer = [...res.data.cfgServer]
+          if (res.data.CfgServer) {
+            this.cfgServer = [...res.data.CfgServer]
             // console.log('res.data.cfgServer', res.data.cfgServer)
           }