Merge branch 'developer-c' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar

src/app/app.module.ts

@@ -29,6 +29,8 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MessagesPage } from './pages/chat/messages/messages.page';
 
+import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'
+
 
 @NgModule({
   declarations: [AppComponent,MessagesPage,],
@@ -55,6 +57,7 @@ import { MessagesPage } from './pages/chat/messages/messages.page';
     //File,
     WebView,
     FilePath,
+    FCM
   ],
   bootstrap: [AppComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]

src/app/home/home.page.ts

@@ -1,11 +1,20 @@
+///<reference path="../../../plugins/cordova-plugin-mfp/typings/worklight.d.ts" />
 import { Component, OnInit, NgZone } from '@angular/core';
 import { EventsService } from '../services/events.service';
 import { Event } from '../models/event.model';
 import { ProcessesService } from '../services/processes.service';
-import { ModalController } from '@ionic/angular';
+import { ModalController, AlertController, AnimationController } from '@ionic/angular';
+//import { AlertController } from 'ionic-angular';
 /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */
 import { Router } from '@angular/router';
 
+//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+import { ViewEventPage } from '../pages/agenda/view-event/view-event.page';
+import { ApproveEventModalPage } from '../pages/agenda/approve-event-modal/approve-event-modal.page';
+import { ExpedienteDetailPage } from '../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
+import { PublicationDetailPage } from '../pages/publications/publication-detail/publication-detail.page';
+import { ViewPublicationsPage } from '../pages/publications/view-publications/view-publications.page';
+
 /* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */
 
 @Component({
@@ -22,133 +31,170 @@ export class HomePage implements OnInit {
   totalExpediente = 0;
   profile: string;
 
-  constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController) {
-    
+  adding: "intervenient" | "CC" = "intervenient";
+  mobileComponent = {
+    showAddNewEvent: false,
+    showEditEvent: false,
+    showEventDetails: false,
+    showEventList: false,
+    transparentEventList: false,
+    transparentEventToApprove: false,
+    showEventToApprove: false,
+    showAttendees: false,
+    showAttendeeModal: false
+  }
+  eventToaprove: any = {
+    back: false,
+    serialNumber: "",
+    saveData: {}
+  }
+  selectedEvent: Event;
+  postEvent: any;
+  folderId: string;
+
+  constructor(private zone: NgZone, 
+    private eventService: EventsService, 
+    private processesbackend: ProcessesService, 
+    private router: Router, 
+    private modalController: ModalController, 
+    public modalCtrl: AlertController, 
+    //private fcm: FCM, 
+    private animationController: AnimationController,) {
+
     router.events.subscribe((val) => {
-      document.querySelectorAll('ion-modal').forEach((e)=>e.remove())
+      document.querySelectorAll('ion-modal').forEach((e) => e.remove())
     });
-    
+
+    {
+      //this.folderId = this.navParams.get('folderId');
+    }
+
   }
 
   ngOnInit() {
-     //Initialize profile as mdgpr
 
-    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";
-
-    this.profile = "mdgpr";
-    if (this.profile == "mdgpr") {
-      this.eventService.getAllMdEvents(start, end).subscribe(res => {
-        this.eventsList = res;
-        this.totalEvent = this.eventsList.length;
-      });
-    }
-    else {
-      this.eventService.getAllPrEvents(start, end).subscribe(res => {
-        this.eventsList = res;
-        this.totalEvent = this.eventsList.length;
-      });
-
-    }
-    this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
-      this.totalExpediente = result;
-    });
+    //this.pushCordova();
+        //Initialize profile as mdgpr
     
-/*
-    PushNotifications.addListener('registrationError', (error: any) => {
-      alert('Error on registration: ' + JSON.stringify(error));
-    });
-
-    PushNotifications.addListener('pushNotificationReceived', notification => {    
-
-      //const isPushNotification = !!notification.title || !!notification.body;
-
-      // if this is a push notification received when the app is in the foreground on Android
-      //if (isAndroid && isPushNotification) {
-  
-          // We schedule a LocalNotification 1 second later since Capacitor for Android doesn't show anything in this case
-          console.log('Recived: ', notification)
-      //}
-  });
-  
-
-    PushNotifications.addListener(
-      'pushNotificationActionPerformed',
-      (notification: PushNotificationActionPerformed) => {
-        let service = notification.notification.data.Service;
-        let object = notification.notification.data.Object;
-        let idObject = notification.notification.data.IdObject;
-
-        console.log('Complete Object: ', notification.notification )
-
-        console.log('Service: ', service);
-        console.log('Object: ', object);
-        console.log('idObject: ', idObject);
-
-          if (service === "agenda") {
-            //this.router.navigate(['/home/', service, idObject, 'home']);
-            this.viewEventDetail(idObject)
-          }  
-          else if (service === "gabinete-digital" && object === "expediente") {
-            this.viewExpedientDetail(idObject)
-          } 
-          else if (service === "gabinete-digital" && object === "event-list") {
-            // this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list', idObject])}) 
-            this.openApproveModal(idObject);
-          } 
-          else if (service === "accoes" && object === "accao") {
-            this.viewPublications(idObject)
-          } 
-          else if (service === "accoes" && object === "publicacao") {
-            this.viewPublicationDetail(idObject)
-          }
- 
-      },
-    ); */
+        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";
+    
+        this.profile = "mdgpr";
+        if (this.profile == "mdgpr") {
+          this.eventService.getAllMdEvents(start, end).subscribe(res => {
+            this.eventsList = res;
+            this.totalEvent = this.eventsList.length;
+          });
+        }
+        else {
+          this.eventService.getAllPrEvents(start, end).subscribe(res => {
+            this.eventsList = res;
+            this.totalEvent = this.eventsList.length;
+          });
+    
+        }
+        this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
+          this.totalExpediente = result;
+        });
+        
+       
   }
 
