add "only inactive instruments" filter in Security list

and visually separate the different filter options
portfolio-performance · May 20, 2024 · 2fd1170 · 2fd1170
1 parent 5ead65a
commit 2fd1170
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 0 deletions.
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
@@ -1176,6 +1176,7 @@ public class Messages extends NLS
     public static String SecurityListFilterDateReached;
     public static String SecurityListFilterDistanceFromAth;
     public static String SecurityListFilterHideInactive;
+    public static String SecurityListFilterOnlyInactive;
     public static String SecurityListFilterLimitPriceExceeded;
     public static String SecurityListFilterOnlyExchangeRates;
     public static String SecurityListFilterOnlySecurities;

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
@@ -2390,6 +2390,8 @@ SecurityListFilterLimitPriceExceeded = Securities: Limit price exceeded
 
 SecurityListFilterOnlyExchangeRates = Only exchange rates
 
+SecurityListFilterOnlyInactive = Only inactive instruments
+
 SecurityListFilterOnlySecurities = Only securities
 
 SecurityMenuAddEvent = Event...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties
@@ -2380,6 +2380,8 @@ SecurityListFilterLimitPriceExceeded = P\u0159ekro\u010Den\u00ED limitn\u00ED ce
 
 SecurityListFilterOnlyExchangeRates = Pouze sm\u011Bnn\u00E9 kurzy
 
+SecurityListFilterOnlyInactive = Pouze neaktivn\u00ED cenn\u00E9 pap\u00EDry
+
 SecurityListFilterOnlySecurities = Pouze cenn\u00E9 pap\u00EDry
 
 SecurityMenuAddEvent = Ud\u00E1lost...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties
@@ -2381,6 +2381,8 @@ SecurityListFilterLimitPriceExceeded = V\u00E6rdipapirer: Gr\u00E6nsepris oversk
 
 SecurityListFilterOnlyExchangeRates = Kun valutakurser
 
+SecurityListFilterOnlyInactive = Kun inaktive instrumenter
+
 SecurityListFilterOnlySecurities = Kun v\u00E6rdipapirer
 
 SecurityMenuAddEvent = Begivenhed...

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
@@ -2383,6 +2383,8 @@ SecurityListFilterLimitPriceExceeded = Wertpapiere: Limit \u00FCberschritten
 
 SecurityListFilterOnlyExchangeRates = Nur Wechselkurse
 
+SecurityListFilterOnlyInactive = Nur inaktive Instrumente
+
 SecurityListFilterOnlySecurities = Nur Wertpapiere
 
 SecurityMenuAddEvent = Ereignis...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties
@@ -2383,6 +2383,8 @@ SecurityListFilterLimitPriceExceeded = Valores: precio l\u00EDmite superado
 
 SecurityListFilterOnlyExchangeRates = S\u00F3lo cambios de divisa
 
+SecurityListFilterOnlyInactive = S\u00F3lo instrumentos inactivos
+
 SecurityListFilterOnlySecurities = S\u00F3lo valores
 
 SecurityMenuAddEvent = Evento...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties
@@ -2384,6 +2384,8 @@ SecurityListFilterLimitPriceExceeded = Titres : Prix limite d\u00E9pass\u00E9
 
 SecurityListFilterOnlyExchangeRates = Seulement taux de change
 
+SecurityListFilterOnlyInactive = Seulement les instruments inactifs
+
 SecurityListFilterOnlySecurities = Seulement titres
 
 SecurityMenuAddEvent = \u00C9v\u00E9nement...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_it.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_it.properties
@@ -2383,6 +2383,8 @@ SecurityListFilterLimitPriceExceeded = Titoli: Prezzo limite superato
 
 SecurityListFilterOnlyExchangeRates = Solo tassi di cambio
 
+SecurityListFilterOnlyInactive = Solo strumenti inattivi
+
 SecurityListFilterOnlySecurities = Solo titoli
 
 SecurityMenuAddEvent = Evento...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_nl.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_nl.properties
@@ -2383,6 +2383,8 @@ SecurityListFilterLimitPriceExceeded = Effecten: Limietprijs overschreden
 
 SecurityListFilterOnlyExchangeRates = Alleen wisselkoersen
 
+SecurityListFilterOnlyInactive = Alleen inactieve effecten
+
 SecurityListFilterOnlySecurities = Alleen effecten
 
 SecurityMenuAddEvent = Gebeurtenis...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pl.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pl.properties
@@ -2381,6 +2381,8 @@ SecurityListFilterLimitPriceExceeded = Walory: Przekroczony limit ceny
 
 SecurityListFilterOnlyExchangeRates = Tylko kursy walut
 
+SecurityListFilterOnlyInactive = Tylko nieaktywne instrumenty
+
 SecurityListFilterOnlySecurities = Tylko walory
 
 SecurityMenuAddEvent = Zdarzenie...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt.properties
@@ -2381,6 +2381,8 @@ SecurityListFilterLimitPriceExceeded = T\u00EDtulos: Limite de pre\u00E7o excedi
 
 SecurityListFilterOnlyExchangeRates = Apenas taxas de c\u00E2mbio
 
+SecurityListFilterOnlyInactive = Apenas instrumentos inactivos
+
 SecurityListFilterOnlySecurities = Apenas a\u00E7\u00F5es
 
 SecurityMenuAddEvent = Evento...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt_BR.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt_BR.properties
@@ -2381,6 +2381,8 @@ SecurityListFilterLimitPriceExceeded = Ativos: Limite de pre\u00E7o excedido
 
 SecurityListFilterOnlyExchangeRates = Apenas taxas de c\u00E2mbio
 
+SecurityListFilterOnlyInactive = Apenas instrumentos inativos
+
 SecurityListFilterOnlySecurities = Apenas a\u00E7\u00F5es
 
 SecurityMenuAddEvent = Evento...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_ru.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_ru.properties
