Skip to content
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
34 changes: 7 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@
"chart.js": "^4.1.1",
"cordova-plugin-file": "^7.0.0",
"cordova-plugin-nativestorage": "^2.3.2",
"date-fns": "^2.29.3",
"date-fns": "^3.6.0",
"file-saver": "^2.0.5",
"ion2-calendar": "^3.5.0",
"ionicons": "^6.0.3",
"mixpanel-browser": "^2.45.0",
"moment": "^2.30.1",
"ng5-slider": "^1.2.6",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class TransferFormPage implements OnInit {
public endDate; // max date
public selected; // max date
dateRange: { from: string; to: string; };
type: 'string'; // 'string' | 'js-date' | 'moment' | 'time' | 'object'
type: 'string'; // 'string' | 'js-date' | 'time' | 'object'

public borderLimit: boolean = false;

Expand Down
180 changes: 180 additions & 0 deletions src/app/util/calendar-shim.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
import { CommonModule } from '@angular/common';
import { Component, Input, NgModule } from '@angular/core';
import { IonicModule, ModalController } from '@ionic/angular';
import { format } from 'date-fns';

const DATE_ONLY_PATTERN = /^(\d{4})-(\d{2})-(\d{2})$/;

export interface CalendarResult {
string: string;
unix: number;
date: Date;
}

export interface CalendarModalOptions {
canBackwardsSelected?: boolean;
defaultDate?: Date | string;
defaultDateRange?: {
from?: Date | string;
to?: Date | string;
};
defaultScrollTo?: Date | string;
pickMode?: 'single' | 'range';
title?: string;
}

export interface CalendarComponentOptions extends CalendarModalOptions {}

@Component({
selector: 'ion-calendar-modal',
template: `
<ion-header>
<ion-toolbar>
<ion-title>{{ options?.title || 'Select Date' }}</ion-title>
<ion-buttons slot="end">
<ion-button (click)="close()">Cancel</ion-button>
</ion-buttons>
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding">
<ng-container *ngIf="isRange; else singleDate">
<ion-item lines="none">
<ion-label position="stacked">From</ion-label>
<ion-datetime
presentation="date"
[min]="minDate"
[value]="fromValue"
(ionChange)="updateFrom($event)"
></ion-datetime>
</ion-item>

<ion-item lines="none">
<ion-label position="stacked">To</ion-label>
<ion-datetime
presentation="date"
[min]="minDate"
[value]="toValue"
(ionChange)="updateTo($event)"
></ion-datetime>
</ion-item>
</ng-container>

<ng-template #singleDate>
<ion-datetime
presentation="date"
[min]="minDate"
[value]="singleValue"
(ionChange)="updateSingle($event)"
></ion-datetime>
</ng-template>
</ion-content>

<ion-footer>
<ion-toolbar>
<ion-buttons slot="end">
<ion-button color="primary" (click)="confirm()">Done</ion-button>
</ion-buttons>
</ion-toolbar>
</ion-footer>
`,
})
export class CalendarModal {
@Input() options: CalendarModalOptions = {};

singleValue = this.toInputValue(new Date());
fromValue = this.toInputValue(new Date());
toValue = this.toInputValue(new Date());
minDate: string | null = null;

constructor(private modalCtrl: ModalController) {}

ngOnInit() {
const today = new Date();
const range = this.options?.defaultDateRange;

this.singleValue = this.toInputValue(this.options?.defaultDate || this.options?.defaultScrollTo || today);
this.fromValue = this.toInputValue(range?.from || this.options?.defaultScrollTo || today);
this.toValue = this.toInputValue(range?.to || this.options?.defaultScrollTo || today);

if (this.options?.canBackwardsSelected === false) {
this.minDate = this.toInputValue(today);
}
}

get isRange() {
return this.options?.pickMode === 'range';
}

normalizeValue(value: string | string[] | null | undefined) {
if (Array.isArray(value)) {
return value[0] || this.toInputValue(new Date());
}

return value || this.toInputValue(new Date());
}

updateFrom(event: Event) {
this.fromValue = this.normalizeValue((event as CustomEvent).detail?.value);
}

updateTo(event: Event) {
this.toValue = this.normalizeValue((event as CustomEvent).detail?.value);
}

updateSingle(event: Event) {
this.singleValue = this.normalizeValue((event as CustomEvent).detail?.value);
}

close() {
this.modalCtrl.dismiss();
}

confirm() {
if (this.isRange) {
this.modalCtrl.dismiss({
from: this.toResult(this.fromValue),
to: this.toResult(this.toValue),
});
return;
}

this.modalCtrl.dismiss(this.toResult(this.singleValue));
}

private toInputValue(value: Date | string) {
return format(this.toDate(value), 'yyyy-MM-dd');
}

private toResult(value: Date | string): CalendarResult {
const date = this.toDate(value);

return {
string: format(date, 'yyyy-MM-dd'),
unix: Math.floor(date.getTime() / 1000),
date,
};
}

private toDate(value: Date | string) {
if (value instanceof Date) {
return value;
}

const dateOnly = DATE_ONLY_PATTERN.exec(value);

if (!dateOnly) {
return new Date(value);
}

const [, year, month, day] = dateOnly;
return new Date(Number(year), Number(month) - 1, Number(day));
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

@NgModule({
declarations: [CalendarModal],
imports: [CommonModule, IonicModule],
exports: [CalendarModal],
})
export class CalendarModule {}
97 changes: 97 additions & 0 deletions src/app/util/date-fns-shim.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
const DATE_ONLY_PATTERN = /^(\d{4})-(\d{2})-(\d{2})$/;

export function parseISO(value: string): Date {
return parseDate(value);
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

export function format(value: Date | string | number, pattern: string): string {
const date = value instanceof Date ? value : new Date(value);
const hours12 = date.getHours() % 12 || 12;
const replacements: Record<string, string> = {
yyyy: String(date.getFullYear()),
MM: pad(date.getMonth() + 1),
MMM: MONTHS[date.getMonth()],
dd: pad(date.getDate()),
d: String(date.getDate()),
HH: pad(date.getHours()),
hh: pad(hours12),
mm: pad(date.getMinutes()),
ss: pad(date.getSeconds()),
a: date.getHours() >= 12 ? 'PM' : 'AM',
};

return pattern.replace(/yyyy|MMM|MM|dd|d|HH|hh|mm|ss|a/g, token => replacements[token]);
}

export function startOfMonth(value: Date | number): Date {
const date = toDate(value);
return new Date(date.getFullYear(), date.getMonth(), 1);
}

export function endOfMonth(value: Date | number): Date {
const date = toDate(value);
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
}

export function eachDayOfInterval(interval: { start: Date; end: Date }): Date[] {
const days: Date[] = [];
const current = new Date(interval.start);

while (current <= interval.end) {
days.push(new Date(current));
current.setDate(current.getDate() + 1);
}

return days;
}

export function getDate(value: Date | number): number {
return toDate(value).getDate();
}

export function getMonth(value: Date | number): number {
return toDate(value).getMonth();
}

export function getYear(value: Date | number): number {
return toDate(value).getFullYear();
}

export function isSameDay(left: Date | number, right: Date | number): boolean {
return format(toDate(left), 'yyyy-MM-dd') === format(toDate(right), 'yyyy-MM-dd');
}

export function isSameMonth(left: Date | number, right: Date | number): boolean {
const leftDate = toDate(left);
const rightDate = toDate(right);

return leftDate.getFullYear() === rightDate.getFullYear() && leftDate.getMonth() === rightDate.getMonth();
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

export function isSameYear(left: Date | number, right: Date | number): boolean {
return toDate(left).getFullYear() === toDate(right).getFullYear();
}

export function isToday(value: Date | number): boolean {
return isSameDay(toDate(value), new Date());
}

function toDate(value: Date | number): Date {
return value instanceof Date ? value : new Date(value);
}

function parseDate(value: string): Date {
const dateOnly = DATE_ONLY_PATTERN.exec(value);

if (!dateOnly) {
return new Date(value);
}

const [, year, month, day] = dateOnly;
return new Date(Number(year), Number(month) - 1, Number(day));
}

function pad(value: number): string {
return String(value).padStart(2, '0');
}
8 changes: 8 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
"downlevelIteration": true,
"experimentalDecorators": true,
"moduleResolution": "node",
"paths": {
"date-fns": [
"src/app/util/date-fns-shim"
],
"ion2-calendar": [
"src/app/util/calendar-shim"
]
},
"importHelpers": true,
"target": "ES2022",
"module": "es2020",
Expand Down