Improve

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

@@ -1,22 +1,19 @@
-<ion-header class="ion-no-border">
+<ion-header class="ion-no-border px-20">
   <app-header></app-header>
 </ion-header>
 <ion-content>
   <div class="main-content d-flex height-100">
-    <div class="content d-flex flex-column" *ngIf="task">
+    <div class="content d-flex flex-column px-20" *ngIf="task">
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between">
           <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
             <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
           </div>
           <div class="middle d-flex align-center flex-grow-1">
-            <ion-label class="title">{{ task.Folio}}</ion-label>
+            <div class="title">{{ task.Folio}}</div>
           </div>
           <div class="div-icon" (click)="openOptions()">
-              <!-- <ion-menu-button autoHide="false">
+            <ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
-                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-              </ion-menu-button> -->
-              <ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
           </div>
         </div>
       </div>
@@ -29,53 +26,57 @@
         </div>
       </div>
       <div class="line"></div>
-      <div class="middle-content" >
-        <div *ngIf="intervenientes.length > 0">
-          <h5 >Intervenientes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <ion-label *ngIf="intervenientes">
-              <div *ngFor="let interveniente of intervenientes">
-                <p>{{interveniente.Name}}</p>
-              </div>
-            </ion-label>
-          </ion-item>
-        </div>
-        <div *ngIf="cc!='' && cc!=' ' ">
-          .. {{ cc | json }} ..
 
-          <h5 *ngIf="cc.length > 0">Com conhecimento</h5>
+      <div class="overflow-y-auto px-20">
-          <ion-item *ngIf="cc.length > 0" class="ion-no-margin ion-no-padding">
+        <div class="middle-content" >
-            <ion-label>
+          <div *ngIf="intervenientes.length > 0">
-              <div *ngFor="let c of cc">
+            <h5 >Intervenientes</h5>
-                <p>{{c.Name}}</p>
+            <ion-item class="ion-no-margin ion-no-padding">
-              </div>
+              <ion-label *ngIf="intervenientes">
+                <div *ngFor="let interveniente of intervenientes">
+                  <p>{{interveniente.Name}}</p>
+                </div>
+              </ion-label>
+            </ion-item>
+          </div>
+          <div *ngIf="cc!='' && cc!=' ' ">
+            .. {{ cc | json }} ..
+  
+            <h5 *ngIf="cc.length > 0">Com conhecimento</h5>
+            <ion-item *ngIf="cc.length > 0" class="ion-no-margin ion-no-padding">
+              <ion-label>
+                <div *ngFor="let c of cc">
+                  <p>{{c.Name}}</p>
+                </div>
+              </ion-label>
+            </ion-item>
+          </div>
+          <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
+            <h5>Detalhes</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+            </ion-item>
+          </div>
+        </div>
+        <div class="bottom-content width-100">
+          <ion-list *ngIf="attachments">
+            <h5>Documentos Anexados</h5>
+            <ion-item *ngFor="let attachment of attachments" 
+            class="ion-no-margin ion-no-padding cursor-pointer">
+            <ion-label
+            (click)="viewDocument(attachment.DocId)">
+              <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+              <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+              <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
             </ion-label>
           </ion-item>
-        </div>
+          </ion-list>
-        <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
-          <h5>Detalhes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
-          </ion-item>
         </div>
       </div>
-      <div class="bottom-content width-100">
+
-        <ion-list *ngIf="attachments">
-          <h5>Documentos Anexados</h5>
-          <ion-item *ngFor="let attachment of attachments" 
-          class="ion-no-margin ion-no-padding cursor-pointer">
-          <ion-label
-          (click)="viewDocument(attachment.DocId)">
-            <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-            <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-            <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
-          </ion-label>
-        </ion-item>
-        </ion-list>
-      </div>
     </div>
 
-    <div *ngIf="task" class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100 px-20">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
         <div class="option-desc"> <div>Responder ao PR</div> </div>
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
@@ -100,7 +101,7 @@
 
     </div>
 
-    <div *ngIf="!task">
+    <div *ngIf="!task" class="px-20">
       <ion-list>
         <ion-list-header>
           <ion-label>

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss

@@ -5,7 +5,7 @@
   border-top-right-radius: 25px;
 }
 .content{
-  padding: 30px 20px 0 20px !important;
+  padding: 30px 00px 0 00px !important;
   margin: 0;
   float: left;
 }

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -50,10 +50,8 @@ export class DespachoPrPage implements OnInit {
     private menu: MenuController,
     private router: Router,
     private modalController: ModalController,
-    private alertService: AlertService,
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
-    private animationController: AnimationController,
     private toastService: ToastService,
     private location: Location,
     ) {
@@ -510,7 +508,17 @@ export class DespachoPrPage implements OnInit {
       },
       translucent: true
     });
-    return await popover.present();
+
+    await popover.present();
+
+    popover.onDidDismiss().then(( res =>{
+
+      if( res['data'] == 'close') {
+        this.goBack()       
+      }
+
+    }))
+
   }
 
 

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -4,21 +4,15 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { formatDate } from '@angular/common';
 import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
-import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
-import { momentG }  from 'src/plugin/momentG'
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { ToastService } from 'src/app/services/toast.service';
-
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-despachos-pr-options',
@@ -45,7 +39,8 @@ export class DespachosPrOptionsPage implements OnInit {
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
     private animationController: AnimationController,
-    private toastService: ToastService) { }
+    private toastService: ToastService,
+    private location: Location,) { }
 
   ngOnInit() {
     
@@ -92,10 +87,12 @@ export class DespachosPrOptionsPage implements OnInit {
 
       }
 
+      this.popoverController.dismiss('close')
+
     });
   }
 
-  sendExpedienteToPending(){
+  sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);
       this.close();
@@ -127,6 +124,7 @@ export class DespachosPrOptionsPage implements OnInit {
         this.close();
         this.openMenu(); */
       }
+      this.popoverController.dismiss('close')
       
     });
   }