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

src/app/pages/chat/chat.page.html

@@ -38,7 +38,7 @@
             </ion-segment-button>
           </ion-segment>
         </ion-toolbar>
-        <div class="overflow-y-auto d-flex flex-wrap">
+        <div class="overflow-y-auto d-flex flex-wrap flex-grow-1">
         <div class="width-100" [ngSwitch]="segment">
           <ion-list *ngSwitchCase="'Contactos'">
             <ion-item-group>

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

@@ -51,7 +51,7 @@
               <!-- <ion-menu-button autoHide="false">
                 <ion-icon name="ellipsis-vertical-outline"></ion-icon>
               </ion-menu-button> -->
-              <ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
+              <ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
           </div>
         </div>
       </div>

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

@@ -23,42 +23,44 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="main-content width-100">
+    <div class="main-content width-100">
-    <div *ngIf="despachoList">
+      <div *ngIf="despachoList">
-      <ion-list>
+        <ion-list>
-        <ion-item 
+          <ion-item 
-            class="expediente ion-no-padding cursor-pointer"  
+              class="expediente ion-no-padding cursor-pointer"  
-            *ngFor = "let task of despachoList; let i = index"
+              *ngFor = "let task of despachoList; let i = index"
-            (click)="viewExpedientDetail(task.SerialNumber)"
+              (click)="goToDespachoPr(task.SerialNumber)"
-
+              >
-            >
+              <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+                <div class="item width-100" *ngIf="task.Status == 'Active'">
-              <div class="item width-100" *ngIf="task.Status == 'Active'">
+                  <div class="exp-top-detail">
-                <div class="exp-top-detail">
+                    <div class="exp-date">
-                  <div class="exp-date">
+                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                    <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                    </div>
-                  </div>
+                    <div class="exp-remetente">
-                  <div class="exp-remetente">
+                      <ion-label>{{task.Senders}}</ion-label>
-                    <ion-label>{{task.Senders}}</ion-label>
+                    </div>
-                  </div>
+                    <div class="exp-workflow">
-                  <div class="exp-icon d-flex align-center">
+                      <span class="label">{{task.activityInstanceName}}</span>
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </div>
-                    <label>{{task.DocumentsQty}}</label>
+                    <div class="exp-icon d-flex align-center">
-
-                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    </ion-menu-button> -->
+                      <label>{{task.DocumentsQty}}</label>
+  
+                      <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                        <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                      </ion-menu-button> -->
+                    </div>
+                  </div>
+                  <div class="exp-bottom-detail">
+                    <ion-label>{{ task.Folio }}</ion-label>
                   </div>
                 </div>
-                <div class="exp-bottom-detail">
+              </ion-item>
-                  <ion-label>{{ task.Folio }}</ion-label>
+        </ion-list>
-                </div>
+  
-              </div>
+      </div>
-            </ion-item>
-      </ion-list>
-
     </div>
-  </div>
   <div *ngIf="loading">
   
     <ion-list>

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

