issue 812

src/app/shared/agenda/edit-event/edit-event.page.html

@@ -127,7 +127,6 @@
               [showSeconds]="showSeconds"
               [stepHour]="stepHour" [stepMinute]="stepMinute"
               [stepSecond]="stepSecond"
-              [min]="endMinDate"
               [touchUi]="touchUi">
             </ngx-mat-datetime-picker>
           </mat-form-field>
@@ -198,7 +197,6 @@
             <input matInput [ngxMatDatetimePicker]="occurrrence"
               placeholder="Choose a date"
               [formControl]="dateControlOccurrence"
-              [min]="endMinDate"
               [disabled]="disabled"
             >
             <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>

src/app/shared/agenda/edit-event/edit-event.page.ts

@@ -20,7 +20,7 @@ import * as moment from 'moment';
 })
 
 export class EditEventPage implements OnInit {
-  
+
   stEvent: Event;
   isRecurring:string;
   isEventEdited: boolean;
@@ -213,9 +213,9 @@ export class EditEventPage implements OnInit {
       dateEnd: new FormControl(this.dateEnd, [
         Validators.required
       ]),
-      /* IsRecurring: new FormControl(this.postEvent.IsRecurring, [
+      dateOccurrence: new FormControl(this.dateOccurrence, [
         Validators.required
-      ]), */
+      ]),
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
@@ -226,6 +226,28 @@ export class EditEventPage implements OnInit {
     })
   }
 
+  openInicio() {
+    let input: any = document.querySelector('#new-inicio')
+    if(input) {
+      console.log(input)
+      input.click()
+    }
+  }
+
+  openFim() {
+    let input: any = document.querySelector('#new-fim')
+    if(input) {
+      input.click()
+    }
+  }
+
+  openLastOccurrence() {
+    let input: any = document.querySelector('#last-occurrence')
+    if(input) {
+      input.click()
+    }
+  }
+
 
   async save() {
 

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

@@ -17,11 +17,11 @@
         refreshingText="A actualizar...">
       </ion-refresher-content>
     </ion-refresher>
-  
+
   <div *ngIf="pendentesList.length >= 1" class="width-100 overflow-y-auto height-100">
       <ion-list>
-        <ion-item 
-            class="expediente ion-no-padding cursor-pointer"  
+        <ion-item
+            class="expediente ion-no-padding cursor-pointer"
             *ngFor = "let task of pendentesList"
             (click)="viewTaskDetails(task.SerialNumber, task.WorkflowName)"
             >
@@ -39,7 +39,7 @@
                   </div>
                   <div class="exp-icon">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label>{{task.DocumentsQty}}</label>
+                    <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                   </div>
                 </div>
                 <div class="exp-bottom-detail">
@@ -50,7 +50,7 @@
       </ion-list>
   </div>
   <div *ngIf="pendentesList.length < 1">
-  
+
     <ion-list>
       <ion-item>
         <ion-thumbnail slot="end">

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

@@ -1,16 +1,12 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
-
+import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
-import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 import { AuthService } from 'src/app/services/auth.service';
-import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
-import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 
 
 @Component({
@@ -26,96 +22,72 @@ export class PendentesPage implements OnInit {
   serialNumber:string;
   totalDocs:any;
   showLoader: boolean;
- 
+
   @Input() profile:string;
   segment:string;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
- 
+
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
     private alertService: AlertService,
     private authService: AuthService,
     private router: Router,
-    ) { 
+    ) {
+      this.pendentesList = new Array();
       this.profile = 'mdgpr';
     }
- 
+
   ngOnInit() {
     //Inicializar segment
     this.segment = "despachos";
     this.LoadList();
 
     const pathname = window.location.pathname
-    
+
    this.router.events.forEach((event) => {
     if(event instanceof NavigationEnd && event.url == pathname) {
       this.LoadList();
     }
   });
   }
-  
+
   segmentChanged(ev: any) {
     this.LoadList();
   }
- 
+
   openExpedientDetailPage(data){
     console.log(data);
     this.openExpedientDetail.emit(data);
   }
- 
+
   async LoadList(){
     this.showLoader = true;
-    this.pendentesList = [];
-    
-    let despachos = await this.processes.GetTasksList("Despacho", false).toPromise();
-    let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
-    let deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise();
-    let expedientes = await this.processes.GetTasksList("Expediente", false).toPromise();
-    let expedientes_pr = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise();
+    this.pendentesList = new Array();
+    let pendentes = await this.processes.GetPendingTasks(false).toPromise();
 
-    let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).filter(data => data.workflowInstanceDataFields.Status == "Pending");
-    
     pendentes.forEach(element => {
-      let DocId = element.workflowInstanceDataFields.FolderID;
-      let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-      this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
-        this.totalDocs = res.DocumentsTotal;
-        let date = new Date(element.taskStartDate);
-        date.setMonth(date.getMonth() + 1);
-        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+      let date = new Date(element.taskStartDate);
+      date.setMonth(date.getMonth() + 1);
+      let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
 
-        let task = {
-            "SerialNumber": element.serialNumber,
-            "Folio": element.workflowInstanceDataFields.Subject,
-            "Senders": element.workflowInstanceDataFields.Sender,
-            "CreateDate":  new Date(element.taskStartDate),
-            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-            "Remetente": element.workflowInstanceDataFields.Sender,
-            "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
+      let task = {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": taskDate,
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": 0,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
+        "Status": element.workflowInstanceDataFields.Status,
         }
         this.pendentesList.push(task);
-      },
-      (error)=>{
-        let task = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceDataFields.Subject,
-          "Senders": element.workflowInstanceDataFields.Sender,
-          "CreateDate": new Date(element.taskStartDate),
-          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-          "Remetente": element.workflowInstanceDataFields.Remetente,
-          "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocId,
-          "WorkflowName": element.workflowDisplayName,
-          "activityInstanceName": element.activityInstanceName,
-        }
-        this.pendentesList.push(task);
-      });
+        this.pendentesList = removeDuplicate( this.pendentesList)
+        this.pendentesList = this.sortArrayISODate(this.pendentesList);
     });
-    this.pendentesList = this.sortArrayISODate(this.pendentesList).reverse();
     this.showLoader = false;
   }
 
@@ -125,11 +97,11 @@ export class PendentesPage implements OnInit {
     });
   }
 
- 
+
   doRefresh() {
     this.LoadList();
   }
- 
+
   async viewTaskDetails(serialNumber:string, workflowName:string) {
     console.log(this.profile);
     if(workflowName == 'Despacho'){
@@ -142,6 +114,5 @@ export class PendentesPage implements OnInit {
       this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
     }
   }
- 
+
  }
-