merge

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

@@ -11,7 +11,8 @@
     <button (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
     <button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>
     <div class="solid"></div>
-    <button (click)="bookMeeting()" class="btn-ok" shape="round" >Novo Evento</button>
+
+    <button *ngIf="p.userPermission([p.permissionList.Agenda.access]) == true " (click)="bookMeeting()" class="btn-ok" shape="round" >Novo Evento</button>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>
 

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

@@ -6,6 +6,7 @@ import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { environment } from 'src/environments/environment';
 import { ThemeService } from 'src/app/services/theme.service'
+import { PermissionService } from 'src/app/services/permission.service';
 
 @Component({
   selector: 'app-chat-options-popover',
@@ -22,7 +23,8 @@ export class ChatOptionsPopoverPage implements OnInit {
     private popoverController: PopoverController,
     private modalController: ModalController,
     private navParams: NavParams,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public p: PermissionService,
   ) {
 
     this.members = this.navParams.get('members');
@@ -118,22 +120,11 @@ export class ChatOptionsPopoverPage implements OnInit {
 
   async bookMeeting() {
     
-    this.popoverController.dismiss();
-    if( window.innerWidth <= 1024){
-      const modal = await this.modalController.create({
-        component: NewEventPage,
-        componentProps:{
-          attendees: this.attendees,
-        },
-        cssClass: 'modal  modal-desktop',
-        backdropDismiss: false
-      });
-      await modal.present();
-      modal.onDidDismiss().then((data) => {
-        if(data){
-
-        }
-      });
+    if( window.innerWidth < 701){
+      this.popoverController.dismiss('meeting');
+    }
+    else{
+      this.modalController.dismiss('meeting');
     }
   }
 

src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html

@@ -3,7 +3,7 @@
     <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
     <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
     <div class="solid"></div>
-    <button (click)="openExpedientActionsModal('0')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
+    <button (click)="openExpedientActionsModal('1')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
     <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
     <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
     <button class="btn-cancel" shape="round"  (click)="close()">Cancelar</button>

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -15,8 +15,6 @@
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
-      </div>
-      <div class="flex-grow-1">
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -51,21 +51,11 @@ export class OptsExpedientePage implements OnInit {
     private expedienteService: ExpedienteService,
     public ThemeService: ThemeService
   ) {
-    this.loggeduser = SessionStore.user
-    this.task = this.navParams.get('task');
-    this.fulltask = this.navParams.get('fulltask');
-
-    if(this.task.Status != 'Pending') {
-      this.showEnviarPendentes = true;
-    }
+   
   }
 
   ngOnInit() {
-    window.onresize = (event) => {
-      if( window.innerWidth >= 800){
-        this.popoverController.dismiss();
-      }
-    };
+  
   }
 
   async openNewGroupPage(){