@@ -2381,6 +2381,8 @@ SecurityListFilterLimitPriceExceeded = \u0426\u0435\u043D\u043D\u044B\u0435 \u04
 
 SecurityListFilterOnlyExchangeRates = \u0422\u043E\u043B\u044C\u043A\u043E \u043A\u0443\u0440\u0441\u044B \u043E\u0431\u043C\u0435\u043D\u0430
 
+SecurityListFilterOnlyInactive = \u0422\u043E\u043B\u044C\u043A\u043E \u043D\u0435\u0430\u043A\u0442\u0438\u0432\u043D\u044B\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B
+
 SecurityListFilterOnlySecurities = \u0422\u043E\u043B\u044C\u043A\u043E \u0430\u043A\u0442\u0438\u0432\u044B
 
 SecurityMenuAddEvent = \u0421\u043E\u0431\u044B\u0442\u0438\u0435...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_sk.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_sk.properties
@@ -2383,6 +2383,8 @@ SecurityListFilterLimitPriceExceeded = Cenn\u00E9 papiere: Prekro\u010Denie limi
 
 SecurityListFilterOnlyExchangeRates = Iba v\u00FDmenn\u00E9 kurzy
 
+SecurityListFilterOnlyInactive = Iba neakt\u00EDvne cenn\u00E9 papiere
+
 SecurityListFilterOnlySecurities = Iba cenn\u00E9 papiere
 
 SecurityMenuAddEvent = Udalos\u0165...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh.properties
@@ -2383,6 +2383,8 @@ SecurityListFilterLimitPriceExceeded = \u8BC1\u5238\uFF1A\u8D85\u8FC7\u9650\u4EF
 
 SecurityListFilterOnlyExchangeRates = \u4EC5\u6C47\u7387
 
+SecurityListFilterOnlyInactive = \u53EA\u6709\u4E0D\u6D3B\u52A8\u7684\u4EEA\u5668
+
 SecurityListFilterOnlySecurities = \u4EC5\u8BC1\u5238
 
 SecurityMenuAddEvent = \u4E8B\u4EF6...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh_TW.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh_TW.properties
@@ -2381,6 +2381,8 @@ SecurityListFilterLimitPriceExceeded = \u8B49\u5238\uFF1A\u8D85\u51FA\u9650\u50F
 
 SecurityListFilterOnlyExchangeRates = \u50C5\u532F\u7387
 
+SecurityListFilterOnlyInactive = \u50C5\u975E\u6D3B\u52D5\u5100\u5668
+
 SecurityListFilterOnlySecurities = \u50C5\u9650\u8B49\u5238
 
 SecurityMenuAddEvent = \u4E8B\u4EF6...

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/SecurityListView.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/SecurityListView.java
@@ -164,6 +164,7 @@ private void addNewSecurity(Security newSecurity)
     private class FilterDropDown extends DropDown implements IMenuListener
     {
         private final Predicate<Security> securityIsNotInactive = record -> !record.isRetired();
+        private final Predicate<Security> securityIsInactive = record -> record.isRetired();
         private final Predicate<Security> onlySecurities = record -> !record.isExchangeRate();
         private final Predicate<Security> onlyExchangeRates = record -> record.isExchangeRate();
         private final Predicate<Security> sharesNotZero = record -> getSharesHeld(getClient(), record) != 0;
@@ -197,6 +198,8 @@ else if (watchlist != null)
                 filter.add(sharesEqualZero);
             if ((savedFilters & (1 << 6)) != 0)
                 filter.add(limitPriceExceeded);
+            if ((savedFilters & (1 << 7)) != 0)
+                filter.add(securityIsInactive);
 
             if (!filter.isEmpty())
                 setImage(Images.FILTER_ON);
@@ -220,6 +223,8 @@ else if (watchlist != null)
                     savedFilter += (1 << 5);
                 if (filter.contains(limitPriceExceeded))
                     savedFilter += (1 << 6);
+                if (filter.contains(securityIsInactive))
+                    savedFilter += (1 << 7);
                 if (watchlist != null)
                     preferenceStore.setValue(
                                     this.getClass().getSimpleName() + "-filterSettings" + "-" + watchlist.getName(), //$NON-NLS-1$ //$NON-NLS-2$
@@ -284,10 +289,14 @@ public void menuAboutToShow(IMenuManager manager)
             }
 
             manager.add(createAction(Messages.SecurityListFilterHideInactive, securityIsNotInactive));
+            manager.add(createAction(Messages.SecurityListFilterOnlyInactive, securityIsInactive));
+            manager.add(new Separator());
             manager.add(createAction(Messages.SecurityListFilterOnlySecurities, onlySecurities));
             manager.add(createAction(Messages.SecurityListFilterOnlyExchangeRates, onlyExchangeRates));
+            manager.add(new Separator());
             manager.add(createAction(Messages.SecurityFilterSharesHeldNotZero, sharesNotZero));
             manager.add(createAction(Messages.SecurityFilterSharesHeldEqualZero, sharesEqualZero));
+            manager.add(new Separator());
             manager.add(createAction(Messages.SecurityListFilterLimitPriceExceeded, limitPriceExceeded));
         }
 
@@ -316,6 +325,10 @@ else if (predicate == sharesEqualZero)
                             filter.remove(sharesNotZero);
                         else if (predicate == sharesNotZero)
                             filter.remove(sharesEqualZero);
+                        else if (predicate == securityIsNotInactive)
+                            filter.remove(securityIsInactive);
+                        else if (predicate == securityIsInactive)
+                            filter.remove(securityIsNotInactive);
                     }
 
                     setImage(filter.isEmpty() ? Images.FILTER_OFF : Images.FILTER_ON);