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

Enhance asset display by handling null builds and sorting assets by QR code

Browse Source
This commit is contained in:
Sebastiaan de Schaetzen
2025-06-15 09:26:08 +02:00
parent 14ac78982f
commit 0dbab45651
2 changed files with 8 additions and 2 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

@@ -1,5 +1,6 @@
package be.seeseepuff.pcinv.controllers; package be.seeseepuff.pcinv.controllers;
import be.seeseepuff.pcinv.models.Asset;
import be.seeseepuff.pcinv.models.WorkLogEntry; import be.seeseepuff.pcinv.models.WorkLogEntry;
import be.seeseepuff.pcinv.services.AssetService; import be.seeseepuff.pcinv.services.AssetService;
import be.seeseepuff.pcinv.services.BuildService; import be.seeseepuff.pcinv.services.BuildService;
@@ -94,7 +95,9 @@ public class WebController {
model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(type)); model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(type));
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());
model.addAttribute(ASSETS, assetService.getAssetsByType(type)); var assets = assetService.getAssetsByType(type);
assets.sort(Comparator.comparing(Asset::getQr));
model.addAttribute(ASSETS, assets);
return "browse_type"; return "browse_type";
} }

5
src/main/resources/templates/view.html
View File

@@ -7,7 +7,10 @@
<table border="1" cellpadding="4"> <table border="1" cellpadding="4">
<tr th:each="p : ${d.properties}"> <tr th:each="p : ${d.properties}">
<th bgcolor="lightgray"><b th:text="${p.displayName}"></b></th> <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> <td th:if="${p.name != 'build'}" th:text="${p.renderValue(asset)}"></td>
</tr> </tr>
</table> </table>