sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Feature/add guards to local comparison (#986)

Browse Source 
* Add guards

* Improve labels
This commit is contained in:
Thomas Kaul 2022-06-05 19:00:45 +02:00 committed by GitHub
parent 7cf0cdc4ce
commit e63578d8ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/api/src/app/portfolio/portfolio-calculator.ts
View File

@ -56,7 +56,7 @@ export class PortfolioCalculator {
this.currentRateService = currentRateService; this.currentRateService = currentRateService;
this.orders = orders; this.orders = orders;
this.orders.sort((a, b) => a.date.localeCompare(b.date)); this.orders.sort((a, b) => a.date?.localeCompare(b.date));
} }
public computeTransactionPoints() { public computeTransactionPoints() {
@ -125,7 +125,7 @@ export class PortfolioCalculator {
(transactionPointItem) => transactionPointItem.symbol !== order.symbol (transactionPointItem) => transactionPointItem.symbol !== order.symbol
); );
newItems.push(currentTransactionPointItem); newItems.push(currentTransactionPointItem);
newItems.sort((a, b) => a.symbol.localeCompare(b.symbol)); newItems.sort((a, b) => a.symbol?.localeCompare(b.symbol));
if (lastDate !== currentDate || lastTransactionPoint === null) { if (lastDate !== currentDate || lastTransactionPoint === null) {
lastTransactionPoint = { lastTransactionPoint = {
date: currentDate, date: currentDate,

4
libs/ui/src/lib/activities-filter/activities-filter.component.ts
View File

@ -126,7 +126,7 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
return filter; return filter;
}) })
.sort((a, b) => a.label.localeCompare(b.label)), .sort((a, b) => a.label?.localeCompare(b.label)),
(filter) => { (filter) => {
return filter.type; return filter.type;
} }
@ -142,7 +142,7 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
} }
return filterGroups return filterGroups
.sort((a, b) => a.name.localeCompare(b.name)) .sort((a, b) => a.name?.localeCompare(b.name))
.map((filterGroup) => { .map((filterGroup) => {
return { return {
...filterGroup, ...filterGroup,

4
libs/ui/src/lib/activities-table/activities-table.component.html
View File

@ -322,7 +322,7 @@
(click)="onImport()" (click)="onImport()"
> >
<ion-icon class="mr-2" name="cloud-upload-outline"></ion-icon> <ion-icon class="mr-2" name="cloud-upload-outline"></ion-icon>
<span i18n>Import</span> <span i18n>Import Activities</span>
</button> </button>
<button <button
*ngIf="hasPermissionToExportActivities" *ngIf="hasPermissionToExportActivities"
@ -332,7 +332,7 @@
(click)="onExport()" (click)="onExport()"
> >
<ion-icon class="mr-2" name="cloud-download-outline"></ion-icon> <ion-icon class="mr-2" name="cloud-download-outline"></ion-icon>
<span i18n>Export</span> <span i18n>Export Activities</span>
</button> </button>
<button <button
*ngIf="hasPermissionToExportActivities" *ngIf="hasPermissionToExportActivities"