diff --git a/Client/src/app/components/add-transaction-page/add-transaction-page.component.html b/Client/src/app/components/add-transaction-page/add-transaction-page.component.html index c1afae6..8ba86f9 100644 --- a/Client/src/app/components/add-transaction-page/add-transaction-page.component.html +++ b/Client/src/app/components/add-transaction-page/add-transaction-page.component.html @@ -6,9 +6,9 @@
| {{contributorName(c.contributorId)}} | +|||||||||||||||||||
| {{c.date}} | +{{contributorName(c.contributorId)}} | ||||||||||||||||||
| @@ -23,8 +23,8 @@ | - | 0">{{t.description}} | -+ | 0">{{t.description}} | +|||||||||||||||
| {{t.date}} | @@ -35,6 +35,7 @@|||||||||||||||||||
| General | @@ -42,6 +43,7 @@Total | ||||||||||||||||||
| {{contributorTotal(c.contributorId, 1) | currency}} | @@ -55,9 +57,10 @@|||||||||||||||||||
| Grand Totals | +Grand Totals | ||||||||||||||||||
| General | @@ -65,6 +68,7 @@Total | ||||||||||||||||||
| {{combinedTotal(1) | currency}} | diff --git a/Client/src/app/components/add-transaction-page/add-transaction-page.component.ts b/Client/src/app/components/add-transaction-page/add-transaction-page.component.ts index e1452b4..d7f470f 100644 --- a/Client/src/app/components/add-transaction-page/add-transaction-page.component.ts +++ b/Client/src/app/components/add-transaction-page/add-transaction-page.component.ts @@ -107,6 +107,18 @@ export class AddTransactionPageComponent implements OnInit { return contributor ? contributor.display : undefined; } + contributorDatesMatch(contributorId: number) { + const contributor = this.contributions.find(c => c.contributorId === contributorId); + if (!contributor) return true; + let match = true; + contributor.transactions.forEach(t => { + if (t.date != contributor.date) { + match = false; + } + }); + return match; + } + contributorTotal(contributorId: number, fundId: number) { const contrib = this.contributions.find(c => c.contributorId === contributorId); if (!contrib) return 0; diff --git a/Client/src/styles.css b/Client/src/styles.css index 2140edf..8bb2be7 100644 --- a/Client/src/styles.css +++ b/Client/src/styles.css @@ -19,6 +19,10 @@ body { color: red; } +.bg-red { + background-color: red; +} + /*MATERIAL FONT FOR ICONS*/ @font-face { font-family: 'Material Icons';|||||||||||||||||||