3b0f2033-3042-471a-8924-af474a7789df

Committed 03 Apr 2024 08:06AM UTC coverage: 90.399% (-0.005%) from 90.404%

Build # 3b0f2033-3042-471a-8924-af474a7789df

Build Type

Pull #3063

circleci

Committed by

minlovehua

Commit Message

Merge branch 'master' of github.com:atinc/ngx-tethys into minlovehua/use-cdk-coercion

Pull Request Pull Request #3063: refactor(util): mark coerceBooleanProperty, coerceNumberValue, and coerceCssPixelValue as deprecated, and use angular cdk to replace them #INFR-12096

Run Details

5410 of 6635 branches covered (81.54%)

Branch coverage included in aggregate %.

14 of 16 new or added lines in 4 files covered. (87.5%)

6 existing lines in 2 files now uncovered.

13176 of 13925 relevant lines covered (94.62%)

979.98 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

91.95

/src/time-picker/time-picker.utils.ts

import { Time, TimePickerComponentState } from './inner/inner-time-picker.class';
import { coerceNumberProperty } from '@angular/cdk/coercion';

const hoursPerDay = 24;
const hoursPerDayHalf = 12;
const minutesPerHour = 60;
const secondsPerMinute = 60;

export function isValidDate(value?: string | Date): boolean {
    if (!value) {
        return false;
    }

    if (value instanceof Date && isNaN(value.getHours())) {
        return false;
    }

    if (typeof value === 'string') {
        return isValidDate(new Date(value));
    }

    return true;
}

export function isValidLimit(controls: TimePickerComponentState, newDate: Date): boolean {
    if (controls.min && newDate < controls.min) {
        return false;
    }

    if (controls.max && newDate > controls.max) {
        return false;
    }

    return true;
}

export function parseHours(value: string | number, isPM = false): number {
    const hour = coerceNumberProperty(value);
    if (isNaN(hour) || hour < 0 || hour > (isPM ? hoursPerDayHalf : hoursPerDay)) {
        return NaN;
    }

    return hour;
}

export function parseMinutes(value: string | number): number {
    const minute = coerceNumberProperty(value);
    if (isNaN(minute) || minute < 0 || minute > minutesPerHour) {
        return NaN;
    }

    return minute;
}

export function parseSeconds(value: string | number): number {
    const seconds = coerceNumberProperty(value);
    if (isNaN(seconds) || seconds < 0 || seconds > secondsPerMinute) {
        return NaN;
    }

    return seconds;
}

export function parseTime(value: string | Date): Date {
    if (typeof value === 'string') {
        return new Date(value);
    }

    return value;
}

export function changeTime(value: Date, diff: Time): Date {
    if (!value) {
        return changeTime(createDate(new Date(), 0, 0, 0), diff);
    }

    let hour = value.getHours();
    let minutes = value.getMinutes();
    let seconds = value.getSeconds();

    if (diff.hour) {
        hour = (hour + coerceNumberProperty(diff.hour)) % hoursPerDay;
        if (hour < 0) {
            hour += hoursPerDay;
        }
    }

    if (diff.minute) {
        minutes = minutes + coerceNumberProperty(diff.minute);
    }

    if (diff.seconds) {
        seconds = seconds + coerceNumberProperty(diff.seconds);
    }

    return createDate(value, hour, minutes, seconds);
}

export function setTime(value: Date, opts: Time): Date {
    let hour = parseHours(opts.hour);
    const minute = parseMinutes(opts.minute);
    const seconds = parseSeconds(opts.seconds) || 0;

    if (opts.isPM && hour !== 12) {
        hour += hoursPerDayHalf;
    }

    if (!value) {
        if (!isNaN(hour) && !isNaN(minute)) {
            return createDate(new Date(), hour, minute, seconds);
        }

        return value;
    }

    if (isNaN(hour) || isNaN(minute)) {
        return value;
    }

    return createDate(value, hour, minute, seconds);
}

export function createDate(value: Date, hours: number, minutes: number, seconds: number): Date {
    return new Date(value.getFullYear(), value.getMonth(), value.getDate(), hours, minutes, seconds, value.getMilliseconds());
}

export function padNumber(value: number): string {
    const _value = value.toString();
    if (_value.length > 1) {
        return _value;
    }

    return `0${_value}`;
}

export function isHourInputValid(hours: string, isPM: boolean): boolean {
    return !isNaN(parseHours(hours, isPM));
}

export function isMinuteInputValid(minutes: string): boolean {
    return !isNaN(parseMinutes(minutes));
}

export function isSecondInputValid(seconds: string): boolean {
    return !isNaN(parseSeconds(seconds));
}

export function isInputLimitValid(diff: Time, max: Date, min: Date): boolean {
    const newDate = setTime(new Date(), diff);

    if (max && newDate > max) {
        return false;
    }

    if (min && newDate < min) {
        return false;
    }

    return true;
}

export function isInputValid(hours: string, minutes = '0', seconds = '0', isPM: boolean): boolean {
    return isHourInputValid(hours, isPM) && isMinuteInputValid(minutes) && isSecondInputValid(seconds);
}