-  /* mobileFirstTest() {
-    this.zone.run(() => {
-      alert("Hello MobileFirst");
-      alert("Connecting to Server...");
-    });
-    WLAuthorizationManager.obtainAccessToken("").then(
-      (token) => {
-        console.log('-->  pingMFP(): Success ', token);
-        this.zone.run(() => {
-          alert("Yay!");
-          alert("Connected to MobileFirst Server");
-        });
-        var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/",
-          WLResourceRequest.GET
-        );
+  pushCordova() {
+/* 
+    this.fcm.onNotification().subscribe(data => {
+      this.viewEventDetail(data.idObject)
+      if (data.click_action) {
+        console.log("Received in background: ", data);
 
-        resourceRequest.setQueryParameter("name", "world");
-        resourceRequest.send().then(
-          (response) => {
-            // Will display "Hello world" in an alert dialog.
-            alert("Success: " + response.responseText);
-          },
-          (error) => {
-            alert("Failure: " + JSON.stringify(error));
-          }
-        );
-      }, (error) => {
-        console.log('-->  pingMFP(): failure ', error.responseText);
-        this.zone.run(() => {
-          alert("Bummer...");
-          alert("Failed to connect to MobileFirst Server");
-        });
-      }
-    );
+        if (data.service === "agenda") {
+          //this.router.navigate(['/home/', service, idObject, 'home']);
+          this.viewEventDetail(data.idObject)
+        }
+        else if (data.service === "gabinete-digital" && data.object === "expediente") {
+          this.viewExpedientDetail(data.idObject)
+        }
+        else if (data.service === "gabinete-digital" && data.object === "event-list") {
+          // this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list', idObject])}) 
+          this.openApproveModal(data.idObject);
+        }
+        else if (data.service === "accoes" && data.object === "accao") {
+          //this.viewPublications(data.idObject)
+          alert(data.idObject)
+        }
+        else if (data.service === "accoes" && data.object === "publicacao") {
+          this.viewPublicationDetail(data.idObject)
+        }
+
+      } else {
+        console.log("Received in foreground: ", data);
+        if (data.service === "agenda") {
+          //this.router.navigate(['/home/', service, idObject, 'home']);
+          this.viewEventDetail(data.idObject)
+        }
+        else if (data.service === "gabinete-digital" && data.object === "expediente") {
+          this.viewExpedientDetail(data.idObject)
+        }
+        else if (data.service === "gabinete-digital" && data.object === "event-list") {
+          // this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list', idObject])}) 
+          this.openApproveModal(data.idObject);
+        }
+        else if (data.service === "accoes" && data.object === "accao") {
+          this.viewPublications(data.idObject)
+        }
+        else if (data.service === "accoes" && data.object === "publicacao") {
+          this.viewPublicationDetail(data.idObject)
+        }
+      };
+    });
+
+    this.fcm.onTokenRefresh().subscribe(token => {
+      // Register your new token in your back-end if you want
+      // backend.registerToken(token);
+    });
+
+    this.ubscribeToTopic()
+    this.getToken() */
+
+  }
+
+  /* ubscribeToTopic() {
+    this.fcm.subscribeToTopic('enappd');
+  }
+  getToken() {
+    this.fcm.getToken().then(token => {
+      console.log('token: ', token)
+      // Register your new token in your back-end if you want
+      // backend.registerToken(token);
+    });
   } */
 
