Improve options

src/app/modals/profile/profile.page.ts

@@ -22,7 +22,7 @@ export class ProfilePage implements OnInit {
 
   loggeduser: User;
   userLoginPreference = ''
-  notificationdata: any[];
+  notificationdata: any[] = [];
   DataArray: Array<Object> = [];
 
   constructor(private modalController: ModalController,

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -104,6 +104,7 @@
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-ok" shape="round"  >Enviar para pendentes</button>
         <div class="solid"></div>
       </div>
     </div>

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

@@ -1,16 +1,29 @@
-<ion-content class="container">
+<ion-content class="container width-100 ">
   <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">
+  <div class="width-100">
-    <button (click)="openExpedientActionsModal('0',fulltask)" full class="btn-ok" shape="round" >Efectuar Despacho</button>
+    <div class="d-flex width-100">
-    <button (click)="openExpedientActionsModal('1',fulltask)" full class="btn-ok" shape="round" >Pedido de Parecer</button>
+      <div class="flex-grow-1">
-    <button (click)="openExpedientActionsModal('2',fulltask)" full class="btn-ok" shape="round" >Pedido de Deferimento</button>
+        <button class="btn-cancel desk" shape="round"> Enviar para o PR </button>
-    <button (click)="openBookMeetingModal()" full class="btn-ok" shape="round" >Marcar reunião</button>
+        <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
-    <button (click)="distartExpedientModal('descartar')" full class="btn-ok" shape="round" >Descartar</button>
+        <button class="btn-cancel desk" shape="round"> Solicitar revisão </button>
-    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-ok" shape="round"  >Enviar para pendentes</button>
+        <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
+        <button class="btn-cancel desk" shape="round">Outras opções </button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</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 (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-ok" shape="round"  >Enviar para pendentes</button>
+      </div>
+    </div>
+
     <div class="solid"></div>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>

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

@@ -3,6 +3,7 @@
    --padding-bottom:20px !important;
    --padding-start:20px !important;
    --padding-end:20px !important;
+   width: 100%;
 }
 .arrow-right{
     display: none;
@@ -32,7 +33,7 @@
 }
 @media only screen and (max-width: 800px) {
     .btn-ok, .btn-cancel, .btn-delete{
-        width: 47% !important;
+        width: 100% !important;
     }
 }
 @media only screen and (min-width: 1024px) {
@@ -53,4 +54,10 @@
    /*  .solid{
         display: block;
     } */
+}
+
+
+.desk{
+    text-align: left;
+    background-color: white;
 }

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

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { PermissionService } from 'src/app/OtherService/permission.service';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
@@ -28,6 +29,7 @@ export class OptsExpedientePage implements OnInit {
     private toastService: ToastService,
     private router: Router,
     private activatedRoute: ActivatedRoute,
+    public p: PermissionService
   ) {
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');