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

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

@@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.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 { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
 
 @Component({
   selector: 'app-despacho',
@@ -62,7 +63,7 @@ export class DespachoPage implements OnInit {
         }
       });
       
-    }
+  }
 
   ngOnInit() {
     this.profile = "mdgpr";
@@ -90,11 +91,11 @@ export class DespachoPage implements OnInit {
     let navigationExtras: NavigationExtras = {
       queryParams: {
         // "serialNumber": serialNumber,
-        'despachos': true
+        //'despachos': true
       }
     }
 
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
 
   }
 
@@ -428,13 +429,14 @@ export class DespachoPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
+    
     const popover = await this.popoverController.create({
-      component: OptsExpedientePage,
+      component: DespachosOptionsPage,
       cssClass: 'exp-options',
       componentProps: {
         task: this.task,
         fulltask: this.fulltask,
-        taskAction:taskAction,
+        taskAction: taskAction,
         showEnviarPendentes: false
       },
       translucent: true
@@ -442,7 +444,6 @@ export class DespachoPage implements OnInit {
     return await popover.present();
   }
   
-
   async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {

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

@@ -8,7 +8,6 @@ import { BookMeetingModalPageRoutingModule } from './book-meeting-modal-routing.
 
 import { BookMeetingModalPage } from './book-meeting-modal.page';
 import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
-import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module';
 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 { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
@@ -19,8 +18,6 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att
     FormsModule,
     IonicModule,
     BookMeetingModalPageRoutingModule,
-    //
-    // AttendeesPageModule,
 
     EmptyContainerPageModule,
 

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

@@ -9,7 +9,6 @@ import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-rout
 import { ExpedientTaskModalPage } from './expedient-task-modal.page';
 import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
 import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
-import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module';
 import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
 import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -21,7 +20,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     IonicModule,
     ExpedientTaskModalPageRoutingModule,
     //
-    AttendeesPageModule,
     AttendeeModalPageModule,
     EmptyContainerPageModule,
     BtnModalDismissPageModule,