1	import { Time, TimePickerComponentState } from './inner/inner-time-picker.class';
2	import { coerceNumberProperty } from '@angular/cdk/coercion';	1✔
3		1✔
4	const hoursPerDay = 24;	1✔
5	const hoursPerDayHalf = 12;	1✔
6	const minutesPerHour = 60;
7	const secondsPerMinute = 60;	173✔
8		83✔
9	export function isValidDate(value?: string \| Date): boolean {
10	if (!value) {	90!
11	return false;	×
12	}
13		90✔
14	if (value instanceof Date && isNaN(value.getHours())) {	8✔
15	return false;
16	}	82✔
17
18	if (typeof value === 'string') {
19	return isValidDate(new Date(value));	3✔
20	}	1✔
21
22	return true;	2✔
23	}	1✔
24
25	export function isValidLimit(controls: TimePickerComponentState, newDate: Date): boolean {	1✔
26	if (controls.min && newDate < controls.min) {
27	return false;	11✔
28	}	200✔
29		200✔
30	if (controls.max && newDate > controls.max) {	1✔
31	return false;
32	}	199✔
33
34	return true;
35	}	198✔
36		198✔
37	export function parseHours(value: string \| number, isPM = false): number {	3✔
38	const hour = coerceNumberProperty(value);
39	if (isNaN(hour) \|\| hour < 0 \|\| hour > (isPM ? hoursPerDayHalf : hoursPerDay)) {	195✔
40	return NaN;
41	}
42		197✔
43	return hour;	197✔
44	}	1✔
45
46	export function parseMinutes(value: string \| number): number {	196✔
47	const minute = coerceNumberProperty(value);
48	if (isNaN(minute) \|\| minute < 0 \|\| minute > minutesPerHour) {
49	return NaN;	82✔
50	}	8✔
51
52	return minute;	74✔
53	}
54
55	export function parseSeconds(value: string \| number): number {	22!
NEW 56	const seconds = coerceNumberProperty(value);	×
57	if (isNaN(seconds) \|\| seconds < 0 \|\| seconds > secondsPerMinute) {
58	return NaN;	22✔
59	}	22✔
60		22✔
61	return seconds;	22✔
62	}	10✔
63		10!
64	export function parseTime(value: string \| Date): Date {	×
65	if (typeof value === 'string') {
66	return new Date(value);
67	}	22✔
68		6✔
69	return value;
70	}	22✔
71		6✔
72	export function changeTime(value: Date, diff: Time): Date {
73	if (!value) {	22✔
74	return changeTime(createDate(new Date(), 0, 0, 0), diff);
75	}
76		11✔
77	let hour = value.getHours();	11✔
78	let minutes = value.getMinutes();	11✔
79	let seconds = value.getSeconds();	11✔
80		1✔
81	if (diff.hour) {
82	hour = (hour + coerceNumberProperty(diff.hour)) % hoursPerDay;	11✔
83	if (hour < 0) {	1!
84	hour += hoursPerDay;	1✔
85	}
86	}	×
87
88	if (diff.minute) {	10✔
89	minutes = minutes + coerceNumberProperty(diff.minute);	1✔
90	}
91		9✔
92	if (diff.seconds) {
93	seconds = seconds + coerceNumberProperty(diff.seconds);
94	}	32✔
95
96	return createDate(value, hour, minutes, seconds);
97	}	150✔
98		150✔
99	export function setTime(value: Date, opts: Time): Date {	58✔
100	let hour = parseHours(opts.hour);
101	const minute = parseMinutes(opts.minute);	92✔
102	const seconds = parseSeconds(opts.seconds) \|\| 0;
103
104	if (opts.isPM && hour !== 12) {	189✔
105	hour += hoursPerDayHalf;
106	}
107		187✔
108	if (!value) {
109	if (!isNaN(hour) && !isNaN(minute)) {
110	return createDate(new Date(), hour, minute, seconds);	186✔
111	}
112
113	return value;	5✔
114	}	5!
115		×
116	if (isNaN(hour) \|\| isNaN(minute)) {
117	return value;	5✔
118	}	1✔
119
120	return createDate(value, hour, minute, seconds);	4✔
121	}
122		×
123	export function createDate(value: Date, hours: number, minutes: number, seconds: number): Date {	185✔
124	return new Date(value.getFullYear(), value.getMonth(), value.getDate(), hours, minutes, seconds, value.getMilliseconds());
125	}
126
127	export function padNumber(value: number): string {
128	const _value = value.toString();
129	if (_value.length > 1) {
130	return _value;
131	}
132
133	return `0${_value}`;
134	}
135
136	export function isHourInputValid(hours: string, isPM: boolean): boolean {
137	return !isNaN(parseHours(hours, isPM));
138	}
139
140	export function isMinuteInputValid(minutes: string): boolean {
141	return !isNaN(parseMinutes(minutes));
142	}
143
144	export function isSecondInputValid(seconds: string): boolean {
145	return !isNaN(parseSeconds(seconds));
146	}
147
148	export function isInputLimitValid(diff: Time, max: Date, min: Date): boolean {
149	const newDate = setTime(new Date(), diff);
150
151	if (max && newDate > max) {
152	return false;
153	}
154
155	if (min && newDate < min) {
156	return false;
157	}
158
159	return true;
160	}
161
162	export function isInputValid(hours: string, minutes = '0', seconds = '0', isPM: boolean): boolean {
163	return isHourInputValid(hours, isPM) && isMinuteInputValid(minutes) && isSecondInputValid(seconds);
164	}

atinc / ngx-tethys / 3b0f2033-3042-471a-8924-af474a7789df

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous