From 01530505c959ebfe9b9142c8c9a6de009efa9632 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 21 Jun 2024 16:38:19 +0100 Subject: [PATCH] ITOTEAM-527 permission and attachment count --- .../edit-profile/edit-profile.page.html | 10 ++--- .../modals/view-event/view-event.page.html | 2 +- src/app/modals/view-event/view-event.page.ts | 4 +- src/app/models/envarioment.ts | 1 - src/app/pages/agenda/agenda.page.html | 2 +- .../agenda/view-event/view-event.page.html | 6 +-- .../agenda/view-event/view-event.page.ts | 4 +- .../approve-event-modal.page.html | 2 +- .../approve-event-modal.page.ts | 42 ++++++++++--------- .../approve-event/approve-event.page.html | 6 +-- .../approve-event/approve-event.page.ts | 4 +- .../monitoring/opentelemetry/tracer.ts | 6 ++- .../approve-event/approve-event.page.html | 6 +-- .../approve-event/approve-event.page.ts | 2 + .../agenda/view-event/view-event.page.html | 6 +-- .../agenda/view-event/view-event.page.ts | 4 +- src/main.ts | 2 + version/git-version.ts | 13 +++--- 18 files changed, 69 insertions(+), 53 deletions(-) diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 03836e13a..956ad2df7 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -118,13 +118,13 @@ -
+ +
- + --> diff --git a/src/app/modals/view-event/view-event.page.html b/src/app/modals/view-event/view-event.page.html index 17b346bd7..3c3e17779 100644 --- a/src/app/modals/view-event/view-event.page.html +++ b/src/app/modals/view-event/view-event.page.html @@ -24,7 +24,7 @@

{{loadedEvent.Subject}}

