Skip to content
This repository was archived by the owner on Jan 7, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ flow | `Array` | Depends of *type* | Customize steps flow, steps available: time
title | `String` | `''` | Popup title.
hide-backdrop | `Boolean` | `false` | Show/Hide backdrop.
backdrop-click | `Boolean` | `true` | Enable/Disable backdrop click to cancel (outside click).
show-week-numbers | `Boolean`| `false` | Display weeknumber in front of every week in the calendar

Input inherits all props not defined above but `style` and `class` will be inherited by root element. [See inheritAttrs option](https://vuejs.org/v2/api/#inheritAttrs)

Expand Down
8 changes: 7 additions & 1 deletion src/Datetime.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
:auto="auto"
:week-start="weekStart"
:flow="flow"
:title="title">
:title="title"
:show-week-numbers="showWeekNumbers"
>
<template slot="button-cancel__internal" slot-scope="scope">
<slot name="button-cancel" v-bind:step="scope.step">{{ phrases.cancel }}</slot>
</template>
Expand Down Expand Up @@ -142,6 +144,10 @@ export default {
backdropClick: {
type: Boolean,
default: true
},
showWeekNumbers: {
type: Boolean,
default: false
}
},

Expand Down
109 changes: 95 additions & 14 deletions src/DatetimeCalendar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,19 @@
</svg>
</div>
</div>
<div class="vdatetime-calendar__month">
<div class="vdatetime-calendar__month__weekday" v-for="weekday in weekdays">{{ weekday }}</div>
<div class="vdatetime-calendar__month__day" v-for="day in days" @click="selectDay(day)" :class="{'vdatetime-calendar__month__day--selected': day.selected, 'vdatetime-calendar__month__day--disabled': day.disabled}">
<span><span>{{ day.number }}</span></span>
<div :class="{ 'vdatetime-calendar__display': showWeekNumbers }">
<div v-if="showWeekNumbers" class="vdatetime-calendar__display__weeknumbers">
<table>
<tr v-for="weekNumber in weekNumbers" :key="weekNumber">
<td>{{ weekNumber }}</td>
</tr>
</table>
</div>
<div :class="showWeekNumbers ? 'vdatetime-calendar__display__month--weeknumbers' : 'vdatetime-calendar__display__month'">
<div class="vdatetime-calendar__display__month__weekday" v-for="weekday in weekdays">{{ weekday }}</div>
<div class="vdatetime-calendar__display__month__day" v-for="day in days" @click="selectDay(day)" :class="{'vdatetime-calendar__display__month__day--selected': day.selected,'vdatetime-calendar__display__month__day--disabled': day.disabled}">
<span><span>{{ day.number }}</span></span>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -54,17 +63,25 @@ export default {
weekStart: {
type: Number,
default: 1
},
showWeekNumbers: {
type: Boolean,
default: false
}
},

data () {
return {
newDate: DateTime.fromObject({ year: this.year, month: this.month, zone: 'UTC' }),
weekdays: weekdays(this.weekStart),
months: months()
months: months(),
weekNumbers: []
}
},
mounted () {
if (this.showWeekNumbers) {
this.getWeekNumberForDisplayedMonth()
}
},

computed: {
newYear () {
return this.newDate.year
Expand Down Expand Up @@ -92,11 +109,43 @@ export default {

this.$emit('change', this.newYear, this.newMonth, day.number)
},
getWeekNumberForDisplayedMonth () {
const weekNumbers = []
const weeksInMonth = this.days.length / 7
const firstWeekOfMonth = DateTime.local(this.newYear, this.newMonth, 1)
.weekNumber

weekNumbers.push(this.getFormattedWeekNumber(firstWeekOfMonth))
let weekNumber
if (DateTime.local(this.newYear, this.newMonth, 7).weekNumber === 1) {
weekNumber = 0
} else {
weekNumber = firstWeekOfMonth
}
for (let counter = 1; counter < weeksInMonth; counter++) {
weekNumber++
weekNumbers.push(this.getFormattedWeekNumber(weekNumber))
}
this.weekNumbers = weekNumbers
},
getFormattedWeekNumber (weekNumber) {
let stringifiedWeekNumber = weekNumber.toString()
if (stringifiedWeekNumber.length === 1) {
stringifiedWeekNumber = '0' + stringifiedWeekNumber
}
return stringifiedWeekNumber
},
previousMonth () {
this.newDate = this.newDate.minus({ months: 1 })
if (this.showWeekNumbers) {
this.getWeekNumberForDisplayedMonth()
}
},
nextMonth () {
this.newDate = this.newDate.plus({ months: 1 })
if (this.showWeekNumbers) {
this.getWeekNumberForDisplayedMonth()
}
}
}
}
Expand Down Expand Up @@ -151,13 +200,45 @@ export default {
text-transform: capitalize;
}

.vdatetime-calendar__month {
.vdatetime-calendar__display {
display: flex;
justify-content: space-evenly;
}

.vdatetime-calendar__display__weeknumbers {
width: 20%;
padding-top: 36px;
padding-left: 20px;

& table {
width: 100%;
}

& tr {
height: 36px;
width: 100%;
}
}

@media (max-width: 375px) {
.vdatetime-calendar__display__weeknumbers tr {
height: 10vw;
}
}

.vdatetime-calendar__display__month--weeknumbers {
padding: 0 20px 0 5px;
transition: height .2s;
width: 80%;
}

.vdatetime-calendar__display__month {
padding: 0 20px;
transition: height .2s;
}

.vdatetime-calendar__month__weekday,
.vdatetime-calendar__month__day {
.vdatetime-calendar__display__month__weekday,
.vdatetime-calendar__display__month__day {
display: inline-block;
width: calc(100% / 7);
line-height: 36px;
Expand Down Expand Up @@ -190,23 +271,23 @@ export default {
}
}

.vdatetime-calendar__month__weekday {
.vdatetime-calendar__display__month__weekday {
font-weight: bold;
}

.vdatetime-calendar__month__day:hover > span > span {
.vdatetime-calendar__display__month__day:hover > span > span {
background: #eee;
}

.vdatetime-calendar__month__day--selected {
.vdatetime-calendar__display__month__day--selected {
& > span > span,
&:hover > span > span {
color: #fff;
background: #3f51b5;
}
}

.vdatetime-calendar__month__day--disabled {
.vdatetime-calendar__display__month__day--disabled {
opacity: 0.4;
cursor: default;

Expand Down
20 changes: 12 additions & 8 deletions src/DatetimePopup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@
:year="year"
:month="month"></datetime-month-picker>
<datetime-calendar
v-if="step === 'date'"
@change="onChangeDate"
:year="year"
:month="month"
:day="day"
:min-date="minDatetime"
:max-date="maxDatetime"
:week-start="weekStart"
v-if="step === 'date'"
@change="onChangeDate"
:year="year"
:month="month"
:day="day"
:min-date="minDatetime"
:max-date="maxDatetime"
:week-start="weekStart"
:show-week-numbers="showWeekNumbers"
></datetime-calendar>
<datetime-time-picker
v-if="step === 'time'"
Expand Down Expand Up @@ -122,6 +123,9 @@ export default {
},
title: {
type: String
},
showWeekNumbers: {
type: Boolean
}
},

Expand Down
Loading