diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 77568cc28..a8b79d8d4 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -55,7 +55,8 @@ - - - - + + + + Hoje,   {{ timelineDate }} diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index b98f77cc5..a8e112119 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -416,6 +416,10 @@ td.monthview-primary-with-event { font-size: 15px; font-weight: bold; } + .collaps{ + font-size: 28px; + padding-right: 8px; + } .filter{ font-size: 15px; font-weight: normal; @@ -454,3 +458,7 @@ td.monthview-primary-with-event { } } + +.showcalendar{ + display: none; +} \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 321e7aa9d..dc863e80b 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -51,6 +51,10 @@ export class AgendaPage implements OnInit { this.view = view; } + // calendar + showCalendar: boolean; + + // timeline monthList = [ { name: 'Janeiro', id: 'Jan' }, { name: 'Fevereiro', id: 'Feb' }, @@ -66,13 +70,12 @@ export class AgendaPage implements OnInit { { name: 'Dezembro', id: 'Dec' } ] - showTimeline: boolean= false; - // for timeline events: CalendarEvent[] = []; // timeline filter timelineFilterState: string = 'Todos'; - showTimelineFilterState: boolean= false; + showTimelineFilterState: boolean; + showTimeline: boolean; /* List of events of our calendar */ eventSource = []; @@ -119,11 +122,9 @@ export class AgendaPage implements OnInit { private alertCrontroller: AlertService ) { - - + this.showCalendar = true; this.timelineDate = momentG(new Date(),'dd MMMM yyyy'); - function setCookie(cname, cvalue, exdays) { var d = new Date(); d.setTime(d.getTime() + (exdays*24*60*60*1000)); @@ -135,6 +136,8 @@ export class AgendaPage implements OnInit { setCookie('searchModalAPPType','0', 99999999); this.showLoader = false; + this.showTimelineFilterState = false; + this.showTimeline = false; } @@ -416,9 +419,9 @@ export class AgendaPage implements OnInit { //Inicializa o array eventSource this.eventSource=[]; - + if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe( + this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe( response => { this.eventsList = response; // loop @@ -449,7 +452,7 @@ export class AgendaPage implements OnInit { } else{ - this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe( + this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe( response => { this.eventsList = response; this.eventsList.forEach((element, eventIndex) => { @@ -482,7 +485,7 @@ export class AgendaPage implements OnInit { //Inicializa o array eventSource this.eventSource=[]; if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(response => { + this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); this.eventsListPessoal.forEach(element => { this.eventSource.push({ @@ -499,7 +502,7 @@ export class AgendaPage implements OnInit { }); } else{ - this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(response => { + this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); this.eventsListPessoal.forEach(element => { this.eventSource.push({ @@ -521,7 +524,7 @@ export class AgendaPage implements OnInit { //Inicializa o array eventSource this.eventSource=[]; if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(res => { + this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); this.eventsListOficial.forEach(element => { this.eventSource.push({ @@ -537,7 +540,7 @@ export class AgendaPage implements OnInit { this.showLoader = false; }); }else{ - this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(res => { + this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); this.eventsListOficial.forEach(element => { this.eventSource.push({ diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 7feea9a13..d0800f495 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -40,8 +40,10 @@ (click)="viewEventDetail(event.EventId)">
+
{{event.StartDate | date: 'hh:mm'}}
{{event.EndDate | date: 'hh:mm'}}
+
{{event.Location}}
@@ -62,7 +64,7 @@ -->
- +
@@ -80,8 +82,11 @@ >
-
{{task.CreateDate | date: 'd/M/yy'}}
-
{{task.CreateDate | date: 'hh:mm'}}
+ +
{{ momentGG(task.CreateDate,'dd/MM/yy')}}
+
{{ momentGG(task.CreateDate,'HH:mm')}}
+ +
{{ task.Folio }}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index dffad8767..4f394f569 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -4,7 +4,6 @@ import { Event } from '../../models/event.model'; import { EventsService } from 'src/app/services/events.service'; import { Router } from '@angular/router'; import { ActivatedRoute, NavigationEnd } from '@angular/router'; -import { formatDate } from '@angular/common'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; import { StorageService } from 'src/app/services/storage.service'; @@ -17,6 +16,7 @@ import { DailyWorkTask } from '../../models/dailyworktask.model'; import { ViewEventPage } from '../agenda/view-event/view-event.page'; import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page'; import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; +import { momentG } from 'src/plugin/momentG' @Component({ selector: 'app-events', @@ -72,7 +72,7 @@ export class EventsPage implements OnInit { // update hours and minutes setInterval(()=> { - this.currentHoursMinutes = formatDate(new Date(), 'HH:MM', 'pt'); + this.currentHoursMinutes = momentG(new Date(), 'HH:MM', 'pt'); }, 1000); // list @@ -127,6 +127,9 @@ export class EventsPage implements OnInit { } + momentGG(date, fomate, UTC ){ + return momentG(date, fomate, UTC); + } doRefresh(event) { this.RefreshEvents(); @@ -287,9 +290,8 @@ export class EventsPage implements OnInit { AllResult.push(task); }); - console.log(AllResult); - this.taskslist = this.sortArrayISODate(AllResult).reverse() + this.taskslist = AllResult.reverse() }); } diff --git a/src/plugin/momentG.js b/src/plugin/momentG.js index 0b9412dcd..f95b1f721 100644 --- a/src/plugin/momentG.js +++ b/src/plugin/momentG.js @@ -18,21 +18,29 @@ class momentG { if(typeof date.getMonth != 'function') { date = new Date(date) + if(! date instanceof Date){ + throw new UserException('Invalid date formate momentG'); + } } var e = { - mm : ((date.getMinutes()).toString()).padStart("2","0"), - dd : ((date.getDate()).toString()).padStart("2","0"), - MM : ((date.getMonth()+1).toString()).padStart("2","0"), - HH : date.getHours(), - EEEE : week[date.getDay()].padStart("2","0"), + d : (date.getDate()).toString() , + M : (date.getMonth()).toString() , + ss : (date.getSeconds().toString()).padStart(2,"0"), + mm : (date.getMinutes().toString()).padStart(2,"0") , + dd : (date.getDate()).toString().padStart(2,"0") , + MM : (date.getMonth()+1).toString().padStart(2,"0"), + HH : date.getHours().toString().padStart(2,"0"), + yy: date.getFullYear().toString().slice(2,4).padStart(2,"0") , + EEEE : week[date.getDay()].padStart(2,"0") , MMMM : month[date.getMonth()], - yyyy : date.getFullYear(), + yyyy : date.getFullYear() , } + Object.keys(e).reverse().forEach(element => { var reg = new RegExp(element,'g') - formate = formate.replace(reg,e[element]) + formate = formate.replace(reg,e[element] ) }); return formate