Improve asset sorting by brand, model, and QR code with null handling

src/main/java/be/seeseepuff/pcinv/controllers/WebController.java

@@ -1,5 +1,6 @@
 package be.seeseepuff.pcinv.controllers;
 
+import be.seeseepuff.pcinv.models.Asset;
 import be.seeseepuff.pcinv.models.WorkLogEntry;
 import be.seeseepuff.pcinv.services.AssetService;
 import be.seeseepuff.pcinv.services.BuildService;
@@ -94,7 +95,12 @@ public class WebController {
         model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(type));
         model.addAttribute(DESCRIPTORS, tree);
         model.addAttribute(PROPERTIES, tree.stream().flatMap(d -> d.getProperties().stream()).toList());
-        model.addAttribute(ASSETS, assetService.getAssetsByType(type));
+        var assets = assetService.getAssetsByType(type);
+        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);
         return "browse_type";
     }
 

src/main/java/be/seeseepuff/pcinv/meta/CapacityInfo.java

@@ -44,6 +44,10 @@ public class CapacityInfo {
     }
 
     public static CapacityUnit idealUnitForCapacity(long capacity, CapacityUnit[] units) {
+        if (capacity <= 0) {
+            return CapacityUnit.BYTES; // Default to bytes for non-positive capacities
+        }
+
         return Arrays.stream(units)
                 .sorted(Comparator.comparing(CapacityUnit::getBytes).reversed())
                 .filter(unit -> capacity % unit.getBytes() == 0)

src/main/java/be/seeseepuff/pcinv/models/HddAsset.java

@@ -57,16 +57,16 @@ public class HddAsset implements Asset
 	@InputList
 	private String driveType;
 
-	@Description("Number of heads in the drive.")
-	@Property("Heads")
-	@HideInOverview
-	private Integer heads;
-
 	@Description("Number of cylinders in the drive.")
 	@Property("Cylinders")
 	@HideInOverview
 	private Integer cylinders;
 
+	@Description("Number of heads in the drive.")
+	@Property("Heads")
+	@HideInOverview
+	private Integer heads;
+
 	@Description("Number of sectors in the drive.")
 	@Property("Sectors")
 	@HideInOverview

src/main/resources/templates/build_view.html

@@ -15,7 +15,7 @@
         </tr>
         <tr th:each="p : ${build.getParts()}">
             <td><a th:href="'/view/' + ${p.qr}" th:text="${p.qr}"></a></td>
-            <td th:text="${descriptors.getDescriptorForType(p.type).displayName}"></td>
+            <td><a th:href="'/browse/' + ${p.type}" th:text="${descriptors.getDescriptorForType(p.type).displayName}"></a></td>
             <td th:text="${descriptors.getGenericProperty('brand').renderValue(p)}"></td>
             <td th:text="${descriptors.getGenericProperty('model').renderValue(p)}"></td>
         </tr>

src/main/resources/templates/view.html

@@ -7,7 +7,10 @@
     <table border="1" cellpadding="4">
       <tr th:each="p : ${d.properties}">
         <th bgcolor="lightgray"><b th:text="${p.displayName}"></b></th>
-        <td th:if="${p.name == 'build'}"><a th:href="'/build/' + ${asset.getAsset().getBuild().id}" th:text="${p.renderValue(asset)}"></a></td>
+        <td th:if="${p.name == 'build'}">
+          <a th:if="${asset.getAsset().getBuild() != null}" th:href="'/build/' + ${asset.getAsset().getBuild().id}" th:text="${p.renderValue(asset)}"></a>
+          <span th:if="${asset.getAsset().getBuild() == null}" th:text="${p.renderValue(asset)}"></span>
+        </td>
         <td th:if="${p.name != 'build'}" th:text="${p.renderValue(asset)}"></td>
       </tr>
     </table>