diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index 48207f9d6..c7bb7e935 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -1,7 +1,9 @@
- +
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 9f4690cb8..cc87f6cbd 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -19,6 +19,7 @@ import { MessagesPage } from './messages/messages.page'; import { NewGroupPage } from './new-group/new-group.page'; import { NewchatPage } from './newchat/newchat.page'; import { Storage } from '@ionic/storage'; +import { AlertService } from 'src/app/services/alert.service'; @Component({ selector: 'app-chat', @@ -76,6 +77,7 @@ export class ChatPage implements OnInit { private authService: AuthService, private storage:Storage, private resolver: ComponentFactoryResolver, + private alertService: AlertService, ) { this.headers = new HttpHeaders(); diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts index ff86e8d5b..4a236340a 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.ts +++ b/src/app/pages/chat/messages/contacts/contacts.page.ts @@ -98,6 +98,8 @@ export class ContactsPage implements OnInit { this.chatService.createRoom(body).subscribe(res => { console.log(res); this.room = res['room']; + console.log(this.room._id); + this.getDirectMessage(this.room._id); }); } @@ -106,21 +108,22 @@ export class ContactsPage implements OnInit { this.chatService.getAllDirectMessages().subscribe(res=>{ let result = res['ims'].filter(data => data._id == roomId); + console.log(result[0]); + this.dm = result[0]; console.log(this.dm); - this.openModal(this.dm); + this.openModal(this.dm._id); }); } - async openModal(dm:any){ + async openModal(roomId:any){ this.close(); - console.log(dm); + console.log(roomId); const modal = await this.modalController.create({ component: MessagesPage, cssClass: 'group-messages', - backdropDismiss: false, componentProps: { - dm: dm, + roomId: roomId, }, }); await modal.present(); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 09f8b01fa..12e023db3 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -12,7 +12,7 @@ Expediente - + Pendentes diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 2e2927c37..3ea384556 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -8,6 +8,7 @@ import { formatDate } from '@angular/common'; import { LoadingService } from 'src/app/services/loading.service'; import { ModalController, NavParams } from '@ionic/angular'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; +import { AlertService } from 'src/app/services/alert.service'; @Component({ selector: 'app-expedients', @@ -29,6 +30,7 @@ export class ExpedientsPage implements OnInit { constructor( private processes:ProcessesService, private modalController: ModalController, + private alertService: AlertService, ) { this.profile = 'mdgpr'; } @@ -39,6 +41,10 @@ export class ExpedientsPage implements OnInit { this.LoadList(); } + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } + openExpedientDetailPage(data){ console.log(data); this.openExpedientDetail.emit(data);