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

Add support for duplicating assets
All checks were successful
Build / build (push) Successful in 6m44s
Details
Deploy / build (push) Successful in 6m57s
Details

Browse Source
This commit is contained in:
Sebastiaan de Schaetzen
2025-06-10 13:54:27 +02:00
parent 698f6a3903
commit 13617eed6d
6 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle.kts
View File

@@ -29,6 +29,7 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8") implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8")
implementation("org.modelmapper:modelmapper:3.2.3")
compileOnly("org.projectlombok:lombok") compileOnly("org.projectlombok:lombok")
developmentOnly("org.springframework.boot:spring-boot-devtools") developmentOnly("org.springframework.boot:spring-boot-devtools")
runtimeOnly("org.postgresql:postgresql") runtimeOnly("org.postgresql:postgresql")

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

@@ -226,6 +226,27 @@ public class WebController {
return "create_asset"; return "create_asset";
} }
/**
* Shows a view where the user can edit an existing asset.
*
* @param qr The QR code of the asset to edit.
*/
@GetMapping("/duplicate/{qr}")
public String duplicate(Model model, @PathVariable long qr) {
model.addAttribute(TIME, System.currentTimeMillis());
var asset = assetService.getAssetByQr(qr);
if (asset == null) {
throw new RuntimeException("Asset not found");
}
String assetType = asset.getAsset().getType();
model.addAttribute(ACTION, "duplicate");
model.addAttribute(ASSET, asset);
model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(assetType));
model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(assetType));
model.addAttribute(INPUT_LIST, assetService.getInputList(assetType));
return "create_asset";
}
/** /**
* Actually edits an asset based on the form data submitted. * Actually edits an asset based on the form data submitted.
* *

26
src/main/java/be/seeseepuff/pcinv/services/AssetService.java
View File

@@ -12,6 +12,8 @@ import be.seeseepuff.pcinv.repositories.GenericAssetRepository;
import be.seeseepuff.pcinv.repositories.WorkLogRepository; import be.seeseepuff.pcinv.repositories.WorkLogRepository;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.modelmapper.ModelMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +56,30 @@ public class AssetService {
return getRepositoryFor(genericAsset.getType()).findByAsset(genericAsset); return getRepositoryFor(genericAsset.getType()).findByAsset(genericAsset);
} }
/**
* Retrieves an asset by its QR code and duplicates the object.
*
* @param qr the QR code of the asset to retrieve
* @return the Asset associated with the given QR code, or null if no duplicate is found
*/
@SneakyThrows
public Asset getAssetDuplicateByQr(long qr) {
var mapper = new ModelMapper();
var originalGenericAsset = genericRepository.findByQr(qr);
if (originalGenericAsset == null) {
throw new IllegalArgumentException("No asset found with QR code: " + qr);
}
var originalAsset = getRepositoryFor(originalGenericAsset.getType()).findByAsset(originalGenericAsset);
var genericAsset = mapper.map(originalGenericAsset, GenericAsset.class);
genericAsset.setId(0); // Reset ID to create a new instance
genericAsset.setQr(0);
var asset = mapper.map(originalAsset, originalAsset.getClass());
asset.setAsset(genericAsset);
return asset;
}
/** /**
* Retrieves all assets of a specific type. * Retrieves all assets of a specific type.
* *

1
src/main/resources/templates/browse_type.html
View File

@@ -14,6 +14,7 @@
<td> <td>
<a th:href="'/view/'+${a.getQr()}">View</a> <a th:href="'/view/'+${a.getQr()}">View</a>
<a th:href="'/edit/'+${a.getQr()}">Edit</a> <a th:href="'/edit/'+${a.getQr()}">Edit</a>
<a th:href="'/duplicate/'+${a.getQr()}">Duplicate</a>
</td> </td>
</tr> </tr>
</table> </table>

6
src/main/resources/templates/create_asset.html
View File

@@ -1,7 +1,7 @@
<body th:replace="~{fragments :: base(title='Create '+${descriptor.displayName}, content=~{::content})}"> <body th:replace="~{fragments :: base(title='Create '+${descriptor.displayName}, content=~{::content})}">
<div th:fragment="content"> <div th:fragment="content">
<h2>Create a <span th:text="${descriptor.displayName}"></span></h2> <h2>Create a <span th:text="${descriptor.displayName}"></span></h2>
<form th:action="'/'+${action}+'/'+${asset != null ? asset.getQr() : descriptor.getType()}" method="post"> <form th:action="'/'+${(action == 'duplicate') ? 'create' : action}+'/'+${(asset != null && action != 'duplicate') ? asset.getQr() : descriptor.getType()}" method="post">
<div th:each="d : ${descriptors}"> <div th:each="d : ${descriptors}">
<h2 th:text="${d.displayName}"></h2> <h2 th:text="${d.displayName}"></h2>
<table border="1" cellpadding="4"> <table border="1" cellpadding="4">
@@ -17,7 +17,7 @@
<input type="text" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${p.getValue(asset)}" th:placeholder="${p.displayName}" th:required="${p.required}"/> <input type="text" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${p.getValue(asset)}" th:placeholder="${p.displayName}" th:required="${p.required}"/>
</span> </span>
<input th:case="STRING" type="text" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${p.getValue(asset)}" th:placeholder="${p.displayName}" th:required="${p.required}"/> <input th:case="STRING" type="text" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${p.getValue(asset)}" th:placeholder="${p.displayName}" th:required="${p.required}"/>
<input th:case="INTEGER" type="number" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${p.getValue(asset)}" th:required="${p.required}"/> <input th:case="INTEGER" type="number" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${(p.name == 'qr' && action == 'duplicate') ? null : p.getValue(asset)}" th:required="${p.required}"/>
<!-- <input th:case="BOOLEAN" type="checkbox" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="true" th:checked="${asset != null ? p.getValue(asset) : p.defaultValue}"/>--> <!-- <input th:case="BOOLEAN" type="checkbox" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="true" th:checked="${asset != null ? p.getValue(asset) : p.defaultValue}"/>-->
<span th:case="BOOLEAN"> <span th:case="BOOLEAN">
<input th:name="${d.asString(p)}" th:id="${d.asString(p)}+'-null'" type="radio" value="null" th:checked="${asset == null || (p.getValue(asset) == null)}"> <input th:name="${d.asString(p)}" th:id="${d.asString(p)}+'-null'" type="radio" value="null" th:checked="${asset == null || (p.getValue(asset) == null)}">
@@ -50,7 +50,7 @@
</table> </table>
</div> </div>
<p> <p>
<input th:if="${action == 'create'}" type="submit" value="Create"> <input th:if="${action == 'create' || action == 'duplicate'}" type="submit" value="Create">
<input th:if="${action == 'edit'}" type="submit" value="Save Changes"> <input th:if="${action == 'edit'}" type="submit" value="Save Changes">
</p> </p>
</form> </form>

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

@@ -15,7 +15,8 @@
<ul th:if="${action == 'view'}"> <ul th:if="${action == 'view'}">
<li><a th:href="'/edit/'+${asset.getQr()}">Edit</a></li> <li><a th:href="'/edit/'+${asset.getQr()}">Edit</a></li>
<li><a th:href="'/delete/'+${asset.getQr()}">Delete</a></li> <li><a th:href="'/delete/'+${asset.getQr()}">Delete</a></li>
<li><a th:href="'/create/'+${asset.getAsset().type}">Create another <span th:text="${descriptor.displayName}">Hard Drive</span> </a></li> <li><a th:href="'/create/'+${asset.getAsset().type}">Create another <span th:text="${descriptor.displayName}">Hard Drive</span></a></li>
<li><a th:href="'/duplicate/'+${asset.getQr()}">Duplicate this <span th:text="${descriptor.displayName}">Hard Drive</span></a></li>
<li><a th:href="'/browse/'+${descriptor.type}">Browse all <span th:text="${descriptor.pluralName}">Hard Drives</span></a></li> <li><a th:href="'/browse/'+${descriptor.type}">Browse all <span th:text="${descriptor.pluralName}">Hard Drives</span></a></li>
</ul> </ul>
<ul th:if="${action == 'delete'}"> <ul th:if="${action == 'delete'}">