Skip to content

feat(date-formatter): update range dates formatter to show current year in some cases #137

Merged
merged 2 commits into from
Jun 7, 2019
Merged

feat(date-formatter): update range dates formatter to show current year in some cases #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8d47c5
feat(date-formatter): update
Jun 5, 2019
9e96881
update examples
Jun 6, 2019
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
8 changes: 4 additions & 4 deletions packages/mosaic-dev/dateformatter/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ export class DemoComponent {
moment().date(10).month(2)
);
this.enRangeShortDateEndsNotCurrentYear = this.dateAdapter.rangeShortDate(
moment().date(1).month(1).subtract(1, 'years'),
moment().date(10).month(2).subtract(1, 'years')
moment().date(1).month(1),
moment().date(10).month(2).add(1, 'years')
);
this.enRangeShortDateTimeSameDateCurrentYear = this.dateAdapter.rangeShortDateTime(
moment().date(10).hour(10).minutes(14),
Expand Down Expand Up @@ -325,8 +325,8 @@ export class DemoComponent {
moment().date(10).month(2)
);
this.enRangeLongDateEndsNotCurrentYear = this.dateAdapter.rangeLongDate(
moment().date(1).month(1).subtract(1, 'years'),
moment().date(10).month(2).subtract(1, 'years')
moment().date(1).month(1),
moment().date(10).month(2).add(1, 'years')
);
this.enRangeLongDateTimeSameDateCurrentYear = this.dateAdapter.rangeLongDateTime(
moment().date(10).hour(10).minutes(14),
Expand Down
40 changes: 20 additions & 20 deletions packages/mosaic-moment-adapter/adapter/moment-date-adapter.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate = moment();

const startString: string = startDate.format(`${startDateFormat} ${YEAR}`);
const endString: string = endDate.format(endDateFormat);
const endString: string = endDate.format(`${endDateFormat} ${YEAR}`);

expect(adapter.rangeShortDate(startDate, endDate)).toBe(
`${startString}${LONG_DASH}${endString}`
Expand All @@ -680,7 +680,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate = moment();
const endDate = moment(startDate).add(1, 'years');

const startString: string = startDate.format(startDateFormat);
const startString: string = startDate.format(`${startDateFormat} ${YEAR}`);
const endString: string = endDate.format(`${endDateFormat} ${YEAR}`);

expect(adapter.rangeShortDate(startDate, endDate)).toBe(
Expand Down Expand Up @@ -748,7 +748,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate = moment();

const startString: string = startDate.format(`${DAY_SHORT_MONTH} ${YEAR}, ${TIME}`);
const endString: string = endDate.format(endDateFormat);
const endString: string = endDate.format(`${DAY_SHORT_MONTH} ${YEAR}, ${TIME}`);

expect(adapter.rangeShortDateTime(startDate, endDate)).toBe(
`${startString}${LONG_DASH}${endString}`
Expand All @@ -759,7 +759,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate = moment();
const endDate = moment(startDate).add(1, 'years');

const startString: string = startDate.format(startDateFormat);
const startString: string = startDate.format(`${DAY_SHORT_MONTH} ${YEAR}, ${TIME}`);
const endString: string = endDate.format(`${DAY_SHORT_MONTH} ${YEAR}, ${TIME}`);

expect(adapter.rangeShortDateTime(startDate, endDate)).toBe(
Expand Down Expand Up @@ -803,7 +803,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate: Moment = moment();

const startString: string = startDate.format(`${startDateFormat} ${YEAR}`);
const endString: string = endDate.format(`${endDateFormat}`);
const endString: string = endDate.format(`${endDateFormat} ${YEAR}`);

expect(adapter.rangeLongDate(startDate, endDate)).toBe(
`${startString}${LONG_DASH}${endString}`
Expand All @@ -814,7 +814,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate: Moment = moment().dayOfYear(1);
const endDate: Moment = moment(startDate).add(1, 'years');

const startString: string = startDate.format(`${startDateFormat}`);
const startString: string = startDate.format(`${startDateFormat} ${YEAR}`);
const endString: string = endDate.format(`${endDateFormat} ${YEAR}`);

expect(adapter.rangeLongDate(startDate, endDate)).toBe(
Expand Down Expand Up @@ -882,7 +882,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate: Moment = moment();

const startString: string = startDate.format(`${DAY_MONTH} ${YEAR}, ${TIME}`);
const endString: string = endDate.format(endDateFormat);
const endString: string = endDate.format(`${DAY_MONTH} ${YEAR}, ${TIME}`);

expect(adapter.rangeLongDateTime(startDate, endDate)).toBe(
`С${NBSP}${startString} по${NBSP}${endString}`
Expand All @@ -893,7 +893,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate: Moment = moment().dayOfYear(1);
const endDate: Moment = moment(startDate).add(1, 'years');

const startString: string = startDate.format(startDateFormat);
const startString: string = startDate.format(`${DAY_MONTH} ${YEAR}, ${TIME}`);
const endString: string = endDate.format(`${DAY_MONTH} ${YEAR}, ${TIME}`);

expect(adapter.rangeLongDateTime(startDate, endDate)).toBe(
Expand Down Expand Up @@ -961,7 +961,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate: Moment = moment();

const startString: string = startDate.format(`${DAY_MONTH} ${YEAR}, ${TIME}`);
const endString: string = endDate.format(endDateFormat);
const endString: string = endDate.format(`${DAY_MONTH} ${YEAR}, ${TIME}`);

expect(adapter.rangeMiddleDateTime(startDate, endDate)).toBe(
`${startString}${LONG_DASH}${endString}`
Expand All @@ -972,7 +972,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate: Moment = moment().dayOfYear(1);
const endDate: Moment = moment(startDate).add(1, 'years');

const startString: string = startDate.format(startDateFormat);
const startString: string = startDate.format(`${DAY_MONTH} ${YEAR}, ${TIME}`);
const endString: string = endDate.format(`${DAY_MONTH} ${YEAR}, ${TIME}`);

expect(adapter.rangeMiddleDateTime(startDate, endDate)).toBe(
Expand Down Expand Up @@ -1201,7 +1201,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate: Moment = moment();

const startString: string = startDate.format(`${startDateFormat}, ${YEAR}`);
const endString: string = endDate.format(endDateFormat);
const endString: string = endDate.format(`${endDateFormat}, ${YEAR}`);

expect(adapter.rangeShortDate(startDate, endDate)).toBe(
`${startString}${LONG_DASH}${endString}`
Expand All @@ -1212,7 +1212,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate: Moment = moment();
const endDate: Moment = moment(startDate).add(1, 'years');

const startString: string = startDate.format(startDateFormat);
const startString: string = startDate.format(`${startDateFormat}, ${YEAR}`);
const endString: string = endDate.format(`${endDateFormat}, ${YEAR}`);

expect(adapter.rangeShortDate(startDate, endDate)).toBe(
Expand Down Expand Up @@ -1280,7 +1280,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate: Moment = moment();

const startString: string = startDate.format(`${DAY_SHORT_MONTH}, ${YEAR}, ${TIME}`);
const endString: string = endDate.format(endDateFormat);
const endString: string = endDate.format(`${DAY_SHORT_MONTH}, ${YEAR}, ${TIME}`);

expect(adapter.rangeShortDateTime(startDate, endDate)).toBe(
`${startString}${LONG_DASH}${endString}`
Expand All @@ -1291,7 +1291,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate: Moment = moment();
const endDate: Moment = moment(startDate).add(1, 'years');

const startString: string = startDate.format(startDateFormat);
const startString: string = startDate.format(`${DAY_SHORT_MONTH}, ${YEAR}, ${TIME}`);
const endString: string = endDate.format(`${DAY_SHORT_MONTH}, ${YEAR}, ${TIME}`);

expect(adapter.rangeShortDateTime(startDate, endDate)).toBe(
Expand Down Expand Up @@ -1335,7 +1335,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate: Moment = moment();

const startString: string = startDate.format(`${startDateFormat}, ${YEAR}`);
const endString: string = endDate.format(`${endDateFormat}`);
const endString: string = endDate.format(`${endDateFormat}, ${YEAR}`);

expect(adapter.rangeLongDate(startDate, endDate)).toBe(
`${startString}${LONG_DASH}${endString}`
Expand All @@ -1346,7 +1346,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate: Moment = moment().dayOfYear(1);
const endDate: Moment = moment(startDate).add(1, 'years');

const startString: string = startDate.format(`${startDateFormat}`);
const startString: string = startDate.format(`${startDateFormat}, ${YEAR}`);
const endString: string = endDate.format(`${endDateFormat}, ${YEAR}`);

expect(adapter.rangeLongDate(startDate, endDate)).toBe(
Expand Down Expand Up @@ -1414,7 +1414,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate: Moment = moment();

const startString: string = startDate.format(`${DAY_MONTH}, ${YEAR}, ${TIME}`);
const endString: string = endDate.format(endDateFormat);
const endString: string = endDate.format(`${DAY_MONTH}, ${YEAR}, ${TIME}`);

expect(adapter.rangeLongDateTime(startDate, endDate)).toBe(
`From ${startString} to${NBSP}${endString}`
Expand All @@ -1425,7 +1425,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate: Moment = moment().dayOfYear(1);
const endDate: Moment = moment(startDate).add(1, 'years');

const startString: string = startDate.format(startDateFormat);
const startString: string = startDate.format(`${DAY_MONTH}, ${YEAR}, ${TIME}`);
const endString: string = endDate.format(`${DAY_MONTH}, ${YEAR}, ${TIME}`);

expect(adapter.rangeLongDateTime(startDate, endDate)).toBe(
Expand Down Expand Up @@ -1493,7 +1493,7 @@ describe('MomentDateAdapter formatter', () => {
const endDate = moment();

const startString = startDate.format(`${DAY_MONTH}, ${YEAR}, ${TIME}`);
const endString = endDate.format(endDateFormat);
const endString = endDate.format(`${DAY_MONTH}, ${YEAR}, ${TIME}`);

expect(adapter.rangeMiddleDateTime(startDate, endDate)).toBe(
`${startString}${LONG_DASH}${endString}`
Expand All @@ -1504,7 +1504,7 @@ describe('MomentDateAdapter formatter', () => {
const startDate = moment().dayOfYear(1);
const endDate = moment(startDate).add(1, 'years');

const startString = startDate.format(startDateFormat);
const startString = startDate.format(`${DAY_MONTH}, ${YEAR}, ${TIME}`);
const endString = endDate.format(`${DAY_MONTH}, ${YEAR}, ${TIME}`);

expect(adapter.rangeMiddleDateTime(startDate, endDate)).toBe(
Expand Down
12 changes: 12 additions & 0 deletions packages/mosaic-moment-adapter/adapter/moment-date-adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,12 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
const endDateVariables = this.compileVariables(endDate, variables);
endDateVariables.SAME_MONTH = sameMonth;

const bothCurrentYear =
startDateVariables.CURRENT_YEAR === 'yes' &&
endDateVariables.CURRENT_YEAR === 'yes';
startDateVariables.CURRENT_YEAR = bothCurrentYear ? 'yes' : 'no';
endDateVariables.CURRENT_YEAR = bothCurrentYear ? 'yes' : 'no';

const params = {...variables,
START_DATE: this.messageformat.compile(template.START_DATE)(startDateVariables),
END_DATE: this.messageformat.compile(template.END_DATE)(endDateVariables),
Expand All @@ -382,6 +388,12 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
endDateVariables.SAME_MONTH = sameMonth;
endDateVariables.SAME_DAY = sameDay;

const bothCurrentYear =
startDateVariables.CURRENT_YEAR === 'yes' &&
endDateVariables.CURRENT_YEAR === 'yes';
startDateVariables.CURRENT_YEAR = bothCurrentYear ? 'yes' : 'no';
endDateVariables.CURRENT_YEAR = bothCurrentYear ? 'yes' : 'no';

const params = {...variables,
START_DATETIME: this.messageformat.compile(template.START_DATETIME)(startDateVariables),
END_DATETIME: this.messageformat.compile(template.END_DATETIME)(endDateVariables),
Expand Down