push origin developer

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html

@@ -5,7 +5,7 @@
 <ion-content>
   <div class="main-content d-flex height-100">
 
-    <app-task-details class="content"
+    <app-task-details class="content d-flex flex-column"
       [task]="task"
       [intervenientes]="intervenientes"
       [cc]="cc"
@@ -14,9 +14,7 @@
       (openOptions)="openOptions($event)"
       (goBack)="goBack()"
       (viewDocument)="viewDocument($event)"
-    >
-      
-    </app-task-details>
+    ></app-task-details>
 
     <div *ngIf="task" class="aside-right flex-column height-100">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
@@ -50,6 +48,7 @@
         <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
       </div>
     </div>
+    
   </div>
 </ion-content>
 

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -412,10 +412,9 @@ export class PedidoPage implements OnInit {
   }
 
   async openForwardModal(task: any) {
-    console.log(task);
 
     let classs;
-    if( window.innerWidth <= 800){
+    if( window.innerWidth <= 800) {
       classs = 'book-meeting-modal modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'

src/app/services/modal.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ModalService } from './modal.service';
+
+describe('ModalService', () => {
+  let service: ModalService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ModalService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/services/modal.service.ts

@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ModalService {
+
+  constructor() { }
+}

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -3,7 +3,7 @@ import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
-import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
+import { NavigationStart, Router } from '@angular/router';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
@@ -34,7 +34,7 @@ export class EventsToApprovePage implements OnInit {
     )
     {
       this.loggeduser = userAuth.ValidatedUser;
-  }
+    }
 
   ngOnInit() {
     this.segment = this.loggeduser.Profile;

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

@@ -22,7 +22,7 @@ export class RequestOptionsPage implements OnInit {
   task:any;
   fulltask: any;
   profile:string;
-  serialnumber : string
+  serialNumber : string
   showEnviarPendentes = false
 
   constructor(
@@ -36,19 +36,23 @@ export class RequestOptionsPage implements OnInit {
     private router: Router,
     public p: PermissionService,
     private location: Location
-  ) { 
+  ) {
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');
-    this.serialnumber = this.navParams.get('serialNumber');
+    this.serialNumber = this.navParams.get('serialNumber');
     
     this.activatedRoute.queryParams.subscribe(params => {
       if(params["serialNumber"]) {
-        this.serialnumber = params["serialNumber"];
+        this.serialNumber = params["serialNumber"];
         // console.log(params["serialNumber"]);
       }
     });
 
-    console.log('serialnumber', this.serialnumber)
+    if(this.task.serialNumber) {
+      this.serialNumber = this.task.serialNumber
+    } else if (this.task.SerialNumber) {
+      this.serialNumber = this.task.SerialNumber
+    }
 
     this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
 
@@ -159,14 +163,14 @@ export class RequestOptionsPage implements OnInit {
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close') {
         this.close();
-      }
+      } else {}
       
     });
   }
 
   async repreciar(note:string, documents:any) {
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Reapreciação",
       "ActionTypeId": 100000009,
       "dataFields": {
@@ -230,8 +234,9 @@ export class RequestOptionsPage implements OnInit {
 
           await this.repreciar(res.data.note, docs);
         }
-        else if(actionName == 'Arquivar'){
+        else if(actionName == 'Arquivar') {
           await this.arquivar(res.data.note, docs);
+          this.popoverController.dismiss('close')
         }
       }
     });
@@ -239,7 +244,7 @@ export class RequestOptionsPage implements OnInit {
 
   async arquivar(note:string, documents:any) {
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Arquivo",
       "ActionTypeId": 95,
       "dataFields": {
@@ -283,7 +288,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openDelegarModal(task: any) {
-    
+
     this.popoverController.dismiss();
     
     let classs;