diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 5a026a463..da437bc96 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -55,21 +55,6 @@ export class AgendaPage implements OnInit { showCalendar: boolean; calendarHeight: string; - // timeline - monthList = [ - { name: 'Janeiro', id: 'Jan' }, - { name: 'Fevereiro', id: 'Feb' }, - { name: 'Março', id: 'Mar' }, - { name: 'Abril', id: 'Apr' }, - { name: 'Maio', id: 'May' }, - { name: 'Junho', id: 'June' }, - { name: 'Julho', id: 'July' }, - { name: 'Agosto', id: 'Aug' }, - { name: 'Setembro', id: 'Sept' }, - { name: 'Outubro', id: 'Oct' }, - { name: 'Novembro', id: 'Nov' }, - { name: 'Dezembro', id: 'Dec' } - ] // for timeline events: CalendarEvent[] = []; @@ -285,7 +270,11 @@ export class AgendaPage implements OnInit { const scrollContainer = shadowRoot.querySelector('main'); try { - scrollContainer.scrollTop = timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60); + scrollContainer.scroll({ + top: timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60), + left: 0, + behavior: 'smooth' + }) } catch (error) { // } @@ -415,6 +404,9 @@ export class AgendaPage implements OnInit { if(this.profile == "mdgpr"){ 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.eventSource=[]; + this.eventsList = response; // loop this.eventsList.forEach((element, eventIndex) => { @@ -446,6 +438,9 @@ export class AgendaPage implements OnInit { else{ 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.eventSource=[]; + this.eventsList = response; this.eventsList.forEach((element, eventIndex) => { this.eventSource.push({ @@ -478,23 +473,29 @@ export class AgendaPage implements OnInit { this.eventSource=[]; if(this.profile == "mdgpr"){ 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({ - title: element.Subject, - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element - }); + + this.eventSource=[]; + this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); + this.eventsListPessoal.forEach(element => { + + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element }); - this.myCal.update(); - this.myCal.loadEvents(); - this.showLoader = false; }); + this.myCal.update(); + this.myCal.loadEvents(); + this.showLoader = false; + }); + } else{ 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.eventSource=[]; + this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); this.eventsListPessoal.forEach(element => { this.eventSource.push({ @@ -517,7 +518,8 @@ export class AgendaPage implements OnInit { this.eventSource=[]; if(this.profile == "mdgpr"){ 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.eventSource=[]; + this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); this.eventsListOficial.forEach(element => { this.eventSource.push({ title: element.Subject, @@ -533,6 +535,7 @@ export class AgendaPage implements OnInit { }); }else{ 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.eventSource=[]; this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); this.eventsListOficial.forEach(element => { this.eventSource.push({ diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 908397907..03f5ea318 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -119,7 +119,12 @@
{{ searchDocument.Assunto}}
diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 5b92e2f08..0006581c0 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -199,7 +199,6 @@ ion-slide{ } .most-searched-word-container{ - width: 441px; height: 400px; } } diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 2371f1f30..bf01c1476 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -48,6 +48,8 @@ export class SearchPage implements OnInit { } + loadedAttachments:any; + list = [] constructor(private modalController: ModalController, @@ -61,8 +63,13 @@ export class SearchPage implements OnInit { } wordCloud(){ + this.search.mostSeachWord("10").subscribe(res=>{ + const container = document.querySelector('.most-searched-word-container'); + + container.setAttribute('style',`height: ${window.innerWidth}px`); + let list = [] res.forEach(element => { @@ -338,4 +345,17 @@ export class SearchPage implements OnInit { this.showCategory = categoryName; } + + + itemIcons(): string{ + return window.location.pathname + } + + viewDocument(){ + const url: string = this.loadedAttachments.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + // const browser = this.iab.create(url,"_blank"); + // browser.show(); + } + + } \ No newline at end of file diff --git a/src/assets/images/icons-viagem.svg b/src/assets/images/icons-viagem.svg new file mode 100644 index 000000000..2d12457f3 --- /dev/null +++ b/src/assets/images/icons-viagem.svg @@ -0,0 +1,36 @@ +