@@ -15,6 +15,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 import { AuthService } from 'src/app/services/auth.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 import { User } from 'src/app/models/user.model';
+import { NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -53,6 +54,7 @@ export class DespachosPrPage implements OnInit {
     private alertService: AlertService,
     private authService: AuthService,
     private navParams: NavParams,
+    private router: Router,
     ) { 
 
       this.loggeduser = authService.ValidatedUser;
@@ -71,7 +73,16 @@ export class DespachosPrPage implements OnInit {
   }
   
   segmentChanged(ev: any) {
-    // this.LoadList();
+    this.LoadList();
+  }
+
+  goToDespachoPr(serialNumber:any){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "serialNumber": serialNumber,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras);
   }
   
   notImplemented(){

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

@@ -53,12 +53,14 @@ export class DespachoPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private router: Router,
     ) { 
+
       this.activatedRoute.queryParams.subscribe(params => {
         if(params["serialNumber"]) {
           this.serialnumber = params["serialNumber"];
           console.log(params["serialNumber"]);
         }
       });
+      
     }
 
   ngOnInit() {

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

@@ -14,6 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 
 import { AuthService } from 'src/app/services/auth.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
+import { NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-despachos',
@@ -49,6 +50,7 @@ export class DespachosPage implements OnInit {
     private modalController: ModalController,
     private alertService: AlertService,
     private authService: AuthService,
+    private router: Router,
     ) { 
       this.profile = 'mdgpr';
       // alert('nice!')
@@ -132,134 +134,17 @@ export class DespachosPage implements OnInit {
   }
 
   async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
-
-    const modal = await this.modalController.create({
-      component: DespachoPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-
-  // old
-  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 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
-      },
-    }
-
-    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();
 
+    let navigationExtras: NavigationExtras = {
+    queryParams: {
+        "serialNumber": serialNumber,
       }
+    };
+
+    this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
 
-    });
   }
 
- async openBookMeetingModal(task: 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
-     },
-   }
-   
-   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: task,
-     },
-     cssClass: classs,
-     backdropDismiss: false
-   });
-   await modal.present();
-   modal.onDidDismiss();
- }
-
-
- async distartExpedientModal() {
-
-   const doc = this.taskList[ this.dicIndex];
-
-   console.log(doc, this.dicIndex, this.taskList)
-   
-   const modal = await this.modalController.create({
-     component: DiscartExpedientModalPage,
-      componentProps: {
-       serialNumber: doc.serialNumber,
-       folderId: doc.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(); */
-     }
-     
-   });
- }
-
  docIndex(index: number) {
   this.dicIndex = index;
  }

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

@@ -311,6 +311,7 @@ export class ExpedientTaskModalPage implements OnInit {
       this.loadedAttachments = res;
       console.log(res);
     });
