Subversion Repositories SmartDukaan

Rev

Rev 36241 | Rev 36841 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36241 Rev 36681
Line 743... Line 743...
743
                    subMenuMap.put(parentMenu, new ArrayList<>());
743
                    subMenuMap.put(parentMenu, new ArrayList<>());
744
                }
744
                }
745
                subMenuMap.get(parentMenu).add(menu);
745
                subMenuMap.get(parentMenu).add(menu);
746
            }
746
            }
747
        }
747
        }
-
 
748
        // Sort submenus alphabetically by display text, then build the top-level list
-
 
749
        Comparator<Menu> byDisplayText = Comparator.comparing(
-
 
750
                m -> m.getDisplayText() == null ? "" : m.getDisplayText(),
-
 
751
                String.CASE_INSENSITIVE_ORDER);
748
        subMenuMap.entrySet().stream().forEach(entry -> {
752
        subMenuMap.entrySet().stream().forEach(entry -> {
-
 
753
            List<Menu> subs = entry.getValue();
-
 
754
            subs.sort(byDisplayText);
749
            entry.getKey().setSubMenus(entry.getValue());
755
            entry.getKey().setSubMenus(subs);
750
            returnMenu.add(entry.getKey());
756
            returnMenu.add(entry.getKey());
751
        });
757
        });
-
 
758
        // Sort the top-level menus alphabetically
-
 
759
        returnMenu.sort(byDisplayText);
752
        return returnMenu;
760
        return returnMenu;
753
    }
761
    }
754
 
762
 
755
    public Map<Integer, PartnerDetailModel> getWarehousePartnerDetail(Map<Integer, List<Integer>> warehousePartnerMap)
763
    public Map<Integer, PartnerDetailModel> getWarehousePartnerDetail(Map<Integer, List<Integer>> warehousePartnerMap)
756
            throws Exception {
764
            throws Exception {