seeseemelk/pcinv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

Improve asset sorting by brand, model, and QR code with null handling
All checks were successful
Build / build (push) Successful in 2m27s
Details
Deploy / build (push) Successful in 3m1s
Details

Browse Source
This commit is contained in:
Sebastiaan de Schaetzen
2025-06-15 09:48:07 +02:00
parent 35c2e07c05
commit bb15c55e46
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/be/seeseepuff/pcinv/controllers/WebController.java
View File

@@ -96,7 +96,10 @@ public class WebController {
model.addAttribute(DESCRIPTORS, tree); model.addAttribute(DESCRIPTORS, tree);
model.addAttribute(PROPERTIES, tree.stream().flatMap(d -> d.getProperties().stream()).toList()); model.addAttribute(PROPERTIES, tree.stream().flatMap(d -> d.getProperties().stream()).toList());
var assets = assetService.getAssetsByType(type); var assets = assetService.getAssetsByType(type);
assets.sort(Comparator.comparing(Asset::getQr)); assets.sort(Comparator
.comparing((Asset a) -> a.getAsset().getBrand(), Comparator.nullsFirst(Comparator.naturalOrder()))
.thenComparing((Asset a) -> a.getAsset().getModel(), Comparator.nullsFirst(Comparator.naturalOrder()))
.thenComparing(Asset::getQr));
model.addAttribute(ASSETS, assets); model.addAttribute(ASSETS, assets);
return "browse_type"; return "browse_type";
} }