diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index be3532bcf..f7cc9be84 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -174,46 +174,6 @@
- - - -
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 1e383dc80..dacec3bbb 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -452,10 +452,11 @@ export class AgendaPage implements OnInit { const endMinutes = new Date(endTime).getMinutes() const endHours = new Date(endTime).getHours() - if (startTimeSamp < endTimeSamp && (endMinutes + endHours) == 0) { + + if (startTimeSamp < endTimeSamp && (endMinutes + endHours) == 0) { endTime = new Date(endTime); endTime.setSeconds(endTime.getSeconds() - 1); - + console.log('new date ======================================================') return new Date(endTime) } else { return new Date(endTime) @@ -965,8 +966,6 @@ export class AgendaPage implements OnInit { startTime: startDate, endTime: event.end }) - - // console.log(event.end.toISOString() == endDate.toISOString()) const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0') @@ -984,6 +983,8 @@ export class AgendaPage implements OnInit { if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) { console.log(new Date(startDate).toLocaleDateString(),'!=' , new Date(endDate).toLocaleDateString()) + console.log(startDate.toISOString(),'iso' , endDate.toISOString() ) + console.log(new Date(startDate).toLocaleTimeString('pt'),'time' , new Date(endDate).toLocaleTimeString('pt')) // difference const diffTime = Math.abs(endDate - startDate); 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 57d93d479..2493ce2ff 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 @@ -129,7 +129,6 @@ export class EventActionsPopoverPage implements OnInit { try { this.processes.PostTaskAction(body).toPromise(); await this.toastService.successMessage('Processo rejeitado'); - this this.goBack(); } catch (error) { this.toastService.badRequest() diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index affa010da..1e8ea2100 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -143,7 +143,6 @@ export class EventsService { let prO = await this.getAllPrOficialEvents(startdate, enddate).toPromise(); let prP = await this.getAllPrPessoalEvents(startdate, enddate).toPromise(); const resFinal = prO.concat(prP); - console.log(resFinal); return new Promise(resolve =>{ return resolve(resFinal) }) @@ -181,7 +180,6 @@ export class EventsService { let prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise(); let prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise(); const resFinal = prO.concat(prP); - console.log(resFinal); return new Promise(resolve =>{ return resolve(resFinal) }); @@ -191,7 +189,6 @@ export class EventsService { let prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise(); let prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise(); const resFinal = prO.concat(prP); - console.log(resFinal); return new Promise(resolve =>{ return resolve(resFinal)