Added sorting by actual in taxonomy view

Issue: #3791 Issue: #3835 Co-authored-by: Fischer, Markus <[email protected]> Co-authored-by: Andreas Buchen <[email protected]>
portfolio-performance · Mar 21, 2024 · a651771 · a651771
1 parent 4bd4674
commit a651771
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 25 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
@@ -964,7 +964,7 @@ public class Messages extends NLS
     public static String MenuTaxonomyMakeAssignment;
     public static String MenuTaxonomyRename;
     public static String MenuTaxonomySortByName;
-    public static String MenuTaxonomySortByTypName;
+    public static String MenuTaxonomySortByType;
     public static String MenuTaxonomySortTreeBy;
     public static String MenuTaxonomyWeightFix;
     public static String MenuTransactionDelete;

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/dialogs/about.contributors.txt b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/dialogs/about.contributors.txt
@@ -145,4 +145,5 @@ bkolb
 jimjaeger
 mfrkn702001
 kimmerin
-mierin12
+mierin12
+gus484
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
@@ -1946,7 +1946,7 @@ MenuTaxonomyRename = Rename taxonomy
 
 MenuTaxonomySortByName = Name
 
-MenuTaxonomySortByTypName = Type, Name
+MenuTaxonomySortByType = Type
 
 MenuTaxonomySortTreeBy = Sort by...
 

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
@@ -1938,7 +1938,7 @@ MenuTaxonomyRename = P\u0159ejmenovat taxonomii
 
 MenuTaxonomySortByName = N\u00E1zvu
 
-MenuTaxonomySortByTypName = Typu, n\u00E1zvu
+MenuTaxonomySortByType = Typu
 
 MenuTaxonomySortTreeBy = Se\u0159adit podle...
 

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
@@ -1937,7 +1937,7 @@ MenuTaxonomyRename = Omd\u00F8b taksonomi
 
 MenuTaxonomySortByName = Navn
 
-MenuTaxonomySortByTypName = Type, Navn
+MenuTaxonomySortByType = Type
 
 MenuTaxonomySortTreeBy = Sorter efter...
 

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
@@ -1937,7 +1937,7 @@ MenuTaxonomyRename = Klassifizierung umbenennen
 
 MenuTaxonomySortByName = Name
 
-MenuTaxonomySortByTypName = Typ, Name
+MenuTaxonomySortByType = Typ
 
 MenuTaxonomySortTreeBy = Sortieren...
 

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
@@ -1939,7 +1939,7 @@ MenuTaxonomyRename = Renombrar taxonom\u00EDa
 
 MenuTaxonomySortByName = Nombre
 
-MenuTaxonomySortByTypName = Tipo, Nombre
+MenuTaxonomySortByType = Tipo
 
 MenuTaxonomySortTreeBy = Ordenar por...
 

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
@@ -1940,7 +1940,7 @@ MenuTaxonomyRename = Renommer taxonomie
 
 MenuTaxonomySortByName = Nom
 
-MenuTaxonomySortByTypName = Type, Nom
+MenuTaxonomySortByType = Type
 
 MenuTaxonomySortTreeBy = Trier par...
 

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
@@ -1939,7 +1939,7 @@ MenuTaxonomyRename = Rinomina tassonomia
 
 MenuTaxonomySortByName = Nome
 
-MenuTaxonomySortByTypName = Tipo, nome
+MenuTaxonomySortByType = Tipo
 
 MenuTaxonomySortTreeBy = Ordina per...
 

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
@@ -1939,7 +1939,7 @@ MenuTaxonomyRename = Naam van taxonomie wijzigen
 
 MenuTaxonomySortByName = Naam
 
-MenuTaxonomySortByTypName = Type, naam
+MenuTaxonomySortByType = Type
 
 MenuTaxonomySortTreeBy = Sorteren op...
 

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
@@ -1937,7 +1937,7 @@ MenuTaxonomyRename = Zmie\u0144 nazw\u0119 taksonomii
 
 MenuTaxonomySortByName = Nazwa
 
-MenuTaxonomySortByTypName = Typ, nazwa
+MenuTaxonomySortByType = Typ
 
 MenuTaxonomySortTreeBy = Sortuj wed\u0142ug...
 

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
@@ -1937,7 +1937,7 @@ MenuTaxonomyRename = Renomear taxonomia
 
 MenuTaxonomySortByName = Nome
 
-MenuTaxonomySortByTypName = Tipo, Nome
+MenuTaxonomySortByType = Tipo
 
 MenuTaxonomySortTreeBy = Ordernar por...
 

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
@@ -1937,7 +1937,7 @@ MenuTaxonomyRename = Renomear taxonomia
 
 MenuTaxonomySortByName = Nome
 
-MenuTaxonomySortByTypName = Tipo, Nome
+MenuTaxonomySortByType = Tipo
 
 MenuTaxonomySortTreeBy = Ordernar por...
 

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
@@ -1937,7 +1937,7 @@ MenuTaxonomyRename = \u041F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u043
 
 MenuTaxonomySortByName = \u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
 
