Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Customizeable Reports #1791

Merged
merged 72 commits into from
Nov 16, 2023
Merged
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
e196a34
Reorganize and add graphs
carkom Sep 8, 2023
ed576f0
Merge remote-tracking branch 'upstream/master' into reportsOrganization
carkom Oct 12, 2023
0ea6036
Create Customizable Chart
carkom Oct 13, 2023
29cdc84
Notes
carkom Oct 13, 2023
b90ccc9
Hide Menu update Donut
carkom Oct 13, 2023
758f91b
lint fixes
carkom Oct 13, 2023
7a50264
Organize Menus
carkom Oct 13, 2023
a57f362
Change Title
carkom Oct 13, 2023
e032d66
UI changes
carkom Oct 14, 2023
0709edd
Merge branch 'master' into reportsOrganization
carkom Oct 14, 2023
8a1465e
Merge remote-tracking branch 'upstream/master' into reportsOrganization
carkom Oct 14, 2023
94dd8df
Merge branch 'reportsOrganization' of https://github.com/carkom/actua…
carkom Oct 14, 2023
9b64c00
UI updates
carkom Oct 14, 2023
014d4ea
Add Data Table
carkom Oct 16, 2023
1c83854
Functionality additions and Privacy Filters
carkom Oct 16, 2023
c6d4ebc
Merge branch 'master' into reportsOrganization
carkom Oct 16, 2023
175d88f
Date filters working and formatting changes
carkom Oct 17, 2023
2877942
Fix default spreadsheet and add tableGraph
carkom Oct 18, 2023
6a5d4f3
Integrate Summary Data and Split Legend
carkom Oct 18, 2023
a08df24
started adding functionality on charts
carkom Oct 19, 2023
6aa596b
Merge branch 'master' into reportsOrganization
carkom Oct 19, 2023
9518f5d
list fix
carkom Oct 19, 2023
a3eaf1e
Enabling more graphs, fixing errors
carkom Oct 20, 2023
053c419
Legend, interactions, Empty Rows Filter
carkom Oct 20, 2023
b2d14d7
fixes for EmptyRows/interactions/legends
carkom Oct 21, 2023
318f016
formatting UI and filtering data
carkom Oct 21, 2023
578d2de
format date
carkom Oct 21, 2023
f87255e
Merge branch 'master' into reportsOrganization
carkom Oct 21, 2023
15448b3
fix errors
carkom Oct 21, 2023
b40ba7b
Fix Legend Order
carkom Oct 22, 2023
47557d9
lint fixes
carkom Oct 22, 2023
f5fbbce
Add tooltips
carkom Oct 22, 2023
cde6193
Feature Flag
carkom Oct 22, 2023
a432aae
Merge branch 'master' into reportsOrganization
carkom Oct 24, 2023
7d99b30
fix overview card, fix offbudget checkbox
carkom Oct 24, 2023
4de4996
Revamped dataType, added scrollBars
carkom Oct 25, 2023
2d492e1
data display adjustments
carkom Oct 26, 2023
47058b1
data spreadsheet updates/groups added to matrix
carkom Oct 27, 2023
80d08c6
Add Category Selector
carkom Oct 28, 2023
6953a0d
Add Labels Button
carkom Oct 28, 2023
69db103
formatting fixes
carkom Oct 28, 2023
a9e414d
Add Averages to dataTable
carkom Oct 28, 2023
d367884
data bug fix
carkom Oct 28, 2023
54f8cf2
Added all type back in with exceptions
carkom Oct 29, 2023
de892a4
formatting
carkom Oct 29, 2023
443fce0
Merge branch 'master' into reportsOrganization
carkom Oct 31, 2023
d887a44
split assets/debts, add Uncategorized
carkom Oct 31, 2023
f2dd6d8
bug fixes and UI updates
carkom Oct 31, 2023
8df59c0
add scrollbars to table
carkom Oct 31, 2023
7790fd6
Merge branch 'master' into reportsOrganization
carkom Oct 31, 2023
e698f1c
formatting dataTable
carkom Nov 1, 2023
e7093aa
tooltips, navigation and graph labels
carkom Nov 3, 2023
c0cc2e9
Merge branch 'master' into reportsOrganization
carkom Nov 5, 2023
5d05239
Merge branch 'master' into reportsOrganization
carkom Nov 6, 2023
f7b1cc9
Code clean-up and re-org
carkom Nov 6, 2023
a20d18a
revert color change
carkom Nov 6, 2023
0df6f8e
Change labels name
carkom Nov 7, 2023
3fa193a
organize files
carkom Nov 11, 2023
a8ffc0d
Merge branch 'master' into reportsOrganization
carkom Nov 11, 2023
2dde53d
code cleanup
carkom Nov 13, 2023
aa7ac72
Tooltip Colors
carkom Nov 13, 2023
4728537
Descoping legend for future PR
carkom Nov 13, 2023
9e3364f
descope legend & rename split
carkom Nov 14, 2023
8699335
rename type variable to be more descriptive
carkom Nov 14, 2023
32da839
Merge remote-tracking branch 'upstream/master' into reportsOrganization
carkom Nov 14, 2023
4d3bb9f
adjustments for sankey and eslint merges
carkom Nov 14, 2023
6d42ece
notes update
carkom Nov 14, 2023
3f82ccb
code review fixes
carkom Nov 15, 2023
64d672f
Merge branch 'master' into reportsOrganization
carkom Nov 15, 2023
20301a0
code fixes
carkom Nov 16, 2023
7df30ac
Merge branch 'master' into reportsOrganization
carkom Nov 16, 2023
62ac0c3
fix date selections
carkom Nov 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
formatting dataTable
carkom committed Nov 1, 2023
commit e698f1cee0d5587251e6d15180e8fbbb5aa5904d
73 changes: 56 additions & 17 deletions packages/desktop-client/src/components/reports/ReportTable.tsx
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ type TableRowProps = {
date: string;
name: string;
monthData: [];
totalAssets: string;
totalDebts: string;
totalAssets: number;
totalDebts: number;
};
typeOp?: string | null;
splitItem: string;
@@ -44,6 +44,7 @@ const TableRow = memo(
<Cell
value={item[splitItem]}
width="flex"
title={item[splitItem].length > 12 && item[splitItem]}
style={{
minWidth: 125,
}}
@@ -53,10 +54,14 @@ const TableRow = memo(
return (
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
key={amountToCurrency(item[typeOp])}
value={amountToCurrency(item[typeOp])}
title={
Math.abs(item[typeOp]) > 100000 &&
amountToCurrency(item[typeOp])
}
width="flex"
privacyFilter
/>
@@ -66,34 +71,49 @@ const TableRow = memo(
<>
<Cell
value={amountToCurrency(item.totalAssets)}
title={
Math.abs(item.totalAssets) > 100000 &&
amountToCurrency(item.totalAssets)
}
width="flex"
style={{
minWidth: 75,
minWidth: 85,
}}
/>
<Cell
value={amountToCurrency(item.totalDebts)}
title={
Math.abs(item.totalDebts) > 100000 &&
amountToCurrency(item.totalDebts)
}
width="flex"
style={{
minWidth: 75,
minWidth: 85,
}}
/>
</>
)}
<Cell
value={amountToCurrency(item[typeOp])}
title={
Math.abs(item[typeOp]) > 100000 && amountToCurrency(item[typeOp])
}
style={{
fontWeight: 600,
minWidth: 75,
minWidth: 85,
}}
width="flex"
privacyFilter
/>
<Cell
value={integerToCurrency(Math.round(average))}
title={
Math.abs(Math.round(average / 100)) > 100000 &&
integerToCurrency(Math.round(average))
}
style={{
fontWeight: 600,
minWidth: 75,
minWidth: 85,
}}
width="flex"
privacyFilter
@@ -177,7 +197,7 @@ export function TableHeader({ scrollWidth, split, interval, type }) {
return (
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
key={header}
// eslint-disable-next-line rulesdir/typography
@@ -190,14 +210,14 @@ export function TableHeader({ scrollWidth, split, interval, type }) {
<>
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
value={'Assets'}
width="flex"
/>
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
value={'Debts'}
width="flex"
@@ -206,14 +226,14 @@ export function TableHeader({ scrollWidth, split, interval, type }) {
)}
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
value={'Totals'}
width="flex"
/>
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
value={'Average'}
width="flex"
@@ -246,10 +266,14 @@ export function TableTotals({ data, scrollWidth, typeOp, mode, monthsCount }) {
return (
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
key={amountToCurrency(item[typeOp])}
value={amountToCurrency(item[typeOp])}
title={
Math.abs(item[typeOp]) > 100000 &&
amountToCurrency(item[typeOp])
}
width="flex"
privacyFilter
/>
@@ -259,33 +283,48 @@ export function TableTotals({ data, scrollWidth, typeOp, mode, monthsCount }) {
<>
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
value={amountToCurrency(data.totalAssets)}
title={
Math.abs(data.totalAssets) > 100000 &&
amountToCurrency(data.totalAssets)
}
width="flex"
/>
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
value={amountToCurrency(data.totalDebts)}
title={
Math.abs(data.totalDebts) > 100000 &&
amountToCurrency(data.totalDebts)
}
width="flex"
/>
</>
)}
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
value={amountToCurrency(data[typeOp])}
title={
Math.abs(data[typeOp]) > 100000 && amountToCurrency(data[typeOp])
}
width="flex"
privacyFilter
/>
<Cell
style={{
minWidth: 75,
minWidth: 85,
}}
value={integerToCurrency(Math.round(average))}
title={
Math.abs(Math.round(average / 100)) > 100000 &&
integerToCurrency(Math.round(average))
}
width="flex"
privacyFilter
/>