diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index 50340c2f8..5dce1dd93 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -90,9 +90,7 @@
-
-

{{item.dateInit}}

-
+

Possivelmente esta tarefa não foi criada ou já foi executada. Deseja dar a notificação como lida?

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 2ed233311..999230d1d 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -87,16 +87,15 @@
-
+
Documentos Anexados
-

{{ attachment.Assunto }}

-

{{ attachment.DocNumber }}

-

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

+

{{attachment.Description}}

+

{{attachment.Stakeholders}}{{ attachment.CreateDate | date: 'dd-MM-yyyy HH:mm' }}

@@ -104,7 +103,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss index f6196d326..468f00472 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss @@ -228,3 +228,41 @@ ion-menu{ width: 25%; } } + + + +.bottom-content{ + margin: 0 auto; + + .bottom-content h3{ + font-size: rem(16); + margin: 0 0 0 10px; + } + .attach-document{ + font-size: rem(15); + color: var(--title-text-color); + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: rem(35); + float: left; + } + .attach-title-item{ + width: 100%; + font-size: rem(15); + color:#0d89d1 !important; + } + /* SPAN */ + .span-left{ + float: left; + font-size: rem(15); + } + .span-right{ + text-align: right; + float: right; + font-size: rem(13); + } +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 6607ba2fc..47000994b 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -14,7 +14,8 @@ import { ThemeService } from 'src/app/services/theme.service' import { OfflineManagerService } from 'src/app/services/offline-manager.service'; import { RouteService } from 'src/app/services/route.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; -import { TaskService } from 'src/app/services/task.service' +import { TaskService } from 'src/app/services/task.service'; +import { AttachmentsService } from 'src/app/services/attachments.service'; @Component({ @@ -56,7 +57,8 @@ export class ApproveEventPage implements OnInit { public ThemeService: ThemeService, private offlineManager: OfflineManagerService, private httpErrorHandle: HttpErrorHandle, - public TaskService: TaskService + public TaskService: TaskService, + private attachmentsService: AttachmentsService, ) { this.activatedRoute.paramMap.subscribe(params => { // @@ -129,6 +131,7 @@ export class ApproveEventPage implements OnInit { this.processes.GetTask(this.serialNumber).subscribe(async res => { this.loadedEvent = res + this.getAttachments(); this.addProcessToDB(this.loadedEvent) try { @@ -375,4 +378,15 @@ export class ApproveEventPage implements OnInit { await modal.present(); } + async getAttachments() { + + try { + this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.loadedEvent.workflowInstanceDataFields.InstanceId).toPromise(); + } catch (error) { + console.error('getAttchaments',error) + } + + + } + } diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 47e54b1f9..d5ee21d9c 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -46,7 +46,7 @@ {{loadedEvent.workflowInstanceDataFields.Location}} - {{loadedEvent.workflowInstanceDataFields.Agenda}} + {{loadedEvent.workflowInstanceDataFields.Agenda}} {{loadedEvent.workflowInstanceDataFields.Agenda}} @@ -98,22 +98,21 @@
-
+
Documentos Anexados
-

{{attachment.Assunto}}

-

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd-MM-yyyy HH:mm' }}

+

{{attachment.Description}}

+

{{attachment.Stakeholders}}{{ attachment.CreateDate | date: 'dd-MM-yyyy HH:mm' }}

-
diff --git a/version/git-version.ts b/version/git-version.ts index 479da6b7c..eba9024fd 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "8091af78e", - "SHA": "8091af78eb185085bf2f2205bd97e0358a857f31", - "branch": "developer-catch-merge", + "shortSHA": "df8fbc373", + "SHA": "df8fbc373ea871a70c5cddc0341f210a82a3fc56", + "branch": "developer", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Jul 31 16:39:35 2023 +0100'", - "lastCommitMessage": "bugs fixed", - "lastCommitNumber": "5127", + "lastCommitTime": "'Mon Jul 31 16:41:50 2023 +0100'", + "lastCommitMessage": "pull made", + "lastCommitNumber": "5131", "change": "", - "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 6 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts", + "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 7 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html", "changeAuthor": "eudes.inacio" } \ No newline at end of file