From 4109787bc4f20b7552b2cbbbd1b5719544836c81 Mon Sep 17 00:00:00 2001 From: Raju Shrestha Date: Mon, 26 Aug 2024 13:36:59 +0545 Subject: [PATCH] cash flow --- .../application/views/accounts/cash_flow.php | 72 ++++++++++++++----- account/dist/css/bbnepalcustom.css | 6 +- 2 files changed, 56 insertions(+), 22 deletions(-) diff --git a/account/application/views/accounts/cash_flow.php b/account/application/views/accounts/cash_flow.php index 5e180ce..948a4e4 100644 --- a/account/application/views/accounts/cash_flow.php +++ b/account/application/views/accounts/cash_flow.php @@ -90,6 +90,36 @@ $PL = $IncomesTotal - $ExpensesTotal; box-shadow: inset 0 0 0 transparent; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; } + + .table1 { + border: 0px !important; + padding: 0; + margin: 10 !important; + width: 100%; + vertical-align: middle; + } + + .table-responsive { + overflow-x: auto; + } + + .card-body { + -webkit-flex: 1 1 auto; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + min-height: 1px; + padding: 0; + } + table { + border: 1px solid #ddd; + border-collapse: collapse; +} +.card-body.p-0 .table tbody>tr>td:last-of-type, .card-body.p-0 .table tbody>tr>th:last-of-type, .card-body.p-0 .table tfoot>tr>td:last-of-type, .card-body.p-0 .table tfoot>tr>th:last-of-type, .card-body.p-0 .table thead>tr>td:last-of-type, .card-body.p-0 .table thead>tr>th:last-of-type { + padding-right:0!important; +} +.text-bold{ + font-weight: 900; +}
@@ -235,15 +265,19 @@ $PL = $IncomesTotal - $ExpensesTotal;
-->
prepareIncomeExpenses() ?> - + + + + +
- + - + @@ -262,15 +296,15 @@ $PL = $IncomesTotal - $ExpensesTotal; --> - + - + - - + + @@ -279,7 +313,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
          
- +
@@ -292,7 +326,7 @@ $PL = $IncomesTotal - $ExpensesTotal; - + @@ -308,20 +342,20 @@ $PL = $IncomesTotal - $ExpensesTotal; - + - - + + - + - + - + getAccountCategoriesWithBalances(null, 2); ?> accounts as $account) : ?> @@ -329,9 +363,9 @@ $PL = $IncomesTotal - $ExpensesTotal; - + - + getAccountCategoriesWithBalances(null, 3); ?> @@ -340,9 +374,9 @@ $PL = $IncomesTotal - $ExpensesTotal; - + - +
TotalTotal TotalTotal
Net InflowNet Inflow
account_name; ?>account_name; ?> balances['dr_total'] - $account->balances['cr_total']); ?>balances['dr_total'] - $account->balances['cr_total']); ?>
account_name; ?>account_name; ?> balances['dr_total'] - $account->balances['cr_total']); ?>balances['dr_total'] - $account->balances['cr_total']); ?>
diff --git a/account/dist/css/bbnepalcustom.css b/account/dist/css/bbnepalcustom.css index e1288c5..ecad3e3 100644 --- a/account/dist/css/bbnepalcustom.css +++ b/account/dist/css/bbnepalcustom.css @@ -123,9 +123,9 @@ margin-bottom: .5rem; .select2-container--default .select2-selection--single .select2-selection__arrow b { margin-top: 0 !important; } -.card-body.p-0 .table tbody>tr>td:last-of-type, .card-body.p-0 .table tbody>tr>th:last-of-type, .card-body.p-0 .table tfoot>tr>td:last-of-type, .card-body.p-0 .table tfoot>tr>th:last-of-type, .card-body.p-0 .table thead>tr>td:last-of-type, .card-body.p-0 .table thead>tr>th:last-of-type { - padding-right: 0!important; -} +/* .card-body.p-0 .table tbody>tr>td:last-of-type, .card-body.p-0 .table tbody>tr>th:last-of-type, .card-body.p-0 .table tfoot>tr>td:last-of-type, .card-body.p-0 .table tfoot>tr>th:last-of-type, .card-body.p-0 .table thead>tr>td:last-of-type, .card-body.p-0 .table thead>tr>th:last-of-type { + padding-right: 0px!important; +} */ .form-group textarea.form-control { height: 50px !important; }