Enable performance calculation without taxes

Issue: #859
portfolio-performance · Dec 17, 2018 · e8eca42 · e8eca42
1 parent 4266a31
commit e8eca42
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java
@@ -486,6 +486,7 @@ public class Messages extends NLS
     public static String LabelPortfolioPerformanceFile;
     public static String LabelPortfolios;
     public static String LabelPortfolioTimeMachine;
+    public static String LabelPreTax;
     public static String LabelQuote;
     public static String LabelQuoteFeed;
     public static String LabelQuoteFeedProvider;
@@ -591,6 +592,7 @@ public class Messages extends NLS
     public static String MenuConfigureChart;
     public static String MenuConfigureCurrentDashboard;
     public static String MenuConfigureDashboards;
+    public static String MenuConfigureView;
     public static String MenuConfirmDeleteAllTransactions;
     public static String MenuConvertToBuy;
     public static String MenuConvertToInboundDelivery;

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties
@@ -1015,6 +1015,8 @@ LabelPortfolioTimeMachine = Portfolio Time Machine
 
 LabelPortfolios = Securities Accounts
 
+LabelPreTax = Pre tax
+
 LabelQuote = Quote
 
 LabelQuoteFeed = Quote Feed
@@ -1183,6 +1185,8 @@ MenuConfigureCurrentDashboard = Configure dashboard
 
 MenuConfigureDashboards = Configure dashboards
 
+MenuConfigureView = Configure view
+
 MenuConfirmDeleteAllTransactions = Delete all transactions of securities {0}?
 
 MenuConvertToBuy = Convert to buy transaction

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties
@@ -1013,6 +1013,8 @@ LabelPortfolioTimeMachine = Portfolio Time Machine
 
 LabelPortfolios = Depots
 
+LabelPreTax = Vor Steuern
+
 LabelQuote = Kursnotierung
 
 LabelQuoteFeed = Kurslieferant
@@ -1179,6 +1181,8 @@ MenuConfigureCurrentDashboard = Dashboard konfigurieren
 
 MenuConfigureDashboards = Dashboards konfigurieren
 
+MenuConfigureView = Ansicht konfigurieren
+
 MenuConfirmDeleteAllTransactions = Alle Buchungen f\u00FCr Wertpapier {0} l\u00F6schen?
 
 MenuConvertToBuy = In Kaufbuchung umwandeln

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/PerformanceView.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/PerformanceView.java
@@ -46,6 +46,7 @@
 import name.abuchen.portfolio.snapshot.ClientPerformanceSnapshot;
 import name.abuchen.portfolio.snapshot.GroupEarningsByAccount;
 import name.abuchen.portfolio.snapshot.ReportingPeriod;
+import name.abuchen.portfolio.snapshot.filter.WithoutTaxesFilter;
 import name.abuchen.portfolio.ui.Images;
 import name.abuchen.portfolio.ui.Messages;
 import name.abuchen.portfolio.ui.selection.SecuritySelection;
@@ -70,6 +71,8 @@ public class PerformanceView extends AbstractHistoricView
 
     private ClientFilterDropDown clientFilter;
 
+    private boolean preTax = false;
+
     private TreeViewer calculation;
     private StatementOfAssetsViewer snapshotStart;
     private StatementOfAssetsViewer snapshotEnd;
@@ -93,6 +96,16 @@ protected void addButtons(ToolBar toolBar)
                         PerformanceView.class.getSimpleName(), filter -> notifyModelUpdated());
 
         new ExportDropDown(toolBar); // NOSONAR
+
+        AbstractDropDown.create(toolBar, Messages.MenuConfigureView, Images.CONFIG.image(), SWT.NONE, manager -> {
+            SimpleAction action = new SimpleAction(Messages.LabelPreTax, a -> {
+                this.preTax = !this.preTax;
+                reportingPeriodUpdated();
+            });
+
+            action.setChecked(this.preTax);
+            manager.add(action);
+        });
     }
 
     @Override
@@ -101,6 +114,10 @@ public void reportingPeriodUpdated()
         ReportingPeriod period = getReportingPeriod();
         CurrencyConverter converter = new CurrencyConverterImpl(factory, getClient().getBaseCurrency());
         Client filteredClient = clientFilter.getSelectedFilter().filter(getClient());
+
+        if (preTax)
+            filteredClient = new WithoutTaxesFilter().filter(filteredClient);
+
         ClientPerformanceSnapshot snapshot = new ClientPerformanceSnapshot(filteredClient, converter, period);
 
         try
@@ -275,7 +292,7 @@ public Font getFont(Object element)
 
         calculation.addSelectionChangedListener(event -> {
             Object selection = ((IStructuredSelection) event.getSelection()).getFirstElement();
-            if (selection != null && selection instanceof ClientPerformanceSnapshot.Position
+            if (selection instanceof ClientPerformanceSnapshot.Position
                             && ((ClientPerformanceSnapshot.Position) selection).getSecurity() != null)
                 selectionService.setSelection(new SecuritySelection(getClient(),
                                 ((ClientPerformanceSnapshot.Position) selection).getSecurity()));