@tasenor/common-plugins 1.9.116 → 1.9.118
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/.turbo/turbo-ci.log +2 -2
- package/.turbo/turbo-lint.log +4 -0
- package/.turbo/turbo-nightly.log +3 -3
- package/data/src/Income Tree - Definitions.tsv +2 -0
- package/dist/AssetReport/backend/index.d.ts +15 -0
- package/dist/AssetReport/backend/index.js +145 -0
- package/dist/AssetReport/backend/index.js.map +1 -0
- package/dist/CoinbaseImport/backend/CoinbaseHandler.d.ts +2 -1
- package/dist/CoinbaseImport/backend/CoinbaseHandler.js +40 -3
- package/dist/CoinbaseImport/backend/CoinbaseHandler.js.map +1 -1
- package/dist/FinnishBalanceSheetReport/backend/index.d.ts +2 -2
- package/dist/FinnishBalanceSheetReport/backend/index.js +2 -2
- package/dist/FinnishBalanceSheetReport/backend/index.js.map +1 -1
- package/dist/FinnishBalanceSheetReportLite/backend/index.js +3 -3
- package/dist/FinnishBalanceSheetReportLite/backend/index.js.map +1 -1
- package/dist/FinnishIncomeStatementReport/backend/index.js +5 -5
- package/dist/FinnishIncomeStatementReport/backend/index.js.map +1 -1
- package/dist/FinnishIncomeStatementReportLite/backend/index.js +5 -5
- package/dist/FinnishIncomeStatementReportLite/backend/index.js.map +1 -1
- package/dist/IncomeAndExpenses/backend/index.js +4 -0
- package/dist/IncomeAndExpenses/backend/index.js.map +1 -1
- package/dist/JournalReport/backend/index.js +5 -5
- package/dist/JournalReport/backend/index.js.map +1 -1
- package/dist/LedgerReport/backend/index.js +10 -10
- package/dist/LedgerReport/backend/index.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/package.json +7 -7
- package/src/AssetReport/backend/index.ts +160 -0
- package/src/CoinbaseImport/backend/CoinbaseHandler.ts +43 -4
- package/src/CoinbaseImport/backend/rules.json +92 -14
- package/src/FinnishBalanceSheetReport/backend/index.ts +4 -4
- package/src/FinnishBalanceSheetReportLite/backend/index.ts +3 -3
- package/src/FinnishIncomeStatementReport/backend/index.ts +5 -5
- package/src/FinnishIncomeStatementReportLite/backend/index.ts +5 -5
- package/src/IncomeAndExpenses/backend/income.json +8 -0
- package/src/IncomeAndExpenses/backend/index.ts +4 -0
- package/src/JournalReport/backend/index.ts +5 -5
- package/src/LedgerReport/backend/index.ts +10 -10
- package/src/index.ts +1 -0
- package/.turbo/turbo-nightly3.log +0 -56
package/.turbo/turbo-build.log
CHANGED
package/.turbo/turbo-ci.log
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
|
|
2
|
-
> @tasenor/common-plugins@1.9.
|
|
2
|
+
> @tasenor/common-plugins@1.9.117 ci /home/wigy/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
|
|
3
3
|
> pnpm run lint
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
> @tasenor/common-plugins@1.9.
|
|
6
|
+
> @tasenor/common-plugins@1.9.117 lint /home/wigy/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
|
|
7
7
|
> eslint 'src/**/*.{ts,tsx}' 'data/**/*.mjs'
|
|
8
8
|
|
package/.turbo/turbo-nightly.log
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
|
|
2
|
-
> @tasenor/common-plugins@1.9.
|
|
2
|
+
> @tasenor/common-plugins@1.9.117 nightly /home/wigy/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
|
|
3
3
|
> pnpm run ci
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
> @tasenor/common-plugins@1.9.
|
|
6
|
+
> @tasenor/common-plugins@1.9.117 ci /home/wigy/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
|
|
7
7
|
> pnpm run lint
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
> @tasenor/common-plugins@1.9.
|
|
10
|
+
> @tasenor/common-plugins@1.9.117 lint /home/wigy/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
|
|
11
11
|
> eslint 'src/**/*.{ts,tsx}' 'data/**/*.mjs'
|
|
12
12
|
|
|
@@ -47,6 +47,8 @@ _OTHER_INCOME Other Income Muut tulot
|
|
|
47
47
|
__OTHER_OPERATING_INCOME Other operating income Muut liiketoiminnan tuotot
|
|
48
48
|
|
|
49
49
|
__MISC_INCOME Miscellaneous Income Satunnaiset tulot
|
|
50
|
+
___REWARDS Rewards Palkkiot
|
|
51
|
+
____LEARNING_REWARDS Learning rewards Opintopalkkiot
|
|
50
52
|
|
|
51
53
|
|
|
52
54
|
_SPECIAL_INCOME_CASES Cases That Need Special Handling Erityiskäsittelyä vaativat tapaukset
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Language, ReportColumnDefinition, ReportData, ReportID, ReportLine, ReportMeta, ReportOptions, ReportQueryParams } from '@tasenor/common';
|
|
2
|
+
import { ReportPlugin } from '@tasenor/common-node';
|
|
3
|
+
declare class AssetReport extends ReportPlugin {
|
|
4
|
+
constructor();
|
|
5
|
+
getLanguages(): Language[];
|
|
6
|
+
getReportOptions(): ReportOptions;
|
|
7
|
+
getColumns(id: ReportID, entries: ReportData[], options: ReportOptions, settings: ReportMeta): Promise<ReportColumnDefinition[]>;
|
|
8
|
+
extraSQLCondition(): Promise<string | null>;
|
|
9
|
+
/**
|
|
10
|
+
* Gather ticker counts for each account.
|
|
11
|
+
*/
|
|
12
|
+
preProcess(id: ReportID, entries: ReportData[], options: ReportQueryParams, settings: ReportMeta, columns: ReportColumnDefinition[]): ReportLine[];
|
|
13
|
+
postProcess(id: any, data: any): any;
|
|
14
|
+
}
|
|
15
|
+
export default AssetReport;
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import { StockBookkeeping } from '@tasenor/common';
|
|
2
|
+
import { ReportPlugin } from '@tasenor/common-node';
|
|
3
|
+
import dayjs from 'dayjs';
|
|
4
|
+
import quarterOfYear from 'dayjs/plugin/quarterOfYear';
|
|
5
|
+
dayjs.extend(quarterOfYear);
|
|
6
|
+
class AssetReport extends ReportPlugin {
|
|
7
|
+
constructor() {
|
|
8
|
+
super('assets');
|
|
9
|
+
this.schemes = undefined;
|
|
10
|
+
this.code = 'AssetReport';
|
|
11
|
+
this.title = 'Asset Report';
|
|
12
|
+
this.version = '1.0.0';
|
|
13
|
+
this.icon = '<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><path d="M0,0h24v24H0V0z" fill="none"/></g><g><g><path d="M14,5H5v14h14v-9h-5V5z M8,17c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S8.55,17,8,17z M8,13 c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S8.55,13,8,13z M8,9C7.45,9,7,8.55,7,8s0.45-1,1-1s1,0.45,1,1S8.55,9,8,9z" opacity=".3"/><circle cx="8" cy="8" r="1"/><path d="M15,3H5C3.9,3,3.01,3.9,3.01,5L3,19c0,1.1,0.89,2,1.99,2H19c1.1,0,2-0.9,2-2V9L15,3z M19,19H5V5h9v5h5V19z"/><circle cx="8" cy="12" r="1"/><circle cx="8" cy="16" r="1"/></g></g></svg>';
|
|
14
|
+
this.releaseDate = '2024-01-05';
|
|
15
|
+
this.use = 'backend';
|
|
16
|
+
this.type = 'report';
|
|
17
|
+
this.description = 'List of tradable assets in all accounts.';
|
|
18
|
+
this.languages = {
|
|
19
|
+
en: {
|
|
20
|
+
'report-assets': 'Assets',
|
|
21
|
+
'column-purchase-value': 'Purchase Value',
|
|
22
|
+
'column-average-value': 'Average Value',
|
|
23
|
+
'column-count': 'Count',
|
|
24
|
+
'column-ticker': 'Ticker',
|
|
25
|
+
},
|
|
26
|
+
fi: {
|
|
27
|
+
'report-assets': 'Omaisuuserät',
|
|
28
|
+
'column-purchase-value': 'Ostohinta',
|
|
29
|
+
'column-average-value': 'Keskihinta',
|
|
30
|
+
'column-count': 'Kpl',
|
|
31
|
+
'column-ticker': 'Lyhenne',
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
getLanguages() {
|
|
36
|
+
return ['en', 'fi'];
|
|
37
|
+
}
|
|
38
|
+
getReportOptions() {
|
|
39
|
+
return {
|
|
40
|
+
quarter1: 'radio:1',
|
|
41
|
+
quarter2: 'radio:1',
|
|
42
|
+
quarter3: 'radio:1',
|
|
43
|
+
full: 'radio:1:default'
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
47
|
+
async getColumns(id, entries, options, settings) {
|
|
48
|
+
return [
|
|
49
|
+
{
|
|
50
|
+
name: 'title',
|
|
51
|
+
title: '',
|
|
52
|
+
type: 'name'
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
name: 'ticker',
|
|
56
|
+
title: '{column-ticker}',
|
|
57
|
+
type: 'text'
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
name: 'count',
|
|
61
|
+
title: '{column-count}',
|
|
62
|
+
type: 'numeric'
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
name: 'average',
|
|
66
|
+
title: '{column-average-value}',
|
|
67
|
+
type: 'currency'
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
name: 'value',
|
|
71
|
+
title: '{column-purchase-value}',
|
|
72
|
+
type: 'currency'
|
|
73
|
+
},
|
|
74
|
+
];
|
|
75
|
+
}
|
|
76
|
+
async extraSQLCondition() {
|
|
77
|
+
return "entry.data->'stock' IS NOT NULL";
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Gather ticker counts for each account.
|
|
81
|
+
*/
|
|
82
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
83
|
+
preProcess(id, entries, options, settings, columns) {
|
|
84
|
+
const stock = {};
|
|
85
|
+
const names = {};
|
|
86
|
+
const lines = [];
|
|
87
|
+
entries.forEach(entry => {
|
|
88
|
+
if (!stock[entry.number]) {
|
|
89
|
+
stock[entry.number] = [];
|
|
90
|
+
names[entry.number] = entry.name;
|
|
91
|
+
}
|
|
92
|
+
stock[entry.number].push({
|
|
93
|
+
data: entry.data,
|
|
94
|
+
time: new Date(entry.date)
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
Object.keys(stock).forEach(number => {
|
|
98
|
+
const bookkeeping = new StockBookkeeping(number);
|
|
99
|
+
bookkeeping.applyAll(stock[number]);
|
|
100
|
+
lines.push({
|
|
101
|
+
tab: 0,
|
|
102
|
+
hideTotal: true,
|
|
103
|
+
required: true,
|
|
104
|
+
bold: true,
|
|
105
|
+
fullWidth: true,
|
|
106
|
+
name: `${number} ${names[number]}`,
|
|
107
|
+
values: {}
|
|
108
|
+
});
|
|
109
|
+
// Note: we could construct also detailed changes at this point, if we want detailed version of the report.
|
|
110
|
+
let total = 0;
|
|
111
|
+
const totals = bookkeeping.totals().sort((a, b) => a[1] < b[1] ? -1 : (a[1] > b[1] ? 1 : 0));
|
|
112
|
+
for (const [, asset, amount] of totals) {
|
|
113
|
+
if (amount) {
|
|
114
|
+
const value = bookkeeping.value(asset);
|
|
115
|
+
total += value;
|
|
116
|
+
lines.push({
|
|
117
|
+
tab: 4,
|
|
118
|
+
values: {
|
|
119
|
+
ticker: asset,
|
|
120
|
+
count: amount,
|
|
121
|
+
average: value / amount,
|
|
122
|
+
value
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
lines.push({
|
|
128
|
+
name: '',
|
|
129
|
+
bold: true,
|
|
130
|
+
values: {
|
|
131
|
+
count: '',
|
|
132
|
+
average: '',
|
|
133
|
+
value: total
|
|
134
|
+
}
|
|
135
|
+
});
|
|
136
|
+
lines.push({ paragraphBreak: true });
|
|
137
|
+
});
|
|
138
|
+
return lines;
|
|
139
|
+
}
|
|
140
|
+
postProcess(id, data) {
|
|
141
|
+
return data;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
export default AssetReport;
|
|
145
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/AssetReport/backend/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,8 @@ import { ProcessFile, TransactionImportHandler } from '@tasenor/common-node';
|
|
|
6
6
|
export declare class CoinbaseHandler extends TransactionImportHandler {
|
|
7
7
|
constructor();
|
|
8
8
|
get path(): DirectoryPath;
|
|
9
|
-
canHandle(file: ProcessFile): boolean;
|
|
9
|
+
canHandle(file: ProcessFile): boolean | number;
|
|
10
|
+
init(files: ProcessFile[]): Promise<ProcessFile[]>;
|
|
10
11
|
segmentId(line: TextFileLine): SegmentId | typeof NO_SEGMENT;
|
|
11
12
|
time(line: TextFileLine): Date | undefined;
|
|
12
13
|
}
|
|
@@ -7,26 +7,63 @@ export class CoinbaseHandler extends TransactionImportHandler {
|
|
|
7
7
|
super('CoinbaseImport');
|
|
8
8
|
this.importOptions = {
|
|
9
9
|
parser: 'csv',
|
|
10
|
-
numericFields: ['amount', 'balance'],
|
|
10
|
+
numericFields: ['amount', 'balance', 'Quantity', 'Price', 'Total', 'Subtotal', 'Fees'],
|
|
11
11
|
requiredFields: [],
|
|
12
12
|
textField: 'type',
|
|
13
13
|
totalAmountField: 'amount',
|
|
14
|
-
csv: { useFirstLineHeadings: true }
|
|
14
|
+
csv: { useFirstLineHeadings: true },
|
|
15
|
+
fieldRemapping: {
|
|
16
|
+
// V1
|
|
17
|
+
'amount/balance unit': 'unit',
|
|
18
|
+
// V2
|
|
19
|
+
'Transaction Type': 'type',
|
|
20
|
+
'Quantity Transacted': 'Quantity',
|
|
21
|
+
'Spot Price Currency': 'Currency',
|
|
22
|
+
'Spot Price at Transaction': 'Price',
|
|
23
|
+
'Total (inclusive of fees and/or spread)': 'Total',
|
|
24
|
+
'Fees and/or Spread': 'Fees'
|
|
25
|
+
}
|
|
15
26
|
};
|
|
16
27
|
}
|
|
17
28
|
get path() {
|
|
18
29
|
return __dirname;
|
|
19
30
|
}
|
|
20
31
|
canHandle(file) {
|
|
21
|
-
|
|
32
|
+
if (file.firstLineMatch(/^(portfolio,)?type,time,amount,balance,amount.balance unit,transfer id,trade id,order id/)) {
|
|
33
|
+
return 1;
|
|
34
|
+
}
|
|
35
|
+
if (file.firstLineMatch(/"You can use this transaction report/)) {
|
|
36
|
+
return 2;
|
|
37
|
+
}
|
|
38
|
+
return 0;
|
|
39
|
+
}
|
|
40
|
+
async init(files) {
|
|
41
|
+
if (this.version === 2) {
|
|
42
|
+
// Clean up trash from the beginning.
|
|
43
|
+
for (const file of files) {
|
|
44
|
+
const data = file.decode();
|
|
45
|
+
const lines = data.split('\n').splice(7);
|
|
46
|
+
if (!/^Timestamp,Transaction Type,Asset,Quantity Transacted,Spot Price Currency,Spot Price at Transaction,Subtotal,Total/.test(lines[0])) {
|
|
47
|
+
throw new Error('Coinbase parser is not able to understand the format.');
|
|
48
|
+
}
|
|
49
|
+
file.set(lines.join('\n'));
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return files;
|
|
22
53
|
}
|
|
23
54
|
segmentId(line) {
|
|
55
|
+
if (this.version === 2) {
|
|
56
|
+
return super.segmentId(line);
|
|
57
|
+
}
|
|
24
58
|
if (['deposit', 'withdrawal'].includes(line.columns.type)) {
|
|
25
59
|
return line.columns['transfer id'];
|
|
26
60
|
}
|
|
27
61
|
return line.columns['trade id'];
|
|
28
62
|
}
|
|
29
63
|
time(line) {
|
|
64
|
+
if (this.version === 2) {
|
|
65
|
+
return line.columns.Timestamp ? new Date(line.columns.Timestamp) : undefined;
|
|
66
|
+
}
|
|
30
67
|
return line.columns.time ? new Date(line.columns.time) : undefined;
|
|
31
68
|
}
|
|
32
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoinbaseHandler.js","sourceRoot":"","sources":["../../../src/CoinbaseImport/backend/CoinbaseHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAE5E;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,wBAAwB;IAE3D;QACE,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACvB,IAAI,CAAC,aAAa,GAAG;YACnB,MAAM,EAAE,KAAK;YACb,aAAa,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"CoinbaseHandler.js","sourceRoot":"","sources":["../../../src/CoinbaseImport/backend/CoinbaseHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAE5E;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,wBAAwB;IAE3D;QACE,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACvB,IAAI,CAAC,aAAa,GAAG;YACnB,MAAM,EAAE,KAAK;YACb,aAAa,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC;YACtF,cAAc,EAAE,EAAE;YAClB,SAAS,EAAE,MAAM;YACjB,gBAAgB,EAAE,QAAQ;YAC1B,GAAG,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE;YACnC,cAAc,EAAE;gBACd,KAAK;gBACL,qBAAqB,EAAE,MAAM;gBAC7B,KAAK;gBACL,kBAAkB,EAAE,MAAM;gBAC1B,qBAAqB,EAAE,UAAU;gBACjC,qBAAqB,EAAE,UAAU;gBACjC,2BAA2B,EAAE,OAAO;gBACpC,yCAAyC,EAAE,OAAO;gBAClD,oBAAoB,EAAE,MAAM;aAC7B;SACF,CAAA;IACH,CAAC;IAED,IAAI,IAAI;QACN,OAAO,SAA0B,CAAA;IACnC,CAAC;IAED,SAAS,CAAC,IAAiB;QACzB,IAAI,IAAI,CAAC,cAAc,CAAC,0FAA0F,CAAC,EAAE;YACnH,OAAO,CAAC,CAAA;SACT;QACD,IAAI,IAAI,CAAC,cAAc,CAAC,sCAAsC,CAAC,EAAE;YAC/D,OAAO,CAAC,CAAA;SACT;QAED,OAAO,CAAC,CAAA;IACV,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAoB;QAC7B,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE;YACtB,qCAAqC;YACrC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;gBAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBACxC,IAAI,CAAC,oHAAoH,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;oBACxI,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;iBACzE;gBACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;aAC3B;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,SAAS,CAAC,IAAkB;QAC1B,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE;YACtB,OAAO,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;SAC7B;QACD,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACzD,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;SACnC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,CAAC,IAAkB;QACrB,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;SAC7E;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACpE,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Language, ReportOptions } from '@tasenor/common';
|
|
1
|
+
import { Language, ReportLine, ReportOptions } from '@tasenor/common';
|
|
2
2
|
import { ReportPlugin } from '@tasenor/common-node';
|
|
3
3
|
declare class FinnishBalanceSheetReport extends ReportPlugin {
|
|
4
4
|
constructor();
|
|
@@ -9,7 +9,7 @@ declare class FinnishBalanceSheetReport extends ReportPlugin {
|
|
|
9
9
|
getLanguages(): Language[];
|
|
10
10
|
getReportOptions(): ReportOptions;
|
|
11
11
|
columnTitle(id: any, period: any, options: any): string;
|
|
12
|
-
preProcess(id: any, entries: any, options: any, settings: any, columns: any):
|
|
12
|
+
preProcess(id: any, entries: any, options: any, settings: any, columns: any): ReportLine[];
|
|
13
13
|
/**
|
|
14
14
|
* Mark mismatching Vastaavaa and Vastattavaa with red.
|
|
15
15
|
*/
|
|
@@ -82,8 +82,8 @@ class FinnishBalanceSheetReport extends ReportPlugin {
|
|
|
82
82
|
const liabilities = data.find(line => line.name === 'Vastattavaa yhteensä');
|
|
83
83
|
const assets = data.find(line => line.name === 'Vastaavaa yhteensä');
|
|
84
84
|
if (liabilities && assets) {
|
|
85
|
-
Object.values(liabilities.
|
|
86
|
-
if (Object.values(assets.
|
|
85
|
+
Object.values(liabilities.values).forEach((value, idx) => {
|
|
86
|
+
if (Object.values(assets.values)[idx] !== value) {
|
|
87
87
|
assets.error = true;
|
|
88
88
|
liabilities.error = true;
|
|
89
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/FinnishBalanceSheetReport/backend/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/FinnishBalanceSheetReport/backend/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ class FinnishBalanceSheetReportLite extends ReportPlugin {
|
|
|
60
60
|
async getColumns(id, entries, options) {
|
|
61
61
|
const columns = options.periods.map((period) => {
|
|
62
62
|
return {
|
|
63
|
-
type: '
|
|
63
|
+
type: 'currency',
|
|
64
64
|
name: 'period' + period.id,
|
|
65
65
|
title: this.columnTitle(id, period, options)
|
|
66
66
|
};
|
|
@@ -95,8 +95,8 @@ class FinnishBalanceSheetReportLite extends ReportPlugin {
|
|
|
95
95
|
const liabilities = data.find(line => line.name === 'Vastattavaa yhteensä');
|
|
96
96
|
const assets = data.find(line => line.name === 'Vastaavaa yhteensä');
|
|
97
97
|
if (liabilities && assets) {
|
|
98
|
-
Object.values(liabilities.
|
|
99
|
-
if (Object.values(assets.
|
|
98
|
+
Object.values(liabilities.values).forEach((value, idx) => {
|
|
99
|
+
if (Object.values(assets.values)[idx] !== value) {
|
|
100
100
|
assets.error = true;
|
|
101
101
|
liabilities.error = true;
|
|
102
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/FinnishBalanceSheetReportLite/backend/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,4BAA4B,CAAA;AACtD,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;AAE3B,MAAM,6BAA8B,SAAQ,YAAY;IACtD;QACE,KAAK,CAAC,oBAAgC,CAAC,CAAA;QAEvC,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAA;QAErD,IAAI,CAAC,IAAI,GAAG,+BAA6C,CAAA;QACzD,IAAI,CAAC,KAAK,GAAG,uCAAuC,CAAA;QACpD,IAAI,CAAC,OAAO,GAAG,QAAmB,CAAA;QAClC,IAAI,CAAC,IAAI,GAAG,0nBAA0nB,CAAA;QACtoB,IAAI,CAAC,WAAW,GAAG,YAAY,CAAA;QAC/B,IAAI,CAAC,GAAG,GAAG,SAAS,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,gEAAgE,CAAA;QAEnF,IAAI,CAAC,SAAS,GAAG;YACf,EAAE,EAAE;gBACF,2BAA2B,EAAE,eAAe;aAC7C;YACD,EAAE,EAAE;gBACF,2BAA2B,EAAE,MAAM;aACpC;SACF,CAAA;IACH,CAAC;IAED,YAAY;QACV,OAAO;YACL,oBAAoB,EAAE,IAAI;YAC1B,iBAAiB,EAAE,IAAI;SACxB,CAAA;IACH,CAAC;IAED,YAAY;QACV,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACrB,CAAC;IAED,gBAAgB;QACd,OAAO;YACL,QAAQ,EAAE,SAAS;YACnB,QAAQ,EAAE,SAAS;YACnB,QAAQ,EAAE,SAAS;YACnB,IAAI,EAAE,iBAAiB;SACxB,CAAA;IACH,CAAC;IAED,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO;QAC7B,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5C,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAA;SAC7E;aAAM,IAAI,OAAO,CAAC,QAAQ,EAAE;YAC3B,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5C,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAA;SAC7E;aAAM,IAAI,OAAO,CAAC,QAAQ,EAAE;YAC3B,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5C,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAA;SAC7E;aAAM;YACL,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAA;SAC7C;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO;QACnC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7C,OAAO;gBACL,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/FinnishBalanceSheetReportLite/backend/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,12 +73,12 @@ class FinnishIncomeStatementReport extends ReportPlugin {
|
|
|
73
73
|
// Construct columns for each tag and extra column for non-tagged.
|
|
74
74
|
if (options.byTags) {
|
|
75
75
|
const columns = settings.tags.map((tag) => ({
|
|
76
|
-
type: '
|
|
76
|
+
type: 'currency',
|
|
77
77
|
name: `tag-${tag.tag}`,
|
|
78
78
|
title: tag.name
|
|
79
79
|
}));
|
|
80
80
|
columns.push({
|
|
81
|
-
type: '
|
|
81
|
+
type: 'currency',
|
|
82
82
|
name: 'other',
|
|
83
83
|
title: '{Other}'
|
|
84
84
|
});
|
|
@@ -167,10 +167,10 @@ class FinnishIncomeStatementReport extends ReportPlugin {
|
|
|
167
167
|
// Find empty columns.
|
|
168
168
|
const found = new Set();
|
|
169
169
|
for (const line of data) {
|
|
170
|
-
if (!line.
|
|
170
|
+
if (!line.values) {
|
|
171
171
|
continue;
|
|
172
172
|
}
|
|
173
|
-
for (const [k, v] of Object.entries(line.
|
|
173
|
+
for (const [k, v] of Object.entries(line.values)) {
|
|
174
174
|
if (v !== null && !isNaN(v)) {
|
|
175
175
|
found.add(k);
|
|
176
176
|
}
|
|
@@ -178,7 +178,7 @@ class FinnishIncomeStatementReport extends ReportPlugin {
|
|
|
178
178
|
}
|
|
179
179
|
// Remove empty columns.
|
|
180
180
|
for (let i = 0; i < columns.length; i++) {
|
|
181
|
-
if (columns[i].type === 'numeric' && !found.has(columns[i].name)) {
|
|
181
|
+
if ((columns[i].type === 'currency' || columns[i].type === 'numeric') && !found.has(columns[i].name)) {
|
|
182
182
|
columns.splice(i, 1);
|
|
183
183
|
i--;
|
|
184
184
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/FinnishIncomeStatementReport/backend/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/FinnishIncomeStatementReport/backend/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,4BAA4B,CAAA;AACtD,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;AAE3B,MAAM,4BAA6B,SAAQ,YAAY;IAErD;QACE,KAAK,CAAC,2BAAuC,EAAE,kBAA8B,CAAC,CAAA;QAE9E,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,+BAA+B,EAAE,2BAA2B,CAAC,CAAC,CAAA;QAEtF,IAAI,CAAC,IAAI,GAAG,8BAA4C,CAAA;QACxD,IAAI,CAAC,KAAK,GAAG,mCAAmC,CAAA;QAChD,IAAI,CAAC,OAAO,GAAG,QAAmB,CAAA;QAClC,IAAI,CAAC,IAAI,GAAG,0nBAA0nB,CAAA;QACtoB,IAAI,CAAC,WAAW,GAAG,YAAY,CAAA;QAC/B,IAAI,CAAC,GAAG,GAAG,SAAS,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,gDAAgD,CAAA;QAEnE,IAAI,CAAC,SAAS,GAAG;YACf,EAAE,EAAE;gBACF,kCAAkC,EAAE,2BAA2B;gBAC/D,yBAAyB,EAAE,kBAAkB;aAC9C;YACD,EAAE,EAAE;gBACF,kCAAkC,EAAE,8BAA8B;gBAClE,yBAAyB,EAAE,eAAe;aAC3C;SACF,CAAA;IACH,CAAC;IAED,YAAY,CAAC,OAAO;QAClB,OAAO;YACL,oBAAoB,EAAE,IAAI;YAC1B,iBAAiB,EAAE,CAAC,OAAO,CAAC,MAAM;SACnC,CAAA;IACH,CAAC;IAED,YAAY;QACV,OAAO,CAAC,IAAI,CAAC,CAAA;IACf,CAAC;IAED,gBAAgB;QACd,OAAO;YACL,QAAQ,EAAE,SAAS;YACnB,QAAQ,EAAE,SAAS;YACnB,QAAQ,EAAE,SAAS;YACnB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,SAAS;SAClB,CAAA;IACH,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAC9C,IAAI,GAAG,CAAA;QACP,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5C,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACrE;aAAM,IAAI,OAAO,CAAC,QAAQ,EAAE;YAC3B,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5C,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACrE;aAAM,IAAI,OAAO,CAAC,QAAQ,EAAE;YAC3B,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5C,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACrE;aAAM;YACL,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;SACrC;QAED,OAAO,GAAG,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,GAAG,GAAG,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ;QAC7C,kEAAkE;QAClE,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC1C,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,OAAO,GAAG,CAAC,GAAG,EAAE;gBACtB,KAAK,EAAE,GAAG,CAAC,IAAI;aAChB,CAAC,CAAC,CAAA;YACH,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,SAAS;aACjB,CAAC,CAAA;YACF,OAAO,CAAC,OAAO,CAAC;gBACd,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,MAAM;aACb,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;SACf;QAED,OAAO,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IACzD,CAAC;IAED,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO;QACtD,YAAY;QACZ,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAErD,yCAAyC;QACzC,MAAM,MAAM,GAA2C,EAAE,CAAA;QACzD,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;QACtD,MAAM,YAAY,GAAG,EAAE,CAAA;QACvB,MAAM,cAAc,GAAG,IAAI,GAAG,EAAiB,CAAA;QAC/C,MAAM,KAAK,GAAG,eAAe,CAAA;QAC7B,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACxB,IAAI,MAAM,GAAa,EAAE,CAAA;YACzB,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;YACvC,IAAI,CAAC,EAAE;gBACL,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;aAChF;YACD,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;YACzB,IAAI,MAAM,CAAC,MAAM,EAAE;gBACnB,sDAAsD;gBACpD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;gBACjG,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACrB,MAAM,MAAM,GAAG,OAAO,GAAG,EAAE,CAAA;oBAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;oBAChE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAA;oBACrC,MAAM,IAAI,KAAK,CAAA;gBACjB,CAAC,CAAC,CAAA;gBACF,IAAI,MAAM,EAAE;oBACZ,wDAAwD;oBACtD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,MAAM,CAAA;oBACxC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;oBACjC,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE;wBACrD,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;wBACjC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAA;wBACrC,MAAM,IAAI,KAAK,CAAA;wBACf,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAA;qBAC5B;iBACF;aACF;YAED,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBAC5D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,CAAA;aACrC;YAED,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAA;YACvC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QAEF,OAAO,IAAI,CAAC,qBAAqB,CAAC,CAAC,GAAG,cAAc,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvG,CAAC;IAED,UAAU,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO;QAChD,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,OAAO,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;SACtE;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAElD,yCAAyC;QACzC,MAAM,MAAM,GAAG,EAAE,CAAA;QACjB,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;QACtD,MAAM,YAAY,GAAG,EAAE,CAAA;QACvB,MAAM,cAAc,GAAG,IAAI,GAAG,EAAiB,CAAA;QAC/C,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACxB,MAAM,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;YACxC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAChE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAA;YAC5C,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAA;YACvC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QAEF,OAAO,IAAI,CAAC,qBAAqB,CAAC,CAAC,GAAG,cAAc,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvG,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO;QAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO,IAAI,CAAA;SACZ;QAED,sBAAsB;QACtB,MAAM,KAAK,GAAG,IAAI,GAAG,EAAE,CAAA;QACvB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;YACvB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChB,SAAQ;aACT;YACD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAChD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,CAAW,CAAC,EAAE;oBACrC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;iBACb;aACF;SACF;QAED,wBAAwB;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBACpG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACpB,CAAC,EAAE,CAAA;aACJ;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAED,eAAe,4BAA4B,CAAA"}
|
|
@@ -71,12 +71,12 @@ class FinnishIncomeStatementReportLite extends ReportPlugin {
|
|
|
71
71
|
// Construct columns for each tag and extra column for non-tagged.
|
|
72
72
|
if (options.byTags) {
|
|
73
73
|
const columns = settings.tags.map((tag) => ({
|
|
74
|
-
type: '
|
|
74
|
+
type: 'currency',
|
|
75
75
|
name: `tag-${tag.tag}`,
|
|
76
76
|
title: tag.name
|
|
77
77
|
}));
|
|
78
78
|
columns.push({
|
|
79
|
-
type: '
|
|
79
|
+
type: 'currency',
|
|
80
80
|
name: 'other',
|
|
81
81
|
title: '{Other}'
|
|
82
82
|
});
|
|
@@ -165,10 +165,10 @@ class FinnishIncomeStatementReportLite extends ReportPlugin {
|
|
|
165
165
|
// Find empty columns.
|
|
166
166
|
const found = new Set();
|
|
167
167
|
for (const line of data) {
|
|
168
|
-
if (!line.
|
|
168
|
+
if (!line.values) {
|
|
169
169
|
continue;
|
|
170
170
|
}
|
|
171
|
-
for (const [k, v] of Object.entries(line.
|
|
171
|
+
for (const [k, v] of Object.entries(line.values)) {
|
|
172
172
|
if (v !== null && !isNaN(v)) {
|
|
173
173
|
found.add(k);
|
|
174
174
|
}
|
|
@@ -176,7 +176,7 @@ class FinnishIncomeStatementReportLite extends ReportPlugin {
|
|
|
176
176
|
}
|
|
177
177
|
// Remove empty columns.
|
|
178
178
|
for (let i = 0; i < columns.length; i++) {
|
|
179
|
-
if (columns[i].type === 'numeric' && !found.has(columns[i].name)) {
|
|
179
|
+
if ((columns[i].type === 'numeric' || columns[i].type === 'currency') && !found.has(columns[i].name)) {
|
|
180
180
|
columns.splice(i, 1);
|
|
181
181
|
i--;
|
|
182
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/FinnishIncomeStatementReportLite/backend/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/FinnishIncomeStatementReportLite/backend/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -141,6 +141,7 @@ class IncomeAndExpenses extends DataPlugin {
|
|
|
141
141
|
'income-INCOME_CORRECTION_WITHHOLDING_TAX': 'Corrections in Withholding Tax',
|
|
142
142
|
'income-INTEREST': 'Interest Income',
|
|
143
143
|
'income-INVEST': 'Capital Investments',
|
|
144
|
+
'income-LEARNING_REWARDS': 'Learning rewards',
|
|
144
145
|
'income-LISTED_CASH_DIVIDEND': 'Cash Dividends from Listed Companies',
|
|
145
146
|
'income-LISTED_DIVIDEND': 'Dividends from Listed Companies',
|
|
146
147
|
'income-LISTED_STOCK_DIVIDEND': 'Stock Dividends from Listed Companies',
|
|
@@ -154,6 +155,7 @@ class IncomeAndExpenses extends DataPlugin {
|
|
|
154
155
|
'income-OTHER_OPERATING_INCOME': 'Other operating income',
|
|
155
156
|
'income-P2P_INTEREST': 'Interest Income from P2P Loaning',
|
|
156
157
|
'income-PAID_SHARES': 'Payment Received from Company Shares',
|
|
158
|
+
'income-REWARDS': 'Rewards',
|
|
157
159
|
'income-SALES': 'Sales',
|
|
158
160
|
'income-SHAREHOLDER_BORROWING': 'Loan from a Shareholder',
|
|
159
161
|
'income-SHARE_ISSUED': 'Issue New Shares',
|
|
@@ -306,6 +308,7 @@ class IncomeAndExpenses extends DataPlugin {
|
|
|
306
308
|
'income-INCOME_CORRECTION_WITHHOLDING_TAX': 'Korjaukset ennakonpidätyksiin',
|
|
307
309
|
'income-INTEREST': 'Korkotulot',
|
|
308
310
|
'income-INVEST': 'Pääomasijoitukset',
|
|
311
|
+
'income-LEARNING_REWARDS': 'Opintopalkkiot',
|
|
309
312
|
'income-LISTED_CASH_DIVIDEND': 'Käteisosingot listatuista yhtiöistä',
|
|
310
313
|
'income-LISTED_DIVIDEND': 'Osingot listatuista yhtiöistä',
|
|
311
314
|
'income-LISTED_STOCK_DIVIDEND': 'Osakeosingot listatuista yhtiöistä',
|
|
@@ -319,6 +322,7 @@ class IncomeAndExpenses extends DataPlugin {
|
|
|
319
322
|
'income-OTHER_OPERATING_INCOME': 'Muut liiketoiminnan tuotot',
|
|
320
323
|
'income-P2P_INTEREST': 'Korkotulot P2P lainaamisesta',
|
|
321
324
|
'income-PAID_SHARES': 'Osakeannista saadut maksut',
|
|
325
|
+
'income-REWARDS': 'Palkkiot',
|
|
322
326
|
'income-SALES': 'Myynti',
|
|
323
327
|
'income-SHAREHOLDER_BORROWING': 'Osakaslainan nosto',
|
|
324
328
|
'income-SHARE_ISSUED': 'Uusien osakkeiden liikkeellelasku',
|