diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index c227681f4..22c7f37b6 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -28,6 +28,10 @@
Chat
+
+
+ Pesquisa
+
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 8f3442467..3f38f1a9e 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -16,223 +16,211 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ viewTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{view.dates[row*7+col].label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ viewTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{view.dates[row*7+col].label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ viewTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{view.dates[row*7+col].label}}
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- {{ viewTitle }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{view.dates[row*7+col].label}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ viewTitle }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
- {{view.dates[row*7+col].label}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ viewTitle }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{view.dates[row*7+col].label}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Hoje, {{ timelineDate }}
+
+
+ Tudos
+
+
+
+
+ [dayStartHour]="0"
+ [dayEndHour]="23">
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 764a0148d..219d769a1 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -282,3 +282,35 @@ label{
background-color: #42b9fe !important;
}
+.calendar-tool-tip{
+ ion-icon{
+ font-size: 35px;
+ }
+ .arrow-down{
+ font-size: 28px;
+ }
+}
+
+
+
+.currente-date-timelien{
+ padding: 10px 20px;
+ .timeline-date{
+ font-size: 15px;
+ font-weight: bold;
+ }
+ .filter{
+ font-size: 15px;
+ font-weight: normal;
+ ion-icon{
+ font-size: 35px;
+ color: #0d89d1;
+ }
+ .filter-name{
+ font-family: Roboto;
+ font-size: 15px;
+ margin-left: 10px;
+
+ }
+ }
+}
\ 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 b17122912..794293bcb 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -30,8 +30,6 @@ import { CustomDateFormatter } from './custom-date-formatter.provider';
],
})
export class AgendaPage implements OnInit {
-
- title = 'my-dream-app';
view: CalendarView = CalendarView.Day;
@@ -43,6 +41,8 @@ export class AgendaPage implements OnInit {
CalendarView = CalendarView;
+ timelineDate: string;
+
setView(view: CalendarView) {
this.view = view;
}
@@ -115,6 +115,9 @@ export class AgendaPage implements OnInit {
private router: Router,
private alertCrontroller: AlertService
) {
+
+ this.timelineDate = formatDate(new Date,'dd MMMM yyyy', 'pt');
+
setTimeout(()=>{
// console.log(JSON.stringify(this.events));
// console.log(this.events);
@@ -156,13 +159,26 @@ export class AgendaPage implements OnInit {
onViewTitleChanged(title){
this.viewTitle = title;
}
+
+ // Show information of the event for timeline
+ eventClicked({ event }: { event: CalendarEvent }): void {
+ console.log('Event clicked', event);
+ this.eventSelectedDate = event.start;
+ this.router.navigate(["/home/agenda", event.id, 'agenda']);
+ }
+
//Show information of the event
async onEventSelected(ev: { event: Event}){
this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']);
}
+
onCurrentChanged = (ev: Date) => {
- this.eventSelectedDate = ev;
+ // timeline change date
+ this.timelineDate = formatDate(ev,'dd MMMM yyyy', 'pt');
+ this.viewDate = new Date(formatDate(ev,'yyyy-MM-dd', 'pt'));
+ // calendar change date
+ this.eventSelectedDate = ev;
};
/* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
@@ -173,6 +189,7 @@ export class AgendaPage implements OnInit {
onRangeChanged (ev: { startTime: Date, endTime: Date }) {
this.rangeStartDate = ev.startTime;
this.rangeEndDate = ev.endTime;
+ console.log('!!!')
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
};
@@ -224,6 +241,9 @@ export class AgendaPage implements OnInit {
}
loadRangeEvents(startTime: Date, endTime: Date){
+
+ console.log('Update date');
+
this.showTimeline = false;
this.showLoader = true;
@@ -236,7 +256,7 @@ export class AgendaPage implements OnInit {
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(
+ this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd', 'pt'), formatDate(endTime, 'yyyy-MM-dd', 'pt')).subscribe(
response => {
this.eventsList = response;
// loop
@@ -250,8 +270,8 @@ export class AgendaPage implements OnInit {
event: element
});
- const startHours = formatDate(new Date(element.StartDate), 'HH:mm', 'pt');
- const EndHours = formatDate(new Date(element.EndDate), 'HH:mm', 'pt');
+ const startHours = formatDate(new Date(element.StartDate), 'HH', 'pt');
+ const EndHours = formatDate(new Date(element.EndDate), 'HH', 'pt');
this.events.push({
title: this.timeLineTemplate(startHours, element.Location, element.Body, element.CalendarName),
@@ -261,6 +281,7 @@ export class AgendaPage implements OnInit {
primary: 'white',
secondary: 'white'
},
+ id: element.EventId
});
});
@@ -377,6 +398,10 @@ export class AgendaPage implements OnInit {
}
}
+ actions(){
+
+ }
+
doRefresh(ev: any){
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
setTimeout(() => {
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 037bd502d..187ceb77f 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -94,7 +94,14 @@
Palavras mais pesquisadas
-
+
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index ba7165846..f9ada6f67 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -33,20 +33,18 @@ export class SearchPage implements OnInit {
showDocuments = false;
showAdvanceSearch = false;
- options: CloudOptions = {
- // if width is between 0 and 1 it will be set to the width of the upper element multiplied by the value
- width: 1000,
- // if height is between 0 and 1 it will be set to the height of the upper element multiplied by the value
- height: 400,
- overflow: false,
- };
-
- data: CloudData[] = [
- {text: 'Weight-8-link-color', weight: 8, link: 'https://google.com', color: '#ffaaee'},
- {text: 'Weight-10-link', weight: 10, link: 'https://google.com', tooltip: 'display a tooltip'},
- // ...
- ];
+ height: number = 411;
+ width: number = 411;
+ data: CloudData[] = [
+ {text: 'Docents', weight: 0.1, color: '#ffaaee'},
+ {text: '1232', weight: 0.2, tooltip: 'display a tooltip'},
+ {text: 'Dcuments', weight: 0.1, color: '#ffaaee'},
+ {text: 'Cat', weight: 0.3, color: '#ffaaee'},
+ {text: 'Dogs', weight: 0.1, tooltip: 'display a tooltip'},
+ {text: 'cars', weight: 0.2, color: '#ffaaee'},
+ ];
+
// See http://idangero.us/swiper/api/ for valid options.
slideOpts = {
slidesPerView: 3,
diff --git a/src/assets/images/icons-arrow-arrow-down.svg b/src/assets/images/icons-arrow-arrow-down.svg
new file mode 100755
index 000000000..c3db65ea6
--- /dev/null
+++ b/src/assets/images/icons-arrow-arrow-down.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/global.scss b/src/global.scss
index 75fd88175..94c1bdbbf 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -45,7 +45,6 @@ td.monthview-current{
text-align: center;
padding-left: 9px;
color: white;
- background: #42b9fe;
}
}
@@ -69,9 +68,6 @@ td.monthview-selected {
background-color: #42b9fe !important;
}
.timeline .cal-event, .cal-event{
- background-color: white !important;
- box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07) !important;
- border: solid 1px #e9e9e9 !important;
padding: 0px !important;
}
@@ -89,7 +85,7 @@ td.monthview-selected {
left: 55px;
position: absolute;
border-radius: 91px;
- top: -2.5px;
+ top: -3.5px;
}
@@ -100,6 +96,10 @@ td.monthview-selected {
}
.timeline-box{
+ padding: 3px;
+ background-color: white !important;
+ box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07) !important;
+ border: solid 1px #e9e9e9 !important;
color: black;
.timeline-start-time, .timeline-location{
font-family: Roboto;
@@ -123,7 +123,26 @@ td.monthview-selected {
height: 100%;
}
+.table-bordered, .table-bordered{
+ border: none !important;
+ td, th {
+ border: none !important;
+ }
+}
+.cal-tooltip, .cal-tooltip-top{
+ display: none;
+}
+
+// ionic calendar2
+.event-detail-container{
+ display: none;
+}
+
+.cal-week-view {
+ border-top: none !important;
+}
.timeline-box-{}
/* angular-cli file: src/styles.css */
-@import "../node_modules/angular-calendar/css/angular-calendar.css";
\ No newline at end of file
+@import "../node_modules/angular-calendar/css/angular-calendar.css";
+