peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix update

Browse Source
This commit is contained in:
Peter Maquiran
2024-09-13 09:31:55 +01:00
parent 2963fa752f
commit e6fa43524e
8 changed files with 221 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/module/agenda/data/repository/agenda-data-repository.service.ts
+1 -2
View File
@@ -42,7 +42,6 @@ export class AgendaDataRepositoryService {
private memoryStore: Store<CalendarState>,
private NativeNotificationService: NativeNotificationService,
public listBoxService: ListBoxService,
) { }
createOwnCalendar(): SharedCalendarListItemOutputDTO {
@@ -230,7 +229,7 @@ export class AgendaDataRepositoryService {
const data = { attendees: this.utils.attendeesAdded(attendeeData) }
APINODReturn(AttendeeInputDTOSchema, data, `PUT/Events/${id}/Attendee`, tracing)
APINODReturn(AttendeeInputDTOSchema, data.attendees, `PUT/Events/${id}/Attendee`, tracing)
return this.agendaDataService.addEventAttendee(id, { attendees: this.utils.attendeesAdded(attendeeData) });
}
src/app/pages/agenda/edit-event/edit-event.page.ts
+68 -29
View File
@@ -458,20 +458,22 @@ export class EditEventPage implements OnInit {
const calendar = await this.agendaDataRepository.getCalendarByUserId(this.selectedUserCalendar)
if(calendar.isOk()) {
const _value = this.agendaDataRepository.updateEvent(this.postEvent.EventId, this.postEvent, this.editAllEvent, calendar.value, tracing)//.subscribe((value) => {
const _value = await this.agendaDataRepository.updateEvent(this.postEvent.EventId, this.postEvent, this.editAllEvent, calendar.value, tracing)//.subscribe((value) => {
_value.then((value) => {
if(value.isOk()) {
console.log(value.value)
this.close();
this.httpErrorHandle.httpsSucessMessagge('Editar evento')
tracing.setAttribute('outcome', 'success')
} else {
tracing.setAttribute('outcome', 'failed')
console.log('edit event error: ', value.error)
}
})
// _value.then((value) => {
// if(value.isOk()) {
// console.log(value.value)
// this.close();
// this.httpErrorHandle.httpsSucessMessagge('Editar evento')
// tracing.setAttribute('outcome', 'success')
// } else {
// tracing.setAttribute('outcome', 'failed')
// console.log('edit event error: ', value.error)
// }
// })
console.log({serverCurrentList: this.serverCurrentList, Attendees: this.postEvent.Attendees})
@@ -479,42 +481,79 @@ export class EditEventPage implements OnInit {
console.log({insert, remove })
if(insert.length >= 1) {
this.agendaDataRepository.addEventAttendee(this.postEvent.EventId, insert, tracing).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.addEventAttendee(this.postEvent.EventId, insert, tracing).toPromise()
} catch (error) {
tracing.setAttribute('failed.attendees', 'true')
console.log('add Attendee error: ', error)
}));
}
// this.agendaDataRepository.addEventAttendee(this.postEvent.EventId, insert, tracing).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// tracing.setAttribute('failed.attendees', 'true')
// console.log('add Attendee error: ', error)
// }));
}
if(remove.length >= 1) {
this.agendaDataRepository.removeEventAttendee(this.postEvent.EventId, remove).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.removeEventAttendee(this.postEvent.EventId, remove).toPromise();
} catch (error) {
tracing.setAttribute('failed.attendees', 'true')
console.log('add Attendee error: ', error)
}));
}
// this.agendaDataRepository.removeEventAttendee(this.postEvent.EventId, remove).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// tracing.setAttribute('failed.attendees', 'true')
// console.log('add Attendee error: ', error)
// }));
}
if (this.addedAttachmentsList.length > 0) {
this.agendaDataRepository.addEventAttachment(this.postEvent.EventId, this.loadedEventAttachments, tracing).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.addEventAttachment(this.postEvent.EventId, this.loadedEventAttachments, tracing).toPromise();
} catch (error) {
console.log('add attachment error: ', error)
}));
}
// this.agendaDataRepository.addEventAttachment(this.postEvent.EventId, this.loadedEventAttachments, tracing).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// console.log('add attachment error: ', error)
// }));
}
if (this.deletedAttachmentsList.length > 0) {
this.agendaDataRepository.removeEventAttachment(this.postEvent.EventId, { attachments: this.deletedAttachmentsList }).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.removeEventAttachment(this.postEvent.EventId, { attachments: this.deletedAttachmentsList }).toPromise()
} catch (error) {
console.log('remove attachment error: ', error)
tracing.setAttribute('failed.remove.attachment', 'true')
}));
}
// this.agendaDataRepository.removeEventAttachment(this.postEvent.EventId, { attachments: this.deletedAttachmentsList }).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// console.log('remove attachment error: ', error)
// tracing.setAttribute('failed.remove.attachment', 'true')
// }));
}
if(_value.isOk()) {
console.log(_value.value)
this.close();
this.httpErrorHandle.httpsSucessMessagge('Editar evento')
tracing.setAttribute('outcome', 'success')
} else {
tracing.setAttribute('outcome', 'failed')
console.log('edit event error: ', _value.error)
}
src/app/services/permission.service.ts
+1 -1
View File
@@ -51,7 +51,7 @@ export class PermissionService {
let count = 0
for(let permission of this.SessionStore.user.UserPermissions ) {
for(let permission of this.SessionStore.user?.UserPermissions || [] ) {
if (args.includes(permission)) {
count++;
}
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+49 -17
View File
@@ -406,7 +406,7 @@ export class EditEventToApprovePage implements OnInit {
if(value.isOk()) {
console.log(value)
this.close()
tracing.setAttribute('outcome', 'success')
} else {
@@ -421,46 +421,78 @@ export class EditEventToApprovePage implements OnInit {
console.log({insert, remove})
if(insert.length >= 1) {
this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, insert, tracing).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, insert, tracing).toPromise()
} catch (error) {
console.log('add Attendee error: ', error)
tracing.setAttribute('failed.attendees', 'true')
}));
}
// this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, insert, tracing).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// console.log('add Attendee error: ', error)
// tracing.setAttribute('failed.attendees', 'true')
// }));
}
if(remove.length >= 1) {
this.agendaDataRepository.removeEventAttendee(this.eventProcess.serialNumber, remove).subscribe((value) => {
}, ((error) => {
try {
await this.agendaDataRepository.removeEventAttendee(this.eventProcess.serialNumber, remove).toPromise()
} catch (error) {
console.log('add Attendee error: ', error)
tracing.setAttribute('failed.attendees', 'true')
}));
}
// this.agendaDataRepository.removeEventAttendee(this.eventProcess.serialNumber, remove).subscribe((value) => {
// }, ((error) => {
// console.log('add Attendee error: ', error)
// tracing.setAttribute('failed.attendees', 'true')
// }));
}
if (this.addedAttachmentsList.length > 0) {
this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).toPromise();
} catch (error) {
this.showLoader = false
console.log('add attachment error: ', error)
tracing.setAttribute('failed.add.attachment', 'true')
}));
}
// this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// this.showLoader = false
// console.log('add attachment error: ', error)
// tracing.setAttribute('failed.add.attachment', 'true')
// }));
}
if (this.deletedAttachmentsList.length > 0) {
this.agendaDataRepository.removeEventAttachment(this.eventProcess.serialNumber, { attachments: this.deletedAttachmentsList }).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.removeEventAttachment(this.eventProcess.serialNumber, { attachments: this.deletedAttachmentsList }).toPromise()
} catch (error) {
this.showLoader = false
console.log('remove attachment error: ', error)
tracing.setAttribute('failed.remove.attachment', 'true')
}));
}
// this.agendaDataRepository.removeEventAttachment(this.eventProcess.serialNumber, { attachments: this.deletedAttachmentsList }).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// this.showLoader = false
// console.log('remove attachment error: ', error)
// tracing.setAttribute('failed.remove.attachment', 'true')
// }));
}
this.close()
this.httpErrorHandler.httpsSucessMessagge('Editar evento');
}
src/app/shared/agenda/edit-event/edit-event.page.ts
+47 -17
View File
@@ -429,7 +429,7 @@ export class EditEventPage implements OnInit {
this.clearPostEvent.emit();
this.deleteTemporaryData();
this.showLoader = false;
this.close();
tracing
} else {
console.log('edit event error: ', value.error)
@@ -442,45 +442,75 @@ export class EditEventPage implements OnInit {
console.log({ insert, remove });
if(insert.length >= 1) {
this.agendaDataRepository.addEventAttendee(this._postEvent.EventId, insert, tracing).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.addEventAttendee(this._postEvent.EventId, insert, tracing).toPromise()
} catch (error) {
tracing.setAttribute('failed.attendees', 'true')
console.log('add Attendee error: ', error)
}));
}
// let a = this.agendaDataRepository.addEventAttendee(this._postEvent.EventId, insert, tracing).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// tracing.setAttribute('failed.attendees', 'true')
// console.log('add Attendee error: ', error)
// }));
}
if(remove.length >= 1) {
this.agendaDataRepository.removeEventAttendee(this._postEvent.EventId, remove).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.removeEventAttendee(this._postEvent.EventId, remove).toPromise()
} catch (error) {
tracing.setAttribute('failed.attendees', 'true')
console.log('add Attendee error: ', error)
}));
}
// this.agendaDataRepository.removeEventAttendee(this._postEvent.EventId, remove).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// tracing.setAttribute('failed.attendees', 'true')
// console.log('add Attendee error: ', error)
// }));
}
if (this.addedAttachmentsList.length >= 1) {
this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this.loadedEventAttachments, tracing).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this.loadedEventAttachments, tracing).toPromise()
} catch (error) {
this.showLoader = false
tracing.setAttribute('failed.add.attachment', 'true')
console.log('add attachment error: ', error)
}));
}
// this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this.loadedEventAttachments, tracing).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// this.showLoader = false
// tracing.setAttribute('failed.add.attachment', 'true')
// console.log('add attachment error: ', error)
// }));
}
if (this.deletedAttachmentsList.length >= 1) {
this.agendaDataRepository.removeEventAttachment(this._postEvent.EventId, { attachments: this.deletedAttachmentsList }).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.removeEventAttachment(this._postEvent.EventId, { attachments: this.deletedAttachmentsList }).toPromise()
} catch (error) {
this.showLoader = false
console.log('remove attachment error: ', error)
}));
}
// this.agendaDataRepository.removeEventAttachment(this._postEvent.EventId, { attachments: this.deletedAttachmentsList }).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// this.showLoader = false
// console.log('remove attachment error: ', error)
// }));
}
this.close();
} else {
console.log('this.selectedUserCalendar', this.selectedUserCalendar)
console.log(calendar.error)
src/app/shared/agenda/new-event/new-event.page.html
+2 -2
View File
@@ -478,9 +478,9 @@
</div>
<div *ngIf="mostrarModal">
<!-- <div *ngIf="mostrarModal">
<app-attendee-modal [loggedAttendSon]="loggedAttendDad"></app-attendee-modal>
</div>
</div> -->
</ion-content>
<ion-footer class="ion-no-border">
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+47 -17
View File
@@ -332,7 +332,6 @@ export class EditEventToApproveComponent implements OnInit {
console.log(value)
this.httpErroHalde.httpsSucessMessagge('Editar evento')
window['approve-event-getTask']()
this.close();
tracing.setAttribute('outcome', 'success')
} else {
this.httpErroHalde.httpStatusHandle(value.error)
@@ -347,47 +346,78 @@ export class EditEventToApproveComponent implements OnInit {
if(insert.length >= 1) {
this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, insert, tracing).subscribe((value) => {
}, ((error) => {
try {
await this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, insert, tracing).toPromise()
} catch (error) {
console.log('add Attendee error: ', error)
tracing.setAttribute('failed.attendees', 'true')
}));
}
// this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, insert, tracing).subscribe((value) => {
// }, ((error) => {
// console.log('add Attendee error: ', error)
// tracing.setAttribute('failed.attendees', 'true')
// }));
}
if(remove.length >= 1) {
this.agendaDataRepository.removeEventAttendee(this.eventProcess.serialNumber, remove).subscribe((value) => {
}, ((error) => {
try {
await this.agendaDataRepository.removeEventAttendee(this.eventProcess.serialNumber, remove).toPromise()
} catch (error) {
console.log('add Attendee error: ', error)
tracing.setAttribute('failed.attendees', 'true')
}));
}
// this.agendaDataRepository.removeEventAttendee(this.eventProcess.serialNumber, remove).subscribe((value) => {
// }, ((error) => {
// console.log('add Attendee error: ', error)
// tracing.setAttribute('failed.attendees', 'true')
// }));
}
if (this.addedAttachmentsList.length > 0) {
this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).toPromise()
} catch (error) {
this.showLoader = false
console.log('add attachment error: ', error)
tracing.setAttribute('failed.add.attachment', 'true')
}));
}
// this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, this.loadedAttachments, tracing).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// this.showLoader = false
// console.log('add attachment error: ', error)
// tracing.setAttribute('failed.add.attachment', 'true')
// }));
}
if (this.deletedAttachmentsList.length > 0) {
this.agendaDataRepository.removeEventAttachment(this.eventProcess.serialNumber, { attachments: this.deletedAttachmentsList }).subscribe((value) => {
console.log(value)
}, ((error) => {
try {
await this.agendaDataRepository.removeEventAttachment(this.eventProcess.serialNumber, { attachments: this.deletedAttachmentsList }).toPromise()
} catch (error) {
this.showLoader = false
console.log('remove attachment error: ', error)
tracing.setAttribute('failed.remove.attachment', 'true')
}));
}
// this.agendaDataRepository.removeEventAttachment(this.eventProcess.serialNumber, { attachments: this.deletedAttachmentsList }).subscribe((value) => {
// console.log(value)
// }, ((error) => {
// this.showLoader = false
// console.log('remove attachment error: ', error)
// tracing.setAttribute('failed.remove.attachment', 'true')
// }));
}
this.close();
}
}
version/git-version.ts
+6 -6
View File
@@ -1,11 +1,11 @@
export let versionData = {
"shortSHA": "82d6a15d5",
"SHA": "82d6a15d5e574f5a0a2af6e285c8aa2f0f01198a",
"shortSHA": "2963fa752",
"SHA": "2963fa752fe45c9729c56eaf91f6856f60537445",
"branch": "feature/agenda-api-peter",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Sep 12 18:57:45 2024 +0100'",
"lastCommitMessage": "add new endpoint to save and get draft",
"lastCommitNumber": "5903",
"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 <file>...\" to unstage)\n\tmodified: doc/architecture.md\n\tnew file: doc/version.md\n\tmodified: version/git-version.ts",
"lastCommitTime": "'Thu Sep 12 19:40:57 2024 +0100'",
"lastCommitMessage": "start documenting version",
"lastCommitNumber": "5904",
"changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 4 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: src/app/module/agenda/data/repository/agenda-data-repository.service.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/services/permission.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/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts",
"changeAuthor": "peter.maquiran"
}