@chat21/chat21-ionic 3.0.94 → 3.0.95

package/.github/workflows/docker-community-push-latest.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2	     
       name: Check out the repo
-    - uses: docker/build-push-action@v1
+    - uses: docker/build-push-action@v2
       with:	    
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

package/.github/workflows/docker-image-tag-community-tag-push.yml

@@ -13,7 +13,7 @@ jobs:
      - name: Check out the repo
        uses: actions/checkout@v2
      - name: Push to Docker Hub
-       uses: docker/build-push-action@v1
+       uses: docker/build-push-action@v2
        with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # chat21-ionic ver 3.0
 
+### 3.0.95 in PROD
+- bug-fixed: cannot upload PDF files
+
+### 3.0.95-rc.1
+- added: custom colors to senderFullname to better distinguish the user
+- bug-fixed: cannot read text.trim() of undefined if no text is sent with an image
+- bug-fixed: markdown not split work correctly
+
 ### 3.0.94 in PROD
 - bug-fixed: error getting projectId during lead detail for conversations with more than 4 segment
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.94",
+    "version": "3.0.95",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.html

@@ -121,7 +121,7 @@
         <!--backgroundColor non viene ancora usato -->
         <chat-bubble-message class="messages msg_sent" id="message_msg_sent" style="position: relative;" 
           [ngClass]="{'has-metadata': (isImage(message) || isFrame(message)), 'privateMsg': (message?.attributes && message?.attributes?.subtype === 'private')}" 
-          [class.no-background]="(isImage(message) || isFrame(message)) && message?.text.trim() === '' "  
+          [class.no-background]="(isImage(message) || isFrame(message)) && message?.text && message?.text.trim() === '' "  
           [class.emoticon]="isEmojii(message?.text)"
           [ngStyle]="{'background': stylesMap.get('bubbleSentBackground'), 'color': stylesMap.get('bubbleSentTextColor')}"
           [ngClass]="{'button-in-msg' : message.metadata && message.metadata.button}"
@@ -168,7 +168,7 @@
         <!--backgroundColor non viene ancora usato -->
         <chat-bubble-message class="messages msg_receive" id="message_msg_receive"
           [ngClass]="{'has-metadata': (isImage(message) || isFrame(message)), 'privateMsg': (message?.attributes && message?.attributes?.subtype === 'private')}" 
-          [class.no-background]="(isImage(message) || isFrame(message)) && message?.text.trim() === '' "  
+          [class.no-background]="(isImage(message) || isFrame(message)) && message?.text && message?.text.trim() === '' "  
           [class.emoticon]="isEmojii(message?.text)"
           [ngStyle]="{'background': stylesMap?.get('bubbleReceivedBackground'), 'color': stylesMap.get('bubbleReceivedTextColor')}"
           [isSameSender]="isSameSender(message?.sender, i)"

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.html

@@ -18,7 +18,7 @@
   <div>
 
     <div *ngIf="messageType(MESSAGE_TYPE_OTHERS, message) && !isSameSender" 
-      [style.color]="convertColorToRGBA(fontColor, 65)"
+      [style.color]="fullnameColor"
       [ngStyle]="{'padding': (isImage(message) || isFrame(message))? '10px 16px 8px 16px': '10px 8px 0px 8px'}" class="message_sender_fullname">
       {{message?.sender_fullname}}
     </div>

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.ts

@@ -10,7 +10,8 @@ import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk
 import * as moment from 'moment';
 import { ModalController, PopoverController } from '@ionic/angular';
 import { convertColorToRGBA } from 'src/chat21-core/utils/utils';
