This commit is contained in:
Tiago Kayaya
2020-09-07 12:01:05 +01:00
parent 15aea46f76
commit 734a78d157
11 changed files with 73 additions and 8 deletions
+1
View File
@@ -10,6 +10,7 @@ const routes: Routes = [
path: '', path: '',
loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
}, },
/* { /* {
path: 'cal-modal', path: 'cal-modal',
loadChildren: () => import('./pages/cal-modal/cal-modal.module').then( m => m.CalModalPageModule) loadChildren: () => import('./pages/cal-modal/cal-modal.module').then( m => m.CalModalPageModule)
@@ -0,0 +1,22 @@
<div class="container">
<div class="calendar">
<div class="month">
<i class="fas fa-angle-left prev"></i>
<div class="date">
<h1>Janeiro de 2020</h1>
<p>Segunda-feira, 7 de Stembro</p>
</div>
<i class="fas fa-angle-right next"></i>
</div>
<div class="weekdays">
<div>D</div>
<div>S</div>
<div>T</div>
<div>Q</div>
<div>Q</div>
<div>S</div>
<div>S</div>
</div>
<div class="days"></div>
</div>
</div>
@@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { CalendarComponent } from './calendar.component';
describe('CalendarComponent', () => {
let component: CalendarComponent;
let fixture: ComponentFixture<CalendarComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ CalendarComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(CalendarComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,14 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-calendar',
templateUrl: './calendar.component.html',
styleUrls: ['./calendar.component.scss'],
})
export class CalendarComponent implements OnInit {
constructor() { }
ngOnInit() {}
}
+3 -4
View File
@@ -1,8 +1,7 @@
/*
import { SlidesComponent } from './slides/slides.component'; import { CalendarComponent } from './calendar/calendar.component';
import { CustomHeaderComponent } from './custom-header/custom-header.component';
import { EventComponent } from './event/event.component'; */
+4 -3
View File
@@ -7,13 +7,14 @@ import { IonicModule } from '@ionic/angular';
import { AgendaPageRoutingModule } from './agenda-routing.module'; import { AgendaPageRoutingModule } from './agenda-routing.module';
import { AgendaPage } from './agenda.page'; import { AgendaPage } from './agenda.page';
/* import { ComponentsModule } from "src/app/components/ComponentsModule"; */
import { NgCalendarModule } from 'ionic2-calendar'; import { NgCalendarModule } from 'ionic2-calendar';
import { CalModalPageModule } from '../cal-modal/cal-modal.module'; import { CalModalPageModule } from '../cal-modal/cal-modal.module';
import { registerLocaleData } from '@angular/common'; import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/pt'; import localeDe from '@angular/common/locales/pt';
import { CalendarComponent } from 'src/app/components/calendar/calendar.component';
registerLocaleData(localeDe); registerLocaleData(localeDe);
@NgModule({ @NgModule({
@@ -24,9 +25,9 @@ registerLocaleData(localeDe);
/* ComponentsModule, */ /* ComponentsModule, */
AgendaPageRoutingModule, AgendaPageRoutingModule,
NgCalendarModule, NgCalendarModule,
CalModalPageModule CalModalPageModule,
], ],
declarations: [AgendaPage], declarations: [AgendaPage, CalendarComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA], schemas: [CUSTOM_ELEMENTS_SCHEMA],
providers: [ providers: [
{ provide: LOCALE_ID, useValue: 'pt-PT'} { provide: LOCALE_ID, useValue: 'pt-PT'}
+2
View File
@@ -27,6 +27,7 @@
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<app-cal-modal></app-cal-modal> <app-cal-modal></app-cal-modal>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -54,6 +55,7 @@
</ion-button> </ion-button>
</ion-col> </ion-col>
</ion-row> </ion-row>
<app-calendar></app-calendar>
<calendar <calendar
[eventSource]="eventSource" [eventSource]="eventSource"
@@ -106,7 +106,7 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
</div> </div>
<div *ngIf="j>1"> <div *ngIf="loadedEventAttachments.length > 1">
<ion-button class="see-more-button" fill="none" shape="round" (click)="showAlert()"> <ion-button class="see-more-button" fill="none" shape="round" (click)="showAlert()">
<ion-label color="secondary">Ver mais...</ion-label> <ion-label color="secondary">Ver mais...</ion-label>
</ion-button> </ion-button>
+1
View File
@@ -53,6 +53,7 @@
<ion-label> <ion-label>
<p class="p-small">{{customDate}}</p> <p class="p-small">{{customDate}}</p>
</ion-label> </ion-label>
<app-calendar></app-calendar>
<!-- COMBINADA --> <!-- COMBINADA -->
<div [ngSwitch]="segment"> <div [ngSwitch]="segment">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+1
View File
@@ -11,6 +11,7 @@
<meta name="viewport" content="viewport-fit=cover, width=device-width, height=device-hight, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <meta name="viewport" content="viewport-fit=cover, width=device-width, height=device-hight, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="format-detection" content="telephone=no" /> <meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" /> <meta name="msapplication-tap-highlight" content="no" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.min.css" integrity="sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog==" crossorigin="anonymous" />
<link rel="icon" type="image/x-icon" href="assets/icon/favicon.png" /> <link rel="icon" type="image/x-icon" href="assets/icon/favicon.png" />