mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
ITOTEAM-525 no mobile ao adicionar attachments aparece um sem título
This commit is contained in:
@@ -37,6 +37,8 @@ export class MetricsInterceptor implements HttpInterceptor {
|
|||||||
if (event instanceof HttpResponse) {
|
if (event instanceof HttpResponse) {
|
||||||
// Capture the status code and check protocol
|
// Capture the status code and check protocol
|
||||||
if (req.method !== 'GET' && !req.urlWithParams.includes('metrics')) {
|
if (req.method !== 'GET' && !req.urlWithParams.includes('metrics')) {
|
||||||
|
|
||||||
|
console.log('response', event.body)
|
||||||
const path = req.urlWithParams;
|
const path = req.urlWithParams;
|
||||||
const url = new URL(path);
|
const url = new URL(path);
|
||||||
if (window.location.protocol !== 'https:') {
|
if (window.location.protocol !== 'https:') {
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ export class ViewEventPage implements OnInit {
|
|||||||
ev.target.complete();
|
ev.target.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
@XTracerAsync({name:'ViewEventPage/loadEvent', bugPrint: true})
|
@XTracerAsync({name:'mobile/loadEvent', bugPrint: true})
|
||||||
async loadEvent(tracing?: TracingType) {
|
async loadEvent(tracing?: TracingType) {
|
||||||
const loader = this.toastService.loading();
|
const loader = this.toastService.loading();
|
||||||
|
|
||||||
|
|||||||
@@ -678,7 +678,7 @@ export class AgendaPage implements OnInit {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@XTracerAsync({name:'AgendaPage/loadRangeEventRun', bugPrint: true})
|
@XTracerAsync({name:'AgendaPage/loadRange', bugPrint: true})
|
||||||
async loadRangeEventRun(startTime: Date, endTime: Date, tracing?: TracingType) {
|
async loadRangeEventRun(startTime: Date, endTime: Date, tracing?: TracingType) {
|
||||||
|
|
||||||
tracing.addEvent('load range start')
|
tracing.addEvent('load range start')
|
||||||
|
|||||||
@@ -459,7 +459,7 @@ export class EditEventPage implements OnInit {
|
|||||||
await this.saveDocument()
|
await this.saveDocument()
|
||||||
|
|
||||||
if (this.addedAttachmentsList.length > 0) {
|
if (this.addedAttachmentsList.length > 0) {
|
||||||
this.agendaDataRepository.addEventAttachment(this.postEvent.EventId, this.loadedEventAttachments).subscribe((value) => {
|
this.agendaDataRepository.addEventAttachment(this.postEvent.EventId, this.loadedEventAttachments, tracing).subscribe((value) => {
|
||||||
console.log(value)
|
console.log(value)
|
||||||
}, ((error) => {
|
}, ((error) => {
|
||||||
console.log('add attachment error: ', error)
|
console.log('add attachment error: ', error)
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ export class EventListPage implements OnInit {
|
|||||||
this.LoadToApproveEvents();
|
this.LoadToApproveEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
@XTracerAsync({name:'EventListPage/LoadToApproveEvents', bugPrint: true})
|
@XTracerAsync({name:'EventListPage/LoadToApprove', bugPrint: true})
|
||||||
async LoadToApproveEvents(tracing?: TracingType) {
|
async LoadToApproveEvents(tracing?: TracingType) {
|
||||||
console.log('aprove event')
|
console.log('aprove event')
|
||||||
this.showLoader = true;
|
this.showLoader = true;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import { SharedCalendarListDetectChanges } from './async/change/shareCalendarCha
|
|||||||
import { SharedCalendarListItemOutputDTO } from './model/sharedCalendarOutputDTO';
|
import { SharedCalendarListItemOutputDTO } from './model/sharedCalendarOutputDTO';
|
||||||
import { EventInputDTOSchema } from './agendaDataModels';
|
import { EventInputDTOSchema } from './agendaDataModels';
|
||||||
import { EventUpdateInputDTOSchema } from './model/eventUpdateInputDtO';
|
import { EventUpdateInputDTOSchema } from './model/eventUpdateInputDtO';
|
||||||
|
import { AttachInputDTOSchema } from './model/addAttachmentDTOInput';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
@@ -221,16 +222,22 @@ export class AgendaDataRepositoryService {
|
|||||||
return this.agendaDataService.updateEvent(eventId, eventInput)
|
return this.agendaDataService.updateEvent(eventId, eventInput)
|
||||||
}
|
}
|
||||||
|
|
||||||
addEventAttendee(id, attendeeData,) {
|
addEventAttendee(id, attendeeData) {
|
||||||
console.log(attendeeData)
|
console.log(attendeeData)
|
||||||
console.log(this.utils.attendeesEdit(attendeeData))
|
console.log(this.utils.attendeesEdit(attendeeData))
|
||||||
|
|
||||||
|
|
||||||
return this.agendaDataService.addEventAttendee(id, { attendees: this.utils.attendeesAdded(attendeeData) });
|
return this.agendaDataService.addEventAttendee(id, { attendees: this.utils.attendeesAdded(attendeeData) });
|
||||||
}
|
}
|
||||||
|
|
||||||
addEventAttachment(id, attachmentData) {
|
addEventAttachment(id, attachmentData, tracing: TracingType) {
|
||||||
console.log(attachmentData)
|
console.log(attachmentData)
|
||||||
console.log('post attachment', this.utils.documentAdded(attachmentData))
|
|
||||||
return this.agendaDataService.addEventAttachment(id, { attachments: this.utils.documentAdded(attachmentData) });
|
const attachments = { attachments: this.utils.documentAdded(attachmentData) }
|
||||||
|
console.log('post attachment', attachments)
|
||||||
|
|
||||||
|
APINODReturn(AttachInputDTOSchema, attachments, `POST/${id}/Attendee`, tracing)
|
||||||
|
return this.agendaDataService.addEventAttachment(id, attachments);
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteEvent(eventId,deleteAll) {
|
deleteEvent(eventId,deleteAll) {
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
import { z } from 'zod';
|
||||||
|
|
||||||
|
export const AttachInputDTOSchema = z.object({
|
||||||
|
attachments: z.array(z.object({
|
||||||
|
docId: z.any(),
|
||||||
|
sourceName: z.any(),
|
||||||
|
description: z.any(),
|
||||||
|
applicationId: z.any(),
|
||||||
|
}))
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
export type AttachInputDTO = z.infer<typeof AttachInputDTOSchema>
|
||||||
@@ -84,7 +84,7 @@ export class Utils {
|
|||||||
documents.forEach(element => {
|
documents.forEach(element => {
|
||||||
let object = {
|
let object = {
|
||||||
docId: element.docId || element.DocId,
|
docId: element.docId || element.DocId,
|
||||||
sourceName: element.subject || element.sourceNames || element.Description,
|
sourceName: element.subject || element.sourceNames || element.Description || element.SourceNames,
|
||||||
description: "",
|
description: "",
|
||||||
applicationId: element.applicationId || element.ApplicationId
|
applicationId: element.applicationId || element.ApplicationId
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -313,7 +313,7 @@ export class TaskService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@XTracerAsync({name:'taskService/loadEventosParaAprovacao', bugPrint: true})
|
@XTracerAsync({name:'taskService/loadEventParaAprovacao', bugPrint: true})
|
||||||
async loadEventosParaAprovacao(tracing?: TracingType) {
|
async loadEventosParaAprovacao(tracing?: TracingType) {
|
||||||
this.showLoaderNum++
|
this.showLoaderNum++
|
||||||
console.log('PR')
|
console.log('PR')
|
||||||
|
|||||||
@@ -392,7 +392,7 @@ export class EditEventToApprovePage implements OnInit {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
if (this.addedAttachmentsList.length > 0) {
|
if (this.addedAttachmentsList.length > 0) {
|
||||||
this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments).subscribe((value) => {
|
this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).subscribe((value) => {
|
||||||
console.log(value)
|
console.log(value)
|
||||||
}, ((error) => {
|
}, ((error) => {
|
||||||
this.showLoader = false
|
this.showLoader = false
|
||||||
|
|||||||
@@ -457,7 +457,7 @@ export class EditEventPage implements OnInit {
|
|||||||
|
|
||||||
|
|
||||||
if (this.addedAttachmentsList.length > 0) {
|
if (this.addedAttachmentsList.length > 0) {
|
||||||
this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this.loadedEventAttachments).subscribe((value) => {
|
this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this.loadedEventAttachments, tracing).subscribe((value) => {
|
||||||
console.log(value)
|
console.log(value)
|
||||||
}, ((error) => {
|
}, ((error) => {
|
||||||
this.showLoader = false
|
this.showLoader = false
|
||||||
|
|||||||
@@ -334,7 +334,7 @@ export class EditEventToApproveComponent implements OnInit {
|
|||||||
|
|
||||||
|
|
||||||
if (this.addedAttachmentsList.length > 0) {
|
if (this.addedAttachmentsList.length > 0) {
|
||||||
this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments).subscribe((value) => {
|
this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).subscribe((value) => {
|
||||||
console.log(value)
|
console.log(value)
|
||||||
}, ((error) => {
|
}, ((error) => {
|
||||||
this.showLoader = false
|
this.showLoader = false
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "0c14b9be9",
|
"shortSHA": "536548af0",
|
||||||
"SHA": "0c14b9be979f22b13e627b978767be4a173d9768",
|
"SHA": "536548af0c7696fdc7384057cf856163459fe374",
|
||||||
"branch": "feature/agenda-api-peter",
|
"branch": "feature/agenda-api-peter",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Fri Jun 21 23:33:29 2024 +0100'",
|
"lastCommitTime": "'Sat Jun 22 13:28:14 2024 +0100'",
|
||||||
"lastCommitMessage": "fix ownertype and category type",
|
"lastCommitMessage": "ITOTEAM-525 send the rigth category and ownertype",
|
||||||
"lastCommitNumber": "5836",
|
"lastCommitNumber": "5837",
|
||||||
"changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 7 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: angular.json\n\tmodified: src/app/interceptors/metter.interceptor.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts\n\tmodified: src/app/services/Repositorys/Agenda/model/eventInputDTO.ts\n\tmodified: src/app/services/Repositorys/Agenda/model/eventListDTOOutput.ts\n\tmodified: src/app/services/Repositorys/Agenda/model/eventToApproveListOutputDTO.ts\n\tnew file: src/app/services/Repositorys/Agenda/model/eventUpdateInputDtO.ts\n\tmodified: src/app/services/monitoring/opentelemetry/tracer.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: version/git-version.ts",
|
"changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/interceptors/metter.interceptor.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts\n\tnew file: src/app/services/Repositorys/Agenda/model/addAttachmentDTOInput.ts\n\tmodified: src/app/services/Repositorys/Agenda/utils.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user