Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(date-picker): Basic date picker #1903

Closed
wants to merge 1 commit into from
Closed

feat(date-picker): Basic date picker #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/demo-app/date-picker/date-picker-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<md-card class="demo-card demo-basic">
<md-toolbar color="primary">Basic</md-toolbar>
<md-card-content>
<md-date-picker [(ngModel)]="date">
<md-input [value]="date | date: 'dd-MMM-y'"></md-input>
</md-date-picker>
<p>{{ date | date: 'dd-MMMM-y' }}</p>
</md-card-content>
</md-card>

<md-card class="demo-card demo-basic">
<md-toolbar color="primary">Two selections</md-toolbar>
<md-card-content>
<md-date-picker #_date2 [(ngModel)]="date01" [(date2)]="date02">
<md-input [value]="date01 | date: 'dd-MMM-y'"></md-input>
<md-input [value]="date02 | date: 'dd-MMM-y'"></md-input>
</md-date-picker>
<p>{{ date01 | date: 'dd-MMMM-y' }} to {{ date02 | date: 'dd-MMMM-y' }}</p>
<p>{{ _date2.Days }} days selected</p>
</md-card-content>
</md-card>

<md-card class="demo-card demo-basic">
<md-toolbar color="primary">Two date picker</md-toolbar>
<md-card-content>
<md-date-picker #_date3 [(ngModel)]="ini" [(date2)]="end" mode="dual">
<md-input [value]="ini | date: 'dd-MMM-y'"></md-input>
<md-input [value]="end | date: 'dd-MMM-y'"></md-input>
</md-date-picker>
<p>{{ ini | date: 'dd-MMMM-y'}} to {{ end | date: 'dd-MMMM-y'}}</p>
<p>{{ _date3.Days }} days selected</p>
</md-card-content>
</md-card>
9 changes: 9 additions & 0 deletions src/demo-app/date-picker/date-picker-demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.demo-basic {
padding: 0;
}
.demo-card {
margin: 16px;
}
.demo-basic md-card-content {
padding: 16px;
}
15 changes: 15 additions & 0 deletions src/demo-app/date-picker/date-picker-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {Component} from '@angular/core';

@Component({
moduleId: module.id,
selector: 'date-pícker-demo',
templateUrl: 'date-picker-demo.html',
styleUrls: ['date-picker-demo.css'],
})
export class DatePickerDemo {
date: any = new Date(Date.now() + 60 * 60 * 24 * 15 * 1000);
date01: any = new Date(Date.now() + 60 * 60 * 24 * 15 * 1000);
date02: any = new Date(Date.now() + 60 * 60 * 24 * 18 * 1000);
ini: any = new Date(Date.now() + 60 * 60 * 24 * 9 * 1000);
end: any = new Date(Date.now() + 60 * 60 * 24 * 18 * 1000);
}
37 changes: 37 additions & 0 deletions src/lib/date-picker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# MdDatePicker
Basic Date Picker Component.
> The `<md-date-picker>` component fully support two-way binding of `ngModel`.
#### Format
```js
export class DatePickerDemo {
date: any = new Date(Date.now()+60*60*24*15*1000);
}
```

## Basic
```html
<md-date-picker [(ngModel)]="date">
<md-input [value]="date | date: 'dd-MMM-y'"></md-input>
</md-date-picker>
```


## Two selection basic
```html
<md-date-picker #_date2 [(ngModel)]="date01" [(date2)]="date02">
<md-input [value]="date01 | date: 'dd-MMM-y'"></md-input>
<md-input [value]="date02 | date: 'dd-MMM-y'"></md-input>
</md-date-picker>
{{ _date2.Days }}
```


## Two selection complete

```html
<md-date-picker #_date3 [(ngModel)]="ini" [(date2)]="end" mode="dual">
<md-input [value]="ini | date: 'dd-MMM-y'"></md-input>
<md-input [value]="end | date: 'dd-MMM-y'"></md-input>
</md-date-picker>
{{ _date3.Days }}
```
52 changes: 52 additions & 0 deletions src/lib/date-picker/_date-picker-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
@import '../core/theming/palette';
@import '../core/theming/theming';

