save

src/app/shared/agenda/approve-event/approve-event.component.ts

@@ -154,7 +154,7 @@ export class ApproveEventComponent implements OnInit {
         let body = { "serialNumber": serialNumber, 
         "action": "Emendar",
             "dataFields": {
-            "ReviewerComments": res.data,
+            "ReviewerUseComment": res.data,
           }
         }
       console.log(body);

src/app/shared/popover/opts-expediente/opts-expediente-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { OptsExpedientePage } from './opts-expediente.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: OptsExpedientePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class OptsExpedientePageRoutingModule {}

src/app/shared/popover/opts-expediente/opts-expediente.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { OptsExpedientePageRoutingModule } from './opts-expediente-routing.module';
+
+import { OptsExpedientePage } from './opts-expediente.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    OptsExpedientePageRoutingModule
+  ],
+  declarations: [OptsExpedientePage]
+})
+export class OptsExpedientePageModule {}

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -0,0 +1,17 @@
+<ion-content class="container">
+  <div class="arrow-right" (click)="close()">
+    <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 (click)="close()" full class="btn-ok" shape="round" >Efectuar Despacho</button>
+    <button (click)="close()" full class="btn-ok" shape="round" >Pedido de Parecer</button>
+    <button (click)="close()" 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)="close()" full class="btn-ok" shape="round" >Descartar</button>
+    <button (click)="close()" full class="btn-ok" shape="round" >Enviar para pendentes</button>
+    <div class="solid"></div>
+    <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+  </div>
+</ion-content>

src/app/shared/popover/opts-expediente/opts-expediente.page.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;
+    } */
+}

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

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { OptsExpedientePage } from './opts-expediente.page';
+
+describe('OptsExpedientePage', () => {
+  let component: OptsExpedientePage;
+  let fixture: ComponentFixture<OptsExpedientePage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OptsExpedientePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OptsExpedientePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,111 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+
+@Component({
+  selector: 'app-opts-expediente',
+  templateUrl: './opts-expediente.page.html',
+  styleUrls: ['./opts-expediente.page.scss'],
+})
+export class OptsExpedientePage implements OnInit {
+  task:any;
+  fulltask: any;
+  profile:string;
+
+  constructor(
+    private popoverController: PopoverController,
+    private modalController: ModalController,
+    private navParams: NavParams,
+  ) { 
+    this.task = this.navParams.get('task');
+  }
+
+  ngOnInit() {
+    this.profile = "mdgpr";
+  }
+
+  close(){
+    if( window.innerWidth <= 1024){
+      this.popoverController.dismiss();
+    }
+    else{
+      this.modalController.dismiss();
+    }
+  }
+
+  async openBookMeetingModal(task: any) {
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        this.distartExpedientModal();
+
+      }
+
+    });
+  }
+
+  async distartExpedientModal(){
+    console.log(this.fulltask);
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.close();
+        /* console.log('2Expedient Discard closed2');
+        this.close();
+        this.openMenu(); */
+      }
+      
+    });
+  }
+
+}