Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 35c2e07c05 | |||
| 92187fd345 | |||
| 0dbab45651 | |||
| 14ac78982f | |||
| b4c493c27b | |||
| 8e26a73243 | |||
| 8cbededc79 |
@@ -1,7 +1,9 @@
|
||||
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;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.http.MediaType;
|
||||
@@ -42,6 +44,12 @@ public class WebController {
|
||||
private static final String INPUT_LIST = "inputLists";
|
||||
/// The name of the model attribute that holds the current work log entries.
|
||||
private static final String WORKLOG = "worklog";
|
||||
/// The name of the model attribute that holds the current build being viewed or edited.
|
||||
private static final String BUILD = "build";
|
||||
/// The name of the model attribute that holds the build information.
|
||||
private static final String BUILD_INFO = "buildInfo";
|
||||
/// The name of the model attribute that holds the builds available for selection.
|
||||
private static final String BUILDS = "builds";
|
||||
|
||||
/// The name of the input field for the current size of the work log.
|
||||
private static final String WORKLOG_SIZE = "worklog_size";
|
||||
@@ -49,6 +57,7 @@ public class WebController {
|
||||
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("dd MMM yyyy 'at' HH:mm");
|
||||
|
||||
private final AssetService assetService;
|
||||
private final BuildService buildService;
|
||||
|
||||
/**
|
||||
* Handles the root URL and returns the index page with asset descriptors and asset count.
|
||||
@@ -86,10 +95,60 @@ 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::getQr));
|
||||
model.addAttribute(ASSETS, assets);
|
||||
return "browse_type";
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles the browsing of all builds.
|
||||
* Displays a list of all builds available in the system.
|
||||
*/
|
||||
@GetMapping("/builds")
|
||||
public String browseBuilds(Model model) {
|
||||
model.addAttribute(TIME, System.currentTimeMillis());
|
||||
model.addAttribute(BUILDS, buildService.getAllBuilds());
|
||||
return "builds";
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles the viewing of a specific build by its ID.
|
||||
* If the build does not exist, it redirects to the builds page.
|
||||
*/
|
||||
@GetMapping("/build/{id}")
|
||||
public String viewBuild(Model model, @PathVariable long id) {
|
||||
model.addAttribute(TIME, System.currentTimeMillis());
|
||||
var build = buildService.getBuildById(id);
|
||||
if (build == null) {
|
||||
return "redirect:/builds";
|
||||
}
|
||||
model.addAttribute(BUILD, build);
|
||||
model.addAttribute(BUILD_INFO, buildService.getBuildInfo(build));
|
||||
model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptors());
|
||||
return "build_view";
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles the creation of a new build.
|
||||
*/
|
||||
@PostMapping("/create_build")
|
||||
public String createBuild(Model model, @RequestBody MultiValueMap<String, String> formData) {
|
||||
model.addAttribute(TIME, System.currentTimeMillis());
|
||||
var build = buildService.createBuild(formData.getFirst("name"), formData.getFirst("description"));
|
||||
return "redirect:/build/" + build.getId();
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a build by its ID.
|
||||
*/
|
||||
@GetMapping("/delete_build/{id}")
|
||||
public String deleteBuild(Model model, @PathVariable long id) {
|
||||
model.addAttribute(TIME, System.currentTimeMillis());
|
||||
buildService.deleteBuild(id);
|
||||
return "redirect:/builds";
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles the view of an asset by its QR code.
|
||||
* If the asset does not exist, it redirects to the index page.
|
||||
@@ -202,6 +261,7 @@ public class WebController {
|
||||
model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(type));
|
||||
model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(type));
|
||||
model.addAttribute(INPUT_LIST, assetService.getInputList(type));
|
||||
model.addAttribute(BUILDS, buildService.getAllBuilds());
|
||||
return "create_asset";
|
||||
}
|
||||
|
||||
@@ -223,6 +283,7 @@ public class WebController {
|
||||
model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(assetType));
|
||||
model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(assetType));
|
||||
model.addAttribute(INPUT_LIST, assetService.getInputList(assetType));
|
||||
model.addAttribute(BUILDS, buildService.getAllBuilds());
|
||||
return "create_asset";
|
||||
}
|
||||
|
||||
|
||||
@@ -99,6 +99,19 @@ public class AssetDescriptor {
|
||||
return String.format("%s-%s", type, property.getName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the property with the specified name.
|
||||
*
|
||||
* @param name The name of the property to retrieve.
|
||||
* @return The AssetProperty with the given name.
|
||||
*/
|
||||
public AssetProperty getProperty(String name) {
|
||||
return properties.stream()
|
||||
.filter(property -> property.getName().equals(name))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new IllegalArgumentException("No property found with name: " + name));
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new instance of the asset type described by this descriptor.
|
||||
*
|
||||
|
||||
@@ -24,6 +24,37 @@ public class AssetDescriptors {
|
||||
assets.add(property);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the descriptor for a specific asset type.
|
||||
*
|
||||
* @param type The type of the asset to retrieve the descriptor for.
|
||||
*/
|
||||
public AssetDescriptor getDescriptorForType(String type) {
|
||||
return assets.stream()
|
||||
.filter(assetDescriptor -> assetDescriptor.getType().equals(type))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new IllegalArgumentException("No asset descriptor found for type: " + type));
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the property for a specific asset type and property name.
|
||||
*
|
||||
* @param type The type of the asset to retrieve the property for.
|
||||
* @param propertyName The name of the property to retrieve.
|
||||
*/
|
||||
public AssetProperty getPropertyForType(String type, String propertyName) {
|
||||
return getDescriptorForType(type).getProperty(propertyName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the generic property for a specific property name.
|
||||
*
|
||||
* @param propertyName The name of the property to retrieve.
|
||||
*/
|
||||
public AssetProperty getGenericProperty(String propertyName) {
|
||||
return getPropertyForType("asset", propertyName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
var builder = new StringBuilder();
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
package be.seeseepuff.pcinv.meta;
|
||||
|
||||
import be.seeseepuff.pcinv.models.Asset;
|
||||
import be.seeseepuff.pcinv.models.AssetCondition;
|
||||
import be.seeseepuff.pcinv.models.GenericAsset;
|
||||
import be.seeseepuff.pcinv.models.ReadWrite;
|
||||
import be.seeseepuff.pcinv.models.*;
|
||||
import jakarta.annotation.Nonnull;
|
||||
import jakarta.annotation.Nullable;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.Singular;
|
||||
@@ -28,7 +24,7 @@ public class AssetProperty {
|
||||
/// The name of the property as it should be displayed, e.g., "Brand", "Model", etc.
|
||||
private final String displayName;
|
||||
/// The type of the property, which can be a string or an integer.
|
||||
private final Type type;
|
||||
private final PropertyType type;
|
||||
/// Whether the property is required for the asset.
|
||||
private final boolean required;
|
||||
/// A set of options for the property, used for enum types.
|
||||
@@ -49,31 +45,6 @@ public class AssetProperty {
|
||||
/// A description of the property, if any.
|
||||
private final String description;
|
||||
|
||||
/**
|
||||
* Enum representing the possible types of asset properties.
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
public enum Type {
|
||||
STRING(false),
|
||||
INTEGER(false),
|
||||
BOOLEAN(false),
|
||||
CAPACITY(false),
|
||||
CONDITION(true),
|
||||
READWRITE(true),
|
||||
;
|
||||
/// Set to `true` if the type is an enum, `false` otherwise.
|
||||
public final boolean isEnum;
|
||||
|
||||
/**
|
||||
* Returns the name of the type, or "enum" if it is an enum type.
|
||||
*
|
||||
* @return The name of the type or "enum" if it is an enum.
|
||||
*/
|
||||
public String nameOrEnum() {
|
||||
return isEnum ? "enum" : name();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads an AssetProperty from a given field.
|
||||
*
|
||||
@@ -131,7 +102,7 @@ public class AssetProperty {
|
||||
builder.option(option);
|
||||
}
|
||||
}
|
||||
if (type == Type.CAPACITY) {
|
||||
if (type == PropertyType.CAPACITY) {
|
||||
var capacityAnnotation = property.getAnnotation(Capacity.class);
|
||||
builder.capacityAsSI(capacityAnnotation.si());
|
||||
builder.capacityAsIEC(capacityAnnotation.iec());
|
||||
@@ -146,19 +117,21 @@ public class AssetProperty {
|
||||
* @return The type of the property.
|
||||
* @throws IllegalArgumentException if the property type is unsupported.
|
||||
*/
|
||||
private static Type determineType(Field property) {
|
||||
private static PropertyType determineType(Field property) {
|
||||
if (property.getType() == String.class) {
|
||||
return Type.STRING;
|
||||
return PropertyType.STRING;
|
||||
} else if (property.isAnnotationPresent(Capacity.class)) {
|
||||
return Type.CAPACITY;
|
||||
return PropertyType.CAPACITY;
|
||||
} else if (property.getType() == Integer.class || property.getType() == int.class || property.getType() == Long.class || property.getType() == long.class) {
|
||||
return Type.INTEGER;
|
||||
return PropertyType.INTEGER;
|
||||
} else if (property.getType() == Boolean.class || property.getType() == boolean.class) {
|
||||
return Type.BOOLEAN;
|
||||
return PropertyType.BOOLEAN;
|
||||
} else if (property.getType() == AssetCondition.class) {
|
||||
return Type.CONDITION;
|
||||
return PropertyType.CONDITION;
|
||||
} else if (property.getType() == ReadWrite.class) {
|
||||
return Type.READWRITE;
|
||||
return PropertyType.READWRITE;
|
||||
} else if (property.getType() == Build.class) {
|
||||
return PropertyType.BUILD;
|
||||
} else {
|
||||
throw new IllegalArgumentException("Unsupported property type: " + property.getType());
|
||||
}
|
||||
@@ -204,12 +177,15 @@ public class AssetProperty {
|
||||
var value = getValue(asset);
|
||||
if (value == null) {
|
||||
return "?";
|
||||
} else if (type == Type.BOOLEAN) {
|
||||
} else if (type == PropertyType.BOOLEAN) {
|
||||
return (boolean) value ? "Yes" : "No";
|
||||
} else if (type == Type.INTEGER || type == Type.STRING) {
|
||||
} else if (type == PropertyType.INTEGER || type == PropertyType.STRING) {
|
||||
return value.toString();
|
||||
} else if (type == Type.CAPACITY) {
|
||||
} else if (type == PropertyType.CAPACITY) {
|
||||
return convertCapacity((Long) value).toString();
|
||||
} else if (type == PropertyType.BUILD) {
|
||||
var build = (Build) value;
|
||||
return build.getName();
|
||||
} else if (type.isEnum) {
|
||||
if (value instanceof AssetEnum assetEnum) {
|
||||
return assetEnum.getDisplayName();
|
||||
@@ -224,7 +200,7 @@ public class AssetProperty {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
if (type != Type.CAPACITY) {
|
||||
if (type != PropertyType.CAPACITY) {
|
||||
throw new IllegalStateException("Property '" + name + "' is not a capacity type.");
|
||||
}
|
||||
return CapacityInfo.of(value, capacityAsIEC, capacityAsSI);
|
||||
|
||||
@@ -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)
|
||||
|
||||
31
src/main/java/be/seeseepuff/pcinv/meta/PropertyType.java
Normal file
31
src/main/java/be/seeseepuff/pcinv/meta/PropertyType.java
Normal file
@@ -0,0 +1,31 @@
|
||||
package be.seeseepuff.pcinv.meta;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
|
||||
/**
|
||||
* Enum representing the possible types of asset properties.
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
public enum PropertyType
|
||||
{
|
||||
STRING(false),
|
||||
INTEGER(false),
|
||||
BOOLEAN(false),
|
||||
CAPACITY(false),
|
||||
CONDITION(true),
|
||||
READWRITE(true),
|
||||
BUILD(false),
|
||||
;
|
||||
/// Set to `true` if the type is an enum, `false` otherwise.
|
||||
public final boolean isEnum;
|
||||
|
||||
/**
|
||||
* Returns the name of the type, or "enum" if it is an enum type.
|
||||
*
|
||||
* @return The name of the type or "enum" if it is an enum.
|
||||
*/
|
||||
public String nameOrEnum()
|
||||
{
|
||||
return isEnum ? "enum" : name();
|
||||
}
|
||||
}
|
||||
50
src/main/java/be/seeseepuff/pcinv/models/Build.java
Normal file
50
src/main/java/be/seeseepuff/pcinv/models/Build.java
Normal file
@@ -0,0 +1,50 @@
|
||||
package be.seeseepuff.pcinv.models;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
@Entity
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Table(
|
||||
name = "builds",
|
||||
uniqueConstraints = @UniqueConstraint(columnNames = "name")
|
||||
)
|
||||
public class Build
|
||||
{
|
||||
@Id
|
||||
@GeneratedValue
|
||||
private long id;
|
||||
|
||||
/**
|
||||
* Indicates whether this build is a meta build.
|
||||
* A meta build is a build that does not represent a physical computer,
|
||||
* but rather a collection of parts that can be used in other builds.
|
||||
*
|
||||
* It is used internally to represents parts that are explicitly not part of a build.
|
||||
*/
|
||||
private boolean meta;
|
||||
|
||||
/**
|
||||
* The name of the build.
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* A description of the build.
|
||||
* This can be used to provide additional information about the build.
|
||||
*/
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* A list of parts that are included in the build.
|
||||
*/
|
||||
@OneToMany(mappedBy = "build")
|
||||
@OrderBy("type, brand, model, qr")
|
||||
private List<GenericAsset> parts;
|
||||
}
|
||||
20
src/main/java/be/seeseepuff/pcinv/models/BuildInfo.java
Normal file
20
src/main/java/be/seeseepuff/pcinv/models/BuildInfo.java
Normal file
@@ -0,0 +1,20 @@
|
||||
package be.seeseepuff.pcinv.models;
|
||||
|
||||
import be.seeseepuff.pcinv.meta.CapacityInfo;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class BuildInfo {
|
||||
private long totalRam;
|
||||
|
||||
/**
|
||||
* Calculates the total RAM capacity of the build.
|
||||
*
|
||||
* @return A CapacityInfo object representing the total RAM capacity.
|
||||
*/
|
||||
public CapacityInfo getTotalRamCapacity() {
|
||||
return CapacityInfo.of(totalRam);
|
||||
}
|
||||
}
|
||||
@@ -73,4 +73,9 @@ public class GenericAsset
|
||||
|
||||
@OneToMany(mappedBy = "asset", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
private List<WorkLogEntry> workLog;
|
||||
|
||||
@ManyToOne
|
||||
@Property("Part of build")
|
||||
@Description("Select which build this asset is placed in.")
|
||||
private Build build;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package be.seeseepuff.pcinv.repositories;
|
||||
|
||||
import be.seeseepuff.pcinv.models.Build;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Repository
|
||||
public interface BuildRepository extends JpaRepository<Build, Long>
|
||||
{
|
||||
Build getBuildByNameAndMeta(String name, boolean meta);
|
||||
|
||||
Build getBuildById(long id);
|
||||
|
||||
List<Build> findAllByMeta(boolean meta);
|
||||
}
|
||||
@@ -1,9 +1,6 @@
|
||||
package be.seeseepuff.pcinv.services;
|
||||
|
||||
import be.seeseepuff.pcinv.meta.AssetDescriptor;
|
||||
import be.seeseepuff.pcinv.meta.AssetDescriptors;
|
||||
import be.seeseepuff.pcinv.meta.AssetInfo;
|
||||
import be.seeseepuff.pcinv.meta.AssetProperty;
|
||||
import be.seeseepuff.pcinv.meta.*;
|
||||
import be.seeseepuff.pcinv.models.Asset;
|
||||
import be.seeseepuff.pcinv.models.GenericAsset;
|
||||
import be.seeseepuff.pcinv.models.WorkLogEntry;
|
||||
@@ -31,6 +28,7 @@ public class AssetService {
|
||||
private final WorkLogRepository workLogRepository;
|
||||
private final Collection<AssetRepository<?>> repositories;
|
||||
private final EntityManager entityManager;
|
||||
private final BuildService buildService;
|
||||
|
||||
/**
|
||||
* Returns the count of all assets in the repository.
|
||||
@@ -225,7 +223,7 @@ public class AssetService {
|
||||
* @return The parsed value as an Object.
|
||||
*/
|
||||
private Object parseValue(AssetDescriptor descriptor, AssetProperty property, Map<String, String> values) {
|
||||
if (property.getType() == AssetProperty.Type.CAPACITY) {
|
||||
if (property.getType() == PropertyType.CAPACITY) {
|
||||
var value = values.get(descriptor.asString(property) + "-value");
|
||||
var unit = values.get(descriptor.asString(property) + "-unit");
|
||||
if (value == null || value.isBlank() || unit == null || unit.isBlank()) {
|
||||
@@ -244,16 +242,22 @@ public class AssetService {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (property.getType() == AssetProperty.Type.INTEGER) {
|
||||
if (property.getType() == PropertyType.INTEGER) {
|
||||
return Integer.parseInt(stringValue);
|
||||
} else if (property.getType() == AssetProperty.Type.STRING) {
|
||||
} else if (property.getType() == PropertyType.STRING) {
|
||||
return stringValue;
|
||||
} else if (property.getType() == AssetProperty.Type.BOOLEAN) {
|
||||
} else if (property.getType() == PropertyType.BOOLEAN) {
|
||||
return switch (stringValue.toLowerCase()) {
|
||||
case "true" -> true;
|
||||
case "false" -> false;
|
||||
default -> null;
|
||||
};
|
||||
} else if (property.getType() == PropertyType.BUILD) {
|
||||
var build = buildService.getBuildById(Integer.parseInt(stringValue));
|
||||
if (build == null) {
|
||||
throw new IllegalArgumentException("Invalid build ID for property '" + property.getName() + "': " + stringValue);
|
||||
}
|
||||
return build;
|
||||
} else if (property.getType().isEnum) {
|
||||
for (var option : property.getOptions()) {
|
||||
if (option.getValue().equals(stringValue)) {
|
||||
|
||||
113
src/main/java/be/seeseepuff/pcinv/services/BuildService.java
Normal file
113
src/main/java/be/seeseepuff/pcinv/services/BuildService.java
Normal file
@@ -0,0 +1,113 @@
|
||||
package be.seeseepuff.pcinv.services;
|
||||
|
||||
import be.seeseepuff.pcinv.models.Build;
|
||||
import be.seeseepuff.pcinv.models.BuildInfo;
|
||||
import be.seeseepuff.pcinv.repositories.BuildRepository;
|
||||
import be.seeseepuff.pcinv.repositories.RamRepository;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import jakarta.transaction.Transactional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* A service that manages computer builds.
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class BuildService {
|
||||
private final BuildRepository buildRepository;
|
||||
private final RamRepository ramRepository;
|
||||
|
||||
@PostConstruct
|
||||
private void init() {
|
||||
Build empty = buildRepository.getBuildByNameAndMeta("None", true);
|
||||
if (empty == null) {
|
||||
empty = Build.builder()
|
||||
.name("None")
|
||||
.meta(true)
|
||||
.build();
|
||||
}
|
||||
empty.setDescription("A meta build to hold unused parts.");
|
||||
empty = buildRepository.save(empty);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a list of all computer builds, including meta builds.
|
||||
*
|
||||
* @return A list of all builds.
|
||||
*/
|
||||
public List<Build> getAllBuilds() {
|
||||
return buildRepository.findAll();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a list of all computer builds, excluding meta builds.
|
||||
*
|
||||
* @return A list of all builds.
|
||||
*/
|
||||
public List<Build> getAllRealBuilds() {
|
||||
return buildRepository.findAllByMeta(false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a build by its ID.
|
||||
*
|
||||
* @param id The ID of the build to retrieve.
|
||||
* @return The build with the given ID, or null if not found.
|
||||
*/
|
||||
public Build getBuildById(long id) {
|
||||
return buildRepository.getBuildById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new build with the given name and description.
|
||||
*
|
||||
* @param name The name of the build.
|
||||
* @param description The description of the build.
|
||||
* @return The created build.
|
||||
*/
|
||||
@Transactional
|
||||
public Build createBuild(String name, String description) {
|
||||
Build build = Build.builder()
|
||||
.name(name)
|
||||
.description(description)
|
||||
.build();
|
||||
return buildRepository.saveAndFlush(build);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a build by its ID.
|
||||
*
|
||||
* @param id The ID of the build to delete.
|
||||
*/
|
||||
@Transactional
|
||||
public void deleteBuild(long id) {
|
||||
Build build = buildRepository.getBuildById(id);
|
||||
for (var part : build.getParts()) {
|
||||
part.setBuild(null);
|
||||
}
|
||||
buildRepository.deleteById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the build information for a given build ID.
|
||||
*
|
||||
* @param build The build object for which to retrieve the information.
|
||||
* @return The BuildInfo object containing the build information.
|
||||
* @throws IllegalArgumentException if the build with the given ID does not exist.
|
||||
*/
|
||||
public BuildInfo getBuildInfo(Build build) {
|
||||
var buildInfo = new BuildInfo();
|
||||
for (var part : build.getParts()) {
|
||||
if (part.getType().equals("ram")) {
|
||||
var asset = ramRepository.findByAsset(part);
|
||||
if (asset.getCapacity() != null) {
|
||||
buildInfo.setTotalRam(buildInfo.getTotalRam() + asset.getCapacity());
|
||||
}
|
||||
}
|
||||
}
|
||||
return buildInfo;
|
||||
}
|
||||
}
|
||||
24
src/main/resources/templates/build_view.html
Normal file
24
src/main/resources/templates/build_view.html
Normal file
@@ -0,0 +1,24 @@
|
||||
<body th:replace="~{fragments :: base(title=${'Build ' + build.getName()}, content=~{::content})}">
|
||||
<div th:fragment="content">
|
||||
<ul>
|
||||
<li><b>Name: </b><span th:text="${build.name}"></span></li>
|
||||
<li><b>Description: </b><span th:text="${build.description}"></span></li>
|
||||
<li><b>Part Count: </b><span th:text="${build.getParts()?.size() ?: 0}"></span></li>
|
||||
<li><b>Total RAM: </b><span th:text="${buildInfo.getTotalRamCapacity().getCapacityInUnit()} + ' ' + ${buildInfo.getTotalRamCapacity().getIdealUnit().displayName}"></span></li>
|
||||
</ul>
|
||||
<table border="1" cellpadding="4">
|
||||
<tr bgcolor="#d3d3d3">
|
||||
<th>QR</th>
|
||||
<th>Type</th>
|
||||
<th>Brand</th>
|
||||
<th>Model</th>
|
||||
</tr>
|
||||
<tr th:each="p : ${build.getParts()}">
|
||||
<td><a th:href="'/view/' + ${p.qr}" th:text="${p.qr}"></a></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>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
28
src/main/resources/templates/builds.html
Normal file
28
src/main/resources/templates/builds.html
Normal file
@@ -0,0 +1,28 @@
|
||||
<body th:replace="~{fragments :: base(title='Builds', content=~{::content})}">
|
||||
<div th:fragment="content">
|
||||
<table border="1" cellpadding="4">
|
||||
<tr bgcolor="#d3d3d3">
|
||||
<th>Name</th>
|
||||
<th>Description</th>
|
||||
<th>Part Count</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
<tr th:each="b : ${builds}">
|
||||
<td><a th:href="'/build/' + ${b.id}" th:text="${b.getName()}"></a></td>
|
||||
<td th:text="${b.getDescription()}"></td>
|
||||
<td th:text="${b.getParts()?.size() ?: 0}"></td>
|
||||
<td>
|
||||
<a th:if="${!b.isMeta()}" th:href="${'/delete_build/' + b.id}">Delete</a>
|
||||
</td>
|
||||
</tr>
|
||||
<form action="/create_build" method="post">
|
||||
<tr>
|
||||
<td><label><input type="text" name="name" placeholder="Name"></label></td>
|
||||
<td><label><input type="text" name="description" placeholder="Description"></label></td>
|
||||
<td></td>
|
||||
<td><input type="submit" value="Create"></td>
|
||||
</tr>
|
||||
</form>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
@@ -8,6 +8,7 @@
|
||||
<tr th:each="p : ${d.getProperties()}">
|
||||
<td bgcolor="#d3d3d3"><b><label th:text="${p.displayName}" th:for="${d.asString(p)}" th:title="${p.description}"></label></b></td>
|
||||
<td th:switch="${p.type.nameOrEnum()}">
|
||||
<!-- Property Type: String List -->
|
||||
<span th:case="STRING">
|
||||
<select th:if="${p.inputList}" th:id="${d.asString(p)+'-list'}" th:name="${d.asString(p)+'-list'}">
|
||||
<option value="__new__">New...</option>
|
||||
@@ -17,8 +18,9 @@
|
||||
<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}"/>
|
||||
<!-- Property Type: Integer -->
|
||||
<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}"/>-->
|
||||
<!-- Property Type: 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)}">
|
||||
<label th:for="${d.asString(p)}+'-null'">Not known</label>
|
||||
@@ -27,9 +29,11 @@
|
||||
<input th:name="${d.asString(p)}" th:id="${d.asString(p)}+'-false'" type="radio" value="false" th:checked="${asset != null && (p.getValue(asset) == false)}">
|
||||
<label th:for="${d.asString(p)}+'-false'">No</label>
|
||||
</span>
|
||||
<!-- Property Type: Enum -->
|
||||
<select th:case="enum" th:id="${d.asString(p)}" th:name="${d.asString(p)}">
|
||||
<option th:each="o : ${p.options}" th:value="${o.value}" th:text="${o.displayName}" th:selected="${asset != null ? (p.getValue(asset) == o.enumConstant) : o.defaultValue}">Good</option>
|
||||
</select>
|
||||
<!-- Property Type: Capacity -->
|
||||
<span th:case="CAPACITY">
|
||||
<input type="number" th:id="${d.asString(p)+'-value'}" th:name="${d.asString(p)+'-value'}" th:required="${p.required}" th:value="${p.asCapacity(asset)?.getCapacityInUnit() ?: ''}"/>
|
||||
<select th:id="${d.asString(p)}+'-unit'" th:name="${d.asString(p)}+'-unit'">
|
||||
@@ -44,6 +48,13 @@
|
||||
<option value="1099511627776" th:if="${p.capacityAsIEC}" th:selected="${p.asCapacity(asset)?.getIdealUnit()?.name() == 'TEBIBYTES'}">TiB</option>
|
||||
</select>
|
||||
</span>
|
||||
<!-- Property Type: Build-->
|
||||
<span th:case="BUILD">
|
||||
<select th:id="${d.asString(p)}" th:name="${d.asString(p)}">
|
||||
<option value="" th:selected="${p.getValue(asset) == null}">(Unknown)</option>
|
||||
<option th:each="b : ${builds}" th:value="${b.getId()}" th:selected="${p.getValue(asset) == b}" th:text="${b.getName()}">My PC Build</option>
|
||||
</select>
|
||||
</span>
|
||||
<b th:case="*">Bad input type for <span th:text="${d.type}+'-'+${p.type}"></span></b>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<a href="/">Home</a>
|
||||
<a href="/browse">Browse</a>
|
||||
<a href="/create">Create</a>
|
||||
<a href="/builds">Builds</a>
|
||||
<hr>
|
||||
<div th:replace="${content}">
|
||||
</div>
|
||||
|
||||
@@ -7,7 +7,11 @@
|
||||
<table border="1" cellpadding="4">
|
||||
<tr th:each="p : ${d.properties}">
|
||||
<th bgcolor="lightgray"><b th:text="${p.displayName}"></b></th>
|
||||
<td th:text="${p.renderValue(asset)}"></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>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user