-import { BubbleInfoPopoverComponent } from 'src/app/components/bubbleMessageInfo-popover/bubbleinfo-popover.component';
+import { getColorBck } from 'src/chat21-core/utils/utils-user';
+
 @Component({
   selector: 'chat-bubble-message',
   templateUrl: './bubble-message.component.html',
@@ -53,7 +54,7 @@ export class BubbleMessageComponent implements OnInit, OnChanges {
     'hide-delay': 200
   };
   sizeImage : { width: number, height: number}
-
+  fullnameColor: string;
   public logger: LoggerService = LoggerInstance.getInstance()
  
   constructor(
@@ -98,6 +99,14 @@ export class BubbleMessageComponent implements OnInit, OnChanges {
     if (this.message && this.message.metadata && typeof this.message.metadata === 'object') {
       this.sizeImage = this.getMetadataSize(this.message.metadata)
     }
+
+    if(this.fontColor){
+      this.fullnameColor = convertColorToRGBA(this.fontColor, 65)
+    }
+    if(this.message && this.message.sender_fullname && this.message.sender_fullname.trim() !== ''){
+      this.fullnameColor = getColorBck(this.message.sender_fullname)
+      console.log('colorrrrrr', this.fullnameColor)
+    }
   }
 
 
@@ -257,3 +266,4 @@ export class BubbleMessageComponent implements OnInit, OnChanges {
 
 
 }
+

package/src/app/chatlib/conversation-detail/message/text/text.component.scss

@@ -28,7 +28,7 @@ p {
 }
 
 p ::ng-deep a {
-    word-break: break-all
+    word-break: break-word
 }
 
 

package/src/app/chatlib/list-conversations-component/list-conversations/list-conversations.component.html

@@ -9,7 +9,7 @@
           </div>
         </div>
         <div class="c21-right-conv">
-          <div class="c21-last-time">{{conversation.time_last_message}}</div>
+          <div class="c21-last-time">{{conversation?.timestamp | amTimeAgo}}</div>
           <div class="truncate c21-name">{{conversation.sender_fullname }}</div>
           <div *ngIf="conversation.type ==='image'">
             <div [class.not-read]="conversation.is_new" class="c21-msg" style="float: left; margin-right: 5px;">
@@ -17,7 +17,6 @@
                 width="20px" height="20px" viewBox="0 0 24 24">
                 <path d="M0 0h24v24H0V0z" fill="none"/>
                 <path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14 6 17h12l-3.86-5.14z"/>
-                <!-- <title id="altIconTitle">{{ translationMap.get('CLOSED') }}</title> -->
               </svg>
             </div>
             <div [class.not-read]="conversation.is_new" class="truncate c21-msg">{{conversation.last_message_text}}</div>

package/src/chat21-core/providers/firebase/firebase-archivedconversations-handler.ts

@@ -14,7 +14,7 @@ import { ConversationModel } from '../../models/conversation';
 
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, searchIndexInArrayForUid, archivedConversationsPathForUserId, isGroup } from '../../utils/utils';
+import { compareValues, searchIndexInArrayForUid, archivedConversationsPathForUserId, isGroup, getTimeLastMessage } from '../../utils/utils';
 import { ArchivedConversationsHandlerService } from '../abstract/archivedconversations-handler.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
@@ -396,7 +396,7 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
         conv.conversation_with = conversation_with;
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);
-        // conv.time_last_message = this.getTimeLastMessage(conv.timestamp); // evaluate if is used
+        conv.time_last_message = getTimeLastMessage(conv.timestamp); // evaluate if is used
         conv.avatar = avatarPlaceholder(conversation_with_fullname);
         conv.color = getColorBck(conversation_with_fullname);
         conv.archived = true;
@@ -415,17 +415,6 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp, 10) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
-
     /**
      *  check if the conversations is valid or not
      */

package/src/chat21-core/providers/firebase/firebase-auth-service.ts

