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

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

@@ -76,6 +76,10 @@ const routes: Routes = [
             path: 'edit-event',
             loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
           },
+          {
+            path: 'emend-message-modal',
+            loadChildren: () => import('../pages/agenda/emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
+          },
         ]
       },
       {

src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html

@@ -15,12 +15,8 @@
   </ion-item>
 </ion-content>
 <ion-footer>
-  <ion-toolbar>
-    <div class="buttons">
-      <ion-item lines="none">
-        <ion-button class="button-reject" shape="round" (click)="close()">Cancelar</ion-button>
-        <ion-button class="button-approve" shape="round" (click)="save()">Gravar</ion-button>
-    </ion-item>
+  <div class="buttons width-100">
+    <button class="btn-delete" shape="round" (click)="close()">Cancelar</button>
+    <button class="btn-ok" shape="round" (click)="save()">Gravar</button>
   </div>
-  </ion-toolbar>
 </ion-footer>

src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss

@@ -1,5 +1,5 @@
 .header-content{
-    width: 360px;
+    //width: 360px;
     overflow: auto;
     margin: 25px auto;
   }
@@ -38,4 +38,11 @@
     border-radius: 22.5px;
     --background: #42b9fe;
     margin: 0 0px 0 12px; 
+  }
+  .buttons{
+    display: flex;
+    width: 100% !important;
+    justify-content: space-between;
+    padding: 15px;
+    overflow: auto;
   }

src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts

@@ -11,12 +11,14 @@ export class EmendMessageModalPage implements OnInit {
 
   constructor(
     private modalController: ModalController,
-  ) { }
+  ) {
+    this.emendMessage = '';
+   }
 
   ngOnInit() {
   }
   close(){
-    this.modalController.dismiss(this.emendMessage);
+    this.modalController.dismiss('');
   }
   save(){
     this.modalController.dismiss(this.emendMessage);

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

@@ -34,7 +34,6 @@
     <ion-label>
       <p class="event-number p-small ion-text-center"> <strong>{{totalEvent}}</strong> eventos agendados para hoje</p>
     </ion-label>
-
     <div class="next-meeting">
       <div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
       <div class="meeting-description"> "{{currentEvent}}"</div>

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

@@ -12,7 +12,11 @@
 
       <!-- Aside left -->
       <div class="aside-wrapper d-flex flex-column pt-25 justify-center width-md-40 ">
-        <p class="text-center mt-0 aside-title px-20">Gabinete Digital</p>
+        <div class="title-container">
+          <span class="text-center mt-0 aside-title px-20">Gabinete Digital</span>
+          <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
+        </div>
+        
         <div class="aside overflow-y-auto d-flex d-md-block  flex-wrap justify-center width-100 px-20">
           <div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApprovePage('MDGPR')">
             <div class="d-flex justify-center">

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

@@ -11,6 +11,15 @@ ion-content{
   ion-card-title{
       text-align: center;
   }
+  .title-container{
+    margin-bottom: 15px;
+    .title-icon{
+      float: right;
+      margin-right: 20px;
+      font-size: 30px;
+      color: #0782c9;
+    }
+  }
 
   ion-card{
     background-color: #d4d5ca;

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

@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
 import { ModalController } from '@ionic/angular';
 import { EventListPage } from './event-list/event-list.page';
 import { ExpedientePage } from './expediente/expediente.page';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -44,7 +44,8 @@ export class GabineteDigitalPage implements OnInit {
     private processesbackend:ProcessesService,
     private modalController: ModalController,
     private alertService: AlertService,
-    private route: ActivatedRoute,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
     ) { 
 
       window.onresize = (event) => {
@@ -57,10 +58,23 @@ export class GabineteDigitalPage implements OnInit {
 
       this.adjastModalHeight();
 
-      this.route.queryParams.subscribe(params => {
+      /* this.activatedRoute.queryParams.subscribe(params => {
         if(params["show"]){
           this.openExpedientListPage();
-        } 
+        }
+        else if(params["events-to-approve"]){
+          this.openEventsToApprovePage("MDGPR");
+        }
+      }); */
+
+      this.activatedRoute.paramMap.subscribe(paramMap =>{
+        if (paramMap.has("show")){
+          this.openExpedientListPage();
+        }
+        else if(paramMap.has("events")){
+          this.openEventsToApprovePage("MDGPR");
+          this.LoadCounts();
+        }
       });
       
     }
@@ -93,6 +107,15 @@ export class GabineteDigitalPage implements OnInit {
   ngOnInit() {
     //Initialize profile as mdgpr
     this.profile = "MDGPR";
+
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.LoadCounts();
+      }
+    });
+
+
+    
     this.LoadCounts();
     /* this.eventService.getAllMdEvents.subscribe(res=>{
       console.log(res);
@@ -137,6 +160,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   }
 
   doRefresh(event) {
+    this.closeAllDesktopComponents();
+    this.showEmptyContainer = true;
     this.LoadCounts();
 
     setTimeout(() => {

src/app/shared/agenda/approve-event/approve-event.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
@@ -136,6 +136,8 @@ export class ApproveEventComponent implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then(res => {
+      console.log(res.data);
+      
       if(res.data !== ''){
         let body = { "serialNumber": serialNumber, 
         "action": "Emendar",
@@ -145,8 +147,9 @@ export class ApproveEventComponent implements OnInit {
         }
       console.log(body);
       this.processes.PostTaskAction(body);
-      this.router.navigate(['/home/gabinete-digital/event-list']);
+      //this.router.navigate(['/home/gabinete-digital/event-list']);
       this.alertService.presentAlert('Operação realizada com sucesso!');
+      this.goToEventsToApprove();
       }
       else{
         this.alertService.presentAlert('Operação cancelada!');
@@ -154,4 +157,13 @@ export class ApproveEventComponent implements OnInit {
     });
   }
 
+  goToEventsToApprove(){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "events": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+  }
+
 }

src/app/shared/agenda/new-event/new-event.component.ts

@@ -63,7 +63,7 @@ export class NewEventPage implements OnInit {
           Body: this.eventBody,
           Location: '',
           CalendarId: '',
-          CalendarName: this.selectedSegment,
+          CalendarName: '',
           StartDate: selectedStartdDate,
           EndDate: new Date(selectedEndDate),
           EventType: 'Reunião',

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -1,6 +1,9 @@
 <ion-content>
   <div class="title width-100">
-    <label>Eventos para Aprovação</label>
+    <div class="title-container">
+      <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
+      <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
+    </div>
     <ion-toolbar>
       <ion-segment [(ngModel)]="profile">
         <ion-segment-button value="MDGPR">

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss

@@ -2,6 +2,15 @@
     padding: 30px 20px 0 20px !important;
     margin: 0;
 }
+.title-container{
+  margin-bottom: 15px;
+  .title-icon{
+    float: right;
+    margin-right: 20px;
+    font-size: 30px;
+    color: #0782c9;
+  }
+}
 .title{
     font-family: Roboto;
     font-size: 25px;