Merge with chat/labe branch and display time on chat message baloom

src/app/shared/agenda/new-event/new-event.page.html

@@ -318,12 +318,13 @@
         <ion-label>
           <p class="d-flex ion-justify-content-between">
             <span class="attach-title-item">{{document.Assunto}}</span>
-            <span class="app-name">{{document.appName}}</span>
+            <span class="app-name" *ngIf="!document.appName">{{ TaskService.attachmentAppName(document)}}</span>
+            <span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
             <span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
               <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
             </span>
           </p>
-          <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
+          <p><span class="span-left">{{(document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data || document.DocDate)  | date: 'dd-MM-yyyy HH:mm'}} </span></p>
         </ion-label>
       </ion-item>
       </ion-list>

src/app/shared/agenda/new-event/new-event.page.ts

@@ -33,6 +33,7 @@ import { EventToAprove } from 'src/app/models/eventToAprove.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { Subject } from 'rxjs';
 
+import { TaskService } from 'src/app/services/task.service'
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
     dateInput: "YYYY-MMMM-DD HH:mm"
@@ -141,6 +142,7 @@ export class NewEventPage implements OnInit {
     private chatMethodService: ChatMethodsService,
     private hhtpErrorHandle: HttpErrorHandle,
     private processeService: ProcessesService,
+    public TaskService: TaskService
   ) {
     this.dateAdapter.setLocale('pt');
     this.loggeduser = SessionStore.user;