michael/swift-duct-calc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Uses room names for trunk sizing in the form and table, prep for removing register-id's in favor of only using the room names.

Browse Source
This commit is contained in:
Michael Housh
2026-01-14 19:24:56 -05:00
parent 356e020e3b
commit 86307dfa05
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Public/css/output.css
View File

@@ -6851,6 +6851,13 @@
margin-block-end: calc(calc(var(--spacing) * 1) * calc(1 - var(--tw-space-y-reverse))); margin-block-end: calc(calc(var(--spacing) * 1) * calc(1 - var(--tw-space-y-reverse)));
} }
} }
.space-y-2 {
:where(& > :not(:last-child)) {
--tw-space-y-reverse: 0;
margin-block-start: calc(calc(var(--spacing) * 2) * var(--tw-space-y-reverse));
margin-block-end: calc(calc(var(--spacing) * 2) * calc(1 - var(--tw-space-y-reverse)));
}
}
.space-y-4 { .space-y-4 {
:where(& > :not(:last-child)) { :where(& > :not(:last-child)) {
--tw-space-y-reverse: 0; --tw-space-y-reverse: 0;

4
Sources/ManualDCore/DuctSizing.swift
View File

@@ -50,6 +50,8 @@ public enum DuctSizing {
} }
} }
// TODO: Remove registerID and just use the roomName
public struct RoomContainer: Codable, Equatable, Sendable { public struct RoomContainer: Codable, Equatable, Sendable {
public let registerID: String public let registerID: String
@@ -152,6 +154,8 @@ extension DuctSizing {
} }
} }
// TODO: Add an optional label that the user can set.
// Represents the database model. // Represents the database model.
public struct TrunkSize: Codable, Equatable, Identifiable, Sendable { public struct TrunkSize: Codable, Equatable, Identifiable, Sendable {

2
Sources/ViewController/Views/DuctSizing/RoomsTable.swift
View File

@@ -5,7 +5,7 @@ import ManualDCore
import Styleguide import Styleguide
extension DuctSizingView { extension DuctSizingView {
// TODO: Remove register ID.
struct RoomsTable: HTML, Sendable { struct RoomsTable: HTML, Sendable {
@Environment(ProjectViewValue.$projectID) var projectID @Environment(ProjectViewValue.$projectID) var projectID

6
Sources/ViewController/Views/DuctSizing/TrunkSizeForm.swift
View File

@@ -77,10 +77,10 @@ struct TrunkSizeForm: HTML, Sendable {
h2(.class("label font-bold col-span-5")) { "Associated Supply Runs" } h2(.class("label font-bold col-span-5")) { "Associated Supply Runs" }
for room in rooms { for room in rooms {
div(.class("flex justify-center items-center col-span-1")) { div(.class("flex justify-center items-center col-span-1")) {
div(.class("space-y-1")) { div(.class("grid grid-cols-1 justify-center items-center space-y-1")) {
p(.class("label block")) { room.registerID } p(.class("label block")) { room.roomName }
input( input(
.class("checkbox"), .class("checkbox mx-auto"),
.type(.checkbox), .type(.checkbox),
.name("rooms"), .name("rooms"),
.value("\(room.roomID)_\(room.roomRegister)") .value("\(room.roomID)_\(room.roomRegister)")

10
Sources/ViewController/Views/DuctSizing/TrunksTable.swift
View File

@@ -51,9 +51,11 @@ extension DuctSizingView {
.attributes(.class("badge-info"), when: trunk.type == .supply) .attributes(.class("badge-info"), when: trunk.type == .supply)
.attributes(.class("badge-error"), when: trunk.type == .return) .attributes(.class("badge-error"), when: trunk.type == .return)
} }
td(.class("space-x-2")) { td {
for id in registerIDS { div(.class("flex flex-wrap space-x-2 space-y-2")) {
Badge { id } for id in registerIDS {
Badge { id }
}
} }
} }
td { td {
@@ -129,7 +131,7 @@ extension DuctSizingView {
rooms rooms
.first(where: { $0.roomID == room.id && $0.roomRegister == register }) .first(where: { $0.roomID == room.id && $0.roomRegister == register })
{ {
array.append(room.registerID) array.append(room.roomName)
} }
} }
} }