From d88f90916fb660e9a4335e584c61826d09009830 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 May 2021 15:46:20 +0100
Subject: [PATCH 1/3] Save

---
 .../despachos-pr/despachos-pr.page.ts         | 25 +++++++++++++++++--
 .../despachos/despacho/despacho.page.html     |  7 +++---
 .../despachos/despacho/despacho.page.ts       | 22 ++++++++++++++--
 .../despachos/despachos.page.ts               | 22 ++++++++--------
 .../gabinete-digital.page.html                |  2 +-
 .../gabinete-digital/gabinete-digital.page.ts | 13 +++++++---
 .../gabinete-digital/pedidos/pedidos.page.ts  |  1 +
 src/app/services/auth.service.ts              |  4 +--
 .../opts-expediente/opts-expediente.page.html |  2 +-
 .../opts-expediente/opts-expediente.page.ts   |  7 ++++++
 10 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index f3ff78b4b..a196cb0c3 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-
+import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 @Component({
   selector: 'app-despachos-pr',
   templateUrl: './despachos-pr.page.html',
@@ -7,9 +8,29 @@ import { Component, OnInit } from '@angular/core';
 })
 export class DespachosPrPage implements OnInit {
 
-  constructor() { }
+
+  task: any;
+  attachments:any;
+  fulltask: any;
+  
+  constructor(public popoverController: PopoverController) { }
 
   ngOnInit() {
   }
 
+
+  async openOptions(taskAction?: any) {
+    const popover = await this.popoverController.create({
+      component: OptsExpedientePage,
+      cssClass: 'exp-options',
+      componentProps: {
+        task: this.task,
+        fulltask: this.fulltask,
+        taskAction:taskAction,
+        showEnviarPendentes: false
+      },
+      translucent: true
+    });
+    return await popover.present();
+  }
 }
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index 62102918f..bd532161f 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -46,10 +46,11 @@
           <div class="middle">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
-          <div class="div-icon">
-              <ion-menu-button autoHide="false">
+          <div class="div-icon" (click)="openOptions()">
+              <!-- <ion-menu-button autoHide="false">
                 <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-              </ion-menu-button>
+              </ion-menu-button> -->
+              <ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
           </div>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index cff88ae48..620143f83 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { formatDate } from '@angular/common';
 import { Event } from '../../../../models/event.model';
