diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index d04394759..14980462d 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -7,7 +7,7 @@
- Editar Evento com divisão + Editar Evento
diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts index 59a8fbe75..7acf42a74 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts @@ -40,7 +40,7 @@ export class DiscartExpedientModalPage implements OnInit { } save(){ - if(this.action != 'discart'){ + /* if(this.action != 'discart'){ let body = { "serialNumber": this.serialNumber, "action": "Tratado" } console.log(body); this.processes.PostTaskAction(body); @@ -49,9 +49,9 @@ export class DiscartExpedientModalPage implements OnInit { let body = { "serialNumber": this.serialNumber, "action": "Passivo" } console.log(body); this.processes.PostTaskAction(body); - } + } */ this.router.navigate(['/home/gabinete-digital/expediente']); - this.modalController.dismiss(); + this.modalController.dismiss('close'); } } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 2552f9e3c..5b6ccde81 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -12,6 +12,7 @@ import { AddParticipantsModalPage } from '../add-participants-modal/add-particip import { environment } from 'src/environments/environment'; import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; import { AttachmentsService } from 'src/app/services/attachments.service'; +import { ExpedienteDetailPage } from '../expediente-detail/expediente-detail.page'; @Component({ selector: 'app-expedient-task-modal', @@ -46,6 +47,7 @@ export class ExpedientTaskModalPage implements OnInit { showAttendees= false; adding: "intervenient" | "CC" = "intervenient"; + profile: string; constructor( private modalController: ModalController, @@ -76,6 +78,7 @@ export class ExpedientTaskModalPage implements OnInit { this.postData.SubjectTypeId = '99999844'; /* Initialize 'Subject' with the title of the expedient */ this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject; + this.profile = this.navParams.get('profile'); } async setAdding(type: "intervenient" | "CC"){ @@ -93,15 +96,18 @@ export class ExpedientTaskModalPage implements OnInit { this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } - cancelTask(){ - this.modalController.dismiss(null); - } + getSubjectType(){ this.processes.GetSubjectType().subscribe(res=>{ console.log(res); this.subjectTypes = res; }); } + cancelTask(){ + this.modalController.dismiss(null); + //this.viewExpedientDetail(); + + } saveTask(){ /* console.log(this.taskType); */ @@ -118,7 +124,9 @@ export class ExpedientTaskModalPage implements OnInit { DispatchFolder: this.dispatchFolder, } console.log(this.postData); - this.processes.postDespatcho(this.postData); + /* this.processes.postDespatcho(this.postData); */ + //this.distartExpedientModal(); + this.modalController.dismiss('openDiscart'); break; case '1': @@ -131,7 +139,9 @@ export class ExpedientTaskModalPage implements OnInit { UsersSelected: this.participants, DispatchFolder: this.dispatchFolder, } - this.processes.postParecer(this.postData); + /* this.processes.postParecer(this.postData); */ + //this.distartExpedientModal(); + this.modalController.dismiss(); break; case '2': this.postData = { @@ -144,10 +154,13 @@ export class ExpedientTaskModalPage implements OnInit { DispatchFolder: this.dispatchFolder, } this.processes.postDeferimento(this.postData); + //this.distartExpedientModal(); + this.close(); break; } - this.distartExpedientModal(); - this.close(); + /* this.distartExpedientModal(); + this.close(); */ + } getAttachments(){ this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{ @@ -245,7 +258,13 @@ export class ExpedientTaskModalPage implements OnInit { }); await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then(res=>{ + if(res['data']=='close'){ + console.log('Expedient Discard closed'); + this.modalController.dismiss(res['data']) + } + + }); } async setContact(data:EventPerson[]){ @@ -271,4 +290,32 @@ export class ExpedientTaskModalPage implements OnInit { this.showAttendees = false; } + async viewExpedientDetail() { + console.log(this.profile); + + let classs; + if( window.innerWidth <= 800){ + classs = 'modal' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + + const modal = await this.modalController.create({ + component: ExpedienteDetailPage, + componentProps:{ + serialNumber: this.task.serialNumber, + profile: this.profile, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + console.log('!refresh list'); + }); + } + + + + } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 41995b9e0..cef4cd329 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -60,6 +60,10 @@ export class ExpedienteDetailPage implements OnInit { this.LoadRelatedEvents(this.serialnumber); } + close(){ + this.modalController.dismiss(); + } + async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe(res => { @@ -120,9 +124,11 @@ export class ExpedienteDetailPage implements OnInit { openMenu() { this.menu.open(); + this.modalController.dismiss(); } async openExpedientActionsModal(taskAction: any, task: any) { + //this.modalController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'modal' @@ -134,11 +140,21 @@ export class ExpedienteDetailPage implements OnInit { componentProps: { taskAction: taskAction, task: task, + profile: this.profile, }, cssClass: classs, }); await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then(res=>{ + console.log(res['data']); + if(res['data']=='openDiscart'){ + console.log('open discart'); + + this.distartExpedientModal(); + + } + + }); } discartExpedient() { @@ -148,7 +164,7 @@ export class ExpedienteDetailPage implements OnInit { this.router.navigate(['/home/gabinete-digital/expediente']); */ } - async distartExpedientModal(task: any){ + async distartExpedientModal2(task: any){ const modal = await this.modalController.create({ component: DiscartExpedientModalPage, componentProps: { @@ -201,4 +217,28 @@ export class ExpedienteDetailPage implements OnInit { } }); } + async distartExpedientModal(){ + console.log(this.fulltask); + const modal = await this.modalController.create({ + component: DiscartExpedientModalPage, + componentProps: { + serialNumber: this.fulltask.serialNumber, + folderId: this.fulltask.workflowInstanceDataFields.FolderID, + action: 'complete', + }, + cssClass: 'discart-expedient-modal', + backdropDismiss: false + }); + + await modal.present(); + modal.onDidDismiss().then(res=>{ + if(res['data']=='close'){ + this.close(); + /* console.log('2Expedient Discard closed2'); + this.close(); + this.openMenu(); */ + } + + }); + } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index f6e8608f5..2b379371f 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -67,7 +67,7 @@ export class ExpedientePage implements OnInit { console.log(this.profile); let classs; - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ classs = 'modal modal-desktop' } else { classs = 'gabinete-digital-mobile-modal-to-Desktop' @@ -84,7 +84,8 @@ export class ExpedientePage implements OnInit { }); await modal.present(); modal.onDidDismiss().then((res)=>{ - + console.log('refresh list'); + this.LoadList(); }); } diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 502a47b0c..fcda710bc 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -160,8 +160,10 @@ export class NewPublicationPage implements OnInit { } console.log('Create'); + console.log(this.pub); + console.log(this.publication); - this.publications.CreatePublication(this.folderId, this.publication); + /* this.publications.CreatePublication(this.folderId, this.publication); */ this.close(); } } 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 5475e1375..8f5e704f3 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 @@
- 2Editar Evento + Editar Evento
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 7ed94ea63..2e2927c37 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -91,7 +91,8 @@ export class ExpedientsPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then((res)=>{ - + console.log('refresh list'); + this.LoadList(); }); }