diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index dac104c08..85937d51d 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -34,7 +34,7 @@ Acções - + Chat diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 2dd30a9fe..e0aa5897b 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -59,6 +59,12 @@ export class ProfilePage implements OnInit { public NotificationHolderService: NotificationHolderService ) { + window['e'] = () => { + console.log( + this.zone.run(() => this.router.navigate(['/home/chat'])) + ) + } + router.events.subscribe((val) => { this.isProfileOpen = false @@ -293,7 +299,11 @@ export class ProfilePage implements OnInit { let navigationExtras: NavigationExtras = { queryParams: { "roomId": IdObject, } }; this.zone.run(() => this.router.navigate(['/home/chat'])); - this.zone.run(() => this.router.navigate(['/home/chat'], navigationExtras)); + + setTimeout(() => { + this.zone.run(() => this.router.navigate(['/home/chat'], navigationExtras)); + }, 200); + this.deleteNotification(index); } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html index 7a7e3fc1c..c1b8944fa 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html @@ -17,7 +17,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index dea2b1782..270c8c8f1 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -18,6 +18,7 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart import { TaskService } from 'src/app/services/task.service' import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page'; import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-diploma-assinar', @@ -52,7 +53,8 @@ export class DiplomaAssinarPage implements OnInit { private httpErroHandle: HttpErrorHandle, private despachoService: DespachoService, public TaskService: TaskService, - private toastController: ToastController + private toastController: ToastController, + public p: PermissionService, ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 1b1849a1b..47217c53c 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -761,6 +761,8 @@ export class RoomService { cloneMessage.msg = currentDateMessage cloneMessage.dateLabel = true cloneMessage.delate = false + cloneMessage.file = undefined + cloneMessage.attachments = undefined if(new Date().toLocaleDateString() == currentDateMessage) { diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.html b/src/app/shared/popover/deploma-options/deploma-options.page.html index 748de32ee..87e350eda 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.html +++ b/src/app/shared/popover/deploma-options/deploma-options.page.html @@ -22,7 +22,7 @@
- +