@@ -3,6 +3,7 @@ import itiriri, { IterableQuery } from 'itiriri';
33import { ILedgerSummary } from './i-ledger-summary' ;
44import { LedgerItemType } from './ledger-item-type' ;
55import { IRentalSavings , RentalSingleFamily } from '../properties' ;
6+ import currency from '../formatters/currency' ;
67
78export interface ILedgerCollection {
89 getBalance ( date : Date ) : number ;
@@ -132,7 +133,9 @@ export class LedgerCollection implements ILedgerCollection {
132133
133134 const salary = this . getSummaryByType ( boundary , LedgerItemType . Salary ) ;
134135 result . cashFlow = this . getSummaryByType ( boundary , LedgerItemType . CashFlow ) ;
135- result . averageCashFlow = boundary . filter ( ( x ) => x . type === LedgerItemType . CashFlow ) . average ( ( x ) => x . amount ) || 0 ;
136+ result . averageCashFlow = currency (
137+ boundary . filter ( ( x ) => x . type === LedgerItemType . CashFlow ) . average ( ( x ) => x . amount ) || 0
138+ ) ;
136139 result . equity = this . getSummaryByType ( boundary , LedgerItemType . Equity ) ;
137140 result . purchases = this . getSummaryByType ( boundary , LedgerItemType . Purchase ) ;
138141 result . balance = result . cashFlow + salary + result . equity - result . purchases || 0 ;
@@ -159,8 +162,8 @@ export class LedgerCollection implements ILedgerCollection {
159162 balance : summaries . sum ( ( x ) => x . balance || 0 ) ,
160163 equity : summaries . sum ( ( x ) => x . equity || 0 ) ,
161164 cashFlow : summaries . sum ( ( x ) => x . cashFlow || 0 ) ,
162- averageCashFlow : summaries . average ( ( x ) => x . cashFlow || 0 ) ,
163- purchases : summaries . average ( ( x ) => x . purchases || 0 ) ,
165+ averageCashFlow : currency ( summaries . average ( ( x ) => x . cashFlow || 0 ) ) ,
166+ purchases : summaries . sum ( ( x ) => x . purchases || 0 ) ,
164167 } ;
165168 }
166169
0 commit comments