diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index f85d07182..92cabc772 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -9,6 +9,8 @@ import { Router, NavigationEnd } from '@angular/router'; import { AlertService } from 'src/app/services/alert.service'; import { NewEventPage } from './new-event/new-event.page'; import { ViewEventPage } from './view-event/view-event.page'; +import { momentG } from 'src/plugin/momentG' +import * as moment from 'moment'; // showTimeline import { setHours, setMinutes } from 'date-fns'; @@ -119,8 +121,9 @@ export class AgendaPage implements OnInit { private alertCrontroller: AlertService ) { - // timeline inicial date - this.timelineDate = formatDate(new Date,'dd MMMM yyyy', 'pt'); + + + this.timelineDate = momentG(new Date(),'dd MMMM yyyy'); function setCookie(cname, cvalue, exdays) { @@ -188,8 +191,8 @@ export class AgendaPage implements OnInit { onCurrentChanged = (ev: Date) => { // timeline change date - this.timelineDate = formatDate(ev,'dd MMMM yyyy', 'pt'); - this.viewDate = new Date(formatDate(ev,'yyyy-MM-dd', 'pt')); + this.timelineDate = momentG(new Date(ev),'dd MMMM yyyy'); + this.viewDate = new Date(ev); // calendar change date this.eventSelectedDate = new Date(ev); @@ -199,15 +202,15 @@ export class AgendaPage implements OnInit { // changedate dropDownChangeDate(id: string){ - const currentCandarDayYear = formatDate(this.eventSelectedDate,'dd -- yyyy', 'pt'); + const currentCandarDayYear = momentG(this.eventSelectedDate,'dd -- yyyy', 'pt'); const newDate = new Date(currentCandarDayYear.replace('--',id)); - this.onCurrentChanged(newDate); + this.onCurrentChanged(newDate); } - /* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => { + onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => { console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0)); this.eventSelectedDate2 = ev.selectedTime; - }; */ + }; onRangeChanged (ev: { startTime: Date, endTime: Date }) { this.rangeStartDate = ev.startTime; @@ -295,7 +298,8 @@ export class AgendaPage implements OnInit { // for timeline timelineIsCurrentDate(): Boolean { - return formatDate(new Date(),'dd MMMM yyyy', 'pt') == formatDate(this.eventSelectedDate,'dd MMMM yyyy', 'pt'); + return true; + //return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt'); } // for timeline @@ -362,11 +366,11 @@ export class AgendaPage implements OnInit { this.eventsList.forEach((element, eventIndex) => { // timeline start - const startHours = formatDate(new Date(element.StartDate), 'HH', 'pt'); - const EndHours = formatDate(new Date(element.EndDate), 'HH', 'pt'); + const startHours = momentG(new Date(element.StartDate), 'HH', 'pt'); + const EndHours = momentG(new Date(element.EndDate), 'HH', 'pt'); - const startHoursOtherFormate = formatDate(new Date(element.StartDate), 'HH:mm', 'pt'); - const EndHoursOtherFormate = formatDate(new Date(element.EndDate), 'HH:mm', 'pt'); + const startHoursOtherFormate = momentG(new Date(element.StartDate), 'HH:mm', 'pt'); + const EndHoursOtherFormate = momentG(new Date(element.EndDate), 'HH:mm', 'pt'); if (element.CalendarName == calendarName) { this.events.push({ @@ -412,7 +416,7 @@ export class AgendaPage implements OnInit { if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd', 'pt'), formatDate(endTime, 'yyyy-MM-dd', 'pt')).subscribe( + this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe( response => { this.eventsList = response; // loop @@ -443,7 +447,7 @@ export class AgendaPage implements OnInit { } else{ - this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe( + this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe( response => { this.eventsList = response; this.eventsList.forEach((element, eventIndex) => { @@ -476,7 +480,7 @@ export class AgendaPage implements OnInit { //Inicializa o array eventSource this.eventSource=[]; if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(response => { + this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(response => { this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); this.eventsListPessoal.forEach(element => { this.eventSource.push({ @@ -493,7 +497,7 @@ export class AgendaPage implements OnInit { }); } else{ - this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(response => { + this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(response => { this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); this.eventsListPessoal.forEach(element => { this.eventSource.push({ @@ -515,7 +519,7 @@ export class AgendaPage implements OnInit { //Inicializa o array eventSource this.eventSource=[]; if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => { + this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(res => { this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); this.eventsListOficial.forEach(element => { this.eventSource.push({ @@ -531,7 +535,7 @@ export class AgendaPage implements OnInit { this.showLoader = false; }); }else{ - this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => { + this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).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.ts b/src/app/pages/events/events.page.ts index acd02700d..dffad8767 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -26,6 +26,7 @@ import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente- export class EventsPage implements OnInit { /* Get current system date */ today = new Date(); + todayEnd = new Date(); months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; @@ -76,6 +77,8 @@ export class EventsPage implements OnInit { // list this.LoadList(); + + this.todayEnd = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 23, 59, 59); } @@ -141,7 +144,7 @@ export class EventsPage implements OnInit { { case "Combinada": if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => { this.eventsList = res; if(res.length > 0){ @@ -152,7 +155,7 @@ export class EventsPage implements OnInit { this.showLoader = false; }); }else{ - this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => { this.eventsList = res; console.log(this.eventsList); console.log(res) @@ -166,12 +169,12 @@ export class EventsPage implements OnInit { break; case "Pessoal": if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => { this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal"); this.showLoader = false; }); }else{ - this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => { this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal"); this.showLoader = false; }); @@ -180,12 +183,12 @@ export class EventsPage implements OnInit { break; case "Oficial": if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => { this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");; this.showLoader = false; }); }else{ - this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => { this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");; this.showLoader = false; }); @@ -276,7 +279,7 @@ export class EventsPage implements OnInit { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceFolio, "Senders": element.originator.email, - "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "CreateDate": new Date(element.taskStartDate).toLocaleString(), "DocumentURL": element.formURL, "Remetente": element.workflowInstanceDataFields.Remetente } diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index b5f157789..4c4adf444 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -12,10 +12,10 @@ import { NotificationsService } from 'src/app/services/notifications.service'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Token } from '../../models/token.model'; -import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core'; - -const { PushNotifications } = Plugins; - +/* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core'; + */ +/* const { PushNotifications } = Plugins; + */ @Component({ @@ -80,7 +80,7 @@ export class LoginPage implements OnInit { storeUserIdANdToken() { - (PushNotifications as any).requestPermission().then(result => { + /* (PushNotifications as any).requestPermission().then(result => { PushNotifications.register(); }); @@ -106,12 +106,12 @@ export class LoginPage implements OnInit { console.log('TOKEN USER MIDLE',data); })*/ - }); + /* }); }); }, - ); + ); */ }; diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 2a136769c..f0cf32a7c 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { ProcessesService } from 'src/app/services/processes.service'; -import { SearchService, } from "../../services/search.service"; +import { SearchService } from "../../services/search.service"; import { SearchCategory } from "src/app/models/search-category"; import { SearchDocument } from "src/app/models/search-document"; import { formatDate } from '@angular/common'; @@ -9,7 +9,7 @@ import { CloudData, CloudOptions } from 'angular-tag-cloud-module'; import { SenderPage } from 'src/app/pages/search/sender/sender.page'; import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-entity.page'; import WordCloud from 'src/plugin/wordcloud2.js' - +import { TopSearch } from 'src/app/models/top-search'; import { NgModel } from '@angular/forms'; @Component({ diff --git a/src/app/services/search.service.ts b/src/app/services/search.service.ts index f0f6de1cf..6393c1071 100644 --- a/src/app/services/search.service.ts +++ b/src/app/services/search.service.ts @@ -53,7 +53,7 @@ export class SearchService { return this.http.get(`${geturl}`, options); } - mostSeachWord(size:string): Observable{ + mostSeachWord(size:string):Observable{ // Endpoint const geturl = environment.apiURL + 'search/top'; // store params @@ -68,7 +68,7 @@ export class SearchService { params: params }; - return this.http.get(`${geturl}`, options); + return this.http.get(`${geturl}`, options); } } diff --git a/src/plugin/momentG.js b/src/plugin/momentG.js new file mode 100644 index 000000000..a33dab764 --- /dev/null +++ b/src/plugin/momentG.js @@ -0,0 +1,63 @@ + +var month = [ + 'Janeiro', + 'Fevereiro', + 'Março', + 'Abril', + 'Pode', + 'Junho', + 'Julho', + 'Agosto' +] + +var week = new Array('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'); + +class momentG { + +static get(date){ + if(typeof date.getMonth != 'function') { + console.log('not a function') + date = new Date(date) + } + + var e = { + day : week[date.getDay()], + dd : ((date.getDate()).toString()).padStart("2","0"), + mm : ((date.getMonth()+1).toString()).padStart("2","0"), + MMMM : month[date.getMonth()], + yyyy : date.getFullYear(), + hour : date.getHours(), + minu : ((date.getMinutes()).toString()).padStart("2","0"), + } + + return e; +} + + static run(date, formate , wgs){ + + if(typeof date.getMonth != 'function') { + date = new Date(date) + } + + 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"), + MMMM : month[date.getMonth()], + yyyy : date.getFullYear(), + } + + Object.keys(e).reverse().forEach(element => { + var reg = new RegExp(element,'g') + formate = formate.replace(reg,e[element]) + }); + + return formate + } +} + +module.exports = { + momentG: momentG.run +}; \ No newline at end of file