repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanups in Utils.ts
[e-mobility-charging-stations-simulator.git]
/
src
/
utils
/
Utils.ts
diff --git
a/src/utils/Utils.ts
b/src/utils/Utils.ts
index f62319983507e9dbc038b7032cd8275da7d080b7..f27f06660227643ebe516f8972ee08206334af22 100644
(file)
--- a/
src/utils/Utils.ts
+++ b/
src/utils/Utils.ts
@@
-50,42
+50,42
@@
export default class Utils {
return Utils.formatDurationMilliSeconds(duration * 1000);
}
return Utils.formatDurationMilliSeconds(duration * 1000);
}
- public static convertToDate(value: unknown): Date {
- // Check
- if (!value) {
- return value as Date;
+ public static convertToDate(value: unknown): Date | null | undefined {
+ if (Utils.isNullOrUndefined(value)) {
+ return value as null | undefined;
+ }
+ if (value instanceof Date) {
+ return value;
}
}
- // Check Type
- if (!(value instanceof Date)) {
- return new Date(value as string);
+ if (Utils.isString(value) || typeof value === 'number') {
+ return new Date(value as string | number);
}
}
- return
value
;
+ return
null
;
}
public static convertToInt(value: unknown): number {
}
public static convertToInt(value: unknown): number {
- let changedValue: number = value as number;
if (!value) {
return 0;
}
if (!value) {
return 0;
}
+ let changedValue: number = value as number;
if (Number.isSafeInteger(value)) {
return value as number;
}
if (Number.isSafeInteger(value)) {
return value as number;
}
- // Check
+ if (typeof value === 'number') {
+ changedValue = Math.trunc(value);
+ }
if (Utils.isString(value)) {
if (Utils.isString(value)) {
- // Create Object
changedValue = parseInt(value as string);
}
return changedValue;
}
public static convertToFloat(value: unknown): number {
changedValue = parseInt(value as string);
}
return changedValue;
}
public static convertToFloat(value: unknown): number {
- let changedValue: number = value as number;
if (!value) {
return 0;
}
if (!value) {
return 0;
}
- // Check
+ let changedValue: number = value as number;
if (Utils.isString(value)) {
if (Utils.isString(value)) {
- // Create Object
changedValue = parseFloat(value as string);
}
return changedValue;
changedValue = parseFloat(value as string);
}
return changedValue;
@@
-93,15
+93,17
@@
export default class Utils {
public static convertToBoolean(value: unknown): boolean {
let result = false;
public static convertToBoolean(value: unknown): boolean {
let result = false;
- // Check boolean
if (value) {
// Check the type
if (typeof value === 'boolean') {
if (value) {
// Check the type
if (typeof value === 'boolean') {
- // Already a boolean
result = value;
result = value;
- } else {
- // Convert
- result = value === 'true';
+ } else if (
+ Utils.isString(value) &&
+ ((value as string).toLowerCase() === 'true' || value === '1')
+ ) {
+ result = true;
+ } else if (typeof value === 'number' && value === 1) {
+ result = true;
}
}
return result;
}
}
return result;
@@
-197,6
+199,9
@@
export default class Utils {
}
public static isEmptyObject(obj: object): boolean {
}
public static isEmptyObject(obj: object): boolean {
+ if (obj?.constructor !== Object) {
+ return false;
+ }
// Iterates over the keys of an object, if
// any exist, return false.
for (const _ in obj) {
// Iterates over the keys of an object, if
// any exist, return false.
for (const _ in obj) {