@mixin _md-date-picker-color($palette) {
._top {
background: md-color($palette, 700);
}
._days_selected {
._background {
background-color: md-color($palette, 0.2) !important;
}
span {
color: md-color($palette, 500);
}
}
._today {
z-index: 1;
span {
color: md-color($palette, 500);
}
}
._day:not(._focused):hover {
._background {
background: md-color($palette, 200) !important;
}
span {
color: #fff;
}
}
._day._focused {
._background {
background: md-color($palette, 500) !important;
}
span {
color: #fff;
}
}
}
@mixin md-date-picker-theme($theme) {
$primary: map-get($theme, primary);
$accent: map-get($theme, accent);
$warn: map-get($theme, warn);
.primary {
@include _md-date-picker-color($primary);
}
.accent {
@include _md-date-picker-color($accent);
}
.warn {
@include _md-date-picker-color($warn);
}
}
101 changes: 101 additions & 0 deletions src/lib/date-picker/date-picker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<div class="_picker"
tabindex="0"
[class._focusedPicker]="_focused"
(click)="openPanelWithBackdrop()"
>
<div class="_input">
<ng-content></ng-content>
</div>
<template portal>
<div [class]="_color">
<div class="_datePicker _focusedPicker" [class._dual]="_mode">
<div class="_datePicker-content">
<div class="_top">
<div class="_top_year">{{_value | date: 'y'}}</div>
<div class="_top_date">{{_value | date: 'EE, MMM d'}}</div>
</div>
<div class="_bg">
<div class="_header _control">
<div>{{ days._INI | date: 'MMMM y' }}</div>
<span (click)="_left(false, days)" class="_left">
<svg viewBox="0 0 24 24" style="display: inline-block; fill: rgba(0, 0, 0, 0.87); height: 24px; width: 24px; user-select: none; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;">
<path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"></path>
</svg>
</span>
<span (click)="_right(false, days)" class="_right">
<svg viewBox="0 0 24 24" style="display: inline-block; fill: rgba(0, 0, 0, 0.87); height: 24px; width: 24px; user-select: none; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;">
<path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"></path>
</svg>
</span>
</div>
<div class="_header">
<span class="_DaysName" *ngFor="let day of daysName">{{day}}</span>
</div>
<div class="_days">
<div
[class._before]="day.date<dateINT"
[class._days_selected]="days2.length!=0&&day.date<=date2INT&&day.date>INT_DATE(_value)"
[class._today]="day.dateActive==dateToday"
[class._focused]="dayActive==day.dateActive || dayActive2==day.dateActive && days2!=0"
[class._parent_S]="dayActive==day.dateActive && !stateSELECT && days2!=0 || dayActive2==day.dateActive && stateSELECT && days2!=0" *ngFor="let day of days.data;" class="_day">
<div class="_background" *ngIf="day.date!=0"></div>
<span
(focus)="selectDate(day.date, false, $event)"
tabindex="0" *ngIf="day.date!=0">{{day.index}}
<div (mouseenter)="stateSELECT=false"
*ngIf="dayActive==day.dateActive && days2!=0"></div>
<div (mouseenter)="stateSELECT=true"
*ngIf="dayActive2==day.dateActive && days2!=0"></div>
</span>
</div>
</div>
</div>
</div>
<div *ngIf="days2.length!=0 && _mode" class="_datePicker-content">
<div class="_top">
<div class="_top_year">{{date2INT | date: 'y'}}</div>
<div class="_top_date">{{date2INT | date: 'EE, MMM d'}}</div>
</div>
<div class="_bg">
<div class="_header _control">
<div>{{ days2._INI | date: 'MMMM y' }}</div>
<span (click)="_left(true, days2)" class="_left">
<svg viewBox="0 0 24 24" style="display: inline-block; fill: rgba(0, 0, 0, 0.87); height: 24px; width: 24px; user-select: none; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;">
<path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"></path>
</svg>
</span>
<span (click)="_right(true, days2)" class="_right">
<svg viewBox="0 0 24 24" style="display: inline-block; fill: rgba(0, 0, 0, 0.87); height: 24px; width: 24px; user-select: none; transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;">
<path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"></path>
</svg>
</span>
</div>
<div class="_header">
<span class="_DaysName" *ngFor="let day of daysName">{{day}}</span>
</div>
<div class="_days">
<div [class._before]="day.date<dateINT"
[class._days_selected]="days2.length!=0&&day.date<=date2INT&&day.date>INT_DATE(_value)"
[class._today]="day.dateActive==dateToday"
[class._focused]="dayActive==day.dateActive || dayActive2==day.dateActive"
[class._parent_S]="dayActive==day.dateActive && !stateSELECT || dayActive2==day.dateActive && stateSELECT"
*ngFor="let day of days2.data;"
class="_day">
<div class="_background" *ngIf="day.date!=0"></div>
<span
(focus)="selectDate(day.date, true, $event)"
tabindex="0"
*ngIf="day.date!=0">{{day.index}}
<div (mouseenter)="stateSELECT=false"
*ngIf="dayActive==day.dateActive"></div>
<div (mouseenter)="stateSELECT=true"
*ngIf="dayActive2==day.dateActive"></div>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
</div>
Loading