- Fare LISTA MOVIMENTI più comprensibile

- Grafica Circuiti

src/server/tools/general.js

@@ -5609,39 +5609,44 @@ module.exports = {
   getStringaConto(mov) {
 
     let mystr = ''
-    let myfrom = ''
-    let myto = ''
+    let userfrom = ''
+    let userto = ''
+
+    let profilefrom = null
+    let profileto = null
 
     let tipocontofrom = shared_consts.AccountType.USER
     let tipocontoto = shared_consts.AccountType.USER
 
     if (mov.contocomfrom && mov.contocomfrom.name) {
-      myfrom += mov.contocomfrom.name + ' '
+      userfrom += mov.contocomfrom.name
       tipocontofrom = shared_consts.AccountType.COMMUNITY_ACCOUNT
     }
     if (mov.groupfrom) {
-      myfrom += mov.groupfrom.groupname + ' '
+      userfrom += mov.groupfrom.groupname
       tipocontofrom = shared_consts.AccountType.COLLECTIVE_ACCOUNT
     }
     if (mov.userfrom) {
-      myfrom += mov.userfrom.username + ' '
+      userfrom += mov.userfrom.username
+      profilefrom = mov.userfrom.profile
     }
 
     if (mov.contocomto && mov.contocomto.name) {
-      myto += mov.contocomto.name + ' '
+      userto += mov.contocomto.name
       tipocontoto = shared_consts.AccountType.COMMUNITY_ACCOUNT
     }
     if (mov.groupto) {
-      myto += mov.groupto.groupname + ' '
+      userto += mov.groupto.groupname
       tipocontoto = shared_consts.AccountType.COLLECTIVE_ACCOUNT
     }
     if (mov.userto) {
-      myto += mov.userto.username + ' '
+      userto += mov.userto.username
+      profileto = mov.userto.profile
     }
 
-    // mystr = t('movement.from') + myfrom + ' ' + t('movement.to') + myto
+    // mystr = t('movement.from') + userfrom + ' ' + t('movement.to') + userto
 
-    return { myfrom, myto, tipocontofrom, tipocontoto }
+    return { userfrom: {profile: profilefrom, username: userfrom}, userto: {profile: profileto, username: userto}, tipocontofrom, tipocontoto }
   },
 
   ImageDownloader,
@@ -5685,5 +5690,21 @@ module.exports = {
     return 'it';
   },
 
+  getFieldsForAnnunci() {
+    let annunciFields = {
+      idMyGroup: {
+        type: String,
+      },
+      expiryDateAdv: {
+        type: Date,
+      },
+      enableExpiringAdv: {
+        type: Boolean,
+      },
+      // **ADDFIELD_ANNUNCI
+    };
+  
+    return annunciFields;
+  },  
 
 };