RunasSudo/DrCr
1
Fork 0
Code Issues 1 Pull Requests Releases Activity

Intelligently update income statement dates when comparison unit changed

Browse Source
This commit is contained in:
RunasSudo 2025-05-28 23:37:38 +10:00
parent ed62e72e6a
commit d1f3547b98
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/reports/IncomeStatementReport.vue
View File

@ -27,7 +27,7 @@
<div class="relative flex flex-grow items-stretch shadow-sm"> <div class="relative flex flex-grow items-stretch shadow-sm">
<input type="number" min="1" class="bordered-field w-[9.5em] pr-[6em]" v-model.lazy="comparePeriods"> <input type="number" min="1" class="bordered-field w-[9.5em] pr-[6em]" v-model.lazy="comparePeriods">
<div class="absolute inset-y-0 right-0 flex items-center z-10"> <div class="absolute inset-y-0 right-0 flex items-center z-10">
<select class="h-full border-0 bg-transparent py-0 pl-2 pr-8 text-gray-900 focus:ring-2 focus:ring-inset focus:ring-emerald-600" v-model="compareUnit"> <select class="h-full border-0 bg-transparent py-0 pl-2 pr-8 text-gray-900 focus:ring-2 focus:ring-inset focus:ring-emerald-600" v-model="compareUnit" @change="onCompareUnitChange">
<option value="years">years</option> <option value="years">years</option>
<option value="months">months</option> <option value="months">months</option>
</select> </select>
@ -69,22 +69,25 @@
} }
async function updateReport() { async function updateReport() {
const dayjsDt = dayjs(dt.value!);
const dayjsDtStart = dayjs(dtStart.value!);
const reportDates = []; const reportDates = [];
for (let i = 0; i < comparePeriods.value; i++) { for (let i = 0; i < comparePeriods.value; i++) {
let thisReportDt, thisReportDtStart; let thisReportDt, thisReportDtStart;
// Get period start and end dates // Get period start and end dates
if (compareUnit.value === 'years') { if (compareUnit.value === 'years') {
thisReportDt = dayjs(dt.value!).subtract(i, 'year'); thisReportDt = dayjsDt.subtract(i, 'year');
thisReportDtStart = dayjs(dtStart.value!).subtract(i, 'year'); thisReportDtStart = dayjsDtStart.subtract(i, 'year');
} else if (compareUnit.value === 'months') { } else if (compareUnit.value === 'months') {
if (dayjs(dt.value!).add(1, 'day').isSame(dayjs(dt.value!).set('date', 1).add(1, 'month'))) { if (dayjsDt.add(1, 'day').isSame(dayjsDt.set('date', 1).add(1, 'month'))) {
// If dt is the end of a calendar month, then fix each prior dt to be the end of the calendar month // If dt is the end of a calendar month, then fix each prior dt to be the end of the calendar month
thisReportDt = dayjs(dt.value!).subtract(i, 'month').set('date', 1).add(1, 'month').subtract(1, 'day'); thisReportDt = dayjsDt.subtract(i, 'month').set('date', 1).add(1, 'month').subtract(1, 'day');
thisReportDtStart = dayjs(dtStart.value!).subtract(i, 'month'); thisReportDtStart = dayjsDtStart.subtract(i, 'month');
} else { } else {
thisReportDt = dayjs(dt.value!).subtract(i, 'month'); thisReportDt = dayjsDt.subtract(i, 'month');
thisReportDtStart = dayjs(dtStart.value!).subtract(i, 'month'); thisReportDtStart = dayjsDtStart.subtract(i, 'month');
} }
} else { } else {
throw new Error('Unexpected compareUnit'); throw new Error('Unexpected compareUnit');
@ -97,4 +100,25 @@
} }
load(); load();
function onCompareUnitChange() {
const dayjsDt = dayjs(dt.value!);
const dayjsDtStart = dayjs(dtStart.value!);
if (compareUnit.value === 'years') {
if (dayjsDt.add(1, 'day').subtract(1, 'month').isSame(dayjsDtStart)) {
// Dates were previously set to one month - now compareUnit changed to years
// Automatically change dates to one year
dtStart.value = dayjsDt.add(1, 'day').subtract(1, 'year').format('YYYY-MM-DD');
}
} else if (compareUnit.value === 'months') {
if (dayjsDt.add(1, 'day').subtract(1, 'year').isSame(dayjsDtStart)) {
// Dates were previously set to one year - now compareUnit changed to months
// Automatically change dates to one month
dtStart.value = dayjsDt.add(1, 'day').subtract(1, 'month').format('YYYY-MM-DD');
}
} else {
throw new Error('Unexpected compareUnit');
}
}
</script> </script>