-import { MenuController, ModalController, NavParams } from '@ionic/angular';
+import { MenuController, ModalController, NavParams, 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'
@@ -17,6 +17,7 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
 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';
 
 @Component({
   selector: 'app-despacho',
@@ -47,7 +48,8 @@ export class DespachoPage implements OnInit {
     private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
-    private alertService: AlertService) { 
+    private alertService: AlertService,
+    public popoverController: PopoverController) { 
       this.serialnumber = this.navParams.get('serialNumber');
       this.profile = this.navParams.get('profile');
     }
@@ -299,4 +301,20 @@ export class DespachoPage implements OnInit {
       
     });
   }
+
+  async openOptions(taskAction?: any) {
+    const popover = await this.popoverController.create({
+      component: OptsExpedientePage,
+      cssClass: 'exp-options',
+      componentProps: {
+        task: this.task,
+        fulltask: this.fulltask,
+        taskAction:taskAction,
+        showEnviarPendentes: false
+      },
+      translucent: true
+    });
+    return await popover.present();
+  }
+  
 }
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index f2a1ad944..ec698c6ff 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -132,8 +132,6 @@ doRefresh(event) {
 async viewExpedientDetail(serialNumber:any) {
   console.log(this.profile);
 
-
-
   const modal = await this.modalController.create({
     component: DespachoPage,
     componentProps:{
@@ -163,15 +161,15 @@ async viewExpedientDetail(serialNumber:any) {
    const doc = this.loadedAttachments[ this.dicIndex];
 
    task = {
-     serialNumber: doc.SourceId,
-     taskStartDate: doc.CreateDate,
-     isEvent: true,
-     workflowInstanceDataFields: {
-       FsId: doc.ApplicationId, 
-       FolderID: null,
-       DocId: doc.SourceId, 
-       Subject: doc.SourceName
-     },
+    serialNumber: doc.SourceId,
+    taskStartDate: doc.CreateDate,
+    isEvent: true,
+    workflowInstanceDataFields: {
+      FsId: doc.ApplicationId, 
+      FolderID: null,
+      DocId: doc.SourceId, 
+      Subject: doc.SourceName
+    },
    }
 
    const modal = await this.modalController.create({
@@ -261,7 +259,7 @@ async viewExpedientDetail(serialNumber:any) {
  }
 
  docIndex(index: number) {
-   this.dicIndex = index;
+  this.dicIndex = index;
  }
  
 }
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index f2037aa0e..065f3c078 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -20,7 +20,7 @@
         </div>
         
         <div class="aside overflow-y-auto d-flex  flex-wrap width-100">
-          <div [class.active]="selectedElement == 'approval'" (click)="openEventsToApprovePage('MDGPR');selectedElement='approval'"  class="exp-card d-flex flex-column" >
+          <div [class.active]="selectedElement == 'approval'" (click)="openEventsToApprovePage('MDGPR');selectedElement='approval'"  class="exp-card d-flex flex-column" *ngIf="loggeduser.Profile == 'MDGPR'" >
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
             </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 7630a9065..898774c8a 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -8,6 +8,8 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { DespachosPage } from './despachos/despachos.page';
 import { PedidosPage } from './pedidos/pedidos.page';
 import { PendentesPage } from './pendentes/pendentes.page';
+import { AuthService } from 'src/app/services/auth.service';
+import { User } from 'src/app/models/user.model';
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -16,7 +18,7 @@ import { PendentesPage } from './pendentes/pendentes.page';
 })
 
 export class GabineteDigitalPage implements OnInit {
-
+  
   segment:string;
   showLoader: boolean;
   public profile:string;
@@ -57,14 +59,19 @@ export class GabineteDigitalPage implements OnInit {
 
   serialNumber:string;
 
+  loggeduser: User;
+
   constructor(
     private processesbackend:ProcessesService,
     private modalController: ModalController,
     private alertService: AlertService,
     private activatedRoute: ActivatedRoute,
     private router: Router,
+    authService: AuthService
     ) {
 
+      this.loggeduser = authService.ValidatedUser;
+
       window.onresize = (event) => {
         // if not mobile remove all component
         if( window.innerWidth <= 800){
@@ -89,7 +96,7 @@ export class GabineteDigitalPage implements OnInit {
           this.selectedElement='RequestsForOpinion'
           
         }
-         else if (window.innerWidth >= 800) {
+         else if (window.innerWidth >= 800 && this.loggeduser.Profile == 'MDGPR') {
           this.openEventsToApprovePage('MDGPR');
           this.selectedElement='approval'
         }
@@ -133,7 +140,6 @@ export class GabineteDigitalPage implements OnInit {
     this.showEmptyContainer = false;
     this.showEventsToApprove = false;
     this.showExpedients = false;
-    this.showExpedients = false;
     this.showPedidos = false;
     this.showDespachos = false;
     this.showDespachosPr = false;
@@ -247,6 +253,7 @@ export class GabineteDigitalPage implements OnInit {
       this.openExpedientList();
     }
     else{
+      this.selectedElement='Correspondence'
       this.showExpedients = true;
     }
   }
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 5f2423768..ec9e2aa20 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -45,6 +45,7 @@ export class PedidosPage implements OnInit {
    }
 
  ngOnInit() {
+    this.segment = 'parecer';
    //Inicializar segment
    this.LoadList();
  }
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index b1c134083..239f33424 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -55,10 +55,10 @@ export class AuthService {
 
       if (result) {
 
-        if( response.RoleID == 100000014){
+        if( response.RoleID == 100000014) {
           response.Profile = 'PR'
         } else if(response.RoleID == 100000011) {
-          response.Profile = 'MDGPR'
+          response.Profile = 'PR'
         }
         response.BasicAuthKey = user.BasicAuthKey
         this.ValidatedUser = response;
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
index 43ad11752..771250029 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
@@ -10,7 +10,7 @@
     <button (click)="openExpedientActionsModal('2',fulltask)" full class="btn-ok" shape="round" >Pedido de Deferimento</button>
     <button (click)="openBookMeetingModal()" full class="btn-ok" shape="round" >Marcar reunião</button>
     <button (click)="distartExpedientModal(fulltask)" full class="btn-ok" shape="round" >Descartar</button>
-    <button (click)="sendExpedienteToPending()" full class="btn-ok" shape="round" >Enviar para pendentes</button>
+    <button (click)="sendExpedienteToPending()" full class="btn-ok" shape="round" *ngIf="showEnviarPendentes" >Enviar para pendentes</button>
     <div class="solid"></div>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 8e8caf2a3..cc61c2eff 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -15,6 +15,8 @@ export class OptsExpedientePage implements OnInit {
   fulltask: any;
   profile:string;
 
+  showEnviarPendentes = false
+
   constructor(
     private popoverController: PopoverController,
     private modalController: ModalController,
@@ -23,6 +25,11 @@ export class OptsExpedientePage implements OnInit {
   ) { 
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');
+
+    this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
+
+    if(!this.showEnviarPendentes) this.showEnviarPendentes = false
+
   }
 
   ngOnInit() {

From b8934d2c775e890075b0cbab12dfdd9274e337fc Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 May 2021 16:08:33 +0100
Subject: [PATCH 2/3] Improve responsiveness

---
 .../pedidos/pedido/pedido.page.html                | 14 ++++++--------
 .../pedidos/pedido/pedido.page.scss                |  4 +---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index 6dcfd9412..86c5f6e0d 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -5,15 +5,13 @@
 <ion-content>
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">
-      <div class="main-header">
-        <div class="title-content">
-          <ion-toolbar>
-            <ion-buttons slot="start">
-              <ion-back-button (click)="goBack()" defaultHref="#"></ion-back-button>
-            </ion-buttons>
-          </ion-toolbar>
+      <div class="main-header ">
+        <div class="title-content d-flex justify-space-between align-center">
+          <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+            <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </div>
           <!-- <app-btn-modal-dismiss></app-btn-modal-dismiss> -->
-          <div class="middle">
+          <div class="middle d-flex align-center flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon">
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
index 99af5da34..dab508d2e 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
@@ -33,7 +33,7 @@
         padding: 0!important;
         float: left;
         width: 280px;
-        margin: 2.5px 0 0 5px;
+
         display: flex;
         align-items: center;
             
@@ -74,8 +74,6 @@
           font-size: 25px;
           overflow: auto;
           float: left;
-          padding-top: 4px;
-          padding-left: 5px;
         }
         .div-icon{
           width: 40px;

From 3ad94744985d2988a489cd1a2c2352fcbc26c3f2 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 May 2021 16:29:21 +0100
Subject: [PATCH 3/3] Add options for event

---
 .../view-event/options/options.component.html | 17 +++++++
 .../view-event/options/options.component.scss | 51 +++++++++++++++++++
 .../options/options.component.spec.ts         | 24 +++++++++
 .../view-event/options/options.component.ts   | 14 +++++
 4 files changed, 106 insertions(+)
 create mode 100644 src/app/pages/agenda/view-event/options/options.component.html
 create mode 100644 src/app/pages/agenda/view-event/options/options.component.scss
 create mode 100644 src/app/pages/agenda/view-event/options/options.component.spec.ts
 create mode 100644 src/app/pages/agenda/view-event/options/options.component.ts

diff --git a/src/app/pages/agenda/view-event/options/options.component.html b/src/app/pages/agenda/view-event/options/options.component.html
new file mode 100644
index 000000000..301bb3166
--- /dev/null
+++ b/src/app/pages/agenda/view-event/options/options.component.html
@@ -0,0 +1,17 @@
+<ion-content class="container">
+  <div class="arrow-right">
+    <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  full class="btn-ok" shape="round" >Efectuar Despacho</button>
+    <button  full class="btn-ok" shape="round" >Pedido de Parecer</button>
+    <button  full class="btn-ok" shape="round" >Pedido de Deferimento</button>
+    <button  full class="btn-ok" shape="round" >Marcar reunião</button>
+    <button  full class="btn-ok" shape="round" >Descartar</button>
+    <button  full class="btn-ok" shape="round" *ngIf="showEnviarPendentes" >Enviar para pendentes</button>
+    <div class="solid"></div>
+    <button  full class="btn-cancel" shape="round" >Cancelar</button>
+  </div>
+</ion-content>
diff --git a/src/app/pages/agenda/view-event/options/options.component.scss b/src/app/pages/agenda/view-event/options/options.component.scss
new file mode 100644
index 000000000..2c7a0cc7f
--- /dev/null
+++ b/src/app/pages/agenda/view-event/options/options.component.scss
@@ -0,0 +1,51 @@
+.container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+}
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+}
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel{
+    //width: 50% !important;
+    margin-bottom: 5px !important;
+    margin-top: 5px !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;
+    } */
+}
\ No newline at end of file
diff --git a/src/app/pages/agenda/view-event/options/options.component.spec.ts b/src/app/pages/agenda/view-event/options/options.component.spec.ts
new file mode 100644
index 000000000..370263b60
--- /dev/null
+++ b/src/app/pages/agenda/view-event/options/options.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { OptionsComponent } from './options.component';
+
+describe('OptionsComponent', () => {
+  let component: OptionsComponent;
+  let fixture: ComponentFixture<OptionsComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OptionsComponent ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OptionsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/agenda/view-event/options/options.component.ts b/src/app/pages/agenda/view-event/options/options.component.ts
new file mode 100644
index 000000000..b4280a4ec
--- /dev/null
+++ b/src/app/pages/agenda/view-event/options/options.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-options',
+  templateUrl: './options.component.html',
+  styleUrls: ['./options.component.scss'],
+})
+export class OptionsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {}
+
+}