Merge branch 'developer' into developer_mobilefirst

package-lock.json

@@ -3434,6 +3434,14 @@
         }
       }
     },
+    "@ngx-translate/core": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
+      "integrity": "sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==",
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",

package.json

@@ -51,6 +51,7 @@
     "@ionic/storage": "^2.3.1",
     "@logisticinfotech/ionic4-datepicker": "^1.4.4",
     "@ng-bootstrap/ng-bootstrap": "^9.1.2",
+    "@ngx-translate/core": "^13.0.0",
     "angular-calendar": "^0.28.22",
     "angular-tag-cloud-module": "^5.2.2",
     "bootstrap": "^4.5.0",

src/app/app-routing.module.ts

@@ -116,10 +116,6 @@ const routes: Routes = [
     path: 'new-event',
     loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule)
   },
-  {
-    path: 'edit-event',
-    loadChildren: () => import('./shared/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
-  },
   {
     path: 'event-list',
     loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule)

src/app/app.component.ts

@@ -3,11 +3,33 @@ import { Component } from '@angular/core';
 import { Platform } from '@ionic/angular';
 /* import { SplashScreen } from '@ionic-native/splash-screen/ngx'; */
 import { StatusBar } from '@ionic-native/status-bar/ngx';
+import * as _moment from 'moment';
+import * as _rollupMoment from 'moment';
+import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+const moment = _rollupMoment || _moment;
+import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
+
 
 @Component({
   selector: 'app-root',
   templateUrl: 'app.component.html',
-  styleUrls: ['app.component.scss']
+  styleUrls: ['app.component.scss'],
+  providers: [
+    { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+  ]
 })
 export class AppComponent {
   constructor(

src/app/app.module.ts

@@ -21,7 +21,7 @@ import { IonicStorageModule } from '@ionic/storage';
 //
 
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 
 import { CalendarModule, DateAdapter } from 'angular-calendar';
@@ -32,12 +32,19 @@ import { WebsocketService } from './services/websocket.service'
 import { ChatService } from './services/chat.service';
 import {MatDatepickerModule} from '@angular/material/datepicker';
 // import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+import {MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
+import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+
 
 import {
   NgxMatDatetimePickerModule, 
   NgxMatNativeDateModule, 
   NgxMatTimepickerModule 
 } from '@angular-material-components/datetime-picker';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MatButtonModule } from '@angular/material/button';
 
 
 @NgModule({
@@ -61,9 +68,17 @@ import {
     //
     NgxMatDatetimePickerModule,
     NgxMatTimepickerModule,
-    NgxMatNativeDateModule
+    NgxMatNativeDateModule,
+
+    NgxMatMomentModule,
+    MatButtonModule,
+    ReactiveFormsModule,
+
+    MatSelectModule,
+    MatDialogModule
     ],
   providers: [
+    { provide: MAT_DATE_LOCALE, useValue: 'pt' },
     StatusBar,
     //SplashScreen,
     HttpClientModule,

src/app/guards/index.guard.ts

@@ -12,7 +12,7 @@ export class IndexGuard implements CanActivate {
     public storageService:StorageService, 
     private router:Router
     ){}
-  canActivate(): Promise<boolean>{
+  canActivate(): Promise<boolean> {
     return new Promise(resolve => {
       /* this.storageService.get(AuthConnstants.AUTH).then(res => {
         if(res){

src/app/home/home.page.ts

@@ -56,7 +56,7 @@ export class HomePage implements OnInit {
     private platform: Platform) {
 
     router.events.subscribe((val) => {
-      // document.querySelectorAll('ion-modal').forEach((e) => e.remove())
+      document.querySelectorAll('ion-modal').forEach((e) => e.remove())
     });
 
     {

src/app/modals/create-process/create-process.module.ts

@@ -7,10 +7,25 @@ import { IonicModule } from '@ionic/angular';
 import { CreateProcessPageRoutingModule } from './create-process-routing.module';
 
 import { CreateProcessPage } from './create-process.page';
-import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
 import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
 import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
 
+
+import { MatNativeDateModule } from '@angular/material/core';
+import {
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+import { MatDialogModule } from '@angular/material/dialog';
+
 @NgModule({
   imports: [
     CommonModule,
@@ -18,7 +33,23 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att
     IonicModule,
     CreateProcessPageRoutingModule,
     EmptyContainerPageModule,
-    AttendeeModalPageModule
+    AttendeeModalPageModule,
+    // Angular material
+    MatDatepickerModule,
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    ReactiveFormsModule,
+    MatDialogModule,
+
+  ],
+  providers: [
+    { provide: MAT_DATE_LOCALE, useValue: 'pt' },
   ],
   declarations: [
     CreateProcessPage

src/app/modals/create-process/create-process.page.html

@@ -28,12 +28,31 @@
               <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>
+
+              <ion-select class="d-block d-md-none" placeholder="Prazo" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
                 <ion-select-option value="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
               </ion-select>
+
+              <mat-form-field class="width-100 d-none d-md-block" placeholder="Sample Type" required>
+                <mat-select matInput [(value)]="postData.Priority" >
+                  <mat-option value="99999861">
+                    Normal
+                  </mat-option>
+                  <mat-option value="99999862">
+                    Urgente
+                  </mat-option>
+                  <mat-option value="99999863">
+                    Muito Urgente
+                  </mat-option>
+                  <mat-option value="99999864">
+                    Urgentíssimo
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+
             </div>
           </div>
         </div>
@@ -43,15 +62,16 @@
               <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">
-              <ion-label>Tipo de assunto</ion-label>
-              <ion-select
-              [(ngModel)]="selectedTypes"
-              (ngModelChange)="onSelectedTypesChanged($event)" 
-              multiple="true" interface="alert" Cancel-text="Cancelar" required>
-                <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
-              </ion-select>
-            </ion-item>
+
+              <mat-form-field appearance="fill" class="width-100">
+                <mat-select [formControl]="toppings">
+                  <mat-option [value]="99999861">Normal</mat-option>
+                  <mat-option  [value]="99999862">Urgente</mat-option>
+                  <mat-option  [value]="99999863">Muito Urgente</mat-option>
+                  <mat-option [value]="99999864">Urgentíssimo</mat-option>
+                </mat-select>
+              </mat-form-field>
+
             </div>
           </div>
         </div>

src/app/modals/create-process/create-process.page.ts

@@ -1,5 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
 import { AnimationController, ModalController, NavParams } from '@ionic/angular';
 import { Despacho } from 'src/app/models/despacho.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
@@ -8,24 +7,38 @@ import { Folder } from 'src/app/models/folder.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { environment } from 'src/environments/environment';
-import { AttachmentsService } from 'src/app/services/attachments.service';
-import { AlertService } from 'src/app/services/alert.service';
-import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page';
-import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { SearchDocument } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { User } from 'src/app/models/user.model';
 import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
 import { ToastService } from 'src/app/services/toast.service';
+import { FormControl } from '@angular/forms';
+import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
+
 
 @Component({
   selector: 'app-create-process',
   templateUrl: './create-process.page.html',
   styleUrls: ['./create-process.page.scss'],
+  providers: [
+    { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+  ]
 })
 export class CreateProcessPage implements OnInit {
   modalTitle: string[] = [
@@ -63,14 +76,15 @@ export class CreateProcessPage implements OnInit {
   documents:SearchDocument[] = [];
 
   loggeduser: User;
-  
+
+  toppings = new FormControl();
+
+  toppingList: string[] = ['Economia', 'Saúde', 'Educação', 'Finanças', 'Agricultura'];
+
   constructor(
     private modalController: ModalController,
-    private router:Router,
     private processes:ProcessesService,
-    private attachmentsService: AttachmentsService,
     private navParams: NavParams,
-    private alertController: AlertService,
     private authService: AuthService,
     private userAuth: AuthService,
     private animationController: AnimationController,
@@ -99,7 +113,6 @@ export class CreateProcessPage implements OnInit {
         DeadlineType: '',
         SubjectTypes: this.selectedTypes,
         NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
-
       };
       
       this.postData.DispatchFolder = this.dispatchFolder;
@@ -125,7 +138,6 @@ export class CreateProcessPage implements OnInit {
     this.taskDate = new Date(this.task.taskStartDate);
   }
 
-
   onSelectedTypesChanged(ev:any){
     console.log(ev);
     if(ev.length > 1){
@@ -137,7 +149,7 @@ export class CreateProcessPage implements OnInit {
     }
   }
 
-  close(){
+  close() {
     //this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
@@ -350,8 +362,7 @@ export class CreateProcessPage implements OnInit {
           "ReviewUserComment": '',
         },
         "AttachmentList" :null,
-      } 
-
+      }
     }
 
     try {

src/app/pages/agenda/agenda.page.html

@@ -226,7 +226,7 @@
                   <div *ngFor="let event of events.value" class="EventListBox">
 
                     <div class="d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" 
-                    *ngIf="viewEventMonth <= dateMonth(event)">
+                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
 
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -266,7 +266,7 @@
                   </div>
                   <div *ngFor="let event of events.value" class="EventListBox" >
                     <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event)">
+                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
                   
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -308,7 +308,7 @@
                   <div *ngFor="let event of events.value" class="EventListBox">
 
                     <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                    *ngIf="viewEventMonth <= dateMonth(event)">
+                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
                     
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>

src/app/pages/agenda/agenda.page.scss

@@ -460,6 +460,10 @@ td.monthview-primary-with-event {
     color: #2e2e2e !important;
     font-size: 13px;
   }
+  .EventListBoxBorder{
+    padding-bottom: 5px;
+    border-bottom: 1px solid #d8d8d8;
+  }
 
   .content-pr-Oficial, .content-pr-Pessoal, .content-mdgpr-Pessoal, .content-mdgpr-Oficial {
     width: 100% !important;
@@ -508,6 +512,13 @@ td.monthview-primary-with-event {
       font-weight: bold;
       color: #0d89d1;
     }
+
+    .description p{
+      white-space: nowrap;
+      overflow: hidden !important;
+      text-overflow: ellipsis !important;
+    }
+
   }
   .color{
     width: 5px;

src/app/pages/agenda/agenda.page.ts

@@ -1310,6 +1310,19 @@ export class AgendaPage implements OnInit {
       this.timelineFilterState = segments
     }
     this.showTimelineFilterState = false;
+
+
+
+    setTimeout(()=>{
+      document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
+        if(e.childElementCount == 0) {
+          e.parentElement.style.display = 'none'
+        } else {
+          e.parentElement.style.display = 'block'
+        }
+      })
+    }, 10)
+    
   }
 
 }

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

@@ -28,11 +28,6 @@
                 <ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
               </div>
             </div>
-            <!-- Error messages -->
-            <!-- <span class="error ion-padding" >
-              Campo obrigatório
-            </span> -->
-        
           </div>
         
           <div class="container-div width-100">
@@ -132,9 +127,6 @@
               </div>
             </div>
           </div>
-          
-  
-  
           <div class="container-div width-100">
             <div (click)="addParticipants()" class="ion-item-class-2 cursor-pointer">
               <div class="ion-icon-class">

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

@@ -3,12 +3,9 @@ import { AlertController, AnimationController, ModalController, NavParams } from
 import { Attachment } from 'src/app/models/attachment.model';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
-import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { Event } from '../../../models/event.model';
 import { AttendeesPageModal } from '../../events/attendees/attendees.page';
 import { SearchPage } from '../../search/search.page';

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

@@ -9,8 +9,6 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { EventsService } from 'src/app/services/events.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { Event } from '../../../models/event.model';
 import { AttendeesPageModal } from '../../events/attendees/attendees.page';
 import { SearchPage } from '../../search/search.page';

src/app/pages/chat/chat.page.html

@@ -90,7 +90,7 @@
             
           </ion-list>
         </div>
-        <button (click)="sendMsg()">Send message</button>
+        <button (click)="sendMsg()" style="height: 41px;">Send message</button>
         </div>
       </div>
       <!-- Aside right -->

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

@@ -55,7 +55,9 @@
               </div>
               <div class="schedule-details">
                 <div class="location">{{event.Location}}</div>
-                <div class="description">{{event.Subject}}</div>
+                <div class="description">
+                  <p>{{event.Subject}}</p>
+                </div>
               </div>
             </div>
             </ion-item>

src/app/pages/events/events.page.scss

@@ -408,7 +408,7 @@ ion-toolbar{
           display: flex;
           flex-wrap: wrap;
           align-items: center;
-          width: 100%;
+          width: 78%;
           .location{
             font-family: Roboto;
             font-size: 13px;
@@ -417,11 +417,17 @@ ion-toolbar{
           
           }
           .description{
+            width: 100%;
             font-family: Roboto;
             font-size: 15px;
             font-weight: bold;
             color: #0d89d1;
           }
+          .description p{
+            white-space: nowrap;
+            overflow: hidden !important;
+            text-overflow: ellipsis !important;
+          }
         }
         .color{
           width: 5px;
@@ -486,4 +492,8 @@ ion-toolbar{
   .schedule{
     width: 360px;
   }
+}
+ion-title{
+  border: 1px solid red;
+  text-overflow: ellipsis;
 }

src/app/pages/events/events.page.ts

@@ -43,7 +43,8 @@ export class EventsPage implements OnInit {
   public profile:string;
   currentEvent: any;
 
-  eventsList: Event[];  
+  eventsList: Event[];
+  maxSubjectLength = 30;
   officialeventsList: Event[];
   personaleventsList: Event[];
 

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

@@ -88,8 +88,6 @@ export class DespachoPage implements OnInit {
   }
 
   goBack() {
-    // window.history.back()
-
     if (window.innerWidth <= 800) {
       this.router.navigate(['/home/gabinete-digital/despachos']);
     } else {
@@ -100,7 +98,6 @@ export class DespachoPage implements OnInit {
       }
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
-
   }
 
 
@@ -140,12 +137,16 @@ export class DespachoPage implements OnInit {
         console.log(users);
         
       });
+      console.log(this.task.FolderId);
+      
       this.getDocumentDetails(this.task.FolderId, '361');
 
     });
   }
 
   getDocumentDetails(forlderId:string, applicationId:string) {
+    console.log(forlderId);
+    
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
       console.log(res['Documents']);

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

@@ -80,12 +80,15 @@ export class DespachosPage implements OnInit {
   }
 
   async LoadList() {
-
+    console.log('HERE');
+    
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
     this.despachoList = new Array();
     
     console.log(result);
+    console.log('OI');
+    
 
     await result.forEach( (element, index) => {
       
@@ -101,7 +104,7 @@ export class DespachosPage implements OnInit {
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocId,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
         }
@@ -110,9 +113,14 @@ export class DespachosPage implements OnInit {
       
     });
 
+    console.log(this.despachoList);
+    
+
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
     this.despachoList.forEach( (element, index) => {
+      console.log(element);
+      
       // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
       let FolderID = element['FolderID'];
 

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

@@ -21,7 +21,7 @@
       <ion-toolbar>
         <ion-segment [(ngModel)]="segment">
           <ion-segment-button value="MDGPR">
-            Seu calendário
+            Meu calendário
           </ion-segment-button>
           <ion-segment-button value="PR">
             Presidente da República
@@ -31,7 +31,7 @@
     </div>
 
     <ion-list *ngSwitchCase="'MDGPR'">
-      <div *ngIf="eventsMDGPRList">
+      <div *ngIf="eventsMDGPRList" class="overflow-y-auto height-100">
           <ion-item-sliding>
             <ion-item class="Rectangle cursor-pointer" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
@@ -52,7 +52,7 @@
       </div>
     </ion-list>
     <ion-list *ngSwitchCase="'PR'">
-      <div *ngIf="eventsPRList">
+      <div *ngIf="eventsPRList" class="overflow-y-auto height-100">
         <ion-item-sliding>
           <ion-item class="Rectangle cursor-pointer" lines="none" 
               *ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">

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

@@ -6,8 +6,9 @@
 }
 .content{
   padding: 30px 20px 0 20px !important;
-  margin: 0;
+  margin: 0 auto;
   float: left;
+  overflow: auto;
 }
 .header-content{
   margin: 0 !important;

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

@@ -11,6 +11,36 @@ import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-c
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
 
+
+import { MatNativeDateModule } from '@angular/material/core';
+import {
+  NgxMatDateFormats,
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule,
+  NGX_MAT_DATE_FORMATS
+} from '@angular-material-components/datetime-picker';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
+
 @NgModule({
   imports: [
     CommonModule,
@@ -23,10 +53,23 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att
     AttendeeModalPageModule,
     EmptyContainerPageModule,
     BtnModalDismissPageModule,
-
+    // Angular material
+    MatDatepickerModule,
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    ReactiveFormsModule
   ],
   declarations: [
     BookMeetingModalPage
-  ]
+  ],
+  providers: [
+    { provide: MAT_DATE_LOCALE, useValue: 'pt' },
+  ],
 })
 export class BookMeetingModalPageModule {}

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

@@ -35,10 +35,28 @@
               <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
             </div>
             <div class="ion-input-class">
-              <ion-select [(ngModel)]="postData.CalendarName" placeholder="Selecione repetição" interface="action-sheet" Cancel-text="Cancelar" required>
+              <ion-select 
+                class="d-block d-md-none" 
+                [(ngModel)]="postData.CalendarName" 
+                placeholder="Selecione repetição" 
+                interface="action-sheet" 
+                Cancel-text="Cancelar" required>
                 <ion-select-option value="Oficial">Oficial</ion-select-option>
                 <ion-select-option value="Pessoal">Pessoal</ion-select-option>
               </ion-select>
+
+
+              <mat-form-field  class="d-none d-md-block width-100" placeholder="Selecione agenda">
+                <mat-select [(value)]="postData.CalendarName" >
+                  <mat-option value="Oficial">
+                    Oficial
+                  </mat-option>
+                  <mat-option value="Pessoal">
+                    Pessoal
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+
             </div>
           </div>
         </div>
@@ -50,6 +68,7 @@
           </div>
           <div class="ion-input-class">
             <ion-datetime 
+              class="d-block d-md-none"
               placeholder="Início"
               [(ngModel)]="postData.StartDate" 
               displayFormat="D MMM YYYY H:mm"
@@ -59,7 +78,24 @@
               max="2022" 
               value="2020-11-19T11:06Z">
             </ion-datetime>
-            <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
+           
+            <mat-form-field class="width-100 date-hour-picker d-none d-md-block">
+              <input matInput [ngxMatDatetimePicker]="picker1" 
+                placeholder="Choose a date" 
+                [formControl]="dateControlStart"
+                [min]="minDate" [max]="maxDate" 
+                [disabled]="disabled"
+              >
+              <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
+              <ngx-mat-datetime-picker #picker1 
+                [showSpinners]="showSpinners" 
+                [showSeconds]="showSeconds"
+                [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                [stepSecond]="stepSecond"
+                [touchUi]="touchUi">
+              </ngx-mat-datetime-picker>
+            </mat-form-field>
+
           </div>
         </div>
         </div>
@@ -71,6 +107,7 @@
             </div>
             <div class="ion-input-class">
               <ion-datetime 
+                class="d-block d-md-none"
                 placeholder="Fim"
                 [(ngModel)]="postData.EndDate" 
                 displayFormat="D MMM YYYY H:mm"
@@ -80,7 +117,23 @@
                 max="2022" 
                 value="2020-11-19T11:06Z">
               </ion-datetime>
-              <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
+              
+              <mat-form-field class="date-hour-picker">
+                <input matInput [ngxMatDatetimePicker]="fim" 
+                  placeholder="Choose a date" 
+                  [formControl]="dateControlEnd"
+                  [min]="minDate" [max]="maxDate" 
+                  [disabled]="disabled"
+                >
+                <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
+                <ngx-mat-datetime-picker #fim 
+                  [showSpinners]="showSpinners" 
+                  [showSeconds]="showSeconds"
+                  [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                  [stepSecond]="stepSecond"
+                  [touchUi]="touchUi">
+                </ngx-mat-datetime-picker>
+              </mat-form-field>
             </div>
           </div>
         </div>
@@ -91,13 +144,41 @@
               <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
             </div>
             <div class="ion-input-class">
-              <ion-select [(ngModel)]="postData.IsRecurring" placeholder="Selecione repetição" value="false" interface="action-sheet" Cancel-text="Cancelar" required>
+              <ion-select 
+                class="d-block d-md-none"
+                [(ngModel)]="postData.IsRecurring" 
+                placeholder="Selecione repetição" 
+                value="false" 
+                interface="action-sheet" 
+                Cancel-text="Cancelar" 
+                required
+                
+              >
                 <ion-select-option value="false">Não se repete</ion-select-option>
                 <ion-select-option value="true">Repete</ion-select-option>
                 <!-- <ion-select-option value="true">Semanal</ion-select-option>
                 <ion-select-option value="true">Diário</ion-select-option>
                 <ion-select-option value="true">Anual</ion-select-option> -->
               </ion-select>
+
+
+              <mat-form-field  
+                class="width-100 d-none d-md-block"
+                placeholder="Selecione repetição" 
+                value="false" 
+                interface="action-sheet" 
+                required
+              >
+                <mat-select [(value)]="postData.IsRecurring">
+                  <mat-option value="false">
+                    Não se repete
+                  </mat-option>
+                  <mat-option value="true">
+                    Repete
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+
             </div>
           </div>
         </div>

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

@@ -1,8 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 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';
 import { Event } from 'src/app/models/event.model'
 import { EventBody } from 'src/app/models/eventbody.model';
 import { ProcessesService } from 'src/app/services/processes.service';
@@ -12,21 +10,74 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { SearchDocument } from 'src/app/models/search-document';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
 import { ToastService } from 'src/app/services/toast.service';
+import { FormControl } from '@angular/forms';
+import * as _moment from 'moment';
+import * as _rollupMoment from 'moment';
+import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+
+const moment = _rollupMoment || _moment;
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
+
 
 @Component({
   selector: 'app-book-meeting-modal',
   templateUrl: './book-meeting-modal.page.html',
   styleUrls: ['./book-meeting-modal.page.scss'],
+  providers: [
+    // { provide: MAT_DATE_LOCALE, useValue: 'pt' },
+    { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+  ]
 })
 
 export class BookMeetingModalPage implements OnInit {
   
+  public date: any;
+  public disabled = false;
+  public showSpinners = true;
+  public showSeconds = false;
+  public touchUi = false;
+  public enableMeridian = false;
+  public minDate: any;
+  public maxDate: any;
+  public stepHour = 1;
+  public stepMinute = 5;
+  public stepSecond = 5;
+
+  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
+  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+
+  showLoader = false
+
+  get dateStart () {
+    return this.dateControlStart.value
+  }
+
+  get dateEnd () {
+    return this.dateControlEnd.value
+  }
+
+  @ViewChild('picker') picker: any;
+  @ViewChild('fim') fim: any;
+  @ViewChild('inicio') inicio: any;
+  @ViewChild('picker1') picker1: any;
+  
   task: any;
   
   taskParticipants: EventPerson[];
@@ -73,9 +124,6 @@ export class BookMeetingModalPage implements OnInit {
       /* Set + 30minutes to seleted datetime */
       let selectedEndDate = new Date();
      /*  this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */
-      
-
-
     }
 
   ngOnInit() {
@@ -128,8 +176,8 @@ export class BookMeetingModalPage implements OnInit {
       Location: this.postData.Location,
       CalendarId: '',
       CalendarName: this.postData.CalendarName,
-      StartDate: this.postData.StartDate,
-      EndDate: this.postData.EndDate,
+      StartDate: this.dateStart,
+      EndDate: this.dateEnd,
       EventType: 'Reunião',
       Attendees: Attendees,
       IsMeeting: false,
@@ -149,7 +197,7 @@ export class BookMeetingModalPage implements OnInit {
       try {
         switch (this.loggeduser.Profile) {
           case 'MDGPR':
-            //await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
+            await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
         
           case 'PR':

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

@@ -12,6 +12,35 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att
 import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
+
+import { MatNativeDateModule } from '@angular/material/core';
+import {
+  NgxMatDateFormats,
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule,
+  NGX_MAT_DATE_FORMATS
+} from '@angular-material-components/datetime-picker';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
 @NgModule({
   imports: [
     CommonModule,
@@ -22,7 +51,21 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     AttendeeModalPageModule,
     EmptyContainerPageModule,
     BtnModalDismissPageModule,
-    
+    // 
+    MatDatepickerModule,
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    ReactiveFormsModule
+  ],
+  providers: [
+    { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+    { provide: MAT_DATE_LOCALE, useValue: 'pt' },
   ],
   declarations: [
     ExpedientTaskModalPage

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

@@ -28,12 +28,29 @@
               <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>
+              <ion-select 
+                placeholder="Prazo" 
+                [(ngModel)]="postData.Priority" 
+                interface="action-sheet" 
+                Cancel-text="Cancelar" 
+                required
+                class="d-md-none"
+                >
                 <ion-select-option value="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
               </ion-select>
+
+              <mat-form-field appearance="fill" class="width-100 d-none d-md-block">
+                <mat-select [(value)]="postData.Priority">
+                  <mat-option [value]="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</mat-option>
+                  <mat-option  [value]="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</mat-option>
+                  <mat-option  [value]="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</mat-option>
+                  <mat-option [value]="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</mat-option>
+                </mat-select>
+              </mat-form-field>
+
             </div>
           </div>
         </div>
@@ -43,15 +60,23 @@
               <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">
-              <ion-label>Tipo de assunto</ion-label>
-              <ion-select
-              [(ngModel)]="selectedTypes"
-              (ngModelChange)="onSelectedTypesChanged($event)" 
-              multiple="true" interface="alert" Cancel-text="Cancelar" required>
-                <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
-              </ion-select>
-            </ion-item>
+              <ion-item 
+                class="ion-no-border ion-no-padding ion-no-margin d-md-none">
+                <ion-select
+                [(ngModel)]="selectedTypes"
+                (ngModelChange)="onSelectedTypesChanged($event)" 
+                multiple="true" interface="alert" Cancel-text="Cancelar" required>
+                  <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
+                </ion-select>
+              </ion-item>
+              
+              <mat-form-field 
+                appearance="fill" 
+                class="width-100 d-none d-md-block">
+                <mat-select [formControl]="toppings" multiple>
+                  <mat-option *ngFor="let type of subjectTypes" [value]="type.Code">{{type.Description}}</mat-option>
+                </mat-select>
+              </mat-form-field>
             </div>
           </div>
         </div>

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

@@ -20,11 +20,30 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
+import { FormControl } from '@angular/forms';
+import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
+
 
 @Component({
   selector: 'app-expedient-task-modal',
   templateUrl: './expedient-task-modal.page.html',
   styleUrls: ['./expedient-task-modal.page.scss'],
+  providers: [
+    { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+  ]
 })
 export class ExpedientTaskModalPage implements OnInit {
 
@@ -46,7 +65,7 @@ export class ExpedientTaskModalPage implements OnInit {
   loadedAttachments:any;
   documents:SearchDocument[] = [];
 
-  subjectTypes:any;
+  subjectTypes:any[] = [];
   selectedTypes: string[]=[];
 
   postData: Despacho;
@@ -66,6 +85,11 @@ export class ExpedientTaskModalPage implements OnInit {
   taskResult: any = {}
 
   loggeduser: User;
+  toppings = new FormControl();
+
+  get toppingsValues() {
+    return this.toppings.value;
+  }
 
   constructor(
     private modalController: ModalController,
@@ -129,7 +153,7 @@ export class ExpedientTaskModalPage implements OnInit {
     this.getSubjectType();
   }
 
-  onSelectedTypesChanged(ev:any){
+  onSelectedTypesChanged(ev:any) {
     console.log(ev);
     if(ev.length > 1){
       console.log(ev.filter(data => data != '99999850'));
@@ -190,6 +214,11 @@ export class ExpedientTaskModalPage implements OnInit {
       }
     });
     docs.Attachments = DocumentToSave;
+
+    if (window.innerWidth >= 800) {
+      this.selectedTypes = this.toppingsValues
+    }
+
     this.dispatchFolder.SubjectTypes = this.selectedTypes;
     
       switch (this.loggeduser.Profile) {

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

@@ -97,27 +97,42 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   goBack() {
-    this.activatedRoute.paramMap.subscribe(params => {
-      switch (params["params"].caller) {
-        case 'events':
-          this.router.navigate(['/home',params["params"].caller]);
-          break;
-    
-        case 'gabinete-digital':
-          let navigationExtras: NavigationExtras = {
-            queryParams: {
-              "expedientes": true,
+    if(this.task.Status == "Pending"){
+      if (window.innerWidth <= 800) {
+        this.router.navigate(['/home/gabinete-digital/pendentes']);
+      } 
+      else {
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+              "pendentes": true,
             }
-          }
-          if( window.innerWidth < 801) {
-            this.router.navigate(['/home/gabinete-digital/expediente']);
-          } else {
-            this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-          }
-          break;
-        
+        }
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       }
-    });
+    }
+    else{
+      this.activatedRoute.paramMap.subscribe(params => {
+        switch (params["params"].caller) {
+          case 'events':
+            this.router.navigate(['/home',params["params"].caller]);
+            break;
+      
+          case 'gabinete-digital':
+            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);
+            }
+            break;
+          
+        }
+      });
+    }
   }
 
   sendExpedienteToPending() {
@@ -149,6 +164,7 @@ export class ExpedienteDetailPage implements OnInit {
         "FsId": res.workflowInstanceDataFields.FsId,
         "DocId": res.workflowInstanceDataFields.DocID,
         "WorkflowName": res.workflowDisplayName,
+        "Status": res.workflowInstanceDataFields.Status,
       }
 
       //console.log('task', this.task);

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

@@ -2,7 +2,7 @@
   <app-header></app-header>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
      <ion-refresher-content>
     </ion-refresher-content>
@@ -19,7 +19,7 @@
           <label>Expediente</label>
         </div>
         <div class="btn-refresh">
-          <button class="btn-no-color" (click)="doRefresh()">
+          <button class="btn-no-color" (click)="doRefresh($event)">
             <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
           </button>
         </div>

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

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

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

@@ -17,6 +17,7 @@
   font-size: 18px !important;
 }
 .main-header{
+  display: flex;
   font-family: Roboto;
   background-color: #fff;
   overflow:auto;

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

@@ -102,6 +102,7 @@ export class PedidoPage implements OnInit {
           "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
           "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
           "activityInstanceName": res.activityInstanceName,
+          "Status": res.workflowInstanceDataFields.Status,
         }
         console.log(this.task);
       }
@@ -126,6 +127,7 @@ export class PedidoPage implements OnInit {
           "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
           "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
           "activityInstanceName": res.activityInstanceName,
+          "Status": res.workflowInstanceDataFields.Status,
         }
         console.log(this.task);
       }
@@ -253,7 +255,7 @@ export class PedidoPage implements OnInit {
   async openExpedientActionsModal(taskAction: any, task: any) {
     
     let classs;
-    if( window.innerWidth <= 800){
+    if( window.innerWidth <= 800) {
       classs = 'modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
@@ -443,17 +445,32 @@ export class PedidoPage implements OnInit {
   }
   
   goBack() {
-    if (window.innerWidth <= 800) {
-      this.router.navigate(['/home/gabinete-digital/pedidos']);
-    } else {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          "pedidos": true,
+    if(this.task.Status == "Pending"){
+      if (window.innerWidth <= 800) {
+        this.router.navigate(['/home/gabinete-digital/pendentes']);
+      } 
+      else {
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+              "pendentes": true,
+            }
         }
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      }
+    }
+    else{
+      if (window.innerWidth <= 800) {
+          this.router.navigate(['/home/gabinete-digital/pedidos']);
+      } 
+      else {
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+              "pedidos": true,
+            }
+        }
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       }
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
-
   }
   
 }

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

@@ -30,22 +30,16 @@
     <div class="width-100">
       <div *ngIf="pendentesList">
         <ion-list>
-          <ion-item 
-              class="expediente ion-no-padding cursor-pointer"  
+          <div 
+              class="expediente ion-no-padding ion-no-margin cursor-pointer"  
               *ngFor = "let task of pendentesList"
               (click)="viewTaskDetails(task.SerialNumber, task.WorkflowName)"
               >
               <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
                 <div class="item width-100">
                   <div class="exp-top-detail">
-                    <div class="exp-date">
-                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                    </div>
-                    <div class="exp-remetente">
-                      <ion-label>{{task.Senders}}</ion-label>
-                    </div>
-                    <div class="exp-workflow">
-                      <span class="label">{{task.WorkflowName}}</span>
+                    <div class="subject">
+                      <ion-label>{{ task.Folio }}</ion-label>
                     </div>
                     <div class="exp-icon">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -53,10 +47,20 @@
                     </div>
                   </div>
                   <div class="exp-bottom-detail">
-                    <ion-label>{{ task.Folio }}</ion-label>
+                    <div class="exp-remetente">
+                      <ion-label>{{task.Senders}}</ion-label>
+                    </div>
+                  </div>
+                  <div class="exp-middle-detail">
+                    <div class="exp-workflow">
+                      <span class="label">{{task.WorkflowName}}</span>
+                    </div>
+                    <div class="exp-date">
+                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                    </div>
                   </div>
                 </div>
-              </ion-item>
+              </div>
         </ion-list>
   
       </div>

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

@@ -50,14 +50,12 @@ ion-item{
   --background: none;
 }
 .item {
-    //border-radius: 15px;
-    //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+    /* border-radius: 15px;
+    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); */
     //Sborder: solid 1px #e9e9e9;
     background-color: var(--white);
     margin: 0 auto;
-    //padding: 10px;
-    margin-bottom: 10px;
-    overflow: hidden;
+    overflow: auto;
   }
 .div-content-expediente{
   width: 100%;
@@ -98,7 +96,6 @@ ion-item{
     margin: 0;
   }
   .span-left{
-      /* border: 1px solid red; */
       float: left;
       font-size: 12px;
       padding-left: 18px;
@@ -113,7 +110,12 @@ ion-item{
 
 /* New CSS */
 .expediente{
-  padding-top: 10px;
+  border-radius: 15px;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+  border:1px solid #e9e9e9 !important;
+  background-color: var(--white);
+  margin-bottom: 10px !important;
+  padding: 15px;
 }
 .exp-list-item{
   //width: 368px;
@@ -121,61 +123,88 @@ ion-item{
   /* border-bottom: 1px solid gray; */
   margin: 10px auto;
 }
+
 .exp-top-detail{
+  width: 100%;
+  float: left;
+  font-family: Roboto;
+  font-size: 12pt;
+  font-weight: 700;
+  color: #0d89d1;
+  padding-left: 3px;
+
+  .subject{
+    width: 84%;
+    float: left;
+  }
+
+  .exp-icon{
+    width: fit-content;
+    float: right;
+   /* font-size: 13px; */
+    margin: 0 !important;
+    padding: 0 !important;
+
+    ion-icon{
+      font-size: 12pt;
+      color: #42b9fe;
+      float: left;
+    }
+    label{
+      font-size: 10pt;
+    }
+  }
+}
+.exp-middle-detail, .exp-bottom-detail{
+  margin-bottom: 5px;
+
+}
+.exp-middle-detail{
+  font-size: 12pt;
   width: 100%;
   overflow: auto;
 
-}
-.exp-date{
-  width: auto;
-  font-family: Roboto;
-  font-size: 13px;
-  font-weight: normal;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  color: #797979;
-  float: left;
-}
-.exp-workflow{
-  float: left;
-  margin-left: 15px;
-
-  .label{
-    border-radius: 20px;
-    background: #ffb703;
-    font-size: 12px;
+  .exp-workflow{
+    float: left;
+    margin: 0 !important;
+  
+    .label{
+      border-radius: 15px;
+      background: #ffb703;
+      /* font-size: 12px; */
+      float: right;
+      padding: 2.5px 13.5px 2.5px 13.5px;
+      color: #fff;
+  }
+  }
+  .exp-date{
+    width: auto;
+    font-family: Roboto;
+    font-size: 10pt;
+    font-weight: normal;
+    font-stretch: normal;
+    font-style: normal;
+    line-height: normal;
+    letter-spacing: normal;
+    color: #797979;
     float: right;
-    padding: 2.5px 13.5px 2.5px 13.5px;
-    color: #fff;
-}
-}
-.exp-remetente{
-  //width: 200px;
-  font-family: Roboto;
-  font-size: 13px;
-  font-weight: normal;
-  color: #000000;
-  float: left;
-  margin-left: 16px;
-
-}
-.exp-icon{
-  width: 45px;
-  float: right;
-  font-size: 13px;
-}
-.exp-icon ion-icon{
-  font-size: 25px;
-  color: #42b9fe;
+  }
 }
 .exp-bottom-detail{
-  float: left;
-  font-family: Roboto;
-  font-size: 16px;
-  font-weight: 700;
-  color: #0d89d1;
+  font-size: 8pt;
+  width: 100%;
+  overflow: auto;
+  padding-left: 3px;
+
+  .exp-remetente{
+    //width: 200px;
+    font-family: Roboto;
+   /*  font-size: 13px; */
+    font-weight: normal;
+    color: #000000;
+    float: left;
+    /* border: 1px solid red; */
+  }
 }
 .div-top-header{
   width: 400px;

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

@@ -44,9 +44,6 @@ export class PendentesPage implements OnInit {
     //Inicializar segment
     this.segment = "despachos";
     this.LoadList();
-    this.authService.userData$.subscribe((res:any)=>{
-     console.log(res); 
-   });
   }
   
   segmentChanged(ev: any) {
@@ -71,7 +68,6 @@ export class PendentesPage implements OnInit {
   }
  
   openExpedientDetailPage(data){
-    console.log(data);
     this.openExpedientDetail.emit(data);
   }
  
@@ -86,6 +82,7 @@ export class PendentesPage implements OnInit {
     let expedientes_pr = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise();
 
     let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
+    console.log(pendentes);
     pendentes.forEach(element => {
       let DocId = element.workflowInstanceDataFields.FolderID;
       let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
@@ -107,6 +104,7 @@ export class PendentesPage implements OnInit {
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
+            "Status": element.workflowInstanceDataFields.Status,
         }
         this.pendentesList.push(task);
       },
@@ -122,6 +120,7 @@ export class PendentesPage implements OnInit {
           "DocId": element.workflowInstanceDataFields.DocId,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
+          "Status": element.workflowInstanceDataFields.Status,
         }
         this.pendentesList.push(task);
       });
@@ -138,7 +137,6 @@ export class PendentesPage implements OnInit {
   }
  
   async viewTaskDetails(serialNumber:string, workflowName:string) {
-    console.log(this.profile);
     if(workflowName == 'Despacho'){
       this.goToDespacho(serialNumber);
     }

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -28,7 +28,7 @@ export class ViewPublicationsPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private router: Router, 
     )
-    { 
+    {
       this.item = new PublicationFolder();
       this.activatedRoute.paramMap.subscribe(params => {
         console.log(params);
@@ -46,6 +46,7 @@ export class ViewPublicationsPage implements OnInit {
     this.getPublications();
     this.getPublicationDetail();
   }
+
   doRefresh(event) {
     this.getPublications();
 
@@ -55,18 +56,22 @@ export class ViewPublicationsPage implements OnInit {
       event.target.complete();
     }, 3000);
   }
-  close(){
+
+  close() {
     this.modalController.dismiss();
   }
-  goBack(){
+
+  goBack() {
     this.router.navigate(['/home/publications']);
   }
+
   getPublicationDetail(){
     this.publications.GetPublicationFolderById(this.folderId).subscribe(res=>{
       console.log(res);
       this.item = res;
     });
   }
+  
   getPublications(){
     this.showLoader = true;
     

src/app/services/processes.service.ts

@@ -244,11 +244,13 @@ export class ProcessesService {
   }
 
   GetDocumentDetails(DocId:string, FsId:string){
+    console.log(DocId);
+    
     const geturl = environment.apiURL + 'search/documents';
     let params = new HttpParams();
 
     params = params.set("docId", DocId);
-    params = params.set("applicationid", FsId);
+    params = params.set("applicationId", FsId);
     
     let options = { 
       headers: this.headers, 

src/app/services/search.service.ts

@@ -27,7 +27,7 @@ export class SearchService {
   }
 
 
-  basicSearch(subject:string, date:string, sender:string, organicEntity:string, docTypeId:string, applicationType:string): Observable<EventSearch>{
+  basicSearch(subject:string, date:string = null, sender:string = null, organicEntity:string = null, docTypeId:string = null, applicationType:string): Observable<EventSearch>{
     // Endpoint
     const geturl = environment.apiURL + 'search';
     // store params

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

@@ -1,19 +1,47 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
-
 import { IonicModule } from '@ionic/angular';
-
 import { EditEventPageRoutingModule } from './edit-event-routing.module';
-
 import { EditEventPage } from './edit-event.page';
 
+import { MatNativeDateModule } from '@angular/material/core';
+import {
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatMenuModule } from '@angular/material/menu';
+
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    EditEventPageRoutingModule
+    EditEventPageRoutingModule,
+    // Angular material
+    MatDatepickerModule,
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    ReactiveFormsModule,
+    MatDialogModule,
+  ],
+  providers: [
+    { provide: MAT_DATE_LOCALE, useValue: 'pt' },
   ],
   declarations: [EditEventPage],
   exports: [EditEventPage]

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

@@ -6,6 +6,7 @@
           <ion-label class="title">Editar Evento</ion-label>
         </div>
       </div>
+      <ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
     </div>
   </ion-toolbar>
 </ion-header>
@@ -38,14 +39,18 @@
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1">
-          <ion-select disabled  placeholder="Selecione agenda"
-          selectedText="{{postEvent.CalendarName}}" 
-          [(ngModel)]="postEvent.CalendarName" 
-          interface="action-sheet" Cancel-text="Cancelar" 
-          required>
-            <ion-select-option value="Oficial">Oficial</ion-select-option>
-            <ion-select-option value="Pessoal">Pessoal</ion-select-option>
-          </ion-select>
+
+          <mat-form-field  class="width-100" placeholder="Selecione agenda">
+            <mat-select [(value)]="postEvent.CalendarName" >
+              <mat-option value="Oficial">
+                Oficial
+              </mat-option>
+              <mat-option value="Pessoal">
+                Pessoal
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+
         </div>
       </div>
     </div>
@@ -56,16 +61,25 @@
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1">
-          <ion-select  placeholder="Selecione tipo" 
-          [(ngModel)]="postEvent.Categories[0]"
-          selectedText="{{postEvent.Categories[0]}}" 
-          interface="action-sheet" 
-          Cancel-text="Cancelar" required>
-            <ion-select-option value="Reunião">Reunião</ion-select-option>
-            <ion-select-option value="Viagem">Viagem</ion-select-option>
-            <ion-select-option value="Conferência">Conferência</ion-select-option>
-            <ion-select-option value="Encontro">Encontro</ion-select-option>
-          </ion-select>
+
+          <mat-form-field class="width-100" placeholder="Sample Type" required>
+            <!-- <input matInput type="text" > -->
+            <mat-select matInput [(value)]="postEvent.Categories[0]" >
+              <mat-option value="Reunião">
+                Reunião
+              </mat-option>
+              <mat-option value="Viagem">
+                Viagem
+              </mat-option>
+              <mat-option value="Conferência">
+                Conferência
+              </mat-option>
+              <mat-option value="Encontro">
+                Encontro
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+
         </div>
       </div>
     </div>
@@ -76,38 +90,52 @@
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1">
-          <ion-datetime 
-            placeholder="Início"
-            [(ngModel)]="postEvent.StartDate"
-            displayFormat="D MMM YYYY H:mm"
-            minuteValues="0,15,30,45"
-            monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="2018" 
-            max="2022" 
-          >
-          </ion-datetime>
-          <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
+
+          <mat-form-field class="date-hour-picker">
+            <input matInput [ngxMatDatetimePicker]="picker1" 
+              placeholder="Choose a date" 
+              [formControl]="dateControlStart"
+              [min]="minDate" [max]="maxDate" 
+              [disabled]="disabled"
+            >
+            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #picker1 
+              [showSpinners]="showSpinners" 
+              [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute" 
+              [stepSecond]="stepSecond"
+              [touchUi]="touchUi">
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
+
         </div>
       </div>
     </div>
     
     <div class="container-div">
-      <div class="ion-item-class-2 width-100 d-flex">
+      <div  class="ion-item-class-2 width-100 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1">
-          <ion-datetime 
-            placeholder="Fim"
-            [(ngModel)]="postEvent.EndDate"
-            displayFormat="D MMM YYYY H:mm"
-            minuteValues="0,15,30,45"
-            monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="2018" 
-            max="2022" 
-          >
-          </ion-datetime>
-          <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
+
+          <mat-form-field class="date-hour-picker">
+            <input matInput [ngxMatDatetimePicker]="fim" 
+              placeholder="Choose a date" 
+              [formControl]="dateControlEnd"
+              [min]="minDate" [max]="maxDate" 
+              [disabled]="disabled"
+            >
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #fim 
+              [showSpinners]="showSpinners" 
+              [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute" 
+              [stepSecond]="stepSecond"
+              [touchUi]="touchUi">
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
+
         </div>
       </div>
     </div>
@@ -118,14 +146,18 @@
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1">
-          <ion-select placeholder="Selecione repetição" 
-          [(ngModel)]="postEvent.IsRecurring"
-          selectedText="{{isRecurring}}" 
-          interface="action-sheet" 
-          Cancel-text="Cancelar" required>
-            <ion-select-option value="false">Não se repete</ion-select-option>
-            <ion-select-option value="true">Repete</ion-select-option>
-          </ion-select>
+
+          <mat-form-field  class="width-100" placeholder="Selecione repetição" value="false" interface="action-sheet" required>
+            <mat-select [(ngModel)]="postEvent.IsRecurring">
+              <mat-option value="false">
+                Não se repete
+              </mat-option>
+              <mat-option value="true">
+                Repete
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+
         </div>
       </div>
     </div>

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

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
@@ -9,6 +9,10 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { Attachment } from 'src/app/models/attachment.model';
+import { ToastService } from 'src/app/services/toast.service';
+import { FormControl } from '@angular/forms';
+import * as moment from 'moment';
+
 @Component({
   selector: 'app-edit-event',
   templateUrl: './edit-event.page.html',
@@ -24,9 +28,21 @@ export class EditEventPage implements OnInit {
   eventBody: EventBody;
   segment:string = "true";
   eventAttendees: EventPerson[];
-  minDate: string;
+  // minDate: string;
   loadedEventAttachments: Attachment[];
 
+  public date: any;
+  public disabled = false;
+  public showSpinners = true;
+  public showSeconds = false;
+  public touchUi = false;
+  public enableMeridian = false;
+  public minDate: any;
+  public maxDate: any;
+  public stepHour = 1;
+  public stepMinute = 5;
+  public stepSecond = 5;
+
   @Input() taskParticipants: EventPerson[];
   @Input() taskParticipantsCc: EventPerson[];
   @Input() profile:string;
@@ -41,15 +57,41 @@ export class EditEventPage implements OnInit {
   @Output() setIntervenientCC = new EventEmitter<any>();
   @Output() clearPostEvent = new EventEmitter<any>();
 
+  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
+  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+
+  showLoader = false
+
+  get dateStart () {
+    return this.dateControlStart.value
+  }
+
+  get dateEnd () {
+    return this.dateControlEnd.value
+  }
+
+  @ViewChild('picker') picker: any;
+  @ViewChild('fim') fim: any;
+  @ViewChild('inicio') inicio: any;
+  @ViewChild('picker1') picker1: any;
+
+  public options = [
+    { value: true, label: 'True' },
+    { value: false, label: 'False' }
+  ];
+
+  public listColors = ['primary', 'accent', 'warn'];
+  public stepHours = [1, 2, 3, 4, 5];
+  public stepMinutes = [1, 5, 10, 15, 20, 25];
+  public stepSeconds = [1, 5, 10, 15, 20, 25];
+
+
   constructor(
     private modalController: ModalController,
     private eventsService: EventsService,
     public alertController: AlertController,
     private attachmentsService: AttachmentsService,
-    
-  ) {
-  
-
+    private toastService: ToastService ) {
   }
 
   ngOnInit() {
@@ -94,11 +136,11 @@ export class EditEventPage implements OnInit {
 
     this.getAttachments(this.postEvent.EventId);
 
-
+    this.restoreDatepickerData()
    
   }
   
-  close(){
+  close() {
     this.closeComponent.emit();
     this.setIntervenient.emit([]);
     this.setIntervenientCC.emit([]);
@@ -107,25 +149,30 @@ export class EditEventPage implements OnInit {
     this.deleteTemporaryData();
   }
 
+  async save() {
 
-
-
-  async save(){
-
+    this.getDatepickerData()
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
+    this.showLoader = true
     await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
+      this.showLoader = false
+     
       const alert = await this.alertController.create({
         cssClass: 'my-custom-class',
         header: 'Evento actualizado',
         buttons: ['OK']
       });
 
-      
+      this.toastService.successMessage()
       setTimeout(()=>{
         alert.dismiss();
       }, 1500);
 
+    },
+    error => {
+      this.showLoader = false
+      this.toastService.badRequest()
     });
 
     this.clearPostEvent.emit();
@@ -157,8 +204,25 @@ export class EditEventPage implements OnInit {
   }
 
 
-  saveTemporaryData(){
+  getDatepickerData() {
+    if (this.postEvent) {
+      this.postEvent.StartDate = this.dateStart
+      this.postEvent.EndDate = this.dateEnd
+    }
+  }
+
+  restoreDatepickerData() {
+    if (this.postEvent) {
+      this.dateControlStart = new FormControl(moment(this.postEvent.StartDate));
+      this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate));
+    }
+
+  }
+
+  saveTemporaryData() {
     
+    this.getDatepickerData()
+
     window['temp.path:/home/agenda/edit-event.component.ts'] = {
       postEvent: this.postEvent,
       eventBody: this.eventBody,
@@ -166,8 +230,8 @@ export class EditEventPage implements OnInit {
     }
   }
 
-  restoreTemporaryData(): boolean{
-    
+  restoreTemporaryData(): boolean {
+   
     const restoredData =  window['temp.path:/home/agenda/edit-event.component.ts']
 
     if(JSON.stringify(restoredData) != "{}" && undefined != restoredData){
@@ -175,6 +239,8 @@ export class EditEventPage implements OnInit {
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment
 
+      this.restoreDatepickerData()
+
       return true;  
     } else {
       return false;

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

@@ -6,7 +6,7 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="profile">
       <ion-segment-button value="MDGPR">
-        Seu calendário
+        Meu calendário
       </ion-segment-button>
       <ion-segment-button value="PR">
         Presidente da República

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

@@ -12,7 +12,6 @@ import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatInputModule } from '@angular/material/input';
 
 import { MatNativeDateModule } from '@angular/material/core';
-import { MatMomentDateModule, MomentDateAdapter } from "@angular/material-moment-adapter";
 
 import {
   NgxMatDatetimePickerModule, 
@@ -20,12 +19,19 @@ import {
   NgxMatTimepickerModule 
 } from '@angular-material-components/datetime-picker';
 
-
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatSelectModule } from '@angular/material/select';
 import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
 
+import { 
+  MAT_MOMENT_DATE_FORMATS,
+  MomentDateAdapter,
+  MAT_MOMENT_DATE_ADAPTER_OPTIONS
+} from '@angular/material-moment-adapter';
+import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
+
+
 @NgModule({
   imports: [
     CommonModule,
@@ -44,7 +50,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'
 
     NgxMatMomentModule,
     // BrowserAnimationsModule,
-    // BrowserModule,
+    // MatRadioModule,
     MatSelectModule,
     //MatRadioModule,
     //MatCheckboxModule,
@@ -52,6 +58,9 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'
     ReactiveFormsModule
   ],
   declarations: [NewEventPage],
+  providers: [
+    { provide: MAT_DATE_LOCALE, useValue: 'pt' },
+  ],
   exports: [NewEventPage]
 })
 export class NewEventPageModule {}

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

@@ -6,6 +6,7 @@
           <ion-label class="title">Novo Evento</ion-label>
         </div>
       </div>
+      <ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
     </div>
   </ion-toolbar>
 </ion-header>
@@ -13,33 +14,6 @@
 <ion-content>
   <div class="main-content">
 
-    <!-- THIS -->
-    
-    <!-- <mat-form-field>
-      <input matInput [ngxMatDatetimePicker]="picker" placeholder="Choose a date" [formControl]="dateControl"
-        [min]="minDate" [max]="maxDate" [disabled]="disabled">
-      <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
-      <ngx-mat-datetime-picker #picker [showSpinners]="showSpinners" [showSeconds]="showSeconds"
-        [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi"
-        [color]="color" [enableMeridian]="enableMeridian">
-      </ngx-mat-datetime-picker>
-    </mat-form-field> -->
-   
-    <!-- <form class="form-inline">
-      <div class="form-group">
-        <div class="input-group">
-          <input class="form-control" placeholder="yyyy-mm-dd"
-                name="dp"  ngbDatepicker #d="ngbDatepicker">
-          <div class="input-group-append">
-            <button class="btn btn-outline-secondary calendar" (click)="d.toggle()" type="button"></button>
-          </div>
-        </div>
-      </div>
-    </form> -->
-
-    <!-- 2. datepicker in the popup -->
-   <!--  <input type="text" ngbDatepicker #d="ngbDatepicker"/> -->
-
     <div class="ion-item-container">
       <ion-input type="text"  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
@@ -52,10 +26,6 @@
           <ion-input type="text" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
         </div>
       </div>
-      <!-- Error messages -->
-      <!-- <span class="error ion-padding" >
-        Campo obrigatório
-      </span> -->
   
     </div>
     
@@ -64,15 +34,19 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
-          <ion-select  placeholder="Selecione agenda"
-          selectedText="{{postEvent.CalendarName}}" 
-          [(ngModel)]="postEvent.CalendarName" 
-          interface="action-sheet" Cancel-text="Cancelar" 
-          required>
-            <ion-select-option value="Oficial">Oficial</ion-select-option>
-            <ion-select-option value="Pessoal">Pessoal</ion-select-option>
-          </ion-select>
+        <div class="ion-input-class flex-grow-1 d-flex justify-center align-center material-inputs materia-top ">
+
+          <mat-form-field  class="width-100" color="ion-color-secondary"  placeholder="Selecione agenda">
+            <mat-select [(value)]="postEvent.CalendarName" >
+              <mat-option value="Oficial">
+                Oficial
+              </mat-option>
+              <mat-option value="Pessoal">
+                Pessoal
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+
         </div>
       </div>
     </div>
@@ -82,50 +56,54 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
-          <ion-select  placeholder="Selecione tipo" 
-          [(ngModel)]="postEvent.Categories[0]" 
-          interface="action-sheet" 
-          Cancel-text="Cancelar" required>
-            <ion-select-option value="Reunião">Reunião</ion-select-option>
-            <ion-select-option value="Viagem">Viagem</ion-select-option>
-            <ion-select-option value="Conferência">Conferência</ion-select-option>
-            <ion-select-option value="Encontro">Encontro</ion-select-option>
-          </ion-select>
+        <div class="ion-input-class flex-grow-1 d-flex justify-center align-center material-inputs materia-top">
+
+          <mat-form-field class="width-100" placeholder="Sample Type" required>
+            <!-- <input matInput type="text" > -->
+            <mat-select matInput [(value)]="postEvent.Categories[0]" >
+              <mat-option value="Reunião">
+                Reunião
+              </mat-option>
+              <mat-option value="Viagem">
+                Viagem
+              </mat-option>
+              <mat-option value="Conferência">
+                Conferência
+              </mat-option>
+              <mat-option value="Encontro">
+                Encontro
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+
         </div>
       </div>
     </div>
-  
     <div class="container-div">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
-          <ion-datetime 
-            class=""
-            placeholder="Início"
-            [(ngModel)]="postEvent.StartDate"
-            displayFormat="D MMM YYYY H:mm"
-            minuteValues="0,15,30,45"
-            monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="2018" 
-            max="2022" 
-          >
-          </ion-datetime>
+        <div  class="ion-input-class  flex-grow-1">
+
+          <mat-form-field class="date-hour-picker">
+            <input matInput [ngxMatDatetimePicker]="picker1" 
+              placeholder="Choose a date" 
+              [formControl]="dateControlStart"
+              [min]="minDate" [max]="maxDate" 
+              [disabled]="disabled"
+            >
+            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #picker1 
+              [showSpinners]="showSpinners" 
+              [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute" 
+              [stepSecond]="stepSecond"
+              [touchUi]="touchUi"
+              >
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
 
-          <!-- <input 
-            class="d-none width-100"  
-            placeholder="Início" 
-            [matDatepicker]="picker" 
-            (focus)="picker.open()" 
-            (click)="picker.open()"
-            [(ngModel)]="postEvent.StartDate"
-          >
-          <mat-datepicker #picker></mat-datepicker> -->
-      
-      
-          <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
         </div>
       </div>
     </div>
@@ -135,18 +113,26 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
-          <ion-datetime 
-            placeholder="Fim"
-            [(ngModel)]="postEvent.EndDate"
-            displayFormat="D MMM YYYY H:mm"
-            minuteValues="0,15,30,45"
-            monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="2018" 
-            max="2022" 
-          >
-          </ion-datetime>
-          <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
+        <div (click)="openFim()" class="ion-input-class flex-grow-1">
+
+          <mat-form-field class="date-hour-picker">
+            <input matInput [ngxMatDatetimePicker]="fim" 
+              placeholder="Choose a date" 
+              [formControl]="dateControlEnd"
+              [min]="minDate" [max]="maxDate" 
+              [disabled]="disabled"
+            >
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #fim 
+              [showSpinners]="showSpinners" 
+              [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute" 
+              [stepSecond]="stepSecond"
+              [touchUi]="touchUi"
+              >
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
+
         </div>
       </div>
     </div>
@@ -156,11 +142,19 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
-          <ion-select placeholder="Selecione repetição" value="false" interface="action-sheet" Cancel-text="Cancelar" required>
-            <ion-select-option value="false">Não se repete</ion-select-option>
-            <ion-select-option value="true">Repete</ion-select-option>
-          </ion-select>
+        <div class="ion-input-class flex-grow-1 d-flex justify-center align-center material-inputs materia-top">
+
+          <mat-form-field  class="width-100" placeholder="Selecione repetição" value="false" interface="action-sheet" required>
+            <mat-select [(value)]="postEvent.IsRecurring">
+              <mat-option value="false">
+                Não se repete
+              </mat-option>
+              <mat-option value="true">
+                Repete
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+
         </div>
       </div>
     </div>

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

@@ -1,10 +1,12 @@
-ion-content{
+  ion-content{
     --background:transparent;
   }
+
   .header-toolbar{
    --background:transparent;
    --opacity: 1;
   }
+
   .main-header{
     width: 100%; /* 400px */
     height: 100%;
@@ -168,17 +170,14 @@ ion-content{
       .span-color{
         color:red;
       }
-  
   }
   
-  
-  .container-div{
-    ion-textarea{
+  .container-div {
+    ion-textarea {
       height: 81px;
     }
   }
   
-  
   .app-name{
     background: #42b9f2;
     border-radius: 18px;
@@ -210,4 +209,9 @@ ion-content{
     .close-button {
       display: block !important;
     }
-  }
+  }
+
+
+.materia-top {
+  padding-top: 7px;
+}

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

@@ -9,27 +9,22 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { SearchDocument } from "src/app/models/search-document";
 import {  EventAttachment } from 'src/app/models/attachment.model';
-import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
-import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
+
 import { ToastService } from 'src/app/services/toast.service';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 
-
-import {MomentDateAdapter, MAT_MOMENT_DATE_ADAPTER_OPTIONS} from '@angular/material-moment-adapter';
-import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
+import {DateAdapter} from '@angular/material/core';
 import * as _moment from 'moment';
 import * as _rollupMoment from 'moment';
-import {FormControl} from '@angular/forms';
+import { FormControl } from '@angular/forms';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 import { ThemePalette } from '@angular/material/core';
 
-
 import { HttpClient } from '@angular/common/http';
 import {  NgZone, ViewChild } from '@angular/core';
 import {  FormGroup, Validators } from '@angular/forms';
-import { NgxMatDatetimePickerModule, NgxMatTimepickerModule, NGX_MAT_DATE_FORMATS, NgxMatDateAdapter } from '@angular-material-components/datetime-picker';
-
+import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 
 const moment = _rollupMoment || _moment;
 
@@ -50,25 +45,13 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   templateUrl: './new-event.page.html',
   styleUrls: ['./new-event.page.scss'],
   providers: [
-    // `MomentDateAdapter` can be automatically provided by importing `MomentDateModule` in your
-    // application's root module. We provide it at the component level here, due to limitations of
-    // our example generation script.
-    // {
-    //   provide: DateAdapter,
-    //   useClass: MomentDateAdapter,
-    //   deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS]
-    // },
-
     { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
-    // { provide: MAT_DATE_LOCALE, useValue: 'pt-br' },
-    // { provide: LOCALE_ID, useValue: "en-GB" } 
   ]
 })
 
 
 export class NewEventPage implements OnInit {
 
-
   eventBody: EventBody;
   segment:string = "true";
 
@@ -81,11 +64,10 @@ export class NewEventPage implements OnInit {
   public minDate: any;
   public maxDate: any;
   public stepHour = 1;
-  public stepMinute = 1;
-  public stepSecond = 1;
+  public stepMinute = 5;
+  public stepSecond = 5;
   public color: ThemePalette = 'primary';
 
-  
   @Input() profile:string;
   @Input() selectedSegment: string;
   @Input() selectedDate: Date;
@@ -108,6 +90,34 @@ export class NewEventPage implements OnInit {
 
   loggeduser: User;
   @ViewChild('picker') picker: any;
+  @ViewChild('fim') fim: any;
+  @ViewChild('inicio') inicio: any;
+  @ViewChild('picker1') picker1: any;
+
+
+  public options = [
+    { value: true, label: 'True' },
+    { value: false, label: 'False' }
+  ];
+
+  public listColors = ['primary', 'accent', 'warn'];
+  public stepHours = [1, 2, 3, 4, 5];
+  public stepMinutes = [1, 5, 10, 15, 20, 25];
+  public stepSeconds = [1, 5, 10, 15, 20, 25];
+
+  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
+  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+
+  showLoader = false
+
+  get dateStart () {
+    return this.dateControlStart.value
+  }
+
+  get dateEnd () {
+    return this.dateControlEnd.value
+  }
+
 
   constructor(
     private modalController: ModalController,
@@ -118,10 +128,14 @@ export class NewEventPage implements OnInit {
     private userService: AuthService,
     private http: HttpClient, 
     private zone: NgZone,
-    private dateAdapter: DateAdapter<any>
+    private dateAdapter: DateAdapter<any>,
+    // private translate: TranslateService
   ) {
     this.dateAdapter.setLocale('pt');
     this.loggeduser = userService.ValidatedUser;
+
+    this.dateControlStart = new FormControl(moment(new Date()));
+    this.dateControlEnd = new FormControl(moment(new Date()));
   }
 
   ngOnInit() {
@@ -149,7 +163,7 @@ export class NewEventPage implements OnInit {
           Body: this.eventBody,
           Location: '',
           CalendarId: '',
-          CalendarName: '',
+          CalendarName: 'Oficial',
           StartDate: selectedStartdDate,
           EndDate: new Date(selectedEndDate),
           EventType: 'Reunião',
@@ -207,60 +221,24 @@ export class NewEventPage implements OnInit {
 
 
     this.date = new Date(2021,9,4,5,6,7);
+    this.getDatepickerData()
   }
 
-  
-  public formGroup = new FormGroup({
-    date: new FormControl(null, [Validators.required]),
-    date2: new FormControl(null, [Validators.required])
-  })
-  public dateControl = new FormControl(new Date(2021,9,4,5,6,7));
-  public dateControlMinMax = new FormControl(new Date());
-
-  public options = [
-    { value: true, label: 'True' },
-    { value: false, label: 'False' }
-  ];
-
-  public listColors = ['primary', 'accent', 'warn'];
-
-  public stepHours = [1, 2, 3, 4, 5];
-  public stepMinutes = [1, 5, 10, 15, 20, 25];
-  public stepSeconds = [1, 5, 10, 15, 20, 25];
-
-  toggleMinDate(evt: any) {
-    if (evt.checked) {
-      this._setMinDate();
-    } else {
-      this.minDate = null;
+  openInicio() {
+    let input: any = document.querySelector('#new-inicio')
+    if(input) {
+      console.log(input)
+      input.click()
     }
   }
 
-  toggleMaxDate(evt: any) {
-    if (evt.checked) {
-      this._setMaxDate();
-    } else {
-      this.maxDate = null;
+  openFim() {
+    let input: any = document.querySelector('#new-fim')
+    if(input) {
+      input.click()
     }
   }
 
-  closePicker() {
-    this.picker.cancel();
-  }
-
-  private _setMinDate() {
-    const now = new Date();
-    this.minDate = new Date();
-    this.minDate.setDate(now.getDate() - 1);
-  }
-
-
-  private _setMaxDate() {
-    const now = new Date();
-    this.maxDate = new Date();
-    this.maxDate.setDate(now.getDate() + 1);
-  }
-
   async getDoc(){
     const modal = await this.modalController.create({
       component: SearchPage,
@@ -290,8 +268,25 @@ export class NewEventPage implements OnInit {
     this.setIntervenientCC.emit([]);
   }
 
+  getDatepickerData() {
+    if (this.postEvent) {
+      this.postEvent.StartDate = this.dateStart
+      this.postEvent.EndDate = this.dateEnd
+    }
+  }
+
+  restoreDatepickerData() {
+    if (this.postEvent) {
+      this.dateControlStart = new FormControl(moment(this.postEvent.StartDate, "DD MM YYYY hh:mm"));
+      this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate, "DD MM YYYY hh:mm"));
+    }
+
+  }
+
   async save(){
-    
+
+    this.getDatepickerData()
+
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
     if(this.documents.length >= 0) {
@@ -299,11 +294,16 @@ export class NewEventPage implements OnInit {
     }
 
     if(this.loggeduser.Profile == 'MDGPR') {
-      console.log('MD - Aqui');
-      console.log(this.postEvent);
+      // console.log('MD - Aqui');
+      // console.log(this.postEvent);
+
+      this.showLoader = true
+
       this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(
         async (id) => {
 
+          this.showLoader = false
+
           const eventId: any = id;
 
           const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
@@ -339,8 +339,9 @@ export class NewEventPage implements OnInit {
 
         },
         error => {
+          this.showLoader = false
           this.toastService.badRequest('Evento não criado')
-        });
+      });
     }
     else if(this.loggeduser.Profile == 'PR') {
       console.log('PR - Aqui');
@@ -386,6 +387,7 @@ export class NewEventPage implements OnInit {
   }
 
   afterSave() {
+    this.getDatepickerData()
     this.deleteTemporaryData();
 
     this.onAddEvent.emit(this.postEvent);
@@ -423,6 +425,7 @@ export class NewEventPage implements OnInit {
   }
 
   saveTemporaryData() {
+    this.getDatepickerData()
     window['temp.path:/home/agenda/new-event.component.ts'] = {
       postEvent: this.postEvent,
       eventBody: this.eventBody,
@@ -431,6 +434,8 @@ export class NewEventPage implements OnInit {
   }
 
   restoreTemporaryData(): boolean {
+
+
     const restoredData =  window['temp.path:/home/agenda/new-event.component.ts']
 
     if(JSON.stringify(restoredData) != "{}" && undefined != restoredData) {
@@ -438,8 +443,11 @@ export class NewEventPage implements OnInit {
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment
 
+      // restore dater for date and hours picker
+      this.restoreDatepickerData()
       return true;
     } else {
+
       return false;
     }
   }
@@ -448,4 +456,4 @@ export class NewEventPage implements OnInit {
     window['temp.path:/home/agenda/new-event.component.ts'] = {}
   }
 
-}
+}

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

@@ -22,8 +22,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="main-content width-100">
-    <div *ngIf="despachoList">
+  <div *ngIf="despachoList.length >= 1" class="main-container width-100 overflow-y-auto height-100">
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
@@ -57,10 +56,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="despachoList?.length < 1">
+  <div *ngIf="despachoList?.length < 1" class="overflow-y-auto height-100">
   
     <ion-list>
       <ion-item>

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss

@@ -1,5 +1,5 @@
 @import '~src/function.scss';
-.main-content{
+.main-container{
     padding: 30px 20px 0 20px !important;
     margin: 0;
     color:#000;

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

@@ -127,7 +127,8 @@ goToDespachoPr(serialNumber:any){
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }

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

@@ -18,9 +18,8 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
-    <div *ngIf="despachoList">
-      <ion-list>
+  <div *ngIf="despachoList.length >= 1" class="overflow-y-auto height-100 width-100">
+      <ion-list part="divo">
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of despachoList; let i = index"
@@ -53,10 +52,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="despachoList?.length < 1">
+  <div *ngIf="despachoList.length < 1">
   
     <ion-list>
       <ion-item>

src/app/shared/gabinete-digital/despachos/despachos.page.scss

@@ -1,9 +1,10 @@
 @import '~src/function.scss';
 /* CONTENT */
 :host{
-    padding: 30px 20px 0 20px !important;
-    margin: 0;
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
 }
+
 .title{
     font-family: Roboto;
     font-size: 25px;

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

@@ -96,6 +96,8 @@ export class DespachosPage implements OnInit {
  }
 
   async LoadList(){
+    console.log('HERE DESK');
+    
 
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
@@ -117,7 +119,8 @@ export class DespachosPage implements OnInit {
         "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
         "Remetente": element.workflowInstanceDataFields.Remetente,
         "DocumentsQty": 0,
-        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "DocId": element.workflowInstanceDataFields.DispatchDocId,
+        "FolderID": element.workflowInstanceDataFields.FolderID,
         "WorkflowName": element.workflowDisplayName,
         "activityInstanceName": element.activityInstanceName,
       }
@@ -129,6 +132,8 @@ export class DespachosPage implements OnInit {
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
     this.despachoList.forEach( (element, index) => {
+      console.log(element['FolderID']);
+      
       // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
       let FolderID = element['FolderID'];
 

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -19,8 +19,8 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
-    <div *ngIf="diplomasList">
+  <div class="width-100 overflow-y-auto height-100">
+    <div *ngIf="diplomasList.length >= 1">
       <ion-list >
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -81,7 +81,8 @@ serialNumber:string;
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
       }
@@ -100,7 +101,8 @@ serialNumber:string;
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Sender,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocID,
+          "FolderID": element.workflowInstanceDataFields.FolderID,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
       }

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

@@ -28,7 +28,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment">
+  <div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
     <div *ngIf="diplomasList">
       <ion-list *ngSwitchCase="'validar'">
         <ion-item 

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

@@ -84,7 +84,8 @@ constructor(
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -103,7 +104,8 @@ constructor(
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -136,7 +138,8 @@ constructor(
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "DocId": element.workflowInstanceDataFields.DispatchDocID,
+              "FolderID": element.workflowInstanceDataFields.FolderID,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
             }
@@ -156,7 +159,8 @@ constructor(
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "DocId": element.workflowInstanceDataFields.DispatchDocID,
+              "FolderID": element.workflowInstanceDataFields.FolderID,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
             }

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts

@@ -8,13 +8,39 @@ import { EditEventToApproveComponentRoutingModule } from './edit-event-routing.m
 import { EditEventToApproveComponent } from './edit-event.page';
 import { ComponentsModule } from 'src/app/components/components.module';
 
+
+import { MatNativeDateModule } from '@angular/material/core';
+import {
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
     ComponentsModule,
-    EditEventToApproveComponentRoutingModule
+    EditEventToApproveComponentRoutingModule,
+    // Angular material
+    MatDatepickerModule,
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    ReactiveFormsModule
   ],
   declarations: [
     EditEventToApproveComponent

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

@@ -8,7 +8,7 @@
         <ion-header>
           <div class="title-content">
             <div class="middle">
-              <ion-label class="title">Editar Evento Por Aprovar QQ</ion-label>
+              <ion-label class="title">Editar evento por aprovar</ion-label>
             </div>
           </div>
         </ion-header>
@@ -40,38 +40,34 @@
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
+                
                 <ion-select disabled  placeholder="Selecione agenda"
-                selectedText="{{eventProcess.workflowInstanceDataFields.Agenda}}" 
-                [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" 
-                interface="action-sheet" Cancel-text="Cancelar" 
-                required>
+                  class="d-block d-md-none"
+                  selectedText="{{eventProcess.workflowInstanceDataFields.Agenda}}" 
+                  [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" 
+                  interface="action-sheet" Cancel-text="Cancelar" 
+                  required
+                >
                   <ion-select-option value="Oficial">Oficial</ion-select-option>
                   <ion-select-option value="Pessoal">Pessoal</ion-select-option>
                 </ion-select>
+
+
+                <mat-form-field  class="d-none d-md-block width-100" placeholder="Selecione agenda">
+                  <mat-select [(value)]="eventProcess.workflowInstanceDataFields.Agenda" >
+                    <mat-option value="Oficial">
+                      Oficial
+                    </mat-option>
+                    <mat-option value="Pessoal">
+                      Pessoal
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+
               </div>
             </div>
           </div>
     
-          <!-- <div class="container-div width-100">
-            <div class="ion-item-class-2">
-              <div class="ion-icon-class">
-                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
-              </div>
-              <div class="ion-input-class">
-                <ion-select  placeholder="Selecione tipo" 
-                [(ngModel)]="postEvent.Categories[0]"
-                selectedText="{{postEvent.Categories[0]}}"
-                interface="action-sheet" 
-                Cancel-text="Cancelar" required>
-                  <ion-select-option value="Reunião">Reunião</ion-select-option>
-                  <ion-select-option value="Viagem">Viagem</ion-select-option>
-                  <ion-select-option value="Conferência">Conferência</ion-select-option>
-                  <ion-select-option value="Encontro">Encontro</ion-select-option>
-                </ion-select>
-              </div>
-            </div>
-          </div> -->
-        
           <div class="container-div width-100">
             <div class="ion-item-class-2 width-100">
               <div class="ion-icon-class">
@@ -79,8 +75,9 @@
               </div>
               <div class="ion-input-class width-100">
                 <ion-datetime 
+                  class="d-block d-md-none"
                   placeholder="Início"
-                  [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
+                  [(ngModel)]="dateControlEnd"
                   displayFormat="D MMM YYYY H:mm"
                   minuteValues="0,15,30,45"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
@@ -88,7 +85,23 @@
                   max="2022" 
                 >
                 </ion-datetime>
-                <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
+
+                <mat-form-field class="width-100 date-hour-picker d-none d-md-block">
+                  <input matInput [ngxMatDatetimePicker]="picker1" 
+                    placeholder="Choose a date" 
+                    [formControl]="dateControlStart"
+                    [min]="minDate" [max]="maxDate" 
+                    [disabled]="disabled"
+                  >
+                  <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
+                  <ngx-mat-datetime-picker #picker1 
+                    [showSpinners]="showSpinners" 
+                    [showSeconds]="showSeconds"
+                    [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                    [stepSecond]="stepSecond"
+                    [touchUi]="touchUi">
+                  </ngx-mat-datetime-picker>
+                </mat-form-field>
               </div>
             </div>
           </div>
@@ -100,6 +113,7 @@
               </div>
               <div class="ion-input-class">
                 <ion-datetime 
+                  class="d-none d-md-none"
                   placeholder="Fim"
                   [(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
                   displayFormat="D MMM YYYY H:mm"
@@ -109,7 +123,24 @@
                   max="2022" 
                 >
                 </ion-datetime>
-                <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
+
+                <mat-form-field class="width-100 date-hour-picker d-none d-md-block">
+                  <input matInput [ngxMatDatetimePicker]="fim" 
+                    placeholder="Choose a date" 
+                    [formControl]="dateControlEnd"
+                    [min]="minDate" [max]="maxDate" 
+                    [disabled]="disabled"
+                  >
+                  <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
+                  <ngx-mat-datetime-picker #fim 
+                    [showSpinners]="showSpinners" 
+                    [showSeconds]="showSeconds"
+                    [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                    [stepSecond]="stepSecond"
+                    [touchUi]="touchUi">
+                  </ngx-mat-datetime-picker>
+                </mat-form-field>
+
               </div>
             </div>
           </div>
@@ -120,7 +151,9 @@
                 <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <ion-select placeholder="Selecione repetição" 
+                <ion-select 
+                placeholder="Selecione repetição"
+                class="d-block d-md-none" 
                 [(ngModel)]="eventProcess.workflowInstanceDataFields.IsRecurring"
                 selectedText="{{isRecurring}}" 
                 interface="action-sheet" 
@@ -128,6 +161,24 @@
                   <ion-select-option value="false">Não se repete</ion-select-option>
                   <ion-select-option value="true">Repete</ion-select-option>
                 </ion-select>
+
+                <mat-form-field  
+                  class="width-100 d-none d-md-block" 
+                  placeholder="Selecione repetição" 
+                  value="false" 
+                  interface="action-sheet" 
+                  required
+                >
+                  <mat-select [(value)]="eventProcess.workflowInstanceDataFields.IsRecurring">
+                    <mat-option value="false">
+                      Não se repete
+                    </mat-option>
+                    <mat-option value="true">
+                      Repete
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+
               </div>
             </div>
           </div>
@@ -204,8 +255,7 @@
                 </ion-label>
               </ion-item>
             </ion-list>
-          </div> 
-
+          </div>
 
           <div class="container-div d-flex width-100">
             <div class="ion-item-class-2 d-flex width-100">
@@ -219,9 +269,6 @@
           </div>
 
         </div>
-        
-
-
       </ion-item-sliding>
 
     </div>

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts

@@ -1,5 +1,7 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { FormControl } from '@angular/forms';
 import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
+import * as moment from 'moment';
 import { Attachment } from 'src/app/models/attachment.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { SearchDocument } from 'src/app/models/search-document';
@@ -9,17 +11,63 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { Event, EventToApproveEdit } from '../../../models/event.model';
-import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
-import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
+import { Event } from '../../../models/event.model';
+import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
+
 
 @Component({
   selector: 'app-edit-event',
   templateUrl: './edit-event.page.html',
   styleUrls: ['./edit-event.page.scss'],
+  providers: [
+    { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+  ]
 })
 export class EditEventToApproveComponent implements OnInit {
 
+  public date: any;
+  public disabled = false;
+  public showSpinners = true;
+  public showSeconds = false;
+  public touchUi = false;
+  public enableMeridian = false;
+  public minDate: any;
+  public maxDate: any;
+  public stepHour = 1;
+  public stepMinute = 5;
+  public stepSecond = 5;
+
+  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
+  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+
+  showLoader = false
+
+  get dateStart () {
+    return this.dateControlStart.value
+  }
+
+  get dateEnd () {
+    return this.dateControlEnd.value
+  }
+
+  @ViewChild('picker') picker: any;
+  @ViewChild('fim') fim: any;
+  @ViewChild('inicio') inicio: any;
+  @ViewChild('picker1') picker1: any;
+  
   serialNumber: string
   loadedAttachments: Attachment[]= []
 
@@ -44,76 +92,6 @@ export class EditEventToApproveComponent implements OnInit {
     }
   }
 
-  // event ={
-  //   "serialNumber":"9073_118",
-  //   "originator":{
-  //     "email":"gilson.manuel@gabinetedigital.local",
-  //     "manager":"",
-  //     "displayName":"",
-  //     "fqn":"K2:GABINETEDIGITAL\\gilson.manuel",
-  //     "username":"GABINETEDIGITAL\\gilson.manuel"
-  //   },
-  //   "actions":null,
-  //   "workflowInstanceFolio":"Final do sprint",
-  //   "taskStartDate":"4/30/2021 9:06:48 AM",
-  //   "workflowID":4365,
-  //   "workflowInstanceID":9073,
-  //   "workflowName":"MDGPR\\Agenda Oficial MDGPR",
-  //   "workflowDisplayName":"Agenda Oficial MDGPR",
-  //   "formURL":"http://bpmdev.gabinetedigital.local/Runtime/Runtime/Form/Exchange+Calendar+Meeting+Approval/?SerialNo=9073_118",
-  //   "workflowInstanceDataFields": {
-  //     "Body":"Será fechado o sprint 1 - 26 Abr - 30 Abr",
-  //     "Location":"Equilibrium - Sala de reuniões",
-  //     "Subject":"Final do sprint",
-  //     "StartDate":"2021-04-30T15:00:00",
-  //     "EndDate":"2021-04-30T15:30:00",
-  //     "Participants":"gilson.manuel@gabinetedigital.local;tiago.kayaya@gabinetedigital.local;solange.vandunem@gabinetedigital.local",
-  //     "CC":"",
-  //     "ReviewUserComment":"teste",
-  //     "Role":0,
-  //     "MDName":"Paulo Pinto",
-  //     "MDEmail":"paulo.pinto@gabinetedigital.local",
-  //     "PREmail":"",
-  //     "OriginatorComments":"",
-  //     "Status":"Active",
-  //     "TimeZone":"W. Central Africa Standard Time",
-  //     "Agenda":"Oficial",
-  //     "EventType":"Reunião",
-  //     "EventID":"",
-  //     "IsRecurring":false,
-  //     "ParticipantsList":[
-  //       {
-  //         "$type":null,
-  //         "EmailAddress":"gilson.manuel@gabinetedigital.local",
-  //         "Name":"Gilson Manuel",
-  //         "IsRequired":true
-  //       },
-  //       {
-  //         "$type":null,
-  //         "EmailAddress":"tiago.kayaya@gabinetedigital.local",
-  //         "Name":"Tiago Kayaya",
-  //         "IsRequired":true
-  //       },
-  //       {
-  //         "$type":null,
-  //         "EmailAddress":"solange.vandunem@gabinetedigital.local",
-  //         "Name":"Solange Van-Dúnem",
-  //         "IsRequired":true
-  //       }
-  //     ],
-  //     "EventOrganizer":"{\"$type\":\"Gabinete.k2RESTidentifier_EventPerson, Gabinete, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"EmailAddress\":\"agenda.mdgpr@gabinetedigital.local\",\"Name\":\"Agenda do Ministro e Director do Gabinete do PR\",\"IsRequired\":true}",
-  //     "CreateEvent":"",
-  //     "IsAllDayEvent":false,
-  //     "SerializedItem":"{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData[], GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"$values\":[{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData, GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"Service\":\"gabinete-digital\",\"Object\":\"event-list\",\"idObject\":\"9073_118\"}]}",
-  //     "MDwxUserID":261,
-  //     "DeserializedItem":"{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData, GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"Service\":\"gabinete-digital\",\"Object\":\"event-list\",\"idObject\":\"9073_118\"}",
-  //     "Message":"Foi actualizado o",
-  //     "InstanceId":"R0RfR0FCSU5FVEVESUdJVEFMXGdpbHNvbi5tYW51ZWxfMjAyMS0wNC0zMCAwODowNDoyN1o=",
-  //     "For Each Result":"",
-  //     "For Each Index":0
-  //   }
-  // }
-
   show = false
 
   postEvent: Event;
@@ -146,20 +124,23 @@ export class EditEventToApproveComponent implements OnInit {
   ) {
 
     this.serialNumber = this.navParams.get('serialNumber');
-    // this.profile = this.navParams.get('profile');
 
     this.isEventEdited = false;
 
-
     this.getTask()
 
+    this.dateControlStart = new FormControl(moment(new Date()));
+    this.dateControlEnd = new FormControl(moment(new Date()));
+
   }
 
   async getTask() {
     console.log('this.eventProcess', this.eventProcess);
 
     const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{
-      this.eventProcess = result
+    this.eventProcess = result
+      
+    this.restoreDatepickerData()
   
       console.log(this.eventProcess.workflowInstanceDataFields.Subject)
       
@@ -170,22 +151,6 @@ export class EditEventToApproveComponent implements OnInit {
 
       this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId
       this.getAttachments()
-
-
-      // attendees
-      //this.eventProcess.workflowInstanceDataFields.ParticipantsList
-      // subject
-      //this.eventProcess.workflowInstanceDataFields.Subject |  this.eventProcess.workflowInstanceFolio
-      // location
-      //this.eventProcess.workflowInstanceDataFields.Location
-      // startDate
-      //this.eventProcess.taskStartDate
-      // endDate
-      //this.eventProcess.workflowInstanceDataFields.EndDate
-  
-      //  this.eventProcess.workflowInstanceDataFields.Agenda
-  
-      // eventProcess.workflowInstanceDataFields.IsRecurring
   
       if(this.eventProcess.workflowInstanceDataFields.IsRecurring == false) {
         this.isRecurring = "Não se repete";
@@ -202,18 +167,12 @@ export class EditEventToApproveComponent implements OnInit {
         }
       })
     })
+
+
   }
 
   ngOnInit() {
     
-    
-    window.onresize = (event) => {
-      // if not mobile remove all component
-      if( window.innerWidth >= 800){
-        this.modalController.dismiss();
-      }
-    };
-    
   }
   
   close() {
@@ -221,6 +180,8 @@ export class EditEventToApproveComponent implements OnInit {
   }
 
   save() {  
+    // set dates to eventProcess object
+    this.getDatepickerData()
 
     this.taskParticipantsCc.forEach(e=>{
       e.IsRequired = false
@@ -325,7 +286,7 @@ export class EditEventToApproveComponent implements OnInit {
     this.postEvent.Attendees = data;
   }
   
-  setIntervenientCC(data){
+  setIntervenientCC(data) {
     this.taskParticipantsCc = data;
   }
 
@@ -362,9 +323,7 @@ export class EditEventToApproveComponent implements OnInit {
 
   deleteAttachment(attachment: Attachment, index) {
 
-    console.log('index', index)
     this.loadedAttachments[index]['action'] = 'delete'
-
   }
 
   async getDoc() {
@@ -411,4 +370,18 @@ export class EditEventToApproveComponent implements OnInit {
     });
   }
 
+  restoreDatepickerData() {
+
+    this.dateControlStart = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.StartDate)));
+    this.dateControlEnd = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.EndDate)));
+    
+  }
+
+  getDatepickerData() {
+
+    this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart
+    this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd
+  
+  }
+
 }

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

@@ -1,4 +1,4 @@
-<ion-content>
+<ion-header>
   <div class="title width-100">
     <div class="title-container d-flex justify-space-between">
       <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
@@ -9,7 +9,7 @@
     <ion-toolbar>
       <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
         <ion-segment-button value="MDGPR">
-          Seu calendário
+          Meu calendário
         </ion-segment-button>
         <ion-segment-button value="PR">
           Presidente da República
@@ -17,12 +17,14 @@
       </ion-segment>
     </ion-toolbar>
    </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="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
+  <div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList.length >= 1">
    <!--  <div class="header-content width-100"> -->
      
   <!-- </div> --> 

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

@@ -15,7 +15,7 @@
     </ion-refresher-content>
   </ion-refresher>
   
-  <div class="width-100" *ngIf="taskslist">
+  <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
     <ion-list>
       <ion-item 
           class="expediente ion-no-padding cursor-pointer"  

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

@@ -18,7 +18,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" *ngIf="taskslist">
+  <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
     <ion-list>
       <ion-item 
           class="expediente ion-no-padding cursor-pointer"  

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

@@ -29,7 +29,7 @@
     </ion-refresher>
   
   <div class="width-100" [ngSwitch]="segment">
-    <div *ngIf="parecerList">
+    <div *ngIf="parecerList.length >= 1" class="overflow-y-auto height-100">
       <ion-list *ngSwitchCase="'parecer'">
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
       </ion-list>
 
     </div>
-    <div *ngIf="deferimentoList">
+    <div *ngIf="deferimentoList.length >= 1" class="overflow-y-auto height-100">
       <ion-list *ngSwitchCase="'deferimento'">
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  

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

@@ -95,7 +95,8 @@ export class PedidosPage implements OnInit {
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.ParecerDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -127,6 +128,7 @@ export class PedidosPage implements OnInit {
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }

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

@@ -18,8 +18,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
-    <div *ngIf="pendentesList">
+  <div *ngIf="pendentesList.length >= 1" class="width-100 overflow-y-auto height-100">
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
@@ -49,10 +48,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="pendentesList?.length < 1 || pendentesList.length == 0">
+  <div *ngIf="pendentesList.length < 1">
   
     <ion-list>
       <ion-item>

src/app/shared/header/header.page.ts

@@ -44,7 +44,7 @@ export class HeaderPage implements OnInit {
       classs = 'modal modal-width-100 modal-padding-top'
       showSearchInput = true
     } else {
-      classs = 'modal modal-width-100 modal-padding-top modal-desktop-shadow modal-desktop-remove-background'
+      classs = 'modal modal-desktop desktop-search'
       showSearchInput = false
     }
 

src/assets/images/Gabinete Digital_files/event-list-event-list-module.js.download

@@ -9,7 +9,7 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony default export */ __webpack_exports__["default"] = ("<ion-header>\n  <ion-toolbar>\n    <ion-buttons slot=\"start\">\n      <ion-back-button defaultHref=\"/gabinete-digital\"></ion-back-button>\n    </ion-buttons>\n    <ion-title>Eventos para Aprovação</ion-title>\n  </ion-toolbar>\n  <ion-toolbar>\n    <ion-segment [(ngModel)]=\"segment\">\n      <ion-segment-button value=\"MDGPR\">\n        Seu calendário\n      </ion-segment-button>\n      <ion-segment-button value=\"PR\">\n        Presidente da República\n      </ion-segment-button>\n    </ion-segment>\n  </ion-toolbar>\n</ion-header>\n\n<ion-content>\n  <div [ngSwitch]=\"segment\">\n    <ion-list *ngSwitchCase=\"'MDGPR'\">\n      <div *ngIf=\"eventsMDGPRList\">\n      <ion-list>\n        <ion-item-sliding>\n          <ion-item class=\"Rectangle\" lines=\"none\" \n            *ngFor=\"let event of eventsMDGPRList\"\n            [routerLink]=\"['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]\">\n            <div class=\"rectangle-content\">\n              <div class=\"approve-event-time\">\n                <p>08:30</p>\n                <p>12:30</p>\n              </div>\n              <div class=\"approve-event-detail\">\n                <p>Luanda | Palácio Presidencial</p>\n                <h3>Reunião de Conselho de Ministros</h3>\n              </div>\n            </div>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n    </div>\n\n    </ion-list>\n    <ion-list *ngSwitchCase=\"'PR'\">\n      <ion-item-sliding *ngIf=\"eventsPRList\">\n        <ion-item class=\"Rectangle\" lines=\"none\" \n            *ngFor=\"let event of eventsPRList\" (click)=\"openApproveModal()\">\n            <div class=\"rectangle-content\">\n              <div class=\"approve-event-time\">\n                <p>08:30</p>\n                <p>12:30</p>\n              </div>\n              <div class=\"approve-event-detail\">\n                <p>Luanda | Palácio Presidencial</p>\n                <h3>Reunião de Conselho de Ministros</h3>\n              </div>\n            </div>\n          </ion-item>\n      </ion-item-sliding>\n    </ion-list>\n  </div>\n\n</ion-content>\n");
+/* harmony default export */ __webpack_exports__["default"] = ("<ion-header>\n  <ion-toolbar>\n    <ion-buttons slot=\"start\">\n      <ion-back-button defaultHref=\"/gabinete-digital\"></ion-back-button>\n    </ion-buttons>\n    <ion-title>Eventos para Aprovação</ion-title>\n  </ion-toolbar>\n  <ion-toolbar>\n    <ion-segment [(ngModel)]=\"segment\">\n      <ion-segment-button value=\"MDGPR\">\n        Meu calendário\n      </ion-segment-button>\n      <ion-segment-button value=\"PR\">\n        Presidente da República\n      </ion-segment-button>\n    </ion-segment>\n  </ion-toolbar>\n</ion-header>\n\n<ion-content>\n  <div [ngSwitch]=\"segment\">\n    <ion-list *ngSwitchCase=\"'MDGPR'\">\n      <div *ngIf=\"eventsMDGPRList\">\n      <ion-list>\n        <ion-item-sliding>\n          <ion-item class=\"Rectangle\" lines=\"none\" \n            *ngFor=\"let event of eventsMDGPRList\"\n            [routerLink]=\"['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]\">\n            <div class=\"rectangle-content\">\n              <div class=\"approve-event-time\">\n                <p>08:30</p>\n                <p>12:30</p>\n              </div>\n              <div class=\"approve-event-detail\">\n                <p>Luanda | Palácio Presidencial</p>\n                <h3>Reunião de Conselho de Ministros</h3>\n              </div>\n            </div>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n    </div>\n\n    </ion-list>\n    <ion-list *ngSwitchCase=\"'PR'\">\n      <ion-item-sliding *ngIf=\"eventsPRList\">\n        <ion-item class=\"Rectangle\" lines=\"none\" \n            *ngFor=\"let event of eventsPRList\" (click)=\"openApproveModal()\">\n            <div class=\"rectangle-content\">\n              <div class=\"approve-event-time\">\n                <p>08:30</p>\n                <p>12:30</p>\n              </div>\n              <div class=\"approve-event-detail\">\n                <p>Luanda | Palácio Presidencial</p>\n                <h3>Reunião de Conselho de Ministros</h3>\n              </div>\n            </div>\n          </ion-item>\n      </ion-item-sliding>\n    </ion-list>\n  </div>\n\n</ion-content>\n");
 
 /***/ }),
 

src/global.scss

@@ -363,6 +363,20 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 }
 
 
+.desktop-search {
+    padding-top: 0px !important;
+    margin-top: 80px !important;
+    position: relative !important;
+
+    ion-backdrop {
+        display: none !important;
+    }
+    // margin-top: 86px;
+    .model-wrapper {
+
+    }
+}
+
 .notification-modal {
     ion-backdrop {
         display: none;
@@ -401,23 +415,24 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 
 .modal-width-100-width-background, .modal-desktop {
     padding-top: 76px;
-    .modal-wrapper{
+    .modal-wrapper {
         width: 100%  !important;
         height: 99%  !important;
         position: relative;
     }
 }
 
-.modal-padding-top{
-    .modal-wrapper{
-        height: 99%;
-        top: 2%;
-        position: relative;
+.modal-padding-top {
+    margin-top: 87px;
+    .modal-wrapper {
+        // height: 99%;
+        // top: 2%;
+        // position: relative;
     }
 }
 
 .modal-top-100-width-background, .modal-desktop {
-    .modal-wrapper{
+    .modal-wrapper {
         width: 100%;
         height: 99%;
         position: relative;
@@ -693,6 +708,11 @@ app-header-no-search  .ion-toolbar{
     margin: 0px auto;
 }
 
+/* .main-content{
+    height: 100% !important;
+    overflow-y: auto !important;
+} */
+
 
 body, .blue-background{ background: #0782C9 !important;}
 
@@ -913,4 +933,54 @@ background: rgb(92, 92, 92);
 
 .modal {
     display: flex !important;
-    }
+}
+
+// calendar
+.mat-calendar-body-selected {
+    background-color: #42b9fe !important;
+}
+
+// select background
+// .mat-primary .mat-option.mat-selected:not(.mat-option-disabled), .mat-option-ripple {
+//     background-color: #fafafa !important;
+// }
+
+.mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical), .cdk-keyboard-focused .mat-calendar-body-active > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical), .cdk-program-focused .mat-calendar-body-active > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical) {
+    background-color: #42b9fe36 !important;
+}
+
+.mat-form-field-underline.ng-tns-c193-6.ng-star-inserted, .mat-form-field-underline {
+    display: none;
+}
+
+.date-hour-picker {
+    margin-top: -6px;
+
+    label#mat-form-field-label-7 {
+      // display: none;
+    }
+
+    .span.ng-tns-c193-4, .ng-star-inserted {
+      // display: none;
+    }
+  
+    .ng-star-inserted{
+      // display: none;
+      position: absolute;
+      width: 447px;
+      height: 43px;
+      opacity: 0;
+      button {
+        width: 100%;
+        height: 100%;
+      }
+    }
+}
+
+.mat-active span {
+    color: #0d89d1 !important;
+}
+
+// .ng-star-inserted {
+//     opacity: 0;
+// }

src/style/main.scss

@@ -420,6 +420,8 @@
     border-bottom-right-radius: 25px;
 }
 
+
+
 // system spacing
 
 

src/theme/variables.scss

@@ -559,6 +559,12 @@ $app-theme: mat-light-theme((
 }
 }
 
+/* .main-content{
+  width: 100%;
+  height: 100% !important;
+  overflow-y: auto;
+} */
+
 
 
 /* Importing Bootstrap SCSS file. */