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

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

@@ -144,7 +144,7 @@
                 <div class="list-people flex-grow-1">
                   <ion-item lines="none">
                     <ion-list>
-                      <ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
+                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
                       <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                     </ion-list>
                   </ion-item>
@@ -165,7 +165,7 @@
                 <div class="list-people flex-grow-1">
                   <ion-item lines="none">
                     <ion-list>
-                      <ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
+                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
                       <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                     </ion-list>
                   </ion-item>

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

@@ -54,7 +54,7 @@
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
-          <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+          <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
         <div class="ion-input-class">
           <ion-select  placeholder="Selecione tipo" 
@@ -135,7 +135,7 @@
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
-              <ion-label  *ngIf="taskParticipants.length == 0"  class="list-people-title">Adicionar interveniente</ion-label>
+              <ion-label  *ngIf="taskParticipants?.length < 1"  class="list-people-title">Adicionar interveniente</ion-label>
                 <div class="list-people">
                     <ion-item lines="none">
                       <ion-list>

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

@@ -210,4 +210,7 @@ ion-content{
   .close-button {
     display: block !important;
   }
+}
+.icon-time{
+  color: #797979b0;
 }

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

@@ -76,7 +76,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/pages/events/attendees/attendees.page.html

@@ -1,6 +1,6 @@
 <ion-header class="ion-no-border px-20">
   <ion-toolbar class="px-10">
-    <ion-title class="pa-0">Adicionar intervenientes - A.M.</ion-title>
+    <ion-title class="pa-0">Adicionar intervenientes</ion-title>
   </ion-toolbar>
   <ion-searchbar class="attendee-search-bar" (ionChange)="onChange($event)" placeholder="Insira email para adicionar destinatário"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
   <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -30,7 +30,7 @@
     </ion-list>
     <hr/>
 
-    <ion-list lines="none" *ngIf="taskParticipants.length >= 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
+    <ion-list lines="none" *ngIf="taskParticipants?.length >= 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
       <div  class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1"  > Destinatário</div> 
       <ion-item-sliding class="px-20"> 
         <ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex">
@@ -47,7 +47,7 @@
         </ion-item>
       </ion-item-sliding>
     </ion-list>
-    <ion-list lines="none" *ngIf="taskParticipantsCc.length >= 1 && adding == 'CC' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
+    <ion-list lines="none" *ngIf="taskParticipantsCc?.length >= 1 && adding == 'CC' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
       <div  class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1"  > Destinatário</div> 
       
       <ion-item-sliding  class="px-20"> 

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

@@ -65,7 +65,7 @@
 
       </div>
     </div>
-    <div *ngIf="despachoList.length < 1">
+    <div *ngIf="despachoList?.length < 1">
     
       <ion-list>
         <ion-item>

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

@@ -12,13 +12,9 @@
    </div>
 </ion-content>
 <ion-footer>
-  <ion-toolbar class="width-100 d-flex justify-space-between px-20">
-    <ion-buttons slot="start">
-      <button class="btn-delete" shape="round" (click)="save()">Sim</button>
-    </ion-buttons>
-    <ion-title></ion-title>
-    <ion-buttons slot="end">
-      <button class="btn-ok" shape="round" (click)="close()">Não</button>
-    </ion-buttons>
-  </ion-toolbar>
+  <div class="buttons width-100">
+    <button class="btn-ok-medium" shape="round" (click)="close()">Não</button>
+    <button class="btn-delete-medium" shape="round" (click)="save()">Sim</button>
+  </div>
+
 </ion-footer>

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

@@ -20,23 +20,7 @@ ion-content{
 }
   
 .buttons{
-    width: 100%;
-    margin: 0 auto;
-    padding: 5px 0 5px 0;
+    display: flex;
+    justify-content: space-between;
+    padding: 15px 0 15px 0;
 }
-
-  .button-reject {
-    width: 130px;
-    height: 44px;
-    --color: #d30a0a;
-    border-radius: 22.5px;
-    --background: #ffe0e0;
-    margin: 0 12px 0 0px;
-  }
-  .button-approve {
-    width: 130px;
-    height: 44px;
-    border-radius: 22.5px;
-    --background: #42b9fe;
-    margin: 0 0px 0 12px; 
-  }

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -2,12 +2,12 @@
   <div class="main-content d-flex height-100">
 
     <div class="content d-flex flex-column width-100 height-100 ">
-      <div class="header-content">
+      <div class="header-content header-default-padding">
         <div class="header-title">
           <label>Convocar Reunião</label>
         </div>
       </div>
