Many changes

Edit event

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

@@ -20,10 +20,15 @@ export class DiscartExpedientModalPage implements OnInit {
    }
 
   ngOnInit() {
+    console.log(this.serialNumber);
+    
   }
   close(){
     this.modalController.dismiss();
   }
+  /* notDelete(){
+
+  } */
   save(){
     let body = { "serialNumber": this.serialNumber, "action": "Task Completed" }
     console.log(body);

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -1,10 +1,19 @@
-<ion-header>
-  <ion-toolbar>
+<ion-header class="ion-no-border">
+  <div class="header-content">
+    <div class="header-icon-left">
+      <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+    </div>
+    <div class="header-title">
+      <label>Eventos para Aprovação</label>
+    </div>
+  
+  <!-- <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="/gabinete-digital"></ion-back-button>
+      <ion-back-button (click) ="close()"></ion-back-button>
     </ion-buttons>
+    <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
     <ion-title>Eventos para Aprovação</ion-title>
-  </ion-toolbar>
+  </ion-toolbar> -->
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment">
       <ion-segment-button value="MDGPR">
@@ -15,6 +24,7 @@
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
+</div>
 </ion-header>
 
 <ion-content>

src/app/pages/gabinete-digital/event-list/event-list.page.scss

@@ -1,3 +1,24 @@
+.header-content{
+  width: 360px;
+  overflow: auto;
+  margin: 0 auto;
+  padding-top: 25px;
+}
+.header-icon-left{
+  width: 36px;
+  font-size: 33px;
+  color: #42b9fe;
+  float: left;
+}
+.header-title{
+  width: 300px;
+  font-family: Roboto;
+  font-size: 25px;
+  margin: 0 5px 0 5px;
+  padding: 0;
+  color:#000;
+  float: left;
+}
 ion-item-sliding{
   margin-top: 5px;
 }

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

@@ -3,7 +3,7 @@ import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { ModalController } from '@ionic/angular';
+import { ModalController, NavParams } from '@ionic/angular';
 import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-event-modal.page';
 import { NavigationEnd, Router } from '@angular/router';
 
@@ -27,10 +27,16 @@ export class EventListPage implements OnInit {
     private processes:ProcessesService,
     private modalController: ModalController,
     private router: Router,
+    private navParams: NavParams,
     ) { }
-
+S
   ngOnInit() {
-    this.segment = "MDGPR";
+    this.segment = this.navParams.get('segment');
+    /* console.log(this.navParams.get('md')); */
+    console.log(this.segment);
+    this.LoadToApproveEvents();
+    
+
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
         this.LoadToApproveEvents();
@@ -71,6 +77,9 @@ export class EventListPage implements OnInit {
        event.target.complete();
      }, 2000);
   }
+  close(){
+    this.modalController.dismiss(null);
+  }
 
 
 }

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

@@ -11,6 +11,7 @@ import { StorageService } from 'src/app/services/storage.service';
 import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page';
 import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
 import { environment } from 'src/environments/environment';
