From b0583ce9e6c2d8f82d18804ae31e42739b0649d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 13 Jun 2024 12:14:48 +0100 Subject: [PATCH] edit recurrence event --- package-lock.json | 11 +++++ package.json | 1 + src/app/models/search-document.ts | 3 ++ .../agenda/edit-event/edit-event.page.ts | 22 +++++++-- src/app/pages/search/search.page.ts | 13 +++--- .../agenda/edit-event/edit-event.page.html | 2 +- .../agenda/edit-event/edit-event.page.ts | 45 ++++++++++++++++++- 7 files changed, 84 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index ee75b4756..f29dcf8ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -133,6 +133,7 @@ "crypto-js": "^4.0.0", "date-fns": "^2.17.0", "depd": "^2.0.0", + "dexie": "^4.0.7", "dompurify": "^3.0.6", "dotenv": "^10.0.0", "duration": "^0.2.2", @@ -14664,6 +14665,11 @@ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1094867.tgz", "integrity": "sha512-pmMDBKiRVjh0uKK6CT1WqZmM3hBVSgD+N2MrgyV1uNizAZMw4tx6i/RTc+/uCsKSCmg0xXx7arCP/OFcIwTsiQ==" }, + "node_modules/dexie": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/dexie/-/dexie-4.0.7.tgz", + "integrity": "sha512-M+Lo6rk4pekIfrc2T0o2tvVJwL6EAAM/B78DNfb8aaxFVoI1f8/rz5KTxuAnApkwqTSuxx7T5t0RKH7qprapGg==" + }, "node_modules/di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", @@ -54872,6 +54878,11 @@ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1094867.tgz", "integrity": "sha512-pmMDBKiRVjh0uKK6CT1WqZmM3hBVSgD+N2MrgyV1uNizAZMw4tx6i/RTc+/uCsKSCmg0xXx7arCP/OFcIwTsiQ==" }, + "dexie": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/dexie/-/dexie-4.0.7.tgz", + "integrity": "sha512-M+Lo6rk4pekIfrc2T0o2tvVJwL6EAAM/B78DNfb8aaxFVoI1f8/rz5KTxuAnApkwqTSuxx7T5t0RKH7qprapGg==" + }, "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", diff --git a/package.json b/package.json index c06f607aa..fa6405ffc 100644 --- a/package.json +++ b/package.json @@ -149,6 +149,7 @@ "crypto-js": "^4.0.0", "date-fns": "^2.17.0", "depd": "^2.0.0", + "dexie": "^4.0.7", "dompurify": "^3.0.6", "dotenv": "^10.0.0", "duration": "^0.2.2", diff --git a/src/app/models/search-document.ts b/src/app/models/search-document.ts index b081717db..9efbc437d 100644 --- a/src/app/models/search-document.ts +++ b/src/app/models/search-document.ts @@ -8,6 +8,9 @@ export class SearchList { Id: string; appName?: string; ApplicationName: string; + docId: number; + subject: string; + applicationId: number } export class SearchList_v2 { diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index ec53d00a6..b4471631b 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -170,12 +170,12 @@ export class EditEventPage implements OnInit { } ngOnInit() { - if(!this.postEvent.IsRecurring) { + if (!this.postEvent.IsRecurring) { this.postEvent.EventRecurrence.frequency = 'never' } else { this.postEvent.EventRecurrence.frequency = this.utils.recurenceTypeSeleted(this.postEvent.EventRecurrence.frequency) } - + console.log(this.postEvent?.Attachments) console.log(this.loadedEventAttachments) window.onresize = (event) => { @@ -377,11 +377,25 @@ export class EditEventPage implements OnInit { this.alertController.create({ header: 'Editar evento?', message: 'Este evento tem recorrência, deseja editar a Sequência de eventos?', + inputs: [ + { + name: 'confirm', + type: 'checkbox', + label: '', + value: 'confirm', + checked: false + } + ], buttons: [ { text: 'Sim', - handler: () => { - this.save_v2(true) + handler: (data) => { + // Check if the checkbox is checked + if (data.includes('confirm')) { + this.save_v2(true) + } else { + this.save_v2(false) + } } }, { diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index ea3bed550..fa2cf30b5 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -165,9 +165,10 @@ export class SearchPage implements OnInit { } async view(item: SearchList) { + console.log('doc item',item) - const ApplicationType = item.ApplicationType.toString() - const Id = item.Id + const ApplicationType = item.applicationId.toString() + const Id = item.docId if (ApplicationType == '8') { @@ -178,12 +179,12 @@ export class SearchPage implements OnInit { componentProps: { trustedUrl: '', file: { - title: item.Assunto, + title: item.subject, url: '', title_link: '', }, applicationId: ApplicationType, - docId: item.Id, + docId: item.docId, }, cssClass: 'modal-width-100-width-background modal' }); @@ -196,12 +197,12 @@ export class SearchPage implements OnInit { componentProps: { trustedUrl: '', file: { - title: item.Assunto, + title: item.subject, url: '', title_link: '', }, applicationId: ApplicationType, - docId: item.Id, + docId: item.docId, }, cssClass: 'modal-width-100-width-background modal' }); diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index f858150cc..7b683cafd 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -428,7 +428,7 @@ - diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 3ed1c662e..865cc250d 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -353,7 +353,48 @@ export class EditEventPage implements OnInit { } - async save_v2() { + validationEditAllEvent() { + if (this.postEvent.IsRecurring) { + this.alertController.create({ + header: 'Editar evento?', + message: 'Este evento tem recorrência, deseja editar a Sequência de eventos?', + inputs: [ + { + name: 'confirm', + type: 'checkbox', + label: '', + value: 'confirm', + checked: false + } + ], + buttons: [ + { + text: 'Sim', + handler: (data) => { + // Check if the checkbox is checked + if (data.includes('confirm')) { + this.save_v2(true) + } else { + this.save_v2(false) + } + } + }, + { + text: 'Não', + handler: () => { + this.save_v2(false) + } + } + ] + }).then(res => { + res.present(); + }); + } else { + this.save_v2(false) + } + } + + async save_v2(editAllEvent) { this.injectValidation() this.runValidation() @@ -366,7 +407,7 @@ export class EditEventPage implements OnInit { try { - this.agendaDataRepository.updateEvent(this._postEvent.EventId, this._postEvent,false).subscribe((value) => { + this.agendaDataRepository.updateEvent(this._postEvent.EventId, this._postEvent,editAllEvent).subscribe((value) => { console.log(value) }, ((error) => { console.log('edit event error: ', error)