Clean up and refactor

This commit is contained in:
RunasSudo 2022-12-24 15:18:53 +11:00
parent f9ed93af03
commit 801d70c6e9
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
5 changed files with 43 additions and 23 deletions

View File

@ -28,7 +28,7 @@ def statement_lines():
else:
statement_lines = StatementLine.query.all()
return render_template('statement_lines.html', statement_lines=sorted(statement_lines, key=lambda l: l.dt))
return render_template('statements/statement_lines.html', statement_lines=sorted(statement_lines, key=lambda l: l.dt))
@app.route('/statement-lines/charge', methods=['POST'])
def statement_line_charge():
@ -68,14 +68,14 @@ def statement_line_edit_transaction():
if request.method == 'GET':
if len(statement_line.postings) == 0:
return render_template('statement_line_edit_transaction.html', statement_line=statement_line, transaction=None)
return render_template('statements/statement_line_edit_transaction.html', statement_line=statement_line, transaction=None)
if len(statement_line.postings) > 1:
# NYI
raise Exception('Cannot display a StatementLine with >2 postings')
# Get existing transaction
return render_template('statement_line_edit_transaction.html', statement_line=statement_line, transaction=statement_line.postings[0].transaction)
return render_template('statements/statement_line_edit_transaction.html', statement_line=statement_line, transaction=statement_line.postings[0].transaction)
# Delete existing postings
if len(statement_line.postings) > 0:

38
drcr/views.py Normal file
View File

@ -0,0 +1,38 @@
# DrCr: Web-based double-entry bookkeeping framework
# Copyright (C) 2022 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/>.
from flask import render_template
from .models import Amount, TrialBalancer
from .webapp import all_transactions, app
@app.route('/')
def index():
return '<a href="/general-journal">General journal</a><br><a href="/statement-lines">Statement lines</a><br><a href="/general-ledger">General ledger</a><br><a href="/trial-balance">Trial balance</a>'
@app.route('/general-ledger')
def general_ledger():
return render_template('general_ledger.html', transactions=sorted(all_transactions(), key=lambda t: t.dt))
@app.route('/trial-balance')
def trial_balance():
balancer = TrialBalancer()
balancer.apply_transactions(all_transactions())
total_dr = Amount(sum(v.quantity for v in balancer.accounts.values() if v.quantity > 0), '$')
total_cr = Amount(sum(v.quantity for v in balancer.accounts.values() if v.quantity < 0), '$')
return render_template('trial_balance.html', accounts=dict(sorted(balancer.accounts.items())), total_dr=total_dr, total_cr=total_cr)

View File

@ -14,19 +14,14 @@
# 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/>.
from flask import Flask, render_template
from flask import Flask
from .database import db_session, init_db
from .general_journal.models import GeneralJournalTransaction
from .models import Amount, TrialBalancer
from .statements.models import StatementLine, StatementLineTransaction
app = Flask(__name__)
@app.route('/')
def index():
return '<a href="/general-journal">General journal</a><br><a href="/statement-lines">Statement lines</a><br><a href="/general-ledger">General ledger</a><br><a href="/trial-balance">Trial balance</a>'
def all_transactions():
return (
GeneralJournalTransaction.query.all() +
@ -34,20 +29,7 @@ def all_transactions():
[line.into_transaction() for line in StatementLine.query.all() if len(line.postings) == 0] # TODO: Filter in SQL
)
@app.route('/general-ledger')
def general_ledger():
return render_template('general_ledger.html', transactions=sorted(all_transactions(), key=lambda t: t.dt))
@app.route('/trial-balance')
def trial_balance():
balancer = TrialBalancer()
balancer.apply_transactions(all_transactions())
total_dr = Amount(sum(v.quantity for v in balancer.accounts.values() if v.quantity > 0), '$')
total_cr = Amount(sum(v.quantity for v in balancer.accounts.values() if v.quantity < 0), '$')
return render_template('trial_balance.html', accounts=dict(sorted(balancer.accounts.items())), total_dr=total_dr, total_cr=total_cr)
from . import views
from .general_journal import views
from .reports import views
from .statements import views