save

src/app/home/home-routing.module.ts

@@ -143,10 +143,6 @@ const routes: Routes = [
       },
       {
         path: 'gabinete-digital',
-        resolve: {
-          diplomas: ProcessesResolverService,
-          pendentes: PendentesResolverService,
-        },
         children: [
           {
             path:'',

src/app/pages/agenda/new-event/new-event.page.ts

@@ -71,6 +71,7 @@ export class NewEventPage implements OnInit {
   ) { 
     this.loggeduser = userService.ValidatedUser;
     this.postEvent = new Event();
+    this.postEvent.EventRecurrence = {Type:'-1'};
     this.eventBody = { BodyType : "1", Text : ""};
     this.postEvent.Body = this.eventBody;
     /* this.profile = this.navParams.get('profile'); */
@@ -109,7 +110,7 @@ export class NewEventPage implements OnInit {
         Organizer: '',
         Categories: ['Reunião'],
         HasAttachments: false,
-        EventRecurrence: null,
+        EventRecurrence: {Type:'-1'},
       };
     }
     else{
@@ -131,7 +132,7 @@ export class NewEventPage implements OnInit {
         Organizer: '',
         Categories: ['Reunião'],
         HasAttachments: false,
-        EventRecurrence: null,
+        EventRecurrence: {Type:'-1'},
       };
     }
 
@@ -219,6 +220,9 @@ export class NewEventPage implements OnInit {
     if(this.documents.length >= 0) {
       this.postEvent.HasAttachments = true;
     }
+    if(this.selectedRecurringType != '-1'){
+      this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
+    }
     
    let eventId: any;
   
@@ -226,6 +230,8 @@ export class NewEventPage implements OnInit {
 
       if(this.loggeduser.Profile == 'MDGPR') {
         console.log(this.loggeduser.Profile);
+
+        console.log(this.postEvent);
         
         eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise();
         console.log(eventId);

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

@@ -9,7 +9,7 @@
   <div class="title">
     <div class="thetitle"><ion-label >Expediente</ion-label></div>
     <div class="theicon btn-refresh">
-      <button class="btn-no-color" (click)="doRefresh($event)">
+      <button class="btn-no-color" (click)="refreshing()">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>

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

@@ -27,8 +27,8 @@
       </ion-refresher-content>
     </ion-refresher>
   
-    <div class="width-100">
-      <div *ngIf="pendentesList">
+    <div *ngIf="pendentesList" class="width-100">
+      <div >
         <ion-list>
           <div 
               class="expediente ion-no-padding ion-no-margin cursor-pointer"  
@@ -66,7 +66,6 @@
       </div>
     </div>
     <div *ngIf="!pendentesList">
-    
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">

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

@@ -1,15 +1,11 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { ActivatedRoute, 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 { 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';
 
 
 @Component({
@@ -37,11 +33,9 @@ export class PendentesPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     ) { 
       this.profile = 'mdgpr';
-     
     }
  
   ngOnInit() {
-    this.initPendentes();
     //Inicializar segment
     this.segment = "despachos";
     this.router.events.forEach((event) => {
@@ -50,37 +44,6 @@ export class PendentesPage implements OnInit {
       }
     });
   }
-
-  initPendentes(){
-    this.activatedRoute.data.subscribe(data => {
-      console.log(data['pendentes']);
-      data['pendentes'].forEach(element => {
-        let DocId = element.workflowInstanceDataFields.FolderID;
-        let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-
-        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": taskDate,
-            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-            "Remetente": element.workflowInstanceDataFields.Remetente,
-            "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
-        }
-        console.log(task);
-        
-        this.pendentesList.push.call(task);
-        this.pendentesList = removeDuplicate( this.pendentesList);
-      });
-    });
-  }
   
   segmentChanged(ev: any) {
     this.refreshing();

src/app/services/events.service.ts

@@ -231,7 +231,7 @@ export class EventsService {
   }
 
   getRecurrenceTypes(): any{
-    const geturl = environment.apiURL + 'Calendar/ListEventRepeatTypes';
+    const geturl = environment.apiURL + 'Calendar/RecurrenceTypes';
     let options = { 
       headers: this.headers, 
     };

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -2,18 +2,13 @@
   <div class="title">
     <div class="thetitle"><ion-label >Expediente</ion-label></div>
     <div class="theicon">
-      <button class="btn-no-color" (click)="doRefresh()">
+      <button class="btn-no-color" (click)="refreshing()">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
   </div>
 </ion-header>
 <ion-content>
-  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
-    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-    <ion-refresher-content>
-    </ion-refresher-content>
-  </ion-refresher>
   
   <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
     <ion-list>

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -117,9 +117,10 @@ export class ExpedientesPrPage implements OnInit {
     }, 1500);
   }
 
-  doRefresh() {
+  doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
+      event.target.complete();
     }, 2000);
   }