Compare commits

...

22 Commits

Author SHA1 Message Date
dependabot[bot]
e35200fc44 Bump https-proxy-agent from 2.2.1 to 2.2.4
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4.
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-04-16 08:53:35 +00:00
Patrick Nagurny
f61f59c801 Merge pull request #20 from pnagurny/feature/debit-credit-labels
make easier to understand labels for debits and credits
2020-01-15 15:02:07 -05:00
Patrick Nagurny
8a1d62dd44 make easier to understand labels for debits and credits 2020-01-15 15:01:15 -05:00
Patrick Nagurny
486feef2c4 Merge pull request #13 from openaccounting/dependabot/npm_and_yarn/bootstrap-4.3.1
Bump bootstrap from 4.1.3 to 4.3.1
2020-01-08 10:58:14 -05:00
Patrick Nagurny
2340c2f208 Merge pull request #19 from openaccounting/dependabot/npm_and_yarn/webpack-dev-server-3.10.1
Bump webpack-dev-server from 3.1.9 to 3.10.1
2020-01-08 10:46:48 -05:00
dependabot[bot]
e4e63e1b5f Bump bootstrap from 4.1.3 to 4.3.1
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.1.3 to 4.3.1.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.1.3...v4.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-08 15:46:02 +00:00
Patrick Nagurny
ca125f2e13 Merge pull request #18 from openaccounting/dependabot/npm_and_yarn/lodash-4.17.15
Bump lodash from 4.17.11 to 4.17.15
2020-01-08 10:45:49 -05:00
Patrick Nagurny
3e104bfa6c Merge pull request #17 from openaccounting/dependabot/npm_and_yarn/tar-2.2.2
Bump tar from 2.2.1 to 2.2.2
2020-01-08 10:45:26 -05:00
dependabot[bot]
9d2e7f3131 Bump lodash from 4.17.11 to 4.17.15
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-08 15:44:45 +00:00
Patrick Nagurny
cf46c3f0fd Merge pull request #16 from openaccounting/dependabot/npm_and_yarn/fstream-1.0.12
Bump fstream from 1.0.11 to 1.0.12
2020-01-08 10:44:30 -05:00
Patrick Nagurny
5875dfcb65 Merge pull request #15 from openaccounting/dependabot/npm_and_yarn/lodash.mergewith-4.6.2
Bump lodash.mergewith from 4.6.1 to 4.6.2
2020-01-08 10:43:57 -05:00
Patrick Nagurny
7245741c8b Merge pull request #14 from openaccounting/dependabot/npm_and_yarn/js-yaml-3.13.1
Bump js-yaml from 3.12.0 to 3.13.1
2020-01-08 10:43:19 -05:00
Patrick Nagurny
1aeed8ef97 Merge pull request #12 from openaccounting/dependabot/npm_and_yarn/mixin-deep-1.3.2
Bump mixin-deep from 1.3.1 to 1.3.2
2020-01-08 10:41:56 -05:00
dependabot[bot]
0a370adf6c Bump tar from 2.2.1 to 2.2.2
Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-08 15:40:55 +00:00
dependabot[bot]
37634fe970 Bump fstream from 1.0.11 to 1.0.12
Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12.
- [Release notes](https://github.com/npm/fstream/releases)
- [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-08 15:40:53 +00:00
dependabot[bot]
851a43e6fc Bump webpack-dev-server from 3.1.9 to 3.10.1
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.1.9 to 3.10.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.10.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.1.9...v3.10.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-08 15:40:48 +00:00
Patrick Nagurny
d3f8e6c3ab Merge pull request #10 from openaccounting/dependabot/npm_and_yarn/handlebars-4.5.3
Bump handlebars from 4.0.12 to 4.5.3
2020-01-08 10:40:00 -05:00
dependabot[bot]
ab62ff7d17 Bump lodash.mergewith from 4.6.1 to 4.6.2
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-08 15:37:59 +00:00
dependabot[bot]
096147855e Bump js-yaml from 3.12.0 to 3.13.1
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-08 15:37:59 +00:00
dependabot[bot]
cd5ddf5e63 Bump mixin-deep from 1.3.1 to 1.3.2
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-08 15:37:58 +00:00
Patrick Nagurny
ce1afb221d Merge pull request #11 from openaccounting/bug/api-new-tx
create new Transaction object from API data
2020-01-08 10:37:23 -05:00
dependabot[bot]
f31572737b Bump handlebars from 4.0.12 to 4.5.3
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.12 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-27 16:08:17 +00:00
5 changed files with 1714 additions and 545 deletions

2208
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -29,7 +29,7 @@
"@angular/router": "^6.1.0",
"@ng-bootstrap/ng-bootstrap": "^3.3.1",
"@types/moment-timezone": "^0.5.12",
"bootstrap": "^4.1.3",
"bootstrap": "^4.3.1",
"core-js": "^2.5.4",
"moment-timezone": "^0.5.25",
"rxjs": "~6.2.0",

View File

@@ -0,0 +1,40 @@
import { Pipe, PipeTransform } from '@angular/core';
import { Account } from './account';
@Pipe({name: 'debitCredit'})
export class DebitCreditPipe implements PipeTransform {
debitNames: any;
creditNames: any;
constructor() {
this.debitNames = {
'Assets': 'Deposit',
'Liabilities': 'Payment',
'Equity': 'Decrease',
'Income': 'Deduction',
'Expenses': 'Expense'
};
this.creditNames = {
'Assets': 'Withdrawal',
'Liabilities': 'Charge',
'Equity': 'Increase',
'Income': 'Income',
'Expenses': 'Refund'
};
}
transform(account: Account, type: string): string {
if(!account) {
return type === 'credit' ? 'Credit' : 'Debit';
}
let parent = account.fullName.split(':')[0];
if(type === 'credit') {
return this.creditNames[parent];
} else {
return this.debitNames[parent];
}
}
}

View File

@@ -4,11 +4,12 @@ import { CurrencyFormatPipe } from './currency-format.pipe';
import { AccountNamePipe } from './account-name.pipe';
import { AccountBalancePipe } from './account-balance.pipe';
import { DateTzPipe } from './datetz.pipe';
import { DebitCreditPipe } from './debit-credit.pipe';
@NgModule({
imports: [],
declarations: [CurrencyFormatPipe, AccountNamePipe, AccountBalancePipe, DateTzPipe],
exports: [CurrencyFormatPipe, AccountNamePipe, AccountBalancePipe, DateTzPipe],
declarations: [CurrencyFormatPipe, AccountNamePipe, AccountBalancePipe, DateTzPipe, DebitCreditPipe],
exports: [CurrencyFormatPipe, AccountNamePipe, AccountBalancePipe, DateTzPipe, DebitCreditPipe],
providers: [DecimalPipe, CurrencyFormatPipe]
})
export class SharedModule { }

View File

@@ -19,10 +19,10 @@
<span>Transfer</span>
</div>
<div class="col custom-3">
<span>Debit</span>
<span>{{account | debitCredit:'debit'}}</span>
</div>
<div class="col custom-3">
<span>Credit</span>
<span>{{account | debitCredit:'credit'}}</span>
</div>
<div class="col custom-3">
<span>Balance</span>