Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/pages/events/events.page.ts

@@ -9,18 +9,11 @@ import { AuthService } from 'src/app/services/auth.service';
 import { StorageService } from 'src/app/services/storage.service';
 import { ModalController, Platform } from '@ionic/angular';
 import { EventDetailPage } from './event-detail/event-detail.page';
-import { EventDetailModalPage } from './event-detail-modal/event-detail-modal.page';
 import { ProcessesService } from '../../services/processes.service';
 import { DailyWorkTask } from '../../models/dailyworktask.model';
-import { ViewEventPage } from '../agenda/view-event/view-event.page';
-import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page';
-import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
-import { EditEventPage as EventEditPage } from './edit-event/edit-event.page';
-import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page';
 import { User } from 'src/app/models/user.model';
 import { ToDayEventStorage  } from 'src/app/store/to-day-event-storage.service';
 import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.service';
-
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 
 @Component({

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 name="ellipsis-vertical-outline"></ion-icon>
-              </ion-menu-button> -->
-              <ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+            <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>
-          <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>
+      <div class="overflow-y-auto px-20">
+        <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>
+            <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>
-        <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>
+          </ion-list>
         </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/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -1,11 +1,9 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
 import { ModalController, NavParams } from '@ionic/angular';
-import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
 
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';

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

@@ -27,43 +27,47 @@
         </div>
       </div>
       <div class="line"></div>
-      <div class="middle-content">
-        <h5 *ngIf="intervenientes">Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <div *ngFor="let interveniente of intervenientes">
-              <p>{{interveniente.Name}}</p>
-            </div>
-          </ion-label>
-        </ion-item>
-        <div *ngIf="cc.length > 0">
-          <h5>Com conhecimento</h5>
+      
+      <div class="overflow-y-auto" style="margin-right: -20px; margin-right: -20px;">
+        <div class="middle-content">
+          <h5 *ngIf="intervenientes">Intervenientes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
             <ion-label>
-              <div *ngFor="let c of cc">
-                <p>{{c.Name}}</p>
+              <div *ngFor="let interveniente of intervenientes">
+                <p>{{interveniente.Name}}</p>
               </div>
             </ion-label>
           </ion-item>
+          <div *ngIf="cc.length > 0">
+            <h5>Com conhecimento</h5>
+            <ion-item 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 *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 class="bottom-content width-100">
+          <ion-list>
+            <h5>Documentos Anexados</h5>
+            <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
+              <ion-label class="d-block" (click)="viewDocument(Document.DocId)">
+                <p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+                <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
+              </ion-label>
+            </ion-item>
+          </ion-list>
         </div>
       </div>
-      <div class="bottom-content width-100">
-        <ion-list>
-          <h5>Documentos Anexados</h5>
-          <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
-            <ion-label class="d-block" (click)="viewDocument(Document.DocId)">
-              <p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-              <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
-            </ion-label>
-          </ion-item>
-        </ion-list>
-      </div>
+
     </div>
 
     <div *ngIf="task" class="aside-right flex-column height-100">

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

@@ -7,7 +7,7 @@
   <div class="title d-flex align-center">
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
 
-    <div class="thetitle"><ion-label >Despachos</ion-label></div>
+    <div class="title"><ion-label >Despachos</ion-label></div>
     <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>

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

@@ -30,47 +30,50 @@
         </div>
       </div>
       <div class="line"></div>
-      <div class="middle-content">
-        <h5 *ngIf="intervenientes">Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <div *ngFor="let interveniente of intervenientes">
-              <p>{{interveniente.Name}}</p>
-            </div>
-          </ion-label>
-        </ion-item>
-        <div *ngIf="cc.length > 0">
-          <h5>Com conhecimento</h5>
+
+      <div class="overflow-y-auto">
+        <div class="middle-content">
+          <h5 *ngIf="intervenientes">Intervenientes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
             <ion-label>
-              <div *ngFor="let c of cc">
-                <p>{{c.Name}}</p>
+              <div *ngFor="let interveniente of intervenientes">
+                <p>{{interveniente.Name}}</p>
               </div>
             </ion-label>
           </ion-item>
+          <div *ngIf="cc.length > 0">
+            <h5>Com conhecimento</h5>
+            <ion-item 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="task.Note">
+            <h5>Detalhes</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+                <p [innerHTML]="task.Note"></p>
+            </ion-item>
+          </div>
         </div>
-        <div *ngIf="task.Note">
-          <h5>Detalhes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="task.Note"></p>
-          </ion-item>
-        </div>
-      </div>
-      <div class="bottom-content width-100">
-        <ion-list>
-          <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)"
+        <div class="bottom-content width-100">
+          <ion-list>
+            <h5>Documentos Anexados</h5>
+            <ion-item *ngFor="let attachment of attachments" 
+              class="ion-no-margin ion-no-padding cursor-pointer"
             >
-              <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>
+              <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>

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

@@ -20,7 +20,6 @@
   display: flex;
   font-family: Roboto;
   background-color: #fff;
-  overflow:auto;
   color:#000;
   transform: translate3d(0, 1px, 0);
       .title-content{
@@ -63,7 +62,6 @@ ion-button{
 .upper-content{
   font-family: Roboto;
   margin-left: 41px;
-  overflow: auto;
   font-size: 18px;
 
   .label{

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

@@ -210,7 +210,15 @@ export class PedidoPage implements OnInit {
       },
       translucent: true
     });
-    return await popover.present();
+    await popover.present();
+
+    popover.onDidDismiss().then(( res =>{
+
+      if( res['data'] == 'close') {
+        this.goBack()       
+      }
+
+    }))
   }
 
   async repreciar(note:string, documents:any) {

src/app/pages/gabinete-digital/pedidos/pedidos.page.html

@@ -98,7 +98,7 @@
               </div>
               <div class="exp-bottom-detail">
                 <div class="exp-remetente">
-                  <ion-label>{{task.Senders}} sender</ion-label>
+                  <ion-label>{{task.Senders}}</ion-label>
                 </div>
               </div>
               <div class="exp-middle-detail">