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

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

@@ -129,7 +129,7 @@
               <button class="btn-no-color"  *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false">
                 <ion-icon class="collaps btn-no-color" src="assets/images/icons-collaps-up.svg" ></ion-icon>
               </button>
-              <button  class="btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='317px';showCalendar=true">
+              <button  class="btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='320px';showCalendar=true">
                 <ion-icon class="collaps btn-no-color" src="assets/images/icons-collaps-down.svg" ></ion-icon>
               </button >
 

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

@@ -82,8 +82,6 @@ export class AgendaPage implements OnInit {
   /* List of events of our calendar */
   eventSource : eventSource[]  = []
 
-
-
   /* The title of the calendar */
   viewTitle: string;
 
@@ -173,7 +171,7 @@ export class AgendaPage implements OnInit {
 
     this.loggeduser = authService.ValidatedUser;
 
-    this.calendarHeight = "317px";
+    this.calendarHeight = "320px";
     this.showCalendar = true;
     this.timelineDate = momentG(new Date(),'dd MMMM yyyy');
 
@@ -590,7 +588,6 @@ export class AgendaPage implements OnInit {
           if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
             this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((res:any) => {
 
-
               this.calendarService.removeRange(startTime, endTime, 'md')
 
               const eventsList = res.filter(data => data.CalendarName == "Oficial");

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

@@ -15,8 +15,7 @@ import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
 import { ToastService } from 'src/app/services/toast.service';
-import { DespachoMdService } from 'src/app/Rules/despacho-md.service'
-import { NavigationService } from 'src/app/services/navigation.service';
+import { DespachoService } from 'src/app/Rules/despacho.service'
 import { Location } from '@angular/common'
 
 @Component({
@@ -47,14 +46,10 @@ export class DespachoPage implements OnInit {
     private events: EventsService,
     private menu: MenuController,
     private modalController: ModalController,
-    private alertService: AlertService,
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
-    private router: Router,
-    private animationController: AnimationController,
     private toastService: ToastService,
-    private despachoMdService: DespachoMdService,
-    private navigationService: NavigationService,
+    private despachoService: DespachoService,
     private location: Location
 
     ) {
@@ -205,7 +200,7 @@ export class DespachoPage implements OnInit {
     const loader = this.toastService.loading()
 
     try {
-      await this.despachoMdService.executado(note, documents, this.serialnumber)
+      await this.despachoService.executado(note, documents, this.serialnumber)
       this.toastService.successMessage('Processo criado')
       this.close();
     } catch(error) {
@@ -301,7 +296,7 @@ export class DespachoPage implements OnInit {
 
   async sendExpedienteToPending() {
 
-    this.despachoMdService.sendExpedienteToPending(this.serialnumber).subscribe(res=>{
+    this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res=>{
       this.goBack();
       this.toastService.successMessage('Processo enviado para despacho')
     },

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

@@ -19,6 +19,7 @@ import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.pag
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+import { task } from 'src/app/models/ExpedientTaskModalPage';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -49,7 +50,7 @@ export class ExpedientTaskModalPage implements OnInit {
     'Solicitar Deferimento'
   ];
   taskType:string;
-  task: any;
+  task: task;
 
   taskParticipants: any = [];
   taskParticipantsCc: any = [];