-  /*  async openApproveModal(eventSerialNumber){
+  async viewEventDetail(eventId: any) {
+    console.log(this.profile);
+
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: eventId,
+        adding: this.adding
+      },
+      cssClass: 'modal  modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      if (res) {
+        //this.viewEventDetailDismiss(res);
+      }
+    });
+  }
+
+  async openApproveModal(eventSerialNumber) {
     const modal = await this.modalController.create({
       component: ApproveEventModalPage,
-      componentProps:{
+      componentProps: {
         serialNumber: eventSerialNumber,
       },
       cssClass: 'cal-modal',
@@ -157,46 +203,17 @@ export class HomePage implements OnInit {
 
     await modal.present();
     modal.onDidDismiss();
-  }  */
-
- /*  async viewEventDetail(eventId:any) {
-    console.log(this.profile);
-    
-    const modal = await this.modalController.create({
-      component: ViewEventPage,
-      componentProps:{
-        eventId: eventId,
-      },
-      cssClass: 'modal',
-      backdropDismiss: false
-    });
-    await modal.present();
-    modal.onDidDismiss();
-  } */
-
-  /* async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
-
-    const modal = await this.modalController.create({
-      component: ViewEventPage,
-      componentProps: {
-        eventId: eventId,
-      },
-      cssClass: 'modal',
-      backdropDismiss: false
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res) => {
-      if (res) {
-        console.log(res);
-        //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-      }
-    });
   }
 
   async viewExpedientDetail(serialNumber: any) {
-    console.log(this.profile);
-    console.log("Expediente id: ", serialNumber);
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'modal'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    /* console.log(this.profile);
+    console.log(serialNumber); */
 
     const modal = await this.modalController.create({
       component: ExpedienteDetailPage,
@@ -204,43 +221,75 @@ export class HomePage implements OnInit {
         serialNumber: serialNumber,
         profile: this.profile,
       },
-      cssClass: 'modal',
-      backdropDismiss: false
+      cssClass: classs,
     });
     await modal.present();
-    modal.onDidDismiss();
-  } */
+    modal.onDidDismiss().then((res) => {
+      if (res) {
+        console.log(res);
+      }
+    });
+  }
 
-
-
- /*  async viewPublicationDetail(folderId) {
+  async viewPublicationDetail(publicationId: string) {
     const modal = await this.modalController.create({
       component: PublicationDetailPage,
       componentProps: {
-        folderId: folderId,
+        publicationId: publicationId,
+        folderId: this.folderId,
       },
       cssClass: 'publication-detail',
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
-  } */
+    modal.onDidDismiss().then(() => {
+      //this.getPublications();
+    });
+  }
+
+
+  async viewPublications(folderId) {
+
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '0', transform: 'scale(0)' },
+          { offset: 1, opacity: '0.99', transform: 'scale(1)' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
 
-  /* async viewPublications(folderId) {
     const modal = await this.modalController.create({
       component: ViewPublicationsPage,
       enterAnimation,
       leaveAnimation,
       componentProps: {
-        item: folderId,
+        folderId: folderId,
       },
       cssClass: 'new-action',
       backdropDismiss: false
     });
     await modal.present();
     modal.onDidDismiss();
-  } */
+  }
 
