mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
merge
This commit is contained in:
@@ -18,7 +18,6 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
|
||||
import { NavigationExtras, Router } from '@angular/router';
|
||||
import { EventController } from 'src/app/controller/event'
|
||||
import { DateService } from 'src/app/services/date.service';
|
||||
import { EventList } from 'src/app/models/agenda/AgendaEventList';
|
||||
import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
|
||||
|
||||
@Component({
|
||||
@@ -68,7 +67,7 @@ export class ViewEventPage implements OnInit {
|
||||
private httpErrorHandle: HttpErrorHandle,
|
||||
private router: Router,
|
||||
private dateService: DateService,
|
||||
public AgendaDataRepositoryService: AgendaDataRepositoryService
|
||||
private agendaDataRepository: AgendaDataRepositoryService
|
||||
) {
|
||||
this.isEventEdited = false;
|
||||
this.loadedEvent = new Event();
|
||||
@@ -130,7 +129,7 @@ export class ViewEventPage implements OnInit {
|
||||
|
||||
try {
|
||||
|
||||
let res = await this.AgendaDataRepositoryService.getEventById(this.eventId).toPromise()
|
||||
let res = await this.agendaDataRepository.getEventById(this.eventId).toPromise()
|
||||
console.log('Loaded Event', res)
|
||||
res = this.dateService.fixDate(res as any)
|
||||
this.loadedEvent = res as any;
|
||||
@@ -156,7 +155,7 @@ export class ViewEventPage implements OnInit {
|
||||
{
|
||||
text: 'Sim',
|
||||
handler: () => {
|
||||
this.deleteEvent();
|
||||
this.deleteEvent_v2();
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -170,6 +169,10 @@ export class ViewEventPage implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
deleteEvent_v2() {
|
||||
this.agendaDataRepository.deleteEvent(this.loadedEvent.EventId)
|
||||
}
|
||||
|
||||
async deleteEvent() {
|
||||
|
||||
if (this.loadedEvent.IsRecurring) {
|
||||
|
||||
Reference in New Issue
Block a user