FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add default unitScale
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2021-01-25 20:18:04 +01:00
parent bb555eec74
commit b17bce1cd2
1 changed files with 84 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
projects/common/src/fm/services/timespan.service.ts
View File

@ -64,12 +64,21 @@ export class TimespanService {
return this.getStartEndCaption(new Date(endDate.getTime() - (this.unitScales[unitScale] / 2)), startDate, unitScale, suffix);
}
getCaption(startDate: Date, endDate: Date, unitScale: number): string {
let startCaption = this.getStartCaption(startDate, endDate, unitScale);
let endCaption = this.getEndCaption(startDate,endDate, unitScale);
if ((endDate.getTime() - startDate.getTime()) < (1.5 * this.unitScales[unitScale]))
getCaption(startDate: Date, endDate: Date, unitScale?: number): string {
let scale = unitScale;
if(unitScale==null) {
scale=4;
if(startDate.getUTCMonth() == 0 && startDate.getUTCDate() == 1 && startDate.getUTCHours() == 0 && startDate.getUTCMinutes() ==0 && startDate.getUTCSeconds() ==0 &&
endDate.getUTCMonth() == 0 && endDate.getUTCDate() == 1 && endDate.getUTCHours() == 0 && endDate.getUTCMinutes() ==0 && endDate.getUTCSeconds() ==0) {
scale=8;
} else if (startDate.getUTCHours() > 0 && startDate.getUTCMinutes() >0) {
scale =3
}
}
let startCaption = this.getStartCaption(startDate, endDate, scale);
let endCaption = this.getEndCaption(startDate,endDate, scale);
if ((endDate.getTime() - startDate.getTime()) < (1.5 * this.unitScales[scale]))
return endCaption;
return `${startCaption}-${endCaption}`;
}
}