+ 
+
+ 
 
 
 

src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html

@@ -1,7 +1,9 @@
 <ion-header class="ion-no-border">
   <div class="header-content">
     <div class="header-icon-left">
-      <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      <button class="btn-no-color" (click)="close()">
+        <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      </button>
     </div>
     <div class="header-title">
       <label>Notas</label>

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;

src/app/pages/chat/group-messages/group-messages.page.html

@@ -87,7 +87,9 @@
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
         <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-        <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        <button class="btn-no-color" (click)="notImplemented()">
+          <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        </button>
       </ion-item>
     </div>
     <div>

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=>{

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();

src/app/pages/chat/messages/messages.page.html

@@ -82,7 +82,9 @@
     <div class="width-70">
       <ion-item class="ion-no-padding ion-no-margin type-message" lines="none">
         <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-        <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        <button class="btn-no-color" (click)="notImplemented()">
+          <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        </button>
       </ion-item>
     </div>
     <div>

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();
   }

src/app/shared/agenda/edit-event/edit-event.component.ts

@@ -95,12 +95,12 @@ export class EditEventComponent implements OnInit {
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
     await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
-      /* const alert = await this.alertController.create({
+      const alert = await this.alertController.create({
         cssClass: 'my-custom-class',
         header: 'Evento actualizado',
         buttons: ['OK']
       });
-      await alert.present(); */
+      await alert.present();
 
     });
 

src/app/shared/chat/group-messages/group-messages.page.html

@@ -65,7 +65,9 @@
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
         <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-        <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        <button class="btn-no-color" (click)="notImplemented()">
+          <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        </button>
       </ion-item>
     </div>
     <div>

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);
   }

src/app/shared/chat/messages/messages.page.html

@@ -57,7 +57,9 @@
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
         <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-        <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        <button class="btn-no-color" (click)="notImplemented()">
+          <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        </button>
       </ion-item>
     </div>
     <div>

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();

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -12,7 +12,7 @@
       <ion-segment-button value="expediente">
         Expediente
       </ion-segment-button>
-      <ion-segment-button value="pendentes">
+      <ion-segment-button value="pendentes" (click)="notImplemented()">
         Pendentes
       </ion-segment-button>
     </ion-segment>

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);

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -1,12 +1,14 @@
 <ion-content class="container">
   <div class="arrow-right">
-    <ion-icon (click)="close()" slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    <button class="btn-no-color" (click)="close()">
+      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    </button>
   </div>
   <div class="buttons">
-    <button full class="btn-ok" shape="round" >Tirar Fotografia</button>
-    <button class="btn-ok" shape="round" >Digitalizar Documento</button>
-    <button full class="btn-ok" shape="round" >Anexar Fotografia</button>
-    <button class="btn-ok" shape="round" >Anexar Documento</button>
+    <button (click)="notImplemented()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
+    <button (click)="notImplemented()" class="btn-ok" shape="round" >Digitalizar Documento</button>
+    <button (click)="notImplemented()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
+    <button (click)="notImplemented()" class="btn-ok" shape="round" >Anexar Documento</button>
     <div class="solid"></div>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>

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();

src/app/shared/popover/messages-options/messages-options.page.html

@@ -1,6 +1,8 @@
 <ion-content class="container">
-  <div class="arrow-right">
-    <ion-icon slot="end" class="arrow-right-icon" (click)="close()" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+  <div class="arrow-right" (click)="close()">
+    <button class="btn-no-color">
+      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    </button>
   </div>
   <div class="buttons">
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>