@@ -74,7 +74,7 @@ export class FirebaseAuthService extends MessagingAuthService {
     this.URL_TILEDESK_CREATE_CUSTOM_TOKEN = this.SERVER_BASE_URL + 'chat21/firebase/auth/createCustomToken';
     this.logger.log('[FIREBASEAuthSERVICE] - initialize URL_TILEDESK_CREATE_CUSTOM_TOKEN ', this.URL_TILEDESK_CREATE_CUSTOM_TOKEN)
 
-
+    
     let firebasePersistence;
     // console.log('FB-AUTH firebasePersistence', this.getPersistence()) 
     switch (this.getPersistence()) {

package/src/chat21-core/providers/firebase/firebase-conversations-handler.ts

@@ -21,7 +21,7 @@ import { AppConfigProvider } from 'src/app/services/app-config';
 
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
+import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
 import { TOUCHING_OPERATOR } from '../../utils/constants';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 
@@ -650,16 +650,6 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp, 10) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
     /**
      *  check if the conversations is valid or not
      */

package/src/chat21-core/providers/firebase/firebase-presence.service.ts

@@ -14,9 +14,6 @@ import { PresenceService } from '../abstract/presence.service';
 import { CustomLogger } from '../logger/customLogger';
 import { LoggerInstance } from '../logger/loggerInstance';
 
-// utils
-// import { setLastDate } from '../../utils/utils';
-// import { environment } from '../../../environments/environment';
 
 // @Injectable({providedIn: 'root'})
 @Injectable()

package/src/chat21-core/providers/mqtt/mqtt-archivedconversations-handler.ts

@@ -13,7 +13,7 @@ import { ConversationsHandlerService } from '../abstract/conversations-handler.s
 // utils
 import { TYPE_GROUP } from '../../utils/constants';
 import { getImageUrlThumbFromFirebasestorage, avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, conversationsPathForUserId, searchIndexInArrayForUid } from '../../utils/utils';
+import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid } from '../../utils/utils';
 import { ArchivedConversationsHandlerService } from '../abstract/archivedconversations-handler.service';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
@@ -370,39 +370,6 @@ export class MQTTArchivedConversationsHandler extends ArchivedConversationsHandl
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp 
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
-    // removeByUid(uid) {
-    //     const index = searchIndexInArrayForUid(this.conversations, uid);
-    //     if (index > -1) {
-    //         this.conversations.splice(index, 1);
-    //         // this.events.publish('conversationsChanged', this.conversations);
-    //         this.conversationsChanged.next(this.conversations);
-    //     }
-    // }
-
-    // addConversationListener(uidUser, conversationId) {
-    //     var that = this;
-    //     this.tenant = environment.tenant;
-    //     // const tenant = this.chatManager.getTenant();
-    //     const url = '/apps/' + this.tenant + '/users/' + uidUser + '/conversations/' + conversationId;
-    //     const reference = firebase.database().ref(url);
-    //     console.log("ChatConversationsHandler::addConversationListener::reference:",url, reference.toString());
-    //     reference.on('value', function (snapshot) {
-    //         setTimeout(function () {
-    //             // that.events.publish(conversationId + '-listener', snapshot);
-    //         }, 100);
-    //     });
-    // }
-
     /**
      * restituisce il numero di conversazioni nuove
      */

package/src/chat21-core/providers/mqtt/mqtt-auth-service.ts

@@ -6,12 +6,6 @@ import { environment } from '../../../environments/environment';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 
-// // firebase
-// import * as firebase from 'firebase/app';
-// import 'firebase/messaging';
-// import 'firebase/database';
-// import 'firebase/auth';
-
 // services
 // import { EventsService } from '../events-service';
 import { MessagingAuthService } from '../abstract/messagingAuth.service';

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -21,7 +21,6 @@ import {
   htmlEntities,
   compareValues,
   searchIndexInArrayForUid,
-  setHeaderDate,
   conversationMessagesRef
 } from '../../utils/utils';
 import { isSender, messageType } from '../../utils/utils-message';

package/src/chat21-core/providers/mqtt/mqtt-conversations-handler.ts

@@ -13,7 +13,7 @@ import { ConversationsHandlerService } from '../abstract/conversations-handler.s
 
 // utils
 import { getImageUrlThumbFromFirebasestorage, avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, conversationsPathForUserId, searchIndexInArrayForUid } from '../../utils/utils';
