diff --git a/package-lock.json b/package-lock.json
index 3f17cd439..e31b9c0cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -413,6 +413,21 @@
}
}
},
+ "@angular/animations": {
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.1.0.tgz",
+ "integrity": "sha512-VgpknW33WJiqnNtQwNVWrpiSxkgoChIZLpYLlijSTvFwZOHiraFKApohaW8X61mwL0HuK1RB7Z36B+Q11cw3aw==",
+ "requires": {
+ "tslib": "^2.0.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+ "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+ }
+ }
+ },
"@angular/cli": {
"version": "9.1.12",
"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.12.tgz",
@@ -2898,6 +2913,11 @@
"tslib": "^1.9.0"
}
},
+ "@mattlewis92/dom-autoscroller": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz",
+ "integrity": "sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ=="
+ },
"@netflix/nerror": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz",
@@ -2915,6 +2935,21 @@
}
}
},
+ "@ng-bootstrap/ng-bootstrap": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-9.0.1.tgz",
+ "integrity": "sha512-dJFoK2mRsj/zL87PNv9frBD+72MkrMeFshXE26FKPf8P8JNFoL6zrcNLxlBouQ1rWBItH50BmlEqQOwyXazF7w==",
+ "requires": {
+ "tslib": "^2.0.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+ "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+ }
+ }
+ },
"@ngtools/webpack": {
"version": "9.1.12",
"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.12.tgz",
@@ -2978,6 +3013,11 @@
}
}
},
+ "@scarf/scarf": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.0.tgz",
+ "integrity": "sha512-b2iE8kjjzzUo2WZ0xuE2N77kfnTds7ClrDxcz3Atz7h2XrNVoAPUoT75i7CY0st5x++70V91Y+c6RpBX9MX7Jg=="
+ },
"@schematics/angular": {
"version": "9.1.12",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.12.tgz",
@@ -3039,6 +3079,11 @@
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
},
+ "@types/date-fns": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/@types/date-fns/-/date-fns-0.0.2.tgz",
+ "integrity": "sha1-px0uCyq1e7jegchD5ez24WF3m4w="
+ },
"@types/glob": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -3431,6 +3476,86 @@
"semver": "^5.4.1"
}
},
+ "angular-calendar": {
+ "version": "0.28.22",
+ "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.28.22.tgz",
+ "integrity": "sha512-jcLszdvSI6+iSYEIqyQjPK5kgGAXaMoGKKGyDpmjy0nRIdaBGMzoveKr/OyiSx1B1oyxRVjj4Ig60n1/BzXmpw==",
+ "requires": {
+ "@scarf/scarf": "^1.1.0",
+ "angular-draggable-droppable": "^4.5.5",
+ "angular-resizable-element": "^3.3.3",
+ "calendar-utils": "^0.8.3",
+ "positioning": "^2.0.1",
+ "tslib": "^1.14.1"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+ }
+ }
+ },
+ "angular-draggable-droppable": {
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-4.6.0.tgz",
+ "integrity": "sha512-+8JhTDMKkc/NuFFqb8/H/QHpB+v4Z7YNrgvEbV+PQxXry19rkr89ofZgjNIXhZexTvJNb03BYlSQoknzXE9b3g==",
+ "requires": {
+ "@mattlewis92/dom-autoscroller": "^2.4.2",
+ "tslib": "^1.9.0"
+ }
+ },
+ "angular-resizable-element": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-3.3.4.tgz",
+ "integrity": "sha512-jA3j8qcWXKR+rdXxerAjpKhUsoUlEBQP3CmutHcHRAKTkQjZTd1LcZOZOnfIdOToyXsIKXYscbHpbPoCeew2Yw==",
+ "requires": {
+ "tslib": "^1.9.0"
+ }
+ },
+ "angular-tag-cloud-module": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/angular-tag-cloud-module/-/angular-tag-cloud-module-5.2.2.tgz",
+ "integrity": "sha512-lb/GeK5n0CDH3rjRC7PHBMgRcafc102sovfjyU3W05m9B8JELTDqk6jVEFqiCg+NbLy+zDm7g68Ij7k7LzxmAA==",
+ "requires": {
+ "tslib": "^2.0.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+ "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+ }
+ }
+ },
+ "angular2-calendar": {
+ "version": "0.3.7",
+ "resolved": "https://registry.npmjs.org/angular2-calendar/-/angular2-calendar-0.3.7.tgz",
+ "integrity": "sha1-1hrZoQWNbjdrpOWs5C3QDaoNVb4=",
+ "requires": {
+ "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.0",
+ "@types/date-fns": "0.0.2",
+ "calendar-utils": "0.0.35",
+ "date-fns": "^1.3.0"
+ },
+ "dependencies": {
+ "@ng-bootstrap/ng-bootstrap": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.1.2.tgz",
+ "integrity": "sha512-lPB4WdFk3s4k1OMKiZsmbxSE3r8qBFapov0HudEVi8HYkm6LBxZmWqy9I6KAC9NnhVUVIYnCixvRSNwOQvIwwA=="
+ },
+ "calendar-utils": {
+ "version": "0.0.35",
+ "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.0.35.tgz",
+ "integrity": "sha1-BqlQdhAFRFyH8YpotAMhZIkcV5s="
+ },
+ "date-fns": {
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+ "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
+ }
+ }
+ },
"ansi": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
@@ -4328,6 +4453,11 @@
"unset-value": "^1.0.0"
}
},
+ "calendar-utils": {
+ "version": "0.8.4",
+ "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.8.4.tgz",
+ "integrity": "sha512-0btakIxxHrCMX/7L6jayixKG9OnGIbqAh5oHe0Me2LYAS7zdEUoRxndyN4N04yVyZURgx1iNXj4l5m51/sDShg=="
+ },
"caller-callsite": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -5876,9 +6006,9 @@
}
},
"date-fns": {
- "version": "2.15.0",
- "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.15.0.tgz",
- "integrity": "sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ=="
+ "version": "2.16.1",
+ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz",
+ "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ=="
},
"date-format": {
"version": "3.0.0",
@@ -11067,6 +11197,11 @@
}
}
},
+ "positioning": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/positioning/-/positioning-2.0.1.tgz",
+ "integrity": "sha512-DsAgM42kV/ObuwlRpAzDTjH9E8fGKkMDJHWFX+kfNXSxh7UCCQxEmdjv/Ws5Ft1XDnt3JT8fIDYeKNSE2TbttA=="
+ },
"posix-character-classes": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
diff --git a/package.json b/package.json
index d26fbd427..f485dbf61 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
},
"private": true,
"dependencies": {
+ "@angular/animations": "^11.1.0",
"@angular/common": "~9.1.6",
"@angular/core": "~9.1.6",
"@angular/forms": "~9.1.6",
@@ -38,13 +39,17 @@
"@ionic/pwa-elements": "^3.0.1",
"@ionic/storage": "^2.3.1",
"@logisticinfotech/ionic4-datepicker": "^1.4.4",
+ "@ng-bootstrap/ng-bootstrap": "^9.0.1",
+ "angular-calendar": "^0.28.22",
+ "angular-tag-cloud-module": "^5.2.2",
+ "angular2-calendar": "^0.3.7",
"cordova-ios": "6.1.0",
"cordova-plugin-camera": "^5.0.1",
"cordova-plugin-file": "^6.0.2",
"cordova-plugin-filepath": "^1.5.8",
"cordova-res": "^0.15.1",
"cordova-sqlite-storage": "^5.1.0",
- "date-fns": "^2.15.0",
+ "date-fns": "^2.16.1",
"ionic-selectable": "^4.5.0",
"ionic2-alpha-scroll": "^2.0.1",
"ionic2-calendar": "^0.6.6",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index bc8c8e056..9539c19ee 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -19,11 +19,27 @@ import { FilePath } from '@ionic-native/file-path/ngx';
import { Camera } from '@ionic-native/camera/ngx';
import { IonicStorageModule } from '@ionic/storage';
import { PipesModule } from './pipes/pipes.module';
+//
+
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+
+import { CalendarModule, DateAdapter } from 'angular-calendar';
+import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+
@NgModule({
declarations: [AppComponent],
entryComponents: [],
imports: [BrowserModule,
+ CommonModule,
+ FormsModule,
+ CalendarModule.forRoot({
+ provide: DateAdapter,
+ useFactory: adapterFactory
+ }),
IonicModule.forRoot(),
IonicStorageModule.forRoot(),
AppRoutingModule,
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.module.ts b/src/app/pages/agenda/agenda.module.ts
index bb91aff5c..d5808e880 100644
--- a/src/app/pages/agenda/agenda.module.ts
+++ b/src/app/pages/agenda/agenda.module.ts
@@ -18,12 +18,20 @@ import { CalendarComponent } from 'src/app/components/calendar/calendar.componen
import { SharedModule } from 'src/app/shared/shared.module';
registerLocaleData(localeDe);
+
+import { CalendarModule, DateAdapter } from 'angular-calendar';
+import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
SharedModule,
+ /* ComponentsModule, */
+ CalendarModule.forRoot({
+ provide: DateAdapter,
+ useFactory: adapterFactory
+ }),
AgendaPageRoutingModule,
NgCalendarModule,
CalModalPageModule,
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index af06cc392..fc2e84cf0 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -3,67 +3,34 @@
-
+
+
-
-
-
-
-
-
-
-
-
- Combinada
-
-
- Oficial
-
-
- Pessoal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
-
+
-
-
-
+
{{ viewTitle }}
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
-
+
@@ -134,7 +101,7 @@
>
-
+
@@ -144,7 +111,7 @@
-
+
@@ -185,7 +152,7 @@
[monthviewDisplayEventTemplate]="template"
>
-
+
@@ -195,7 +162,7 @@
-
+
@@ -203,4 +170,50 @@
Todos
+
+
+
+
+
+
+
+
+
\ 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 9b5c2fadf..c65c46cfb 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -15,7 +15,10 @@
.monthview-primary-with-event {
background-color: white !important;
}
-
+
+ .monthview-current{
+ background-color: red;
+ }
.monthview-selected {
background-color: lightskyblue !important;
}
@@ -32,8 +35,14 @@
}
.with-event {
- background-color: #ccc;
- border-radius: 15px;
+ background-color: #fff;
+ border-radius: 21px;
+ border-left: 3px solid #ffb703;
+ border-bottom: none;
+ border-right: 3px solid #f05d5e;
+ color: black;
+ margin: 0px auto;
+ width: 35px;
}
.main-header{
@@ -76,7 +85,6 @@
}
-
/* TOGGLE button */
.switch {
position: relative;
@@ -299,3 +307,52 @@ label{
color: #000 !important;
}
+.segment {
+
+}
+
+/* Timeline */
+
+.cal-hour-segment {
+ border-bottom: none !important;
+}
+
+.cal-current-time-marker {
+ 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;
+ .filter-name{
+ color: #0d89d1;
+ }
+ 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 0dad04bef..ad47654d7 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -10,12 +10,68 @@ import { AlertService } from 'src/app/services/alert.service';
import { NewEventPage } from './new-event/new-event.page';
import { ViewEventPage } from './view-event/view-event.page';
+// showTimeline
+import { setHours, setMinutes } from 'date-fns';
+import {
+ CalendarDateFormatter,
+ CalendarEvent,
+ CalendarView,
+ DAYS_OF_WEEK,
+} from 'angular-calendar';
+import { CustomDateFormatter } from './custom-date-formatter.provider';
+
@Component({
selector: 'app-agenda',
templateUrl: './agenda.page.html',
styleUrls: ['./agenda.page.scss'],
+ providers: [
+ /* {
+ provide: CalendarDateFormatter,
+ useClass: CustomDateFormatter,
+ }, */
+ ],
})
export class AgendaPage implements OnInit {
+
+ view: CalendarView = CalendarView.Day;
+
+ viewDate: Date = new Date();
+
+ weekStartsOn: number = DAYS_OF_WEEK.MONDAY;
+
+ weekendDays: number[] = [DAYS_OF_WEEK.FRIDAY, DAYS_OF_WEEK.SATURDAY];
+
+ CalendarView = CalendarView;
+
+ timelineDate: string;
+
+ setView(view: CalendarView) {
+ this.view = view;
+ }
+
+ showTimeline: boolean= false;
+
+
+ events: CalendarEvent[] = [
+/* {
+ title: '123',
+ start: setHours(setMinutes(new Date(), 0), 3),
+ color: {
+ primary: 'red',
+ secondary: 'yellow'
+ },
+ },
+ {
+ title: '123123',
+ start: setHours(setMinutes(new Date(), 0), 5),
+ color: {
+ primary: 'red',
+ secondary: 'yellow'
+ },
+ }, */
+ ];
+
+
/* List of events of our calendar */
eventSource = [];
@@ -62,6 +118,15 @@ export class AgendaPage implements OnInit {
private alertCrontroller: AlertService
) {
this.showLoader = false;
+
+ this.timelineDate = formatDate(new Date,'dd MMMM yyyy', 'pt');
+
+ setTimeout(()=>{
+ // console.log(JSON.stringify(this.events));
+ // console.log(this.events);
+ },5000)
+
+ // console.log(setHours(setMinutes(new Date(), 0), 12))
}
ngOnInit() {
@@ -97,14 +162,27 @@ 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.viewEventDetail(ev.event.EventId);
/* 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[] }) => {
@@ -115,6 +193,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);
};
@@ -144,25 +223,49 @@ export class AgendaPage implements OnInit {
allDay: false,
event: postEvent
});
+
this.myCal.update();
this.myCal.loadEvents();
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
});
}
+
+ timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string): string{
+ return `
+
+
+ ${startTime}${eventlocation}
+
+
+ ${eventDiscription.Text}
+
+
Palavras mais pesquisadas
-
+
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index a776a1896..c5deed915 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -5,7 +5,7 @@ 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';
-/* import { CloudData, CloudOptions } from 'angular-tag-cloud-module'; */
+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';
@@ -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/assets/images/icons-calendar-arrow-down.svg b/src/assets/images/icons-calendar-arrow-down.svg
new file mode 100755
index 000000000..c3db65ea6
--- /dev/null
+++ b/src/assets/images/icons-calendar-arrow-down.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/images/icons-calendar-arrow-left.svg b/src/assets/images/icons-calendar-arrow-left.svg
new file mode 100755
index 000000000..2c258f00b
--- /dev/null
+++ b/src/assets/images/icons-calendar-arrow-left.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/images/icons-calendar-arrow-right.svg b/src/assets/images/icons-calendar-arrow-right.svg
new file mode 100755
index 000000000..0f196ec63
--- /dev/null
+++ b/src/assets/images/icons-calendar-arrow-right.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/global.scss b/src/global.scss
index d854de84a..94c1bdbbf 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -24,3 +24,125 @@
@import "~@ionic/angular/css/text-alignment.css";
@import "~@ionic/angular/css/text-transformation.css";
@import "~@ionic/angular/css/flex-utils.css";
+
+
+
+
+// calendar
+td.monthview-current{
+ color: white;
+ /* border-radius: 89px; */
+ background: lightskyblue !important;
+ justify-content: center;
+ align-items: center;
+ /* display: flex; */
+ height: 100%;
+ div {
+ border-radius: 28px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ padding-left: 9px;
+ color: white;
+ }
+}
+
+.monthview-secondary-with-event, .monthview-secondary-with-event[_ngcontent-dwf-c153] {
+ background-color: white !important;
+}
+
+td.monthview-selected {
+ background-color: #42b9fe30 !important;
+ color: black !important;
+}
+
+
+/* Timeline */
+
+.cal-hour-segment {
+ border-bottom: none !important;
+ }
+
+ .cal-current-time-marker {
+ background-color: #42b9fe !important;
+ }
+.timeline .cal-event, .cal-event{
+ padding: 0px !important;
+}
+
+.cal-current-time-marker {
+ width: 100% !important;
+ margin-left: 0px !important;
+}
+
+.cal-current-time-marker::before{
+ width: 10px;
+ height: 10px;
+ background-color: #42b9fe !important;
+ content: ".";
+ color: transparent;
+ left: 55px;
+ position: absolute;
+ border-radius: 91px;
+ top: -3.5px;
+
+}
+
+.cal-time{
+ font-family: Roboto;
+ font-size: 13px;
+ color: #797979;
+}
+
+.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;
+ font-size: 13px;
+ margin-right: 10px;
+ }
+ .timeline-event-discription{
+ font-family: Roboto;
+ font-size: 15px;
+ font-weight: bold;
+ }
+}
+
+
+.timeline-box-Pessoal{
+ border-left: 5px solid #ffb703 !important;
+ height: 100%;
+}
+.timeline-box-Oficial{
+ border-left: 5px solid #f05d5e !important;
+ 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";
+
diff --git a/src/style/main.scss b/src/style/main.scss
new file mode 100644
index 000000000..b10b6ba43
--- /dev/null
+++ b/src/style/main.scss
@@ -0,0 +1,159 @@
+.v-application .overflow-auto {
+ overflow: auto !important;
+}
+.overflow-hidden {
+ overflow: hidden !important;
+}
+.overflow-visible {
+ overflow: visible !important;
+}
+.overflow-x-auto {
+ overflow-x: auto !important;
+}
+.overflow-x-hidden {
+ overflow-x: hidden !important;
+}
+.overflow-y-auto {
+ overflow-y: auto !important;
+}
+.overflow-y-hidden {
+ overflow-y: hidden !important;
+}
+.d-none {
+ display: none !important;
+}
+.d-inline {
+ display: inline !important;
+}
+.d-inline-block {
+ display: inline-block !important;
+}
+.d-block {
+ display: block !important;
+}
+.d-table {
+ display: table !important;
+}
+.d-table-row {
+ display: table-row !important;
+}
+.d-table-cell {
+ display: table-cell !important;
+}
+.d-flex {
+ display: flex !important;
+}
+.d-inline-flex {
+ display: inline-flex !important;
+}
+.float-none {
+ float: none !important;
+}
+.float-left {
+ float: left !important;
+}
+.float-right {
+ float: right !important;
+}
+.flex-fill {
+ flex: 1 1 auto !important;
+}
+.flex-row {
+ flex-direction: row !important;
+}
+.flex-column {
+ flex-direction: column !important;
+}
+.flex-row-reverse {
+ flex-direction: row-reverse !important;
+}
+.flex-column-reverse {
+ flex-direction: column-reverse !important;
+}
+.flex-grow-0 {
+ flex-grow: 0 !important;
+}
+.flex-grow-1 {
+ flex-grow: 1 !important;
+}
+.flex-shrink-0 {
+ flex-shrink: 0 !important;
+}
+.flex-shrink-1 {
+ flex-shrink: 1 !important;
+}
+.flex-wrap {
+ flex-wrap: wrap !important;
+}
+.flex-nowrap {
+ flex-wrap: nowrap !important;
+}
+.flex-wrap-reverse {
+ flex-wrap: wrap-reverse !important;
+}
+.justify-start {
+ justify-content: flex-start !important;
+}
+.justify-end {
+ justify-content: flex-end !important;
+}
+.justify-center {
+ justify-content: center !important;
+}
+.justify-space-between {
+ justify-content: space-between !important;
+}
+.justify-space-around {
+ justify-content: space-around !important;
+}
+.align-start {
+ align-items: flex-start !important;
+}
+.align-end {
+ align-items: flex-end !important;
+}
+.align-center {
+ align-items: center !important;
+}
+.align-baseline {
+ align-items: baseline !important;
+}
+.align-stretch {
+ align-items: stretch !important;
+}
+.align-content-start {
+ align-content: flex-start !important;
+}
+.align-content-end {
+ align-content: flex-end !important;
+}
+.align-content-center {
+ align-content: center !important;
+}
+.align-content-space-between {
+ align-content: space-between !important;
+}
+.align-content-space-around {
+ align-content: space-around !important;
+}
+.align-content-stretch {
+ align-content: stretch !important;
+}
+.align-self-auto {
+ align-self: auto !important;
+}
+.align-self-start {
+ align-self: flex-start !important;
+}
+.align-self-end {
+ align-self: flex-end !important;
+}
+.align-self-center {
+ align-self: center !important;
+}
+.align-self-baseline {
+ align-self: baseline !important;
+}
+.align-self-stretch {
+ align-self: stretch !important;
+}
\ No newline at end of file
diff --git a/src/style/readme.md b/src/style/readme.md
new file mode 100644
index 000000000..eae46b5fc
--- /dev/null
+++ b/src/style/readme.md
@@ -0,0 +1,137 @@
+# System design
+
+First solve the problem then write the code
+
+
+
+## Table of content
+
+
+ - Diplay
+ - Flex
+
+ - Float
+
+
+
+
+
+
+
+
+
+## Diplay
+
+
+
+
+
Specify the elements display property. These classes can be applied using the following format d-{display}.
+
+
+
+ d-inline-flex - sets the element display property to inline-flexd-flex - sets the element display property to flexd-inline-block - sets the element display property to inline-blockd-block - sets the element display property to blockd-inline - sets the element display property to inlined-none - sets the element display property to none
+
+
+
+
+## Flex
+
+Control the layout of flex containers with alignment, justification and more with responsive flexbox utilities.
+
+You can also customize flex utilities to apply based upon various breakpoints.
+
+
+
+
+
+### Enabling flexbox
+
+ - .d-flex
+ - .d-inline-flex
+
+
+
+
+
+
+### Flex direction
+
+
+ - .flex-row
+ - .flex-row-reverse
+ - .flex-column
+ - .flex-column-reverse
+
+
+
+
+
+### Flex-justify
+
+
+- .justify-start
- .justify-end
- .justify-center
- .justify-space-between
- .justify-space-around
+
+
+
+
+
+### Flex align
+
+- .align-start
- .align-end
- .align-center
- .align-baseline
- .align-stretch
+
+
+
+
+
+### Flex align self
+
+
+- .align-start
- .align-end
- .align-center
- .align-baseline
- .align-stretch
+
+
+
+
+### Flex wrap
+
+
+ - .flex-nowrap
- .flex-wrap
- .flex-wrap-reverse
+
+
+
+
+
+
+## Float
+
+Float utility classes.
+
+You can also customize flex utilities to apply based upon
+
+
+
+
+### Float direction
+
+
+ - .float-left
- .float-right
+
\ No newline at end of file