From 539afac69dfd02a937e03724f184dfdda819a6af Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 14:51:33 +0100 Subject: [PATCH 01/15] save --- .../discart-expedient-modal.page.ts | 6 +- .../expedient-task-modal.page.ts | 63 ++++++++++++++++--- .../expediente-detail.page.ts | 44 ++++++++++++- .../expediente/expediente.page.ts | 5 +- .../expedients/expedients.page.ts | 3 +- 5 files changed, 105 insertions(+), 16 deletions(-) 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/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(); }); } From da4e84eeab2ff052c7dfa3f928e05f9dda300b66 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 15:07:29 +0100 Subject: [PATCH 02/15] save --- .../publications/new-publication/new-publication.page.ts | 4 +++- src/app/shared/agenda/edit-event/edit-event.component.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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
From 42a6e9797f407027ac7f1d2eebe7db38f724638f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 15:08:17 +0100 Subject: [PATCH 03/15] save --- src/app/pages/agenda/edit-event/edit-event.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7e3974aae..817692062 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
From affbc090d87c6df23ac31fdd19dc3e786ddcf391 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 6 Apr 2021 16:25:20 +0100 Subject: [PATCH 04/15] Add attendees --- .../agenda/edit-event/edit-event.page.html | 6 ++-- .../agenda/edit-event/edit-event.page.ts | 14 ++++------ .../events/attendees/attendees.page.html | 7 ++--- .../pages/events/attendees/attendees.page.ts | 28 ++++++++++++++----- src/app/pages/events/events.page.ts | 1 + src/global.scss | 2 +- 6 files changed, 35 insertions(+), 23 deletions(-) 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 7e3974aae..d04394759 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -1,7 +1,7 @@
-
+
@@ -14,7 +14,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
- +
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 fcda710bc..502a47b0c 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -160,10 +160,8 @@ 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/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 5baf710a6..b2c6e612f 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -86,7 +86,7 @@ class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1" [folderId]="folderId" [publicationType]="publicationType" - [publication]="publication" + (closeDesktopComponent)="closeDesktopComponent($event)" (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)" (goBackToViewPublications)="goBackToViewPublications($event)" diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index b9ae10405..6aedeab1d 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -13,7 +13,7 @@
- +
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index c547eb9b5..a61fefa58 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -24,7 +24,8 @@ import { LoadingService } from 'src/app/services/loading.service'; }) export class NewPublicationPage implements OnInit { showLoader: boolean; - pub: Publication = new Publication(); + pub: Publication; + pubTitle:string; image: Image = new Image(); publicationTitle:string; @@ -34,8 +35,8 @@ export class NewPublicationPage implements OnInit { photo: SafeResourceUrl; + publication: Publication; - @Input() publication: Publication; @Input() publicationType: string; @Input() folderId: string; @Output() closeDesktopComponent = new EventEmitter(); @@ -55,9 +56,16 @@ export class NewPublicationPage implements OnInit { private camera: Camera, ) { this.publicationTitle = 'Nova Publicação'; + this.pubTitle = 'new'; + this.pub = new Publication(); + this.pub.Title = 'title'; } ngOnInit() { + console.log(this.publication); + console.log(this.folderId); + console.log(this.publicationType); + this.setTitle(); this.clear(); this.takePicture(); @@ -104,7 +112,9 @@ export class NewPublicationPage implements OnInit { }); } - async save(){ +save(){ + console.log(this.publicationType); + if(this.publicationType == '3'){ if(this.capturedImage != ''){ @@ -138,7 +148,7 @@ export class NewPublicationPage implements OnInit { } console.log('Edit - keep image'); console.log(this.publication); - this.publications.UpdatePublication(this.publication.ProcessId, this.publication); + /* this.publications.UpdatePublication(this.publication.ProcessId, this.publication); */ this.goBack(); } } @@ -148,18 +158,19 @@ export class NewPublicationPage implements OnInit { DateIndex: new Date(), DocumentId:null, ProcessId:this.folderId, - Title: this.pub.Title, + Title: this.pubTitle, Message: this.pub.Message, DatePublication: new Date(), OriginalFileName: this.capturedImageTitle, FileBase64: this.capturedImage, FileExtension: 'jpeg', } - + console.log(this.pubTitle); + console.log(this.pub); console.log(this.publication); - this.publications.CreatePublication(this.folderId, this.publication); + //this.publications.CreatePublication(this.folderId, this.publication); - this.closeDesktopComponent.emit(); + //this.closeDesktopComponent.emit(); } } From 769687e70890a055a371fcb567a9f4a2ba0a9f01 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 17:39:27 +0100 Subject: [PATCH 06/15] add publication --- .../new-publication/new-publication.page.html | 14 +++++----- .../new-publication/new-publication.page.ts | 28 ++++++------------- src/global.scss | 2 +- src/style/main.scss | 2 +- 4 files changed, 18 insertions(+), 28 deletions(-) diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index 6aedeab1d..a0fb02be2 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -13,7 +13,7 @@
- +
@@ -31,7 +31,7 @@
Fotografia Anexada
-
+
image
@@ -45,26 +45,26 @@
-
+ - + -
+
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index a61fefa58..5b816f0a6 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -24,8 +24,7 @@ import { LoadingService } from 'src/app/services/loading.service'; }) export class NewPublicationPage implements OnInit { showLoader: boolean; - pub: Publication; - pubTitle:string; + pub: Publication = new Publication(); image: Image = new Image(); publicationTitle:string; @@ -35,7 +34,8 @@ export class NewPublicationPage implements OnInit { photo: SafeResourceUrl; - publication: Publication; + + publication: Publication = new Publication(); @Input() publicationType: string; @Input() folderId: string; @@ -56,16 +56,9 @@ export class NewPublicationPage implements OnInit { private camera: Camera, ) { this.publicationTitle = 'Nova Publicação'; - this.pubTitle = 'new'; - this.pub = new Publication(); - this.pub.Title = 'title'; } ngOnInit() { - console.log(this.publication); - console.log(this.folderId); - console.log(this.publicationType); - this.setTitle(); this.clear(); this.takePicture(); @@ -112,9 +105,7 @@ export class NewPublicationPage implements OnInit { }); } -save(){ - console.log(this.publicationType); - + async save(){ if(this.publicationType == '3'){ if(this.capturedImage != ''){ @@ -148,7 +139,7 @@ save(){ } console.log('Edit - keep image'); console.log(this.publication); - /* this.publications.UpdatePublication(this.publication.ProcessId, this.publication); */ + this.publications.UpdatePublication(this.publication.ProcessId, this.publication); this.goBack(); } } @@ -158,19 +149,18 @@ save(){ DateIndex: new Date(), DocumentId:null, ProcessId:this.folderId, - Title: this.pubTitle, + Title: this.pub.Title, Message: this.pub.Message, DatePublication: new Date(), OriginalFileName: this.capturedImageTitle, FileBase64: this.capturedImage, FileExtension: 'jpeg', } - console.log(this.pubTitle); - console.log(this.pub); + console.log(this.publication); - //this.publications.CreatePublication(this.folderId, this.publication); + this.publications.CreatePublication(this.folderId, this.publication); - //this.closeDesktopComponent.emit(); + this.closeDesktopComponent.emit(); } } diff --git a/src/global.scss b/src/global.scss index 4a1266b0e..4321ddc74 100644 --- a/src/global.scss +++ b/src/global.scss @@ -330,7 +330,7 @@ border-top: 1px solid #d8d8d8; } .showAsideOptions{ - @media only screen and (min-width: 801px) { + @media only screen and (min-width: 800px) { .div-icon{ display: none; } diff --git a/src/style/main.scss b/src/style/main.scss index a54c700b9..ad7f2f7f9 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -65,7 +65,7 @@ .flex-0{ flex: 0;} -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 800px) { // overflow .v-application-md .overflow-md-auto {overflow: auto !important;} .overflow-md-hidden {overflow: hidden !important;} From d3fa720cb37b26e0d4c73c4675a70b5c871a1671 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 17:41:19 +0100 Subject: [PATCH 07/15] save --- .../shared/publication/new-publication/new-publication.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 5b816f0a6..4ff61af78 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -160,7 +160,7 @@ export class NewPublicationPage implements OnInit { console.log(this.publication); this.publications.CreatePublication(this.folderId, this.publication); - this.closeDesktopComponent.emit(); + this.goBackToViewPublications.emit(); } } From 019f500d0ce11539f6e8cf8bc8ef49afd89868b8 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 17:52:27 +0100 Subject: [PATCH 08/15] save --- .../publications/new-publication/new-publication.page.html | 2 +- .../publication-detail/publication-detail.page.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index e62a3e09e..5df45dc6c 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -23,7 +23,7 @@
- +
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts index 0e9f1f426..4988706e5 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts @@ -86,7 +86,7 @@ export class PublicationDetailPage implements OnInit { console.log(res); }); - this.closeDesktopComponent.emit(); + this.goBackToViewPublications.emit(); } async editPost(publicationType:any) { From 9c20fac14d96dbb385ca600781b06ce75704c21f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 17:57:41 +0100 Subject: [PATCH 09/15] save --- .../shared/agenda/approve-event/approve-event.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html index 8f9862116..1cfdc6590 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -66,7 +66,7 @@
-
+
Intervenientes
From 6ef21f8699b8d311cacef3c88b4d938151e99f77 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 6 Apr 2021 18:06:37 +0100 Subject: [PATCH 10/15] save --- .../shared/agenda/approve-event/approve-event.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html index 1cfdc6590..5b868267f 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -66,13 +66,15 @@
-
+
+
Intervenientes

{{loadedEvent.workflowInstanceDataFields.Participants}}

 +
Detalhes

From 53e3908fffca57dc033a535b42ee57fbfe270449 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 09:32:17 +0100 Subject: [PATCH 11/15] save --- src/app/pages/events/events.page.ts | 3 +- .../discart-expedient-modal.page.html | 2 +- .../book-meeting-modal.page.html | 10 +++--- src/app/pages/search/search.page.html | 6 ++-- src/app/pages/search/search.page.ts | 31 ++++++++++++++++++- .../approve-event.component.html | 14 ++++----- 6 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 8359be511..3f3d5c133 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -95,6 +95,7 @@ export class EventsPage implements OnInit { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { this.RefreshEvents(); + this.LoadList(); } }); /* this.storageService.get(AuthConnstants.PROFILE).then(res=>{ @@ -106,8 +107,8 @@ export class EventsPage implements OnInit { doRefresh(event) { this.RefreshEvents(); - event.target.complete(); this.LoadList(); + event.target.complete(); } onSegmentChange(){ diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html index 0ca41e81b..05fe484c6 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html @@ -1,7 +1,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index bd36576bc..a37497c9f 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -6,8 +6,8 @@
--> - -
+ +
@@ -150,12 +150,12 @@
-
+
-
- +
+
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 2955e13d4..ad083af1b 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -105,7 +105,7 @@
-

Assunto mais pesquisado

+

Assuntos mais recebidos

@@ -121,8 +121,8 @@

Order por: - Mais Recente - Mais Antigo + Mais Recentes + Mais Antigos

diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index b394d7491..6b200e616 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -9,6 +9,7 @@ import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-e import WordCloud from 'src/plugin/wordcloud2.js'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page'; +import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; @Component({ selector: 'app-search', templateUrl: './search.page.html', @@ -421,6 +422,8 @@ export class SearchPage implements OnInit { async viewDetail(id:any) { + console.log(id); + if(window.location.pathname == '/home/agenda'){ @@ -430,7 +433,6 @@ export class SearchPage implements OnInit { eventId: id }, cssClass: 'modal modal-desktop', - backdropDismiss: false }); await modal.present(); modal.onDidDismiss().then((res)=>{}); @@ -439,6 +441,10 @@ export class SearchPage implements OnInit { this.viewPublicationDetail(id); } + else if(window.location.pathname == '/home/gabinete-digital'){ + console.log('OPEN DOC'); + + } } @@ -456,5 +462,28 @@ export class SearchPage implements OnInit { modal.onDidDismiss().then(()=>{}); } + + async viewExpedientDetail(serialNumber:any) { + + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'gabinete-digital-mobile-modal-to-Desktop' + } + + const modal = await this.modalController.create({ + component: ExpedienteDetailPage, + componentProps:{ + serialNumber: serialNumber, + profile: 'mdgpr', + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + }); + } } diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html index 5b868267f..bcc6ea3d2 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -68,13 +68,13 @@
-
Intervenientes
- - -

{{loadedEvent.workflowInstanceDataFields.Participants}}

- - -
+
Intervenientes
+ + +

{{loadedEvent.workflowInstanceDataFields.Participants}}

+ + +
Detalhes

From 7e0b4bea7ee22fef4a46c43306504a34623c74cb Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 09:37:19 +0100 Subject: [PATCH 12/15] save --- src/app/pages/gabinete-digital/expediente/expediente.page.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 2b379371f..1363d9c4d 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -40,8 +40,9 @@ export class ExpedientePage implements OnInit { LoadList(){ this.processes.GetTasksList("Expediente", false).subscribe(result => { + let tasksListReverse = result.reverse(); this.taskslist = new Array(); - result.forEach(element => { + tasksListReverse.forEach(element => { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, From 370dce7bf9c7dc3195c32a45e0223ca3318f8a87 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 10:08:52 +0100 Subject: [PATCH 13/15] save --- src/app/pages/publications/new-action/new-action.page.html | 1 - .../pages/publications/new-publication/new-publication.page.html | 1 - 2 files changed, 2 deletions(-) diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index 1fb650f72..5a8ff7e6d 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -15,7 +15,6 @@ -
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 5df45dc6c..2afd16c36 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -15,7 +15,6 @@ -
From 59f768488fe38a6bc6b57552da5e79db5614d1ce Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 10:20:01 +0100 Subject: [PATCH 14/15] save --- .../publication-detail/publication-detail.page.ts | 3 +-- .../publications/view-publications/view-publications.page.ts | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 418dfb844..e2e7785d3 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -22,7 +22,7 @@ export class PublicationDetailPage implements OnInit { private publications:PublicationsService, ) { this.publicationId = this.navParams.get('publicationId'); - /* this.folderId = this.navParams.get('folderIdId'); */ + this.folderId = this.navParams.get('folderId'); this.publication = { DateIndex: null, DocumentId: '', @@ -78,7 +78,6 @@ export class PublicationDetailPage implements OnInit { deletePost(){ this.publications.DeletePublication(this.folderId, this.publicationId).then(res =>{ console.log(res); - }); this.close(); } diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index ceae35606..64e32b201 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -107,13 +107,14 @@ export class ViewPublicationsPage implements OnInit { component: PublicationDetailPage, componentProps:{ publicationId: publicationId, + folderId: this.folderId, }, cssClass: 'publication-detail', backdropDismiss: false }); await modal.present(); modal.onDidDismiss().then(()=>{ - this.doRefresh(event); + this.getPublications(); }); } From d4bb2a0a99b2d378e00f7bfef943f734a233a475 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 10:38:53 +0100 Subject: [PATCH 15/15] fix discart method --- .../discart-expedient-modal/discart-expedient-modal.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7acf42a74..65f0ace3e 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,7 +49,7 @@ 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('close'); }