Merge branch 'develop' into bugfix/start-conversation

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

@@ -123,9 +123,9 @@
 
         <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
-          <mat-form-field class="date-hour-picker">
+          <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
-              placeholder="Choose a date"
+              placeholder="Data Inicio*"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
               [min]="currentDate"
@@ -155,9 +155,9 @@
          -->
         <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
-          <mat-form-field class="date-hour-picker">
+          <mat-form-field appearance="none" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"
-              placeholder="Choose a date"
+              placeholder="Data de fim*"
               [(ngModel)]="postEvent.EndDate"
               [disabled]="disabled"
               [min]="currentDate"

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

@@ -133,22 +133,6 @@ export class NewEventPage implements OnInit {
     this.loggeduser = userService.ValidatedUser;
     this.postEvent = new Event();
 
-    let now = new Date();
-
-    if(now.getMinutes() <= 30) {
-      this.autoStartTime = new Date(now.setMinutes(30));
-      this.postEvent.StartDate = this.autoStartTime;
-      this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000);
-      this.postEvent.EndDate = this.autoEndTime;
-    }
-    else {
-      this.autoStartTime = new Date(now.setHours(now.getHours()+1));
-      this.autoStartTime = new Date(this.autoStartTime.setMinutes(0));
-      this.postEvent.StartDate = this.autoStartTime;
-      this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000);
-      this.postEvent.EndDate = this.autoEndTime;
-    }
-
   }
 
   ngOnInit() {

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

@@ -278,6 +278,12 @@ export class EditEventToApproveComponent implements OnInit {
       }
     })
 
+    this.startDate = new Date(this.startDate);
+    this.startDate.setHours(this.startDate.getHours() + 1);
+
+    this.endDate = new Date(this.endDate);
+    this.endDate.setHours(this.endDate.getHours() + 1);
+
     const event: EventToApproveEdit = {
       SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
@@ -304,9 +310,9 @@ export class EditEventToApproveComponent implements OnInit {
 
 
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
-      this.toastService.successMessage('Evento editado');
+      this.toastService._successMessage('Evento editado');
     }, error =>{
-      this.toastService.badRequest('Evento não editado');
+      this.toastService._badRequest('Evento não editado');
     })
 
 
@@ -314,16 +320,16 @@ export class EditEventToApproveComponent implements OnInit {
       if(document['action'] == 'add') {
         delete document.action
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
-          this.toastService.successMessage();
+          this.toastService._successMessage();
         }, error =>{
-          this.toastService.badRequest();
+          this.toastService._badRequest();
         });
       } else if(document['action'] == 'delete') {
         delete document.action
         this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
-          this.toastService.successMessage()
+          this.toastService._successMessage()
         }, error =>{
-          this.toastService.badRequest()
+          this.toastService._badRequest()
         })
       }
 

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

@@ -2,7 +2,7 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Expediente</ion-label></div>
-    <div class="theicon">
+    <div class="theicon" (click)="refreshing()">
       <button title="Atualizar" class="btn-no-color" (click)="refreshing()">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
       </button>

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

@@ -84,6 +84,7 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   refreshing() {
+
     setTimeout(() => {
       this.LoadList();
     }, 1000);

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

@@ -95,6 +95,7 @@ export class ExpedientsPage implements OnInit {
   }
 
     doRefresh() {
+
       setTimeout(() => {
         this.LoadList();
       }, 1000)

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -72,14 +72,16 @@ export class DespachosOptionsPage implements OnInit {
     });
   }
 
-  sendExpedienteToPending(){
+  sendExpedienteToPending() {
+    const loader = this.toastService.loading()
     this.popoverController.dismiss();
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       this.toastService._successMessage()
+      loader.remove()
       
       this.close();
     },()=>{
-
+      loader.remove()
       this.toastService._badRequest('Processo não encontrado')
     });
   }

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -98,11 +98,14 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   sendExpedienteToPending() {
+    const loader = this.toastService.loading()
     this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
       
       this.toastService._successMessage()
       this.popoverController.dismiss('close')
+      loader.remove()
     },()=>{
+      loader.remove()
 
       this.toastService._badRequest('Processo não encontrado')
     });

src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts

@@ -107,12 +107,14 @@ export class DiplomasGerarOptionsPage implements OnInit {
   }
 
   async sendExpedienteToPending() {
-
+    const loader = this.toastService.loading()
     this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => {
       this.goBack();
       this.toastService.successMessage()
+      loader.remove()
     },
       error => {
+        loader.remove()
         this.toastService.badRequest("Processo não enviado para despacho")
       });
 

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -252,12 +252,14 @@ export class OptsExpedientePrPage implements OnInit {
 
   sendExpedienteToPending(){
     this.popoverController.dismiss();
+    const loader = this.toastService.loading()
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
-      
+      loader.remove()
       this.close();
     },()=>{
 
       this.toastService._badRequest('Processo não encontrado')
+      loader.remove()
     });
   }
 

src/app/shared/popover/request-options/request-options.page.ts

@@ -81,11 +81,14 @@ export class RequestOptionsPage implements OnInit {
   }
 
   sendExpedienteToPending() {
+    const loader = this.toastService.loading()
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       
       this.toastService._successMessage()
       this.close();
+      loader.remove()
     },()=>{
+      loader.remove()
 
       this.toastService._badRequest('Processo não encontrado')
     });

src/app/shared/publication/new-action/new-action.page.html

@@ -41,9 +41,9 @@
           </ion-datetime>
 
 
-          <mat-form-field  appearance="none" class="width-100 date-hour-picker  d-md-block">
+          <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker1"
-              placeholder="Choose a date*"
+              placeholder="Data inicio*"
               [(ngModel)]="folder.DateBegin"
               [disabled]="disabled"
               [min]="currentDate"
@@ -80,12 +80,12 @@
 
           <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker2"
-              placeholder="Choose a date*"
+              placeholder="Data de fim*"
               [(ngModel)]="folder.DateEnd"
               [disabled]="disabled"
               [min]="currentDate"
             >
-            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker2"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker2
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"

src/app/shared/publication/new-action/new-action.page.ts

@@ -45,10 +45,10 @@ export class NewActionPage implements OnInit {
     this.folder = new PublicationFolder();
 
 
-    this.folder = Object.assign(this.folder, {
+    /* this.folder = Object.assign(this.folder, {
       DateBegin: new Date().toISOString(),
       DateEnd: (new Date(new Date().getTime() + 15 * 60000)).toISOString(),
-    })
+    }) */
 
   }