zoom-out fallback to default view, pct 3 decimal places
This commit is contained in:
1 parent
86e4f402ca
commit
1b17a3d4a2
1 file changed
+16
-8
+16
-8
@@ -67,7 +67,7 @@ async function loadView() {
|
|||||||
|
|
||||||
$('range-label').textContent =
|
$('range-label').textContent =
|
||||||
`${fmtDate(viewFrom)} - ${fmtDate(viewTo)} (${entryMode ? 'Einträge' : ZOOM_LEVELS[zoomIndex].name})`;
|
`${fmtDate(viewFrom)} - ${fmtDate(viewTo)} (${entryMode ? 'Einträge' : ZOOM_LEVELS[zoomIndex].name})`;
|
||||||
$('btn-zoom-out').disabled = zoomStack.length === 0;
|
$('btn-zoom-out').disabled = zoomStack.length === 0 && zoomIndex === 0 && !entryMode;
|
||||||
|
|
||||||
if (entryMode) {
|
if (entryMode) {
|
||||||
const [entries, summary] = await Promise.all([
|
const [entries, summary] = await Promise.all([
|
||||||
@@ -337,12 +337,20 @@ function enterEntryMode(bucketStart, bucketEnd) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function zoomOut() {
|
function zoomOut() {
|
||||||
if (!zoomStack.length) return;
|
if (zoomStack.length) {
|
||||||
const prev = zoomStack.pop();
|
const prev = zoomStack.pop();
|
||||||
viewFrom = prev.from;
|
viewFrom = prev.from;
|
||||||
viewTo = prev.to;
|
viewTo = prev.to;
|
||||||
zoomIndex = prev.zoom;
|
zoomIndex = prev.zoom;
|
||||||
entryMode = prev.entry;
|
entryMode = prev.entry;
|
||||||
|
} else {
|
||||||
|
// Reset to default view
|
||||||
|
viewTo = new Date();
|
||||||
|
viewFrom = new Date(viewTo);
|
||||||
|
viewFrom.setDate(viewFrom.getDate() - ZOOM_LEVELS[0].days);
|
||||||
|
zoomIndex = 0;
|
||||||
|
entryMode = false;
|
||||||
|
}
|
||||||
loadView();
|
loadView();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -473,5 +481,5 @@ function escAttr(s) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function pct(cost) {
|
function pct(cost) {
|
||||||
return (cost / WEEKLY_BUDGET * 100).toFixed(2) + '%';
|
return (cost / WEEKLY_BUDGET * 100).toFixed(3) + '%';
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user