+import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid } from '../../utils/utils';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
@@ -383,7 +383,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.conversation_with = conversation_with;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);
-        conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
+        // conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
         conv.avatar = avatarPlaceholder(conversation_with_fullname);
         conv.color = getColorBck(conversation_with_fullname);
         if (!conv.last_message_text) {
@@ -417,16 +417,6 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp 
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
     /**
      * restituisce il numero di conversazioni nuove
      */

package/src/chat21-core/providers/mqtt/mqtt-presence.service.ts

@@ -12,9 +12,6 @@ import { PresenceService } from '../abstract/presence.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 
-// utils
-import { setLastDate } from '../../utils/utils';
-import { environment } from '../../../environments/environment';
 
 @Injectable({
   providedIn: 'root'

package/src/chat21-core/providers/mqtt/mqtt-typing.service.ts

@@ -11,8 +11,6 @@ import { PresenceService } from '../abstract/presence.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 // utils
-import { setLastDate } from '../../utils/utils';
-import { environment } from '../../../environments/environment';
 import { TypingService } from '../abstract/typing.service';
 import { BehaviorSubject } from 'rxjs';
 

package/src/chat21-core/providers/native/native-upload-service.ts

@@ -67,6 +67,7 @@ export class NativeUploadService extends UploadService {
                     if(upload.file.type.includes('pdf')){
                         downloadURL = this.URL_TILEDESK_FILE + '?path=' + encodeURI(data['filename']);
                     }
+                    resolve(downloadURL)
                     // that.BSStateUpload.next({upload: upload});
                 }, (error) => {
                     this.logger.error('[NATIVE UPLOAD] - ERROR upload new file ', error)

package/src/chat21-core/utils/utils.ts

@@ -147,80 +147,80 @@ export function removeHtmlTags(text) {
  * ieri; 
  * giorno della settimana (lunedì, martedì, ecc)
  */
-export function setHeaderDate_old(translate, timestamp, lastDate?): string {
-  var date = new Date(timestamp);
-  let now: Date = new Date();
-  var LABEL_TODAY;// = translate.get('LABEL_TODAY')['value'];
-  var LABEL_TOMORROW;// = translate.get('LABEL_TOMORROW')['value'];
-  translate.get('LABEL_TODAY').subscribe((res: string) => {
-    LABEL_TODAY = res;
-  });
-  translate.get('LABEL_TOMORROW').subscribe((res: string) => {
-    LABEL_TOMORROW = res;
-  });
-  var labelDays: string = LABEL_TODAY;
-  var _MS_PER_DAY = 1000 * 60 * 60 * 24;
-  // Esclude l'ora ed il fuso orario
-  var utc1 = Date.UTC(date.getFullYear(), date.getMonth(), date.getDate());
-  var utc2 = Date.UTC(now.getFullYear(), now.getMonth(), now.getDate());
-  const days = Math.floor((utc2 - utc1) / _MS_PER_DAY);
-  // console.log('setHeaderDate days: ********************',days);
-  if (days > 6) {
-    labelDays = date.toLocaleDateString();//date.getDate()+"/"+(date.getMonth()+1)+"/"+date.getFullYear();
-  }
-  else if (days == 0) {
-    labelDays = LABEL_TODAY;
-  } else if (days == 1) {
-    labelDays = LABEL_TOMORROW;
-  } else {
-    labelDays = convertDayToString(translate, date.getDay());
-  }
-  // console.log('setHeaderDate labelDays: ********************',labelDays);
-  // se le date sono diverse o la data di riferimento non è impostata
-  // ritorna la data calcolata
-  // altrimenti torna null 
-  if (lastDate != labelDays || lastDate == null || lastDate == '') {
-    return labelDays;
-  } else {
-    return null;
-  }
-}
+// export function setHeaderDate_old(translate, timestamp, lastDate?): string {
+//   var date = new Date(timestamp);
+//   let now: Date = new Date();
+//   var LABEL_TODAY;// = translate.get('LABEL_TODAY')['value'];
+//   var LABEL_TOMORROW;// = translate.get('LABEL_TOMORROW')['value'];
+//   translate.get('LABEL_TODAY').subscribe((res: string) => {
+//     LABEL_TODAY = res;
+//   });
+//   translate.get('LABEL_TOMORROW').subscribe((res: string) => {
+//     LABEL_TOMORROW = res;
+//   });
+//   var labelDays: string = LABEL_TODAY;
+//   var _MS_PER_DAY = 1000 * 60 * 60 * 24;
+//   // Esclude l'ora ed il fuso orario
+//   var utc1 = Date.UTC(date.getFullYear(), date.getMonth(), date.getDate());
+//   var utc2 = Date.UTC(now.getFullYear(), now.getMonth(), now.getDate());
+//   const days = Math.floor((utc2 - utc1) / _MS_PER_DAY);
+//   // console.log('setHeaderDate days: ********************',days);
+//   if (days > 6) {
+//     labelDays = date.toLocaleDateString();//date.getDate()+"/"+(date.getMonth()+1)+"/"+date.getFullYear();
+//   }
+//   else if (days == 0) {
+//     labelDays = LABEL_TODAY;
+//   } else if (days == 1) {
+//     labelDays = LABEL_TOMORROW;
+//   } else {
+//     labelDays = convertDayToString(translate, date.getDay());
+//   }
+//   // console.log('setHeaderDate labelDays: ********************',labelDays);
+//   // se le date sono diverse o la data di riferimento non è impostata
+//   // ritorna la data calcolata
+//   // altrimenti torna null 
+//   if (lastDate != labelDays || lastDate == null || lastDate == '') {
+//     return labelDays;
+//   } else {
+//     return null;
+//   }
+// }
 
 /**
  * @deprecated
  */
-export function setHeaderDate(translate, timestamp): string {
-  // const LABEL_TODAY = translate.get('LABEL_TODAY');
-  // const LABEL_TOMORROW = translate.get('LABEL_TOMORROW');
-
-  const date = new Date(timestamp);
-  const now: Date = new Date();
-  let labelDays = '';
-  if (now.getFullYear() !== date.getFullYear()) {
-    // quest'anno: data esatta
-    const month = date.getMonth() + 1;
-    labelDays = date.getDay() + '/' + month + '/' + date.getFullYear();
-  } else if (now.getMonth() !== date.getMonth()) {
-    // questo mese: data esatta
-    const month = date.getMonth() + 1;
-    labelDays = date.getDay() + '/' + month + '/' + date.getFullYear();
-  } else if (now.getDay() === date.getDay()) {
-    // oggi: oggi
-    labelDays = moment().calendar(timestamp).split(' ')[0].toLocaleLowerCase();
-    // labelDays = LABEL_TODAY;
-  } else if (now.getDay() - date.getDay() === 1) {
-    // ieri: ieri
-    labelDays = moment().calendar(timestamp).split(' ')[0].toLocaleLowerCase();
-    // labelDays = LABEL_TOMORROW;
-  } else {
-    // questa settimana: giorno
-    labelDays = convertDayToString(translate, date.getDay());
-  }
-  // se le date sono diverse o la data di riferimento non è impostata
-  // ritorna la data calcolata
-  // altrimenti torna null
-  return labelDays;
-}
+// export function setHeaderDate(translate, timestamp): string {
+//   // const LABEL_TODAY = translate.get('LABEL_TODAY');
+//   // const LABEL_TOMORROW = translate.get('LABEL_TOMORROW');
+
+//   const date = new Date(timestamp);
+//   const now: Date = new Date();
+//   let labelDays = '';
+//   if (now.getFullYear() !== date.getFullYear()) {
+//     // quest'anno: data esatta
+//     const month = date.getMonth() + 1;
+//     labelDays = date.getDay() + '/' + month + '/' + date.getFullYear();
+//   } else if (now.getMonth() !== date.getMonth()) {
+//     // questo mese: data esatta
+//     const month = date.getMonth() + 1;
+//     labelDays = date.getDay() + '/' + month + '/' + date.getFullYear();
+//   } else if (now.getDay() === date.getDay()) {
+//     // oggi: oggi
+//     labelDays = moment().calendar(timestamp).split(' ')[0].toLocaleLowerCase();
+//     // labelDays = LABEL_TODAY;
+//   } else if (now.getDay() - date.getDay() === 1) {
+//     // ieri: ieri
+//     labelDays = moment().calendar(timestamp).split(' ')[0].toLocaleLowerCase();
+//     // labelDays = LABEL_TOMORROW;
+//   } else {
+//     // questa settimana: giorno
+//     labelDays = convertDayToString(translate, date.getDay());
+//   }
+//   // se le date sono diverse o la data di riferimento non è impostata
+//   // ritorna la data calcolata
+//   // altrimenti torna null
+//   return labelDays;
+// }
 
 
 
@@ -229,33 +229,33 @@ export function setHeaderDate(translate, timestamp): string {
  * utilizzata per calcolare data ultimo accesso utente
  * @param timestamp 
  */
-export function setLastDate(translate, timestamp): string {
-
-  const LABEL_TODAY = translate.get('LABEL_TODAY');
-  const LABEL_TOMORROW = translate.get('LABEL_TOMORROW');
-  const LABEL_TO = translate.get('LABEL_TO');
-  const LABEL_LAST_ACCESS = translate.get('LABEL_LAST_ACCESS');
-
-  var date = new Date(timestamp);
-  let now: Date = new Date();
-  var labelDays = '';
-  if (now.getFullYear() !== date.getFullYear()) {
-    const month = date.getMonth() + 1;
-    labelDays = date.getDay() + '/' + month + '/' + date.getFullYear();
-  } else if (now.getMonth() !== date.getMonth()) {
-    const month = date.getMonth() + 1;
-    labelDays = date.getDay() + '/' + month + '/' + date.getFullYear();
-  } else if (now.getDay() === date.getDay()) {
-    labelDays = LABEL_TODAY;
-  } else if (now.getDay() - date.getDay() === 1) {
-    labelDays = LABEL_TOMORROW;
-  } else {
-    labelDays = convertDayToString(translate, date.getDay());
-  }
-  // aggiungo orario
-  const orario = date.getHours() + ':' + (date.getMinutes() < 10 ? '0' : '') + date.getMinutes();
-  return LABEL_LAST_ACCESS + ' ' + labelDays + ' ' + LABEL_TO + ' ' + orario;
-}
+// export function setLastDate(translate, timestamp): string {
+
+//   const LABEL_TODAY = translate.get('LABEL_TODAY');
+//   const LABEL_TOMORROW = translate.get('LABEL_TOMORROW');
+//   const LABEL_TO = translate.get('LABEL_TO');
+//   const LABEL_LAST_ACCESS = translate.get('LABEL_LAST_ACCESS');
+
+//   var date = new Date(timestamp);
+//   let now: Date = new Date();
+//   var labelDays = '';
+//   if (now.getFullYear() !== date.getFullYear()) {
+//     const month = date.getMonth() + 1;
+//     labelDays = date.getDay() + '/' + month + '/' + date.getFullYear();
+//   } else if (now.getMonth() !== date.getMonth()) {
+//     const month = date.getMonth() + 1;
+//     labelDays = date.getDay() + '/' + month + '/' + date.getFullYear();
+//   } else if (now.getDay() === date.getDay()) {
+//     labelDays = LABEL_TODAY;
+//   } else if (now.getDay() - date.getDay() === 1) {
+//     labelDays = LABEL_TOMORROW;
+//   } else {
+//     labelDays = convertDayToString(translate, date.getDay());
+//   }
+//   // aggiungo orario
+//   const orario = date.getHours() + ':' + (date.getMinutes() < 10 ? '0' : '') + date.getMinutes();
+//   return LABEL_LAST_ACCESS + ' ' + labelDays + ' ' + LABEL_TO + ' ' + orario;
+// }
 
 /**
  *