lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: added last month last days on the popup calendar, and fix it's day

Browse source 
of week organization

chore: removed debug logging
This commit is contained in:
Liordino Neto 2020-08-17 23:41:53 -03:00 • committed by Josh Harvey
parent d88508d0f5
commit f700b29b3d
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
new-lamassu-admin/src/components/date-range-picker/Calendar.js
View file

@ -3,9 +3,9 @@ import moment from 'moment'
import * as R from 'ramda'
import React, { useState } from 'react'
import typographyStyles from 'src/components/typography/styles'
import { ReactComponent as Arrow } from 'src/styling/icons/arrow/month_change.svg'
import { primaryColor, zircon } from 'src/styling/variables'
import typographyStyles from 'src/components/typography/styles'
import Tile from './Tile'
@ -73,12 +73,6 @@ const Calendar = ({ minDate, maxDate, handleSelect, ...props }) => {
const classes = useStyles()
const weekdays = moment.weekdaysMin().map(day => day.slice(0, 1))
const firstDayOfMonth = month =>
Number.parseInt(
moment(month)
.startOf('month')
.format('d')
)
const monthLength = month =>
Number.parseInt(
moment(month)
@ -88,7 +82,12 @@ const Calendar = ({ minDate, maxDate, handleSelect, ...props }) => {
const monthdays = month => {
const lastMonth = moment(month).subtract(1, 'month')
const lastMonthRange = R.range(firstDayOfMonth(month) - 1, -1)
const lastMonthRange = R.range(
0,
moment(month)
.startOf('month')
.weekday()
).reverse()
const lastMonthDays = R.map(i =>
moment(lastMonth)
.endOf('month')