Fix merge

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html

@@ -1,15 +1,14 @@
-<ion-list>
-  <ion-item>
-    <p>
-      <ion-button class="button-edit-event cursor-pointer" shape="round" (click)="emendarTask()">Adicionar Nota</ion-button>
-    </p>
-    <p>
-      <ion-button class="button-approve cursor-pointer" shape="round" (click)="approveTask()">Aprovar</ion-button>
-    </p>
-  </ion-item>
-  <ion-item lines="none">
-    <p>
-      <ion-button class="button-discart-event cursor-pointer" shape="round" (click)="deleteTask()">Rejeitar</ion-button>
-    </p>
-  </ion-item>
-</ion-list>
+<ion-content class="container">
+  <div class="arrow-right" (click)="closePopover()">
+    <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 class="btn-cancel" shape="round" (click)="emendarTask()">Adicionar Nota</button>
+    <button class="btn-ok" shape="round" (click)="approveTask()">Aprovar</button>
+    <div class="solid"></div>
+    <button class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
+    <button class="btn-delete" shape="round" (click)="deleteTask()">Rejeitar</button>
+  </div>
+</ion-content>

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss

@@ -1,24 +1,58 @@
-.button-edit-event {
-    /* width: 140px; */
-    height: 44px;
-    border-radius: 22.5px;
-    --background: #e0e9ee;
-    --color:#061b52;
+.container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
 }
-.button-options {
-    height: 44px;
-    --color: #42b9fe;
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
 }
-.button-approve {
-    /* width: 140px; */
-    height: 44px;
-    border-radius: 22.5px;
-    --background: #42b9fe;
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    align-items: center;
 }
-.button-discart-event {
-    /* width: 140px; */
-     height: 44px;
-    border-radius: 22.5px;
-    --background: #d30a0a;
-    --color:#fff;
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 5px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel{
+    //width: 50% !important;
+    justify-content: center;
+    margin-bottom: 10px !important;
+    margin-top: 10px !important;
+}
+@media only screen and (max-width: 800px) {
+    .btn-ok, .btn-cancel, .btn-delete{
+        width: 47% !important;
+    }
+}
+@media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        display: none;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+    }
+    .btn-delete, .btn-ok{
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        margin-top: 10px !important;
+    }
+   /*  .solid{
+        display: block;
+    } */
 }

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { ProcessesService } from 'src/app/services/processes.service';
+import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
 
 @Component({
   selector: 'app-event-actions-popover',
@@ -9,16 +10,25 @@ import { ProcessesService } from 'src/app/services/processes.service';
   styleUrls: ['./event-actions-popover.page.scss'],
 })
 export class EventActionsPopoverPage implements OnInit {
+  serialNumber:string;
+  instanceId: string;
 
-  constructor(private navParams: NavParams,
+  constructor(
+    private navParams: NavParams,
     private processes:ProcessesService,
     private router:Router,
     private modalController: ModalController,
     private popoverController: PopoverController,) {
-      /* this.serialNumber = this.navParams.get('serialNumber'); */
+      this.serialNumber = this.navParams.get('serialNumber');
+      this.instanceId = this.navParams.get('InstanceId');
      }
 
   ngOnInit() {
+    window.onresize = (event) => {
+      if( window.innerWidth >= 800){
+        this.popoverController.dismiss();
+      }
+    };
   }
   closePopover(){
     this.popoverController.dismiss();
@@ -41,5 +51,25 @@ export class EventActionsPopoverPage implements OnInit {
   deleteTask(){
 
   }
+  async editTask() {
+    console.log(this.serialNumber);
+    console.log(this.instanceId);
+    const modal = await this.modalController.create({
+      component: EditEventToApproveComponent,
+      componentProps: {
+        serialNumber: this.serialNumber,
+        InstanceId: this.instanceId
+      },
+      cssClass: 'modal modal-desktop',
+      // backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then(res => {
+    });
+
+  } 
+  
 
 }