-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 12768df68..bf44bb9bb 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -11,6 +11,7 @@ import { PendentesPage } from './pendentes/pendentes.page'; import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page' +import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page'; @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -267,7 +268,7 @@ export class GabineteDigitalPage implements OnInit { console.log(data); this.closeAllDesktopComponents(); - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ //this.openExpedientList(); } else{ @@ -278,7 +279,7 @@ export class GabineteDigitalPage implements OnInit { openPedidosPage(segment:string){ this.closeAllDesktopComponents(); - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ this.openPedidoList(); } else{ @@ -289,7 +290,7 @@ export class GabineteDigitalPage implements OnInit { openDespachosPage(segment:string){ this.closeAllDesktopComponents(); - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ this.openDespachoList(); } else{ @@ -299,7 +300,7 @@ export class GabineteDigitalPage implements OnInit { openDespachosPrPage(segment:string) { this.closeAllDesktopComponents(); - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ this.openDespachoListPr(); } else{ @@ -309,7 +310,7 @@ export class GabineteDigitalPage implements OnInit { openPendentesPage(segment:string){ this.closeAllDesktopComponents(); - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ this.openPendenteList(); } else{ @@ -319,7 +320,7 @@ export class GabineteDigitalPage implements OnInit { openExpedientesPrPage(segment:string){ this.closeAllDesktopComponents(); - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ //this.openDespachoList(); } else{ @@ -329,8 +330,8 @@ export class GabineteDigitalPage implements OnInit { openDiplomasPage(segment:string){ this.closeAllDesktopComponents(); - if( window.innerWidth <= 1024){ - //this.openPendenteList(); + if( window.innerWidth <= 800){ + this.openDeploma(); } else{ this.segment = segment; @@ -338,6 +339,21 @@ export class GabineteDigitalPage implements OnInit { } } + + + async openDeploma() { + const modal = await this.modalController.create({ + component: DiplomasPage, + componentProps:{ + profile: this.profile, + }, + cssClass: 'modal modal-desktop', + //backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + async openExpedientList(){ this.closeAllDesktopComponent(); //if( window.innerWidth <= 1024){ @@ -414,6 +430,4 @@ export class GabineteDigitalPage implements OnInit { console.log('show desktop modal') } - - } diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html index f34b8d1c8..916d4c40f 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.html +++ b/src/app/shared/agenda/edit-event/edit-event.component.html @@ -3,7 +3,7 @@
- Editar Evento agenda + Editar Evento
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index d5040e88f..006791024 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -14,7 +14,6 @@
- {{ eventProcess.serialNumber }}
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 8b506fc33..af8c6f3f6 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -19,7 +19,7 @@ import { Event, EventToApproveEdit } from '../../../models/event.model'; export class EditEventToApproveComponent implements OnInit { serialNumber: string - loadedAttachments: Attachment[] + loadedAttachments: Attachment[]= [] eventProcess = { @@ -258,8 +258,10 @@ export class EditEventToApproveComponent implements OnInit { this.loadedAttachments.forEach((document:any)=>{ if(document['action'] == 'add'){ + delete document.action this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{}); } else if(document['action'] == 'delete') { + delete document.action this.attachmentsService.deleteEventAttachmentById(document).subscribe( res=>{}) } @@ -382,6 +384,7 @@ export class EditEventToApproveComponent implements OnInit { this.loadedAttachments.push(DocumentToSave) + console.log('push', DocumentToSave) // await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{ // this.getAttachments();