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

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

@@ -5,22 +5,40 @@
     </button>
   </div>
 
-  <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
-    <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
-    <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
-    <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma </button>
+  <div class="width-100">
+    <div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1">
+        <button class="btn-cancel desk" shape="round"> Enviar para o PR </button>
+        <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
+        <button class="btn-cancel desk" shape="round"> Solicitar revisão </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" >Efetuar 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()" 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 *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
+      <div class="flex-grow-1">
+        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
+        <div class="solid"></div>
+        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <div hidden class="solid"></div>
+        <button hidden class="btn-cancel" shape="round" >Delegar</button>
+      </div>
+    </div>
+
     <div class="solid"></div>
-    <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
-    <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-    <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-    <div class="solid"></div>
-    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
-  </div>
-  <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
-    <button (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
-    <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
-    <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-    <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>
 
 </ion-content>

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

@@ -3,18 +3,19 @@
    --padding-bottom:20px !important;
    --padding-start:20px !important;
    --padding-end:20px !important;
+   width: 100%;
 }
-.arrow-right {
+.arrow-right{
     display: none;
     margin-bottom: 20px;
-    .arrow-right-icon {
+    .arrow-right-icon{
         width: 37px;
         float: right;
         font-size: 35px;
         overflow: hidden;
     }
 }
-.buttons {
+.buttons{
     display: flex;
     flex-wrap: wrap;
     justify-content: space-around;
@@ -30,10 +31,8 @@
     margin-bottom: 5px !important;
     margin-top: 5px !important;
 }
-@media only screen and (max-width: 800px) {
-    .btn-ok, .btn-cancel, .btn-delete{
-        width: 47% !important;
-    }
+.btn-ok, .btn-cancel, .btn-delete{
+    width: 100% !important;
 }
 @media only screen and (min-width: 1024px) {
     .arrow-right{
@@ -53,4 +52,10 @@
    /*  .solid{
         display: block;
     } */
+}
+
+
+.desk{
+    text-align: left;
+    background-color: white;
 }

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

@@ -13,6 +13,7 @@ import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/
 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'
+import { PermissionService } from 'src/app/OtherService/permission.service';
 
 @Component({
   selector: 'app-despachos-pr-options',
@@ -29,18 +30,14 @@ export class DespachosPrOptionsPage implements OnInit {
 
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
-    private iab: InAppBrowser,
-    private attachmentsService: AttachmentsService,
-    private events: EventsService,
-    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,) { }
+    private location: Location,
+    public p: PermissionService,
+  ) { }
 
   ngOnInit() {
     
@@ -78,9 +75,9 @@ export class DespachosPrOptionsPage implements OnInit {
       cssClass: classs,
     });
     await modal.present();
-    modal.onDidDismiss().then(res=>{
+    modal.onDidDismiss().then( (res)=> {
       console.log(res['data']);
-      if(res['data']=='openDiscart'){
+      if(res['data']=='openDiscart') {
         console.log('open discart');
         
         this.distartExpedientModal();
@@ -102,7 +99,7 @@ export class DespachosPrOptionsPage implements OnInit {
     });
   }
   
-  async distartExpedientModal(){
+  async distartExpedientModal() {
     this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
@@ -170,7 +167,7 @@ export class DespachosPrOptionsPage implements OnInit {
     modal.onDidDismiss();
   }
 
-  async generateDiploma(note:string, documents:any){
+  async generateDiploma(note:string, documents:any) {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Reencaminhar",
@@ -331,13 +328,15 @@ export class DespachosPrOptionsPage implements OnInit {
 
   goBack() {
 
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "despachospr": true,
-      }
-    };
+    // let navigationExtras: NavigationExtras = {
+    //   queryParams: {
+    //     "despachospr": true,
+    //   }
+    // };
     
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
+    this.location.back()
 
   }
 

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

@@ -12,6 +12,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-opts-expediente-pr',
@@ -48,7 +49,8 @@ export class OptsExpedientePrPage implements OnInit {
     private navParams: NavParams,
     private animationController: AnimationController,
     private router: Router,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private location: Location,
 
   ) {
 
@@ -275,8 +277,8 @@ export class OptsExpedientePrPage implements OnInit {
     modal.onDidDismiss().then( async (res)=>{
       console.log(res['data']);
       let body = res['data'];
-      // alert('close '+ res['data'])
-      if(res['data']){
+      // console.log('close '+ res['data'])
+      if(res['data']) {
         console.log('open discart');
 
         const loader = this.toastService.loading()
@@ -290,7 +292,6 @@ export class OptsExpedientePrPage implements OnInit {
         }  finally {
           loader.remove()
         }
-        this.goBack();
 
       }
       else{
@@ -321,16 +322,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    if (window.innerWidth <= 800) {
-      this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
-    } else {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          "expedientes-pr": true,
-        }
-      };
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    this.location.back()
   }
 
   getAttachments(serialNumber){