diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts
index c049f3cf0..f0ec93920 100644
--- a/src/app/modals/delegar/delegar.page.ts
+++ b/src/app/modals/delegar/delegar.page.ts
@@ -167,6 +167,7 @@ export class DelegarPage implements OnInit {
modal.onDidDismiss().then((data) => {
if(data) {
+ this.taskParticipants = []
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
@@ -179,6 +180,7 @@ export class DelegarPage implements OnInit {
await modal.present();
} else {
+ this.taskParticipants = []
this.showAttendees=true
}
}
@@ -234,6 +236,7 @@ export class DelegarPage implements OnInit {
dynamicSetIntervenient({taskParticipants}){
this.taskParticipants = taskParticipants;
+ this.showAttendees = false
}
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index dbf904ee8..8d85fb566 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -45,7 +45,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { CalendarState, selectEventSource } from 'src/app/services/Repositorys/Agenda/agenda-memory-source.service';
import { Store } from '@ngrx/store';
import { NotificationRepositoryService } from 'src/app/module/notification/data/notification-repository.service';
-import { Unsubscribable } from '../../../../android/app/build/intermediates/assets/debug/public/assets/dexie/dist/dexie';
+// import { Unsubscribable } from '../../../../android/app/build/intermediates/assets/debug/public/assets/dexie/dist/dexie';
@Component({
selector: 'app-agenda',
templateUrl: './agenda.page.html',
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
index d75d2401e..1a72816bd 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
@@ -8,11 +8,9 @@
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index da81cc4dd..fd87574e3 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -150,10 +150,10 @@ export class EventActionsPopoverPage implements OnInit {
let body = { "serialNumber": this.serialNumber, "action": "Descartar" }
const loader = this.toastService.loading();
- const result = await this.agendaDataRepository.eventToaprovalStatus(this.serialNumber, 'Declined', '')//.subscribe((value) => {
+ const result = await this.agendaDataRepository.deleteEvent(this.serialNumber, true)//.subscribe((value) => {
if(result.isOk()) {
this.TaskService.loadEventosParaAprovacao()
- this.httpErrorHandle.httpsSucessMessagge('Rejeitar')
+ this.httpErrorHandle.httpsSucessMessagge('delete event')
this.goBack();
} else {
console.log('reject event error: ', result.error)
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 16f075f55..ae92e5fe8 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
@@ -106,12 +106,10 @@
@@ -126,7 +124,7 @@
-
+
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 73e4d4573..6988ab6ad 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
@@ -146,7 +146,6 @@ export class ApproveEventPage implements OnInit {
const result = await this.AgendaDataRepositoryService.approveEvent(serialNumber)//.subscribe(async (value) => {
if(result.isOk()) {
- await this.processes.PostTaskAction(body).toPromise()
this.goBack();
this.httpErrorHandle.httpsSucessMessagge('Evento aprovação')
this.TaskService.loadEventosParaAprovacao();
@@ -221,9 +220,9 @@ export class ApproveEventPage implements OnInit {
const loader = this.toastService.loading()
/* await this.processes.PostTaskAction(body).toPromise(); */
- const result = await this.AgendaDataRepositoryService.eventToaprovalStatus(serialNumber, 'Declined', '')//.subscribe((value) => {
+ const result = await this.AgendaDataRepositoryService.deleteEvent(serialNumber, true)//.subscribe((value) => {
if(result.isOk()) {
- this.httpErrorHandle.httpsSucessMessagge('Rejeitar')
+ this.httpErrorHandle.httpsSucessMessagge('delete event')
this.TaskService.loadEventosParaAprovacao();
this.goBack();
} else {
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 c9d68bbe4..05fa4aae7 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -116,12 +116,13 @@
@@ -131,9 +132,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index f7f0fe0ad..edefbb159 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -114,6 +114,7 @@ export class ApproveEventPage implements OnInit {
}
async approveTask(serialNumber: string) {
+ alert("lll")
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
const loader = this.toastService.loading()
@@ -143,10 +144,10 @@ export class ApproveEventPage implements OnInit {
const loader = this.toastService.loading()
- const result = await this.agendaDataRepository.eventToaprovalStatus(serialNumber, 'Declined', "")//.subscribe((value) => {
+ const result = await this.agendaDataRepository.deleteEvent(serialNumber, true)//.subscribe((value) => {
if(result.isOk()) {
- this.httpErroHandle.httpsSucessMessagge('Rejeitar');
+ this.httpErroHandle.httpsSucessMessagge('delete event');
this.TaskService.loadEventosParaAprovacao();
this.close()
diff --git a/version/git-version.ts b/version/git-version.ts
index fec859cec..eb6fb64ca 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,11 +1,11 @@
export let versionData = {
- "shortSHA": "5cf405404",
- "SHA": "5cf40540473f6ccafd3bf2dee2f49fb3f4baa9bd",
+ "shortSHA": "186324832",
+ "SHA": "186324832df0e3b475f7913fa33911eebe6d5448",
"branch": "feature/agenda-api-peter",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Thu Jul 11 12:47:36 2024 +0100'",
- "lastCommitMessage": "fix button size",
- "lastCommitNumber": "5862",
- "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 1 commit.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: version/git-version.ts",
+ "lastCommitTime": "'Thu Jul 11 12:52:35 2024 +0100'",
+ "lastCommitMessage": "fix attendees type",
+ "lastCommitNumber": "5863",
+ "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 ...\" to unstage)\n\tmodified: src/app/modals/delegar/delegar.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\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.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file