-MenuTaxonomySortByTypName = \u0422\u0438\u043F, \u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
+MenuTaxonomySortByType = \u0422\u0438\u043F
 
 MenuTaxonomySortTreeBy = \u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E...
 

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
@@ -1939,7 +1939,7 @@ MenuTaxonomyRename = Premenovanie taxon\u00F3mie
 
 MenuTaxonomySortByName = N\u00E1zov
 
-MenuTaxonomySortByTypName = Typ, n\u00E1zov
+MenuTaxonomySortByType = Typ
 
 MenuTaxonomySortTreeBy = Zoradi\u0165 pod\u013Ea...
 

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
@@ -1939,7 +1939,7 @@ MenuTaxonomyRename = \u91CD\u547D\u540D\u7C7B\u522B
 
 MenuTaxonomySortByName = \u540D\u79F0
 
-MenuTaxonomySortByTypName = \u7C7B\u578B\uFF0C\u540D\u79F0
+MenuTaxonomySortByType = \u7C7B\u578B
 
 MenuTaxonomySortTreeBy = \u6392\u5E8F...
 

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
@@ -1937,7 +1937,7 @@ MenuTaxonomyRename = \u91CD\u65B0\u547D\u540D\u5206\u985E
 
 MenuTaxonomySortByName = \u540D\u7A31
 
-MenuTaxonomySortByTypName = \u985E\u578B\u3001\u540D\u7A31
+MenuTaxonomySortByType = \u985E\u578B
 
 MenuTaxonomySortTreeBy = \u6309...\u6392\u5E8F
 

diff --git a/...hen.portfolio.ui/src/name/abuchen/portfolio/ui/views/taxonomy/AbstractNodeTreeViewer.java b/...hen.portfolio.ui/src/name/abuchen/portfolio/ui/views/taxonomy/AbstractNodeTreeViewer.java
@@ -276,6 +276,11 @@ else if (targetNode.isAssignment())
         }
     }
 
+    private enum SortCriterion
+    {
+        TYPE, NAME, ACTUAL
+    }
+
     protected static final String MENU_GROUP_DEFAULT_ACTIONS = "defaultActions"; //$NON-NLS-1$
     protected static final String MENU_GROUP_CUSTOM_ACTIONS = "customActions"; //$NON-NLS-1$
     protected static final String MENU_GROUP_DELETE_ACTIONS = "deleteActions"; //$NON-NLS-1$
@@ -849,8 +854,13 @@ protected void fillContextMenu(IMenuManager manager) // NOSONAR
             manager.add(new Separator());
 
             MenuManager sorting = new MenuManager(Messages.MenuTaxonomySortTreeBy);
-            sorting.add(new SimpleAction(Messages.MenuTaxonomySortByTypName, a -> doSort(node, true)));
-            sorting.add(new SimpleAction(Messages.MenuTaxonomySortByName, a -> doSort(node, false)));
+            sorting.add(new SimpleAction(
+                            String.join(", ", Messages.MenuTaxonomySortByType, Messages.MenuTaxonomySortByName), //$NON-NLS-1$
+                            a -> doSort(node, SortCriterion.TYPE, SortCriterion.NAME)));
+            sorting.add(new SimpleAction(String.join(", ", Messages.MenuTaxonomySortByType, Messages.ColumnActualValue), //$NON-NLS-1$
+                            a -> doSort(node, SortCriterion.TYPE, SortCriterion.ACTUAL)));
+            sorting.add(new SimpleAction(Messages.MenuTaxonomySortByName, a -> doSort(node, SortCriterion.NAME)));
+            sorting.add(new SimpleAction(Messages.ColumnActualValue, a -> doSort(node, SortCriterion.ACTUAL)));
 
             manager.add(sorting);
 
@@ -995,7 +1005,7 @@ else if (change > 0)
         // do not fire model change -> called within modification listener
     }
 
-    private void doSort(TaxonomyNode node, final boolean byType) // NOSONAR
+    private void doSort(TaxonomyNode node, SortCriterion... criteria) // NOSONAR
     {
         Collections.sort(node.getChildren(), (node1, node2) -> { // NOSONAR
             // unassigned category always stays at the end of the list
@@ -1004,12 +1014,32 @@ private void doSort(TaxonomyNode node, final boolean byType) // NOSONAR
             if (node2.isUnassignedCategory())
                 return -1;
 
-            if (byType && node1.isClassification() && !node2.isClassification())
-                return -1;
-            if (byType && !node1.isClassification() && node2.isClassification())
-                return 1;
+            for (int ii = 0; ii < criteria.length; ii++)
+            {
+                switch (criteria[ii])
+                {
+                    case TYPE:
+                        if (node1.isClassification() && !node2.isClassification())
+                            return -1;
+                        if (!node1.isClassification() && node2.isClassification())
+                            return 1;
+                        break;
+                    case NAME:
+                        int cn = TextUtil.compare(node1.getName(), node2.getName());
+                        if (cn != 0)
+                            return cn;
+                        break;
+                    case ACTUAL:
+                        int ca = node2.getActual().compareTo(node1.getActual());
+                        if (ca != 0)
+                            return ca;
+                        break;
+                    default:
+
+                }
+            }
 
-            return TextUtil.compare(node1.getName(), node2.getName());
+            return 0;
         });
 
         int rank = 0;