+
   }
  
   async addParticipants() {

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

@@ -266,16 +266,16 @@ export class GabineteDigitalPage implements OnInit {
     return false;
   }
 
-  openEventsToApprovePage(profile:any){
+  openEventsToApprovePage(profile:any) {
     console.log(profile);
     
     this.closeAllDesktopComponents();
     let navigationExtras: NavigationExtras = { queryParams: {"eventos": true,}};
-    if( window.innerWidth <= 800){
+    if( window.innerWidth <= 800) {
       //this.openEventsToApproveList(profile);
       this.router.navigate(['/home/gabinete-digital/event-list']);
     }
-    else{
+    else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showEventsToApprove = true;
     }
@@ -347,7 +347,7 @@ export class GabineteDigitalPage implements OnInit {
 
   openPedidosPage(segment:string){
     this.closeAllDesktopComponents();
-    if( window.innerWidth <= 800){
+    if( window.innerWidth <= 800) {
       this.openPedidoList();
     }
     else{
@@ -463,7 +463,7 @@ export class GabineteDigitalPage implements OnInit {
     //if( window.innerWidth <= 1024){
       const modal = await this.modalController.create({
         component: ExpedientePage,
-        componentProps:{
+        componentProps: {
           profile: this.profile,
         },
         cssClass: 'modal modal-desktop',
@@ -497,6 +497,7 @@ export class GabineteDigitalPage implements OnInit {
         component: DespachosPage,
         componentProps:{
           profile: this.profile,
+          serialNumber: this.serialNumber
         },
         cssClass: 'modal modal-desktop',
       });

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

@@ -16,7 +16,7 @@
           </div>
           <div class="div-icon">
             <div autoHide="false" class="d-flex">
-              <ion-icon class="font-30" name="ellipsis-vertical-outline"></ion-icon>
+              <ion-icon class="font-30 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
             </div>
           </div>
         </div>

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

@@ -42,19 +42,19 @@ export class PedidosPage implements OnInit {
    private modalController: ModalController,
    private alertService: AlertService,
    ) { 
-     this.profile = 'mdgpr';
+    this.profile = 'mdgpr';
-   }
+  }
 
- ngOnInit() {
+  ngOnInit() {
-   //Inicializar segment
+    //Inicializar segment
-   //this.segment = 'parecer';
+    this.segment = 'parecer';
-   console.log(this.serialNumber);
+    
-   
+    this.LoadList();
-   this.LoadList();
+  }
- }
+
- segmentChanged(ev: any) {
+  segmentChanged(ev: any) {
-   this.LoadList();
+    this.LoadList();
- }
+  }
 
  goToPedido(serialNumber:any){
   let navigationExtras: NavigationExtras = {
@@ -66,72 +66,72 @@ export class PedidosPage implements OnInit {
 }
 
  notImplemented(){
-   this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
  }
 
- openExpedientDetailPage(data){
+  openExpedientDetailPage(data){
-   console.log(data);
+    console.log(data);
-   this.openExpedientDetail.emit(data);
+    this.openExpedientDetail.emit(data);
- }
+  }
 
  LoadList(){
-   if(this.segment == 'parecer'){
+    if(this.segment == 'parecer'){
-     this.taskType = "Pedido de Parecer";
+      this.taskType = "Pedido de Parecer";
-     this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
+      this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
-       this.taskslist = result;
+        this.taskslist = result;
-       console.log(result);
+        console.log(result);
-       
+        
-       this.parecerList = new Array();
+        this.parecerList = new Array();
-       let res = result.reverse();
+        let res = result.reverse();
-       res.forEach(element => {
+        res.forEach(element => {
-         let task = {
+          let task = {
-           "SerialNumber": element.serialNumber,
+            "SerialNumber": element.serialNumber,
-           "Folio": element.workflowInstanceDataFields.Subject,
+            "Folio": element.workflowInstanceDataFields.Subject,
-           "Senders": element.originator.email,
+            "Senders": element.originator.email,
-           "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+            "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-           "Remetente": element.workflowInstanceDataFields.Remetente,
+            "Remetente": element.workflowInstanceDataFields.Remetente,
-           "DocumentsQty": 0,
+            "DocumentsQty": 0,
-           "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-           "WorkflowName": element.workflowDisplayName,
+            "WorkflowName": element.workflowDisplayName,
-           "activityInstanceName": element.activityInstanceName,
+            "activityInstanceName": element.activityInstanceName,
-         }
+          }
-         this.parecerList.push(task);
+          this.parecerList.push(task);
-       });
+        });
-       console.log(this.parecerList);
+        console.log(this.parecerList);
-       
+        
-     });
+      });
-   }
+    }
-   else if(this.segment == 'deferimento'){
+    else if(this.segment == 'deferimento'){
-     this.taskType = "Pedido de Deferimento";
+      this.taskType = "Pedido de Deferimento";
-     this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
+      this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
-       this.taskslist = result;
+        this.taskslist = result;
-       
+        
-       console.log(result);
+        console.log(result);
-       
+        
-       this.deferimentoList = new Array();
+        this.deferimentoList = new Array();
-       let res = result.reverse();
+        let res = result.reverse();
-       res.forEach(element => {
+        res.forEach(element => {
-         let task = {
+          let task = {
-           "SerialNumber": element.serialNumber,
+            "SerialNumber": element.serialNumber,
-           "Folio": element.workflowInstanceDataFields.Subject,
+            "Folio": element.workflowInstanceDataFields.Subject,
-           "Senders": element.originator.email,
+            "Senders": element.originator.email,
-           "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+            "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-           "Remetente": element.workflowInstanceDataFields.Remetente,
+            "Remetente": element.workflowInstanceDataFields.Remetente,
-           "DocumentsQty": 0,
+            "DocumentsQty": 0,
-           "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-           "FolderId": element.workflowInstanceDataFields.FolderId,
+            "FolderId": element.workflowInstanceDataFields.FolderId,
-           "WorkflowName": element.workflowDisplayName,
+            "WorkflowName": element.workflowDisplayName,
-         }
+          }
-         this.deferimentoList.push(task);
+          this.deferimentoList.push(task);
-       });
+        });
-       console.log(this.deferimentoList);
+        console.log(this.deferimentoList);
-       
+        
-     });
+      });
-   }
+    }
-   console.log(this.taskType); 
+    console.log(this.taskType); 
- }
+  }
 
  doRefresh() {
    this.LoadList();

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

@@ -19,40 +19,40 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
+    <div class="width-100">
-    <div *ngIf="pendentesList">
+      <div *ngIf="pendentesList">
-      <ion-list>
+        <ion-list>
-        <ion-item 
+          <ion-item 
-            class="expediente ion-no-padding"  
+              class="expediente ion-no-padding cursor-pointer"  
-            *ngFor = "let task of pendentesList"
+              *ngFor = "let task of pendentesList"
-            (click)="viewTaskDetails(task.SerialNumber, task.WorkflowName)"
+              (click)="viewTaskDetails(task.SerialNumber, task.WorkflowName)"
-            >
+              >
-            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+              <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-              <div class="item width-100">
+                <div class="item width-100">
-                <div class="exp-top-detail">
+                  <div class="exp-top-detail">
-                  <div class="exp-date">
+                    <div class="exp-date">
-                    <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                    </div>
+                    <div class="exp-remetente">
+                      <ion-label>{{task.Senders}}</ion-label>
+                    </div>
+                    <div class="exp-workflow">
+                      <span class="label">{{task.WorkflowName}}</span>
+                    </div>
+                    <div class="exp-icon">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                      <label>{{task.DocumentsQty}}</label>
+                    </div>
                   </div>
-                  <div class="exp-remetente">
+                  <div class="exp-bottom-detail">
-                    <ion-label>{{task.Senders}}</ion-label>
+                    <ion-label>{{ task.Folio }}</ion-label>
-                  </div>
-                  <div class="exp-workflow">
-                    <span class="label">{{task.WorkflowName}}</span>
-                  </div>
-                  <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label>{{task.DocumentsQty}}</label>
                   </div>
                 </div>
-                <div class="exp-bottom-detail">
+              </ion-item>
-                  <ion-label>{{ task.Folio }}</ion-label>
+        </ion-list>
-                </div>
+  
-              </div>
+      </div>
-            </ion-item>
-      </ion-list>
-
     </div>
-  </div>
   <div *ngIf="!pendentesList">
   
     <ion-list>

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

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -34,6 +34,7 @@ export class PendentesPage implements OnInit {
     private modalController: ModalController,
     private alertService: AlertService,
     private authService: AuthService,
+    private router: Router,
     ) { 
       this.profile = 'mdgpr';
     }
@@ -122,14 +123,46 @@ export class PendentesPage implements OnInit {
   async viewTaskDetails(serialNumber:string, workflowName:string) {
     console.log(this.profile);
     if(workflowName == 'Despacho'){
-      this.openDespacho(serialNumber);
+      this.goToDespacho(serialNumber);
     }
     else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento'){
-      this.openPedido(serialNumber);
+      this.goToPedido(serialNumber);
+    }
+    else if(workflowName == 'Expediente'){
+      this.goToExpediente(serialNumber);
     }
  
   }
 
+
+  goToDespacho(serialNumber:any){
+    let navigationExtras: NavigationExtras = {
+     queryParams: {
+        "serialNumber": serialNumber,
+      }
+     };
+     this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
+   }
+
+   goToPedido(serialNumber:any){
+    let navigationExtras: NavigationExtras = {
+     queryParams: {
+        "serialNumber": serialNumber,
+      }
+     };
+     this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
+   }
+
+   goToExpediente(serialNumber:any){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "serialNumber": serialNumber,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+  }
+
+
   async openDespacho(serialNumber:string){
 
     const modal = await this.modalController.create({

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

@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Despachos</ion-label></div>
     <div class="theicon">