Merge branch 'developer-c' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar

src/app/pages/events/events.page.html

@@ -94,7 +94,7 @@
           class="icon-next" 
           slot="end" 
           src="assets/images/icons-arrow-circle-arrow-right.svg"
-          (click)="openExpedientList()"
+          (click)="viewExpedientListPage()"
           ></ion-icon>
           
         </div>

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

@@ -1,4 +1,4 @@
-import { Component, OnInit, LOCALE_ID } from '@angular/core';
+import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/core';
 
 import { Event } from '../../models/event.model';
 import { EventsService } from 'src/app/services/events.service';
@@ -15,6 +15,7 @@ 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 { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page';
 
 @Component({
   selector: 'app-events',
@@ -58,6 +59,8 @@ export class EventsPage implements OnInit {
   taskslist:DailyWorkTask[];
   expedientList:any;
 
+  @Output() openExpedientListPage:EventEmitter<any> = new EventEmitter<any>();
+
   constructor(private eventService: EventsService, 
     private router: Router, 
     private storageService:StorageService,
@@ -65,6 +68,7 @@ export class EventsPage implements OnInit {
     private alertController: AlertService,
     private authService: AuthService,
     private processes:ProcessesService,
+    private gabineteService: GabineteDigitalPage,
     private modalController:ModalController) {
       this.prEventList = null;
 
@@ -239,8 +243,7 @@ export class EventsPage implements OnInit {
     return await modal.present();
   }
 
-  LoadList()
-  {
+  LoadList(){
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
       this.expedientList = result.reverse();
       console.log(this.expedientList);
@@ -306,13 +309,30 @@ export class EventsPage implements OnInit {
     });
   }
 
+  viewExpedientListPage(){
+    if( window.innerWidth <= 1024){
+      this.openExpedientList();
+    }
+    else{
+      console.log('ttt');
+      this.router.navigate(['/home/gabinete-digital']);
+      this.gabineteService.openExpedientListPage();
+    }
+  }
+
   async openExpedientList(){
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
     const modal = await this.modalController.create({
       component: ExpedientePage,
       componentProps:{
         profile: this.profile,
       },
-      cssClass: 'modal',
+      cssClass: classs,
       backdropDismiss: false
     });
     await modal.present();

src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts

@@ -10,6 +10,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 })
 export class DiscartExpedientModalPage implements OnInit {
   serialNumber:string;
+  folderId:string;
   constructor(
     private modalController: ModalController,
     private processes:ProcessesService,
@@ -17,6 +18,7 @@ export class DiscartExpedientModalPage implements OnInit {
     private navParams: NavParams,
   ) { 
     this.serialNumber = this.navParams.get('serialNumber');
+    this.folderId = this.navParams.get('folderId');
    }
 
   ngOnInit() {
@@ -24,13 +26,20 @@ export class DiscartExpedientModalPage implements OnInit {
     
   }
   close(){
+    /* let body = { "serialNumber": this.serialNumber, "action": "Tratado" } */
+    console.log(this.folderId);
+    console.log('FOLDER');
+    
+    this.processes.UpdateTaskStatus(this.folderId).subscribe(res=>{
+      console.log(res);
+    });
     this.modalController.dismiss();
   }
   /* notDelete(){
 
   } */
   save(){
-    let body = { "serialNumber": this.serialNumber, "action": "Task Completed" }
+    let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
     console.log(body);
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/expediente']);

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -224,6 +224,7 @@ export class ExpedientTaskModalPage implements OnInit {
       component: DiscartExpedientModalPage,
        componentProps: {
         serialNumber: this.task.serialNumber,
+        folderId: this.task.workflowInstanceDataFields.FolderID,
       },
       cssClass: 'discart-expedient-modal',
       backdropDismiss: false

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -38,8 +38,7 @@ export class ExpedientePage implements OnInit {
     this.LoadList();
   }
 
-  LoadList()
-  {
+  LoadList(){
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
       this.taskslist = new Array();
       result.forEach(element => {

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

@@ -200,7 +200,6 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   async openExpedientList(){
     
     this.closeAllDesktopComponent();
-
     let classs;
     if( window.innerWidth <= 1024){
       classs = 'modal'