diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index b8f7fd590..a69d06b98 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -77,9 +77,9 @@ export class HomePage implements OnInit { ngOnInit() { this.pushCordova(); - /* //Initialize profile as mdgpr + //Initialize profile as mdgpr - let date = new Date(); + /* let date = new Date(); date.setMonth(date.getMonth() + 1); let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59"; @@ -99,10 +99,10 @@ export class HomePage implements OnInit { } this.processesbackend.GetTasksList("Expediente", true).subscribe(result => { - this.totalExpediente = result; - }); + this.totalExpediente = result; + });*/ - */ + } pushCordova() { 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..f93e4b569 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', @@ -99,6 +100,7 @@ export class ChatPage implements OnInit { console.log(this.roomId); } + closeAllDesktopComponents() { this.showMessages=false; this.showContacts=false; diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index fd04d7fbe..a42f3ea1f 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -87,7 +87,9 @@
- +
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index e983b0948..b15fd0816 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; @@ -36,6 +37,7 @@ export class GroupMessagesPage implements OnInit { private chatService: ChatService, private navParams: NavParams, private authService: AuthService, + private alertService: AlertService, ) { this.isGroupCreated = true; this.roomId = this.navParams.get('roomId'); @@ -49,6 +51,10 @@ export class GroupMessagesPage implements OnInit { this.getRoomInfo(); } + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } + getRoomInfo(){ this.showLoader = true; this.chatService.getRoomInfo(this.roomId).subscribe(room=>{ 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/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index f131fb4ee..dd94a44dc 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -82,7 +82,9 @@
- +
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index bd946b607..a52e0bc3a 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -2,6 +2,7 @@ import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@ang import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { Status } from 'src/app/models/chat/status.model'; import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page'; +import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; @@ -32,6 +33,7 @@ export class MessagesPage implements OnInit, AfterViewChecked { private navParams: NavParams, private chatService: ChatService, private authService: AuthService, + private alertService: AlertService, ) { this.roomId = this.navParams.get('roomId'); } @@ -50,6 +52,11 @@ export class MessagesPage implements OnInit, AfterViewChecked { /* }, 9000); */ } + + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } + close(){ this.modalController.dismiss(); } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index ee3c49a3f..15e3c3c37 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -65,7 +65,9 @@
- +
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 3f5445438..2e4a5b159 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -1,5 +1,6 @@ import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter} from '@angular/core'; import { ActionSheetController, AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; +import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; @@ -35,6 +36,7 @@ export class GroupMessagesPage implements OnInit, OnChanges { private chatService: ChatService, private authService: AuthService, private animationController: AnimationController, + private alertService: AlertService, ) { this.isGroupCreated = true; } @@ -51,6 +53,10 @@ export class GroupMessagesPage implements OnInit, OnChanges { console.log(this.roomId); } + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } + openGroupContactsPage(){ this.openGroupContacts.emit(this.roomId); } diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 63ad72653..a570a2633 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -57,7 +57,9 @@
- +
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 034a50225..67e8530d6 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -1,6 +1,7 @@ import { AfterViewChecked, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { Status } from 'src/app/models/chat/status.model'; +import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; @@ -35,6 +36,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { private chatService: ChatService, private authService: AuthService, private animationController: AnimationController, + private alertService: AlertService, ) { /* this.dm = this.navParams.get('dm'); */ } @@ -61,6 +63,11 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { } + + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } + load(){ this.loadMessages(); this.getChatMembers(); 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); diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index 8471b8e16..1ece6356d 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -5,10 +5,10 @@
- - - - + + + +
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index 1958349dd..f066f9e0f 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, PopoverController } from '@ionic/angular'; +import { AlertService } from 'src/app/services/alert.service'; @Component({ selector: 'app-chat-options-popover', @@ -11,11 +12,16 @@ export class ChatOptionsPopoverPage implements OnInit { constructor( private popoverController: PopoverController, private modalController: ModalController, + private alertService: AlertService, ) { } ngOnInit() { } + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } + close(){ if( window.innerWidth <= 1024){ this.popoverController.dismiss(); diff --git a/src/app/shared/popover/messages-options/messages-options.page.html b/src/app/shared/popover/messages-options/messages-options.page.html index 9d8ac3b7d..62e6265a2 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.html +++ b/src/app/shared/popover/messages-options/messages-options.page.html @@ -1,6 +1,8 @@ -
- +
+