From ebfc658cd6bf1a9724d24bfb847d21d69cd60c19 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 11:38:36 +0100 Subject: [PATCH 1/9] fix edit publication desktop --- src/app/pages/publications/publications.page.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 0399a0937..55dbb5e7f 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -87,7 +87,8 @@ class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1" [folderId]="folderId" [publicationType]="publicationType" - + [publicationId]="publicationId" + (closeDesktopComponent)="closeDesktopComponent($event)" (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)" (goBackToViewPublications)="goBackToViewPublications($event)" From 0a753bd38c17078d871bc4c4ce42a309e1ae549d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 11:55:44 +0100 Subject: [PATCH 2/9] save --- .../publication-detail.page.ts | 2 ++ .../pages/publications/publications.page.ts | 4 ++- .../new-publication/new-publication.page.ts | 32 ++++++++++++++++++- src/global.scss | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index 52aace972..6e564f5d5 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -85,6 +85,8 @@ export class PublicationDetailPage implements OnInit { } async editPost(publicationType:any) { + console.log('HERE'); + console.log(this.publication); const modal = await this.modalController.create({ component: NewPublicationPage, diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index c565c6809..bba22464f 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -10,6 +10,7 @@ import { ViewPublicationsPage } from './view-publications/view-publications.page import { Animation, AnimationController } from '@ionic/angular'; import { LoadingController } from '@ionic/angular'; import { LoadingService } from 'src/app/services/loading.service'; +import { Publication } from 'src/app/models/publication'; @Component({ @@ -20,6 +21,7 @@ import { LoadingService } from 'src/app/services/loading.service'; export class PublicationsPage implements OnInit { showLoader: boolean; publicationFolder: PublicationFolder; + publication: Publication; publicationFolderList: PublicationFolder[]; publicationsEventFolderList: PublicationFolder[]; @@ -45,7 +47,7 @@ export class PublicationsPage implements OnInit { publicationId: string; // from publication details - publication: object; + //publication: object; constructor( private router: Router, 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 4ff61af78..6aebde7d5 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -39,6 +39,7 @@ export class NewPublicationPage implements OnInit { @Input() publicationType: string; @Input() folderId: string; + @Input() publicationId:string; @Output() closeDesktopComponent = new EventEmitter(); @Output() openPublicationDetails = new EventEmitter(); @Output() goBackToViewPublications = new EventEmitter(); @@ -59,10 +60,38 @@ export class NewPublicationPage implements OnInit { } ngOnInit() { + if(this.publicationType == '3'){ + this.getPublicationDetail(); + } this.setTitle(); this.clear(); this.takePicture(); } + + getPublicationDetail(){ + this.showLoader = true; + console.log(this.publicationId); + /* console.log(this.folderId); */ + this.publications.GetPublicationById(this.publicationId).subscribe(res=>{ + console.log(res); + /* this.publication = res; */ + this.publication = { + DateIndex: res.DateIndex, + DocumentId: res.DocumentId, + ProcessId:res.ProcessId, + Title:res.Title, + Message: res.Message, + DatePublication: res.DatePublication, + FileBase64: "data:image/jpg;base64," + res.FileBase64, + OriginalFileName: res.OriginalFileName, + FileExtension: 'jpeg', + } + this.pub = this.publication; + this.showLoader = false; + }); + } + + takePicture(){ const options: CameraOptions = { quality: 90, @@ -189,7 +218,8 @@ export class NewPublicationPage implements OnInit { if(this.publicationType == '2'){ this.goBackToViewPublications.emit(); } else { - this.goBacktoPublicationDetails.emit(); + this.goBackToViewPublications.emit(); + //this.goBacktoPublicationDetails.emit(); } } diff --git a/src/global.scss b/src/global.scss index cbbd385c4..c0cc6c0bf 100644 --- a/src/global.scss +++ b/src/global.scss @@ -571,6 +571,6 @@ border-top: 1px solid #d8d8d8; } .title-icon{ font-size: 40px !important; - color: #0782c9; + color: #42b9fe; overflow: auto; } \ No newline at end of file From ed811ceddf4e7adbce33a150e9c04a043297dc4c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 12:04:22 +0100 Subject: [PATCH 3/9] save --- src/app/pages/publications/publications.page.html | 2 +- src/global.scss | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 55dbb5e7f..06f318e5c 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -22,7 +22,7 @@
- +
diff --git a/src/global.scss b/src/global.scss index c0cc6c0bf..981f4f95c 100644 --- a/src/global.scss +++ b/src/global.scss @@ -573,4 +573,7 @@ border-top: 1px solid #d8d8d8; font-size: 40px !important; color: #42b9fe; overflow: auto; + } + ion-icon { + pointer-events: none; } \ No newline at end of file From e154918a41f193b4020cdf328dea067fcd58571d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 13:28:56 +0100 Subject: [PATCH 4/9] save --- .../expedient-task-modal/expedient-task-modal.page.html | 8 ++++---- .../expedient-task-modal/expedient-task-modal.page.ts | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 1f3293adf..39c79687e 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -61,8 +61,8 @@ -
- +
+
@@ -82,8 +82,8 @@ -
- +
+
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 145756f0a..e6972b373 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 @@ -167,6 +167,8 @@ export class ExpedientTaskModalPage implements OnInit { } async addParticipants(){ + console.log('HERES'); + this.adding = "intervenient"; this.contacts = this.taskParticipants; From 720a94a6f752e48a866b935cba82cd765a932d10 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 15:09:01 +0100 Subject: [PATCH 5/9] fix attendees dispach --- .../shared/agenda/approve-event/approve-event.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bcc6ea3d2..dd888936f 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -66,8 +66,8 @@
-
-
+
+
Intervenientes
From 027f5dab6239991b872c5eb6aa3336a80b8cb82e Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 15:09:15 +0100 Subject: [PATCH 6/9] save --- .../expedient-task-modal.page.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 49915e848..1c4888f1d 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 @@ -111,7 +111,14 @@ export class ExpedientTaskModalPage implements OnInit { } saveTask(){ - + let attendees = this.taskParticipants.concat(this.taskParticipantsCc); + + attendees = attendees.map(function(val) { + return { + UserEmail: val.EmailAddress, + UserType: val.IsRequired?"T": "CC" + }; + }) switch (this.taskType) { case '0': @@ -121,7 +128,7 @@ export class ExpedientTaskModalPage implements OnInit { Priority: this.postData.Priority, UserEmail: this.user, SubjectTypeId: this.postData.SubjectTypeId, - UsersSelected: this.participants, + UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } console.log(this.postData); @@ -134,7 +141,7 @@ export class ExpedientTaskModalPage implements OnInit { Priority: this.postData.Priority, UserEmail: this.user, SubjectTypeId: this.postData.SubjectTypeId, - UsersSelected: this.participants, + UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } this.processes.postParecer(this.postData); @@ -146,7 +153,7 @@ export class ExpedientTaskModalPage implements OnInit { Priority: this.postData.Priority, UserEmail: this.user, SubjectTypeId: this.postData.SubjectTypeId, - UsersSelected: this.participants, + UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } this.processes.postDeferimento(this.postData); From 1cba74e5215abad1cfb68b800bc7175b38a098b4 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 15:24:21 +0100 Subject: [PATCH 7/9] save --- .../approve-event/approve-event.component.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 dd888936f..9633ccee6 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -66,14 +66,12 @@
-
-
+
+
Intervenientes
- - -

{{loadedEvent.workflowInstanceDataFields.Participants}}

- - +
+ {{att.Name}} +
Detalhes
From a715dc81c9cbb42b1ccf3438d542c6d52983ecd0 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 15:29:26 +0100 Subject: [PATCH 8/9] save --- .../expedient-task-modal/expedient-task-modal.page.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 1c4888f1d..d44bf0b12 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 @@ -116,7 +116,7 @@ export class ExpedientTaskModalPage implements OnInit { attendees = attendees.map(function(val) { return { UserEmail: val.EmailAddress, - UserType: val.IsRequired?"T": "CC" + UserType: val.IsRequired?"I": "CC" }; }) switch (this.taskType) @@ -144,6 +144,7 @@ export class ExpedientTaskModalPage implements OnInit { UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } + console.log(this.postData); this.processes.postParecer(this.postData); break; case '2': @@ -156,6 +157,7 @@ export class ExpedientTaskModalPage implements OnInit { UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } + console.log(this.postData); this.processes.postDeferimento(this.postData); break; } From db26d7ceb050dc80f4940474cc4ac67d87b6557a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 8 Apr 2021 15:50:04 +0100 Subject: [PATCH 9/9] save --- .../expedient-task-modal.page.ts | 91 ++++++++++--------- 1 file changed, 48 insertions(+), 43 deletions(-) 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 d44bf0b12..a7709d154 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 @@ -13,6 +13,7 @@ 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'; +import { AlertService } from 'src/app/services/alert.service'; @Component({ selector: 'app-expedient-task-modal', @@ -58,6 +59,7 @@ export class ExpedientTaskModalPage implements OnInit { private processes:ProcessesService, private attachmentsService: AttachmentsService, private navParams: NavParams, + private alertController: AlertService, private authService: AuthService) { this.user = environment.defaultuser +'@'+ environment.domain; this.task = this.navParams.get('task'); @@ -112,58 +114,61 @@ export class ExpedientTaskModalPage implements OnInit { } saveTask(){ let attendees = this.taskParticipants.concat(this.taskParticipantsCc); - attendees = attendees.map(function(val) { return { UserEmail: val.EmailAddress, UserType: val.IsRequired?"I": "CC" }; }) - switch (this.taskType) - { - case '0': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - } - console.log(this.postData); - this.processes.postDespatcho(this.postData); - break; - case '1': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - } - console.log(this.postData); - this.processes.postParecer(this.postData); - break; - case '2': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - } - console.log(this.postData); - this.processes.postDeferimento(this.postData); - break; - } + if(this.taskParticipants.length > 0){ + switch (this.taskType){ + case '0': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + SubjectTypeId: this.postData.SubjectTypeId, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log(this.postData); + this.processes.postDespatcho(this.postData); + break; + case '1': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + SubjectTypeId: this.postData.SubjectTypeId, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log(this.postData); + this.processes.postParecer(this.postData); + break; + case '2': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + SubjectTypeId: this.postData.SubjectTypeId, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + } + console.log(this.postData); + this.processes.postDeferimento(this.postData); + break; + } this.modalController.dismiss('openDiscart'); /* this.distartExpedientModal(); this.close(); */ + } + else{ + this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes."); + } } getAttachments(){