Implement journal view
This commit is contained in:
parent
8def6bf046
commit
7616d1256d
@ -30,6 +30,7 @@ async function initApp() {
|
|||||||
const routes = [
|
const routes = [
|
||||||
{ path: '/', name: 'index', component: () => import('./pages/HomeView.vue') },
|
{ path: '/', name: 'index', component: () => import('./pages/HomeView.vue') },
|
||||||
{ path: '/general-ledger', name: 'general-ledger', component: () => import('./pages/GeneralLedgerView.vue') },
|
{ path: '/general-ledger', name: 'general-ledger', component: () => import('./pages/GeneralLedgerView.vue') },
|
||||||
|
{ path: '/journal', name: 'journal', component: () => import('./pages/JournalView.vue') },
|
||||||
{ path: '/transactions/:account', name: 'transactions', component: () => import('./pages/TransactionsView.vue') },
|
{ path: '/transactions/:account', name: 'transactions', component: () => import('./pages/TransactionsView.vue') },
|
||||||
{ path: '/trial-balance', name: 'trial-balance', component: () => import('./pages/TrialBalanceView.vue') },
|
{ path: '/trial-balance', name: 'trial-balance', component: () => import('./pages/TrialBalanceView.vue') },
|
||||||
];
|
];
|
||||||
|
@ -22,8 +22,8 @@
|
|||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<div class="my-4 flex">
|
<div class="my-4 flex">
|
||||||
<button v-if="commodityDetail" class="btn-secondary" @click="commodityDetail = false; renderTable();">Hide commodity detail</button>
|
<button v-if="commodityDetail" class="btn-secondary" @click="commodityDetail = false">Hide commodity detail</button>
|
||||||
<button v-if="!commodityDetail" class="btn-secondary" @click="commodityDetail = true; renderTable();">Show commodity detail</button>
|
<button v-if="!commodityDetail" class="btn-secondary" @click="commodityDetail = true">Show commodity detail</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="transaction-list" class="max-h-[100vh] overflow-y-scroll wk-aa">
|
<div id="transaction-list" class="max-h-[100vh] overflow-y-scroll wk-aa">
|
||||||
@ -44,7 +44,7 @@
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="4">Loading data…</td>
|
<td colspan="6">Loading data…</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@ -56,7 +56,7 @@
|
|||||||
|
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import { onUnmounted, ref } from 'vue';
|
import { onUnmounted, ref, watch } from 'vue';
|
||||||
|
|
||||||
import { asCost } from '../amounts.ts';
|
import { asCost } from '../amounts.ts';
|
||||||
import { JoinedTransactionPosting, Transaction, db, joinedToTransactions } from '../db.ts';
|
import { JoinedTransactionPosting, Transaction, db, joinedToTransactions } from '../db.ts';
|
||||||
@ -64,7 +64,7 @@
|
|||||||
|
|
||||||
const commodityDetail = ref(false);
|
const commodityDetail = ref(false);
|
||||||
|
|
||||||
let transactions: Transaction[] = [];
|
const transactions = ref([] as Transaction[]);
|
||||||
let clusterize: Clusterize | null = null;
|
let clusterize: Clusterize | null = null;
|
||||||
|
|
||||||
async function load() {
|
async function load() {
|
||||||
@ -77,15 +77,13 @@
|
|||||||
ORDER BY dt DESC, transaction_id DESC, postings.id`
|
ORDER BY dt DESC, transaction_id DESC, postings.id`
|
||||||
);
|
);
|
||||||
|
|
||||||
transactions = joinedToTransactions(joinedTransactionPostings);
|
transactions.value = joinedToTransactions(joinedTransactionPostings);
|
||||||
|
|
||||||
renderTable();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderTable() {
|
function renderTable() {
|
||||||
const rows = [];
|
const rows = [];
|
||||||
|
|
||||||
for (const transaction of transactions) {
|
for (const transaction of transactions.value) {
|
||||||
rows.push(
|
rows.push(
|
||||||
`<tr class="border-t border-gray-300">
|
`<tr class="border-t border-gray-300">
|
||||||
<td class="py-0.5 pr-1 text-gray-900 lg:w-[12ex]">${ dayjs(transaction.dt).format('YYYY-MM-DD') }</td>
|
<td class="py-0.5 pr-1 text-gray-900 lg:w-[12ex]">${ dayjs(transaction.dt).format('YYYY-MM-DD') }</td>
|
||||||
@ -140,6 +138,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
watch(commodityDetail, renderTable);
|
||||||
|
watch(transactions, renderTable);
|
||||||
|
|
||||||
load();
|
load();
|
||||||
|
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
<div class="pr-4">
|
<div class="pr-4">
|
||||||
<h2 class="font-medium text-gray-700 mb-2">Data sources</h2>
|
<h2 class="font-medium text-gray-700 mb-2">Data sources</h2>
|
||||||
<ul class="list-disc ml-6">
|
<ul class="list-disc ml-6">
|
||||||
<!--<li><a href="#" class="text-gray-900 hover:text-blue-700 hover:underline">Journal</a></li>-->
|
<li><RouterLink :to="{ name: 'journal' }" class="text-gray-900 hover:text-blue-700 hover:underline">Journal</RouterLink></li>
|
||||||
<!--<li><a href="#" class="text-gray-900 hover:text-blue-700 hover:underline">Statement lines</a></li>-->
|
<!--<li><a href="#" class="text-gray-900 hover:text-blue-700 hover:underline">Statement lines</a></li>-->
|
||||||
<!--<li><a href="#" class="text-gray-900 hover:text-blue-700 hover:underline">Balance assertions</a></li>-->
|
<!--<li><a href="#" class="text-gray-900 hover:text-blue-700 hover:underline">Balance assertions</a></li>-->
|
||||||
<!--<li><a href="#" class="text-gray-900 hover:text-blue-700 hover:underline">Chart of accounts</a></li>-->
|
<!--<li><a href="#" class="text-gray-900 hover:text-blue-700 hover:underline">Chart of accounts</a></li>-->
|
||||||
|
157
src/pages/JournalView.vue
Normal file
157
src/pages/JournalView.vue
Normal file
@ -0,0 +1,157 @@
|
|||||||
|
<!--
|
||||||
|
DrCr: Web-based double-entry bookkeeping framework
|
||||||
|
Copyright (C) 2022–2024 Lee Yingtong Li (RunasSudo)
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<h1 class="page-heading">
|
||||||
|
Journal
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<div class="my-4 flex gap-x-2">
|
||||||
|
<!--<a href="{{ url_for('journal_new_transaction') }}" class="btn-primary pl-2">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
|
||||||
|
</svg>
|
||||||
|
New transaction
|
||||||
|
</a>-->
|
||||||
|
<button v-if="commodityDetail" class="btn-secondary" @click="commodityDetail = false">Hide commodity detail</button>
|
||||||
|
<button v-if="!commodityDetail" class="btn-secondary" @click="commodityDetail = true">Show commodity detail</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="transaction-list" class="max-h-[100vh] overflow-y-scroll wk-aa">
|
||||||
|
<table class="min-w-full">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="py-0.5 pr-1 text-gray-900 font-semibold lg:w-[12ex] text-start">Date</th>
|
||||||
|
<th class="py-0.5 px-1 text-gray-900 font-semibold text-start" colspan="3">Description</th>
|
||||||
|
<template v-if="commodityDetail">
|
||||||
|
<th class="py-0.5 px-1 text-gray-900 font-semibold text-end">Dr</th>
|
||||||
|
<th class="py-0.5 pl-1 text-gray-900 font-semibold text-end">Cr</th>
|
||||||
|
</template>
|
||||||
|
<template v-if="!commodityDetail">
|
||||||
|
<th class="py-0.5 px-1 text-gray-900 font-semibold lg:w-[12ex] text-end">Dr</th>
|
||||||
|
<th class="py-0.5 pl-1 text-gray-900 font-semibold lg:w-[12ex] text-end">Cr</th>
|
||||||
|
</template>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td colspan="6">Loading data…</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import Clusterize from 'clusterize.js';
|
||||||
|
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
|
import { onUnmounted, ref, watch } from 'vue';
|
||||||
|
|
||||||
|
import { asCost } from '../amounts.ts';
|
||||||
|
import { JoinedTransactionPosting, Transaction, db, joinedToTransactions } from '../db.ts';
|
||||||
|
import { pp, ppWithCommodity } from '../display.ts';
|
||||||
|
|
||||||
|
const commodityDetail = ref(false);
|
||||||
|
|
||||||
|
const transactions = ref([] as Transaction[]);
|
||||||
|
let clusterize: Clusterize | null = null;
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
const session = await db.load();
|
||||||
|
|
||||||
|
const joinedTransactionPostings: JoinedTransactionPosting[] = await session.select(
|
||||||
|
`SELECT transaction_id, dt, transactions.description AS transaction_description, postings.id, postings.description, account, quantity, commodity
|
||||||
|
FROM transactions
|
||||||
|
JOIN postings ON transactions.id = postings.transaction_id
|
||||||
|
ORDER BY dt DESC, transaction_id DESC, postings.id`
|
||||||
|
);
|
||||||
|
|
||||||
|
transactions.value = joinedToTransactions(joinedTransactionPostings);
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderTable() {
|
||||||
|
const rows = [];
|
||||||
|
|
||||||
|
for (const transaction of transactions.value) {
|
||||||
|
rows.push(
|
||||||
|
`<tr class="border-t border-gray-300">
|
||||||
|
<td class="py-0.5 pr-1 text-gray-900 lg:w-[12ex]">${ dayjs(transaction.dt).format('YYYY-MM-DD') }</td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900" colspan="3">${ transaction.description }</td>
|
||||||
|
<td></td>
|
||||||
|
<td></td>
|
||||||
|
</tr>`
|
||||||
|
);
|
||||||
|
for (const posting of transaction.postings) {
|
||||||
|
if (commodityDetail.value) {
|
||||||
|
rows.push(
|
||||||
|
`<tr>
|
||||||
|
<td class=""></td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900 lg:w-[30%]">${ posting.description ?? '' }</td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900 text-end"><i>${ posting.quantity >= 0 ? 'Dr' : 'Cr' }</i></td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900 lg:w-[30%]"><a href="/transactions/${ encodeURIComponent(posting.account) }" class="text-gray-900 hover:text-blue-700 hover:underline">${ posting.account }</a></td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900 text-end">
|
||||||
|
${ posting.quantity >= 0 ? ppWithCommodity(posting.quantity, posting.commodity) : '' }
|
||||||
|
</td>
|
||||||
|
<td class="py-0.5 pl-1 text-gray-900 text-end">
|
||||||
|
${ posting.quantity < 0 ? ppWithCommodity(-posting.quantity, posting.commodity) : '' }
|
||||||
|
</td>
|
||||||
|
</tr>`
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
rows.push(
|
||||||
|
`<tr>
|
||||||
|
<td class=""></td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900 lg:w-[30%]">${ posting.description ?? '' }</td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900 text-end"><i>${ posting.quantity >= 0 ? 'Dr' : 'Cr' }</i></td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900 lg:w-[30%]"><a href="/transactions/${ encodeURIComponent(posting.account) }" class="text-gray-900 hover:text-blue-700 hover:underline">${ posting.account }</a></td>
|
||||||
|
<td class="py-0.5 px-1 text-gray-900 lg:w-[12ex] text-end">
|
||||||
|
${ posting.quantity >= 0 ? pp(asCost(posting.quantity, posting.commodity)) : '' }
|
||||||
|
</td>
|
||||||
|
<td class="py-0.5 pl-1 text-gray-900 lg:w-[12ex] text-end">
|
||||||
|
${ posting.quantity < 0 ? pp(asCost(-posting.quantity, posting.commodity)) : '' }
|
||||||
|
</td>
|
||||||
|
</tr>`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (clusterize === null) {
|
||||||
|
clusterize = new Clusterize({
|
||||||
|
'rows': rows,
|
||||||
|
scrollElem: document.getElementById('transaction-list')!,
|
||||||
|
contentElem: document.querySelector('#transaction-list tbody')!
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
clusterize.update(rows);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(commodityDetail, renderTable);
|
||||||
|
watch(transactions, renderTable);
|
||||||
|
|
||||||
|
load();
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (clusterize !== null) {
|
||||||
|
clusterize.destroy();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
Loading…
Reference in New Issue
Block a user