+import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 
 @Component({
   selector: 'app-expedient-task-modal',
@@ -66,13 +67,14 @@ export class ExpedientTaskModalPage implements OnInit {
      }
 
   ngOnInit() {
-    
-    this.task = this.navParams.get('task');
     this.taskDate = new Date(this.task.taskStartDate);
     /* this.authService.userData$.subscribe((res:any)=>{
       console.log(res);
     });
     console.log(this.user); */ 
+    console.log(this.task)
+    console.log(this.task.serialNumber);
+    
   }
 
   close(){
@@ -98,6 +100,7 @@ export class ExpedientTaskModalPage implements OnInit {
         }
         console.log(this.postData);
         this.processes.postDespatcho(this.postData);
+
         break;
       case '1':
         this.postData = {
@@ -122,8 +125,8 @@ export class ExpedientTaskModalPage implements OnInit {
         this.processes.postDeferimento(this.postData);
         break;
     }
-    this.router.navigate(['/home/gabinete-digital/expediente']);
-    this.modalController.dismiss(null);
+    this.distartExpedientModal();
+    this.close();
   }
  
   async addParticipants(){
@@ -135,14 +138,10 @@ export class ExpedientTaskModalPage implements OnInit {
       cssClass: 'add-participants-modal',
       backdropDismiss: false
     });
-
     await modal.present();
-
     modal.onDidDismiss().then((res) => {
       this.taskParticipants = res.data;
-
       let newattendees: EventPerson[] = res['data'];
-
       if(newattendees!= null){
         newattendees.forEach(newattendee => {
         let att = {
@@ -159,6 +158,7 @@ export class ExpedientTaskModalPage implements OnInit {
       console.log(this.postData);
     });
   }
+  
   async addParticipantsCc(){
     const modal = await this.modalController.create({
       component: AddParticipantsCcModalPage,
@@ -168,14 +168,10 @@ export class ExpedientTaskModalPage implements OnInit {
       cssClass: 'add-participants-cc-modal',
       backdropDismiss: false
     });
-
     await modal.present();
-
     modal.onDidDismiss().then((res) => {
       this.taskParticipantsCc = res.data;
-
       let newattendees: EventPerson[] = res['data'];
-
       if(newattendees!= null){
         newattendees.forEach(newattendee => {
         let att = {
@@ -193,4 +189,18 @@ export class ExpedientTaskModalPage implements OnInit {
     });
   }
 
+  async distartExpedientModal(){
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.task.serialNumber,
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
 }

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

@@ -14,11 +14,11 @@
     <ion-card-header>
       <ion-card-title>Eventos para Aprovação</ion-card-title>
       <ion-card-content>
-        <ion-item  [routerLink]="['/home/gabinete-digital/event-list']">
+        <ion-item  (click)="openEventsToApproveList('MDGPR')">
           <ion-label>Minha agenda</ion-label>
           <ion-button slot="end">{{count_ev_md}}</ion-button>
         </ion-item>
-        <ion-item [routerLink]="['/home/gabinete-digital/event-list']" class="ion-item-change-color">
+        <ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color"><!-- [routerLink]="['/home/gabinete-digital/event-list', 'pr']" -->
           <ion-label>Agenda do Presidente</ion-label>
           <ion-button slot="end">{{count_ev_pr}}</ion-button>
         </ion-item>

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

@@ -1,6 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { AlertService } from 'src/app/services/alert.service';
+import { EventsService } from 'src/app/services/events.service';
+import { ModalController } from '@ionic/angular';
+import { EventListPage } from './event-list/event-list.page';
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -12,7 +15,11 @@ export class GabineteDigitalPage implements OnInit {
   segment:string;
   showLoader: boolean;
 
-  constructor(private processesbackend:ProcessesService, private alertService: AlertService) { }
+  constructor(
+    private processesbackend:ProcessesService,
+    private modalController: ModalController,
+    private eventService: EventsService,
+    private alertService: AlertService) { }
 
   count_exp_dailywork : number;  
   count_exp_pp : string;
@@ -25,6 +32,12 @@ export class GabineteDigitalPage implements OnInit {
 
   ngOnInit() {
     this.LoadCounts();
+    /* this.eventService.getAllMdEvents.subscribe(res=>{
+      console.log(res);
+      
+    });
+    console.log(this.eventService.getAllPrEvents.length);
+ */
   }
 
   LoadCounts() {
@@ -47,8 +60,6 @@ export class GabineteDigitalPage implements OnInit {
     this.count_de_pr = "-";
     this.count_ev_md='-';
 
-
-
   }
 
   doRefresh(event) {
@@ -63,5 +74,18 @@ export class GabineteDigitalPage implements OnInit {
   {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
+  
+  async openEventsToApproveList(segment:any){
+    const modal = await this.modalController.create({
+      component: EventListPage,
+      componentProps:{
+        segment: segment,
+      },
+      cssClass: 'expedient-task-modal',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
 
 }