Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 13617eed6d | |||
| 698f6a3903 |
@@ -29,6 +29,7 @@ dependencies {
|
||||
implementation("org.springframework.boot:spring-boot-starter-web")
|
||||
implementation("org.springframework.boot:spring-boot-starter-actuator")
|
||||
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8")
|
||||
implementation("org.modelmapper:modelmapper:3.2.3")
|
||||
compileOnly("org.projectlombok:lombok")
|
||||
developmentOnly("org.springframework.boot:spring-boot-devtools")
|
||||
runtimeOnly("org.postgresql:postgresql")
|
||||
|
||||
@@ -226,6 +226,27 @@ public class WebController {
|
||||
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.
|
||||
*
|
||||
|
||||
@@ -99,7 +99,7 @@ public class AssetProperty {
|
||||
.setter((obj, value) -> {
|
||||
try {
|
||||
property.setAccessible(true);
|
||||
property.set(obj, value);
|
||||
property.set(obj, Converters.convert(value, property.getType()));
|
||||
} catch (IllegalAccessException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
66
src/main/java/be/seeseepuff/pcinv/meta/Converters.java
Normal file
66
src/main/java/be/seeseepuff/pcinv/meta/Converters.java
Normal file
@@ -0,0 +1,66 @@
|
||||
package be.seeseepuff.pcinv.meta;
|
||||
|
||||
import lombok.experimental.UtilityClass;
|
||||
|
||||
/**
|
||||
* Utility class for converting values to different types.
|
||||
*/
|
||||
@UtilityClass
|
||||
public class Converters {
|
||||
/**
|
||||
* Converts a value to the specified target type.
|
||||
*
|
||||
* @param value The value to convert.
|
||||
* @param target The target class to convert the value to.
|
||||
* @return The converted value, or null if conversion is not possible.
|
||||
*/
|
||||
public static Object convert(Object value, Class<?> target) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
if (target.isInstance(value)) {
|
||||
return value; // No conversion needed
|
||||
}
|
||||
if (value instanceof Long longValue) {
|
||||
return convertLong(longValue, target);
|
||||
}
|
||||
if (value instanceof Integer intValue) {
|
||||
return convertInteger(intValue, target);
|
||||
}
|
||||
throw new ClassCastException("Cannot convert " + value.getClass().getName() + " to " + target.getName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Long value to the specified target type.
|
||||
*
|
||||
* @param value The Long value to convert.
|
||||
* @param target The target class to convert the value to.
|
||||
* @return The converted value, or throws ClassCastException if conversion is not possible.
|
||||
*/
|
||||
private static Object convertLong(Long value, Class<?> target) {
|
||||
if (target == Long.class || target == long.class) {
|
||||
return value; // No conversion needed
|
||||
}
|
||||
if (target == Integer.class || target == int.class) {
|
||||
return value.intValue();
|
||||
}
|
||||
throw new ClassCastException("Cannot convert " + value.getClass().getName() + " to " + target.getName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an Integer value to the specified target type.
|
||||
*
|
||||
* @param value The Integer value to convert.
|
||||
* @param target The target class to convert the value to.
|
||||
* @return The converted value, or throws ClassCastException if conversion is not possible.
|
||||
*/
|
||||
private static Object convertInteger(Integer value, Class<?> target) {
|
||||
if (target == Integer.class || target == int.class) {
|
||||
return value; // No conversion needed
|
||||
}
|
||||
if (target == Long.class || target == long.class) {
|
||||
return value.longValue();
|
||||
}
|
||||
throw new ClassCastException("Cannot convert " + value.getClass().getName() + " to " + target.getName());
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,8 @@ import be.seeseepuff.pcinv.repositories.GenericAssetRepository;
|
||||
import be.seeseepuff.pcinv.repositories.WorkLogRepository;
|
||||
import jakarta.persistence.EntityManager;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.SneakyThrows;
|
||||
import org.modelmapper.ModelMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -54,6 +56,30 @@ public class AssetService {
|
||||
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.
|
||||
*
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
<td>
|
||||
<a th:href="'/view/'+${a.getQr()}">View</a>
|
||||
<a th:href="'/edit/'+${a.getQr()}">Edit</a>
|
||||
<a th:href="'/duplicate/'+${a.getQr()}">Duplicate</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<body th:replace="~{fragments :: base(title='Create '+${descriptor.displayName}, content=~{::content})}">
|
||||
<div th:fragment="content">
|
||||
<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}">
|
||||
<h2 th:text="${d.displayName}"></h2>
|
||||
<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}"/>
|
||||
</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="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}"/>-->
|
||||
<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)}">
|
||||
@@ -50,7 +50,7 @@
|
||||
</table>
|
||||
</div>
|
||||
<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">
|
||||
</p>
|
||||
</form>
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
<ul th:if="${action == 'view'}">
|
||||
<li><a th:href="'/edit/'+${asset.getQr()}">Edit</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>
|
||||
</ul>
|
||||
<ul th:if="${action == 'delete'}">
|
||||
|
||||
Reference in New Issue
Block a user