mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
merge branch
This commit is contained in:
@@ -588,6 +588,8 @@ export class AgendaPage implements OnInit {
|
||||
this.showLoader = true;
|
||||
const selectedCalendarIds = this.getSelectedAgendaCalendars();
|
||||
this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)
|
||||
// this.calendar.currentDate.setDate(1);
|
||||
|
||||
this.updateEventListBox()
|
||||
|
||||
try {
|
||||
|
||||
@@ -26,11 +26,7 @@ export class EmendMessageModalPage implements OnInit {
|
||||
}
|
||||
|
||||
save() {
|
||||
if(this.emendMessage != '') {
|
||||
this.modalController.dismiss({option:'save', note: this.emendMessage});
|
||||
} else {
|
||||
this.toastService._badRequest('É necessário adicionar uma nota');
|
||||
}
|
||||
this.modalController.dismiss({option:'save', note: this.emendMessage});
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -108,7 +108,6 @@ export class EventActionsPopoverPage implements OnInit {
|
||||
|
||||
|
||||
if(res.data.option == 'save') {
|
||||
if(res.data.note !== '') {
|
||||
let body = { "serialNumber": this.serialNumber,
|
||||
"action": "Emendar",
|
||||
"dataFields": {
|
||||
@@ -130,10 +129,6 @@ export class EventActionsPopoverPage implements OnInit {
|
||||
finally {
|
||||
loader.remove()
|
||||
}
|
||||
}
|
||||
else {
|
||||
this.toastService._badRequest('É necessário adicionar uma nota');
|
||||
}
|
||||
} else {
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user