- -
- @@ -71,7 +71,7 @@
-
Intervenientes
+
Intervenientes({{ loadedEvent.Attendees.length }})
@@ -90,7 +90,7 @@
-
Documentos Anexados
+
Documentos Anexados({{ loadedEvent.Attachments.length }})
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 921968af7..105e65a39 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -22,6 +22,7 @@ import { DateService } from 'src/app/services/date.service'; import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-view-event', @@ -75,7 +76,8 @@ export class ViewEventPage implements OnInit { private httpErrorHandle: HttpErrorHandle, private attachmentsService: AttachmentsService, private dateService: DateService, - private agendaDataRepository: AgendaDataRepositoryService + private agendaDataRepository: AgendaDataRepositoryService, + public p: PermissionService, ) { diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index a5565b59a..17b348596 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -10,7 +10,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index 9c5a8bac7..2fa16d4ad 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -13,6 +13,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { ThemeService } from 'src/app/services/theme.service' import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { TaskService } from 'src/app/services/task.service' +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-approve-event-modal', @@ -44,7 +45,8 @@ export class ApproveEventModalPage implements OnInit { private toastService: ToastService, public ThemeService: ThemeService, private httpErrorHandle: HttpErrorHandle, - public TaskService: TaskService + public TaskService: TaskService, + public p: PermissionService, ) { @@ -54,7 +56,7 @@ export class ApproveEventModalPage implements OnInit { return; } else{ - this.serialNumber = paramMap.get('serialNumber'); + this.serialNumber = paramMap.get('serialNumber'); } }); } @@ -80,12 +82,12 @@ export class ApproveEventModalPage implements OnInit { this.loadedEvent = res; this.today = new Date(res.workflowInstanceDataFields.StartDate); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); - + this.InstanceId = res.workflowInstanceDataFields.InstanceId this.getAttachments() }) - + } viewDocument(docId:string, applicationId:string){ @@ -95,7 +97,7 @@ export class ApproveEventModalPage implements OnInit { browser.show(); }); } - + async approveTask(serialNumber:string) { let body = { "serialNumber": serialNumber, "action": "Aprovar" } @@ -112,7 +114,7 @@ export class ApproveEventModalPage implements OnInit { } catch (error) { this.httpErrorHandle.httpStatusHandle(error) - } + } finally { loader.remove() } @@ -128,10 +130,10 @@ export class ApproveEventModalPage implements OnInit { async rejectTask(serialNumber:string) { let body = { "serialNumber": serialNumber, "action": "Rejeitar" } - + const loader = this.toastService.loading() - try { + try { await this.processes.PostTaskAction(body).toPromise() this.toastService._successMessage('Evento Eliminado!', () =>{ @@ -141,10 +143,10 @@ export class ApproveEventModalPage implements OnInit { if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { - + this.toastService._badRequest('Evento não rejeitado') } - } + } finally { loader.remove() } @@ -158,7 +160,7 @@ export class ApproveEventModalPage implements OnInit { } catch (error) { console.error('getAttachments', error) } - + } async openOptions(ev:any) { @@ -194,10 +196,10 @@ export class ApproveEventModalPage implements OnInit { modal.onDidDismiss().then( async (res) => { - if(res.data.option == 'save') { - - let body = { - "serialNumber": serialNumber, + if(res.data.option == 'save') { + + let body = { + "serialNumber": serialNumber, "action": "Emendar", "dataFields": { "ReviewUserComment": res.data, @@ -206,7 +208,7 @@ export class ApproveEventModalPage implements OnInit { // const loader = this.toastService.loading() - + try { await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); @@ -215,11 +217,11 @@ export class ApproveEventModalPage implements OnInit { if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { - + this.toastService._badRequest('Evento não enviado para revisão'); } this.router.navigate(['/home/gabinete-digital/event-list']); - } + } finally { loader.remove() } @@ -243,7 +245,7 @@ export class ApproveEventModalPage implements OnInit { // backdropDismiss: false }); - + modal.onDidDismiss().then(res => { this.getTask(); this.getAttachments(); @@ -254,7 +256,7 @@ export class ApproveEventModalPage implements OnInit { await modal.present(); - } + } } 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 7845f5c95..16f075f55 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 @@ -22,7 +22,7 @@
-
+
@@ -74,7 +74,7 @@
-
Intervenientes
+
Intervenientes({{loadedEvent.workflowInstanceDataFields.ParticipantsList.length}})
{{att.Name}}
@@ -90,7 +90,7 @@
-
Documentos Anexados
+
Documentos Anexados({{loadedAttachments.length}})
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 ac981dbbd..38d99d7bd 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 @@ -20,6 +20,7 @@ import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; import { EventsService } from 'src/app/services/events.service'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-approve-event', @@ -63,7 +64,8 @@ export class ApproveEventPage implements OnInit { public TaskService: TaskService, private attachmentsService: AttachmentsService, public AgendaDataRepositoryService: AgendaDataRepositoryService, - public EventsService: EventsService + public EventsService: EventsService, + public p: PermissionService, ) { this.activatedRoute.paramMap.subscribe(params => { // diff --git a/src/app/services/monitoring/opentelemetry/tracer.ts b/src/app/services/monitoring/opentelemetry/tracer.ts index 639efd96d..75aeaa349 100644 --- a/src/app/services/monitoring/opentelemetry/tracer.ts +++ b/src/app/services/monitoring/opentelemetry/tracer.ts @@ -4,7 +4,7 @@ import { Tracer, Span } from '@opentelemetry/sdk-trace-base'; import { OpentelemetryAgendaProvider, OpentelemetryInterceptorProvider, OpentelemetryNotificationProvider } from './opentelemetry'; import { Device, DeviceInfo } from '@capacitor/device'; import { SessionStore } from 'src/app/store/session.service'; - +import { environment } from 'src/environments/environment'; const tracerInstance = OpentelemetryAgendaProvider.getTracer('example-tracer-hole', '111', {}) const tracerNotificationInstance = OpentelemetryNotificationProvider.getTracer('example-tracer-hole', '111', {}) @@ -89,6 +89,8 @@ export function XTracerAsync({ name, bugPrint, module = null, autoFinish = true tracing.setAttribute('User', SessionStore?.user?.FullName); tracing.setAttribute('current.page', window.location.pathname); tracing.setAttribute('device.name', device?.name || device?.model) + tracing.setAttribute('commit.date', environment.version.lastCommitTime) + tracing.setAttribute('commit.branch', environment.version.branch) args.push(tracing) @@ -128,6 +130,8 @@ export function XTracer({ name, bugPrint, module, autoFinish = true }) { tracing.setAttribute('User', SessionStore?.user?.FullName); tracing.setAttribute('current.page', window.location.pathname); tracing.setAttribute('device.name', device?.name || device?.model) + tracing.setAttribute('commit.date', environment.version.lastCommitTime) + tracing.setAttribute('commit.branch', environment.version.branch) args.push(tracing) 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 f9f560d32..c9d68bbe4 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -26,7 +26,7 @@
-
+
-
Intervenientes
+
Intervenientes({{ loadedEvent.Attendees.length }})
@@ -115,7 +115,7 @@
-
Documentos Anexados
+
Documentos Anexados({{ loadedEvent.Attachments.length }})
  • diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index eec5e2630..92b5db25b 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -22,7 +22,7 @@ import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda import { SearchList_v2 } from 'src/app/models/search-document'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; - +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-view-event', templateUrl: './view-event.page.html', @@ -71,6 +71,8 @@ export class ViewEventPage implements OnInit { private router: Router, private dateService: DateService, private agendaDataRepository: AgendaDataRepositoryService, + public p: PermissionService, + ) { this.isEventEdited = false; this.loadedEvent = new Event(); diff --git a/src/main.ts b/src/main.ts index 6756849f7..38ffdde7a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -50,3 +50,5 @@ platformBrowserDynamic().bootstrapModule(AppModule) // Call the element loader after the platform has been bootstrapped defineCustomElements(window); + +console.log(environment.version.lastCommitTime) diff --git a/version/git-version.ts b/version/git-version.ts index 31ed2cd28..61f9dabb8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,11 @@ export let versionData = { - "shortSHA": "3b6da3d2c", - "SHA": "3b6da3d2c785fea9e8e15de78f983f40d4763da3", + "shortSHA": "4d400e1f8", + "SHA": "4d400e1f8b8b8354f5fa9e71986815e684de517c", "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jun 21 13:45:06 2024 +0100'", - "lastCommitMessage": "allow to alter agenda", - "lastCommitNumber": "5831", - "change": "diff --git a/.husky/pre-commit b/.husky/pre-commit\nindex 9df0546ba..2a1952310 100644\n--- a/.husky/pre-commit\n+++ b/.husky/pre-commit\n@@ -1,4 +1,4 @@\n-!/usr/bin/env sh\n- . \"$(dirname -- \"$0\")/_/husky.sh\"\n+#!/usr/bin/env sh\n+. \"$(dirname -- \"$0\")/_/husky.sh\"\n \n-npm run build:version && git add version/git-version.ts\n+node version/git-version.js", - "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 2 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .husky/commit-msg\n\tmodified: .husky/pre-commit\n\tnew file: gabinete.postman_collection.json\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/interceptors/metter.interceptor.ts\n\tmodified: src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: .husky/pre-commit\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Fri Jun 21 14:35:50 2024 +0100'", + "lastCommitMessage": "add husky", + "lastCommitNumber": "5832", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .husky/pre-commit\n\tmodified: version/git-version.js\n\tmodified: version/git-version.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file