-      <div class="overflow-y-auto">
+      <div class="overflow-y-auto content-default-padding">
         
         <div class="ion-item-container width-100">
           <ion-input placeholder="Assunto" [(ngModel)]="postData.Subject"></ion-input>
@@ -111,7 +111,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
                     <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>
@@ -132,7 +132,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Com conhecimento</ion-label>
+                    <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com conhecimento</ion-label>
                     <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>
@@ -188,6 +188,11 @@
     </div>
 
     <div class="aside-righ flex-grow-1">
+      <app-empty-container 
+          [texto]="emptyTextDescription" 
+          *ngIf="!showAttendees" 
+          class="d-flex height-100 flex-column">
+      </app-empty-container>
       <app-attendee-modal class=" d-flex flex-column height-100" 
         *ngIf="showAttendees"
         [footer]="false"

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss

@@ -1,5 +1,4 @@
 .content{
-  padding: 30px 20px 0 20px !important;
   margin: 0;
   float: left;
 

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { AnimationController, ModalController, NavParams } from '@ionic/angular';
 import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page';
 import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
@@ -29,7 +29,7 @@ export class BookMeetingModalPage implements OnInit {
   
   task: any;
   
-  taskParticipants: EventPerson[] = [];
+  taskParticipants: EventPerson[];
   taskParticipantsCc: EventPerson[] = [];
   
   taskDocId:string;
@@ -45,6 +45,7 @@ export class BookMeetingModalPage implements OnInit {
   formLocationSatus: boolean = false;
   showAttendees= false;
   loggeduser: User;
+  emptyTextDescription = "Sem intervenientes selecionados";
 
   constructor(
     private modalController: ModalController,
@@ -56,7 +57,9 @@ export class BookMeetingModalPage implements OnInit {
     authService: AuthService,
     private animationController: AnimationController,
     private toastService: ToastService,
+    private activatedRoute: ActivatedRoute,
     ) {
+      this.taskParticipants = [];
       this.loggeduser = authService.ValidatedUser;
       this.task = this.navParams.get('task');
       this.postData = new Event();
@@ -96,6 +99,19 @@ export class BookMeetingModalPage implements OnInit {
   cancelTask(){
     this.modalController.dismiss(null);
   }
+  goBack() {
+    this.modalController.dismiss(null);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "expedientes": true,
+      }
+    }
+    if( window.innerWidth < 801) {
+      this.router.navigate(['/home/gabinete-digital/expediente']);
+    } else {
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    }
+  }
   async saveTask(){
 
     // issue12323423
@@ -138,9 +154,11 @@ export class BookMeetingModalPage implements OnInit {
             await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise()
             break;
         }
-       
+
+        this.modalController.dismiss();
         this.distartExpedientModal();
-        this.toastService.successMessage('Reunião criada')
+        this.toastService.successMessage('Reunião criada');
+
       } catch (error) {
         this.toastService.badRequest('Reunião não criada')
       }

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

@@ -25,7 +25,7 @@
         <div class="container-div width-100">
           <div class="ion-item-class-2 width-100">
             <div class="ion-icon-class">
-              <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              <ion-icon class="icon-time" slot="start" name="time-outline"></ion-icon>
             </div>
             <div class="ion-input-class">
               <ion-select placeholder="Prazo" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
@@ -40,7 +40,7 @@
         <div class="container-div">
           <div class="ion-item-class-2">
             <div class="ion-icon-class">
-              <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class">
               <ion-item class="ion-no-border ion-no-padding ion-no-margin">
@@ -65,7 +65,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipants.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
                     <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>
@@ -86,7 +86,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Com conhecimento</ion-label>
+                    <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com conhecimento</ion-label>
                     <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>

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

@@ -205,5 +205,8 @@ font-size: 13px;
   -ms-border-radius: 18px;
   -o-border-radius: 18px;
 }
+.icon-time{
+  color: #797979b0;
+}
 
 

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

@@ -135,7 +135,7 @@ export class ExpedienteDetailPage implements OnInit {
   async LoadTaskDetail(serial: string) {
 
     this.processes.GetTask(serial).subscribe(res => {
-      console.log(res);
+      //console.log(res);
       
       this.task = {
         "SerialNumber": res.serialNumber,
@@ -151,10 +151,10 @@ export class ExpedienteDetailPage implements OnInit {
         "WorkflowName": res.workflowDisplayName,
       }
 
-      console.log('task', this.task);
+      //console.log('task', this.task);
 
       this.fulltask = res;
-      console.log('GetTask', res);
+      //console.log('GetTask', res);
 
       let thedate = new Date(this.task.CreateDate);
       this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
@@ -303,6 +303,8 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   async openBookMeetingModal(task: any) {
+    console.log(task);
+    
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'