michael/swift-hvac-toolbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Finalizes room-pressure view.

Browse Source
This commit is contained in:
Michael Housh
2025-03-01 11:46:47 -05:00
parent 5630820575
commit eaf0387899
8 changed files with 108 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Public/output.css
View File

File diff suppressed because one or more lines are too long

19
Sources/ApiController/Extensions/RoomPressure.swift
View File

@@ -20,23 +20,6 @@ public extension RoomPressure.Request {
14: OrderedSet([14])
]
// OrderedSet([
// (width: 8, height: 4),
// (width: 10, height: 4),
// (width: 12, height: 4),
// (width: 14, height: 4),
// (width: 8, height: 6),
// (width: 10, height: 6),
// (width: 12, height: 6),
// (width: 14, height: 6),
// (width: 10, height: 8),
// (width: 12, height: 8),
// (width: 14, height: 8),
// (width: 10, height: 10),
// (width: 12, height: 12),
// (width: 14, height: 14)
// ])
func respond(logger: Logger) async throws -> RoomPressure.Response {
switch self {
case let .knownAirflow(request):
@@ -67,6 +50,7 @@ public extension RoomPressure.Request {
let (standardDuctSize, actualVelocity) = calculateDuctMetrics(for: request.supplyAirflow)
return .init(
mode: .knownAirflow,
grilleSize: .init(width: grilleDimensions.width, height: grilleDimensions.height, area: netFreeArea / 144),
ductSize: .init(diameter: standardDuctSize, velocity: actualVelocity),
warnings: generateWarnings(
@@ -101,6 +85,7 @@ public extension RoomPressure.Request {
let (standardDuctSize, actualVelocity) = calculateDuctMetrics(for: calculatedAirflow)
return .init(
mode: .measuredPressure,
grilleSize: .init(width: grilleDimensions.width, height: grilleDimensions.height, area: netFreeArea / 144),
ductSize: .init(diameter: standardDuctSize, velocity: actualVelocity),
calculatedAirflow: calculatedAirflow,

16
Sources/Routes/Models/RoomPressure.swift
View File

@@ -68,17 +68,20 @@ public enum RoomPressure {
public struct Response: Codable, Equatable, Sendable {
public let mode: Mode
public let grilleSize: GrilleSize
public let ductSize: DuctSize
public let calculatedAirflow: Double?
public let warnings: [String]
public init(
mode: Mode,
grilleSize: RoomPressure.Response.GrilleSize,
ductSize: RoomPressure.Response.DuctSize,
calculatedAirflow: Double? = nil,
warnings: [String]
) {
self.mode = mode
self.grilleSize = grilleSize
self.ductSize = ductSize
self.calculatedAirflow = calculatedAirflow
@@ -124,3 +127,16 @@ public enum RoomPressure {
public var label: String { "\(rawValue)\"" }
}
}
#if DEBUG
public extension RoomPressure.Response {
static let mock = Self(
mode: .knownAirflow,
grilleSize: .init(width: 14, height: 8, area: 72),
ductSize: .init(diameter: 10, velocity: 367),
warnings: [
"Duct leakage area is significant - consider reducing gaps or increasing grille size."
]
)
}
#endif

2
Sources/Routes/SiteRoutes.swift
View File

@@ -186,7 +186,7 @@ public extension SiteRoute {
Path { rootPath }
Method.get
Query {
Optionally { Field("form") { Routes.RoomPressure.Mode.parser() } }
Optionally { Field("mode") { Routes.RoomPressure.Mode.parser() } }
}
}
Route(.case(Self.submit)) {

2
Sources/Styleguide/WarningBox.swift
View File

@@ -24,6 +24,7 @@ public struct WarningBox<Header: HTML>: HTML, Sendable {
public var content: some HTML<HTMLTag.div> {
div(.id("warnings")) {
if warnings.count > 0 {
header(warnings)
ul(.class("list-disc mx-10")) {
for warning in warnings {
@@ -31,6 +32,7 @@ public struct WarningBox<Header: HTML>: HTML, Sendable {
}
}
}
}
.attributes(
.class("""
mt-6 p-4 rounded-lg shadow-lg

9
Sources/ViewController/Live.swift
View File

@@ -46,7 +46,8 @@ extension ViewController: DependencyKey {
@Dependency(\.psychrometricClient) var psychrometricClient
return .init(view: { request in
request.logger.debug("View route: \(request.route)")
let logger = request.logger
logger.debug("View route: \(request.route)")
switch request.route {
case .index:
return MainPage {
@@ -108,9 +109,9 @@ extension ViewController: DependencyKey {
case let .index(mode):
return request.respond(RoomPressureForm(mode: mode, response: nil))
// FIX:
case .submit:
fatalError()
case let .submit(request):
let response = try await request.respond(logger: logger)
return RoomPressureResult(response: response)
}
}
})

2
Sources/ViewController/MainPage.swift
View File

@@ -82,7 +82,7 @@ private struct Header: HTML {
private struct Footer: HTML {
var content: some HTML {
div(.class("bg-blue-500 text-yellow-300 text-sm font-semibold border-t border-yellow-300")) {
div(.class("bg-blue-500 text-yellow-300 text-sm font-semibold border-t border-yellow-300 mt-20")) {
div(.class("sm:grid sm:grid-cols-1 lg:flex lg:justify-between")) {
div(.class("grid grid-cols-1 p-4")) {
div(.class("flex")) {

83
Sources/ViewController/Views/RoomPressure.swift
View File

@@ -16,12 +16,6 @@ struct RoomPressureForm: HTML, Sendable {
div(.class("relative")) {
FormHeader(label: "Room Pressure Calculator", svg: .leftRightArrow)
// FIX: Remove when done testing.
WarningBox(
"This calculator is currently under construction, so it does not do anything when the form is submitted."
)
.attributes(.class("mb-8"))
// Mode toggle / buttons.
div(.class("absolute top-0 right-0 flex items-center gap-x-0")) {
switch mode {
@@ -74,7 +68,10 @@ struct RoomPressureForm: HTML, Sendable {
let mode: RoomPressure.Mode
var content: some HTML<HTMLTag.form> {
form {
form(
.hx.post(route: .roomPressure(.index)),
.hx.target("#result")
) {
div(.class("space-y-6")) {
LabeledContent(label: pressureLabel) {
// NB: using .attributes(..., when:...) not working, so using a switch statement.
@@ -171,4 +168,76 @@ struct RoomPressureForm: HTML, Sendable {
struct RoomPressureResult: HTML, Sendable {
let response: RoomPressure.Response
var content: some HTML {
ResultContainer(reset: .roomPressure(.index(mode: response.mode))) {
div(.class("grid grid-cols-1 lg:grid-cols-2 gap-4")) {
RoundedContainer(title: "Return / Transfer Grille") {
div(.class("flex justify-between mt-6")) {
span(.class("font-semibold")) { "Standard Size:" }
span { """
\(response.grilleSize.width)" x \(response.grilleSize.height)"
""" }
}
div(.class("flex justify-between mt-3")) {
span(.class("font-semibold")) { "Required Net Free Area:" }
span {
"""
\(double: response.grilleSize.area, fractionDigits: 1) in
"""
sup { "2" }
}
}
div(.class("mt-8 text-sm")) {
span(.class("font-semibold")) { "Note: " }
span {
"Select a grille with at least \(double: response.grilleSize.area, fractionDigits: 1) in"
sup { "2" }
span { " net free area." }
}
}
}
.attributes(.class("bg-blue-100 border border-blue-600 text-blue-600"))
RoundedContainer(title: "Return / Transfer Duct") {
div(.class("flex justify-between mt-6")) {
span(.class("font-semibold")) { "Standard Size:" }
span { "\(response.ductSize.diameter)\"" }
}
div(.class("flex justify-between mt-3")) {
span(.class("font-semibold")) { "Air Velocity:" }
span { "\(double: response.ductSize.velocity, fractionDigits: 1) FPM" }
}
}
.attributes(.class("bg-purple-100 border border-purple-600 text-purple-600"))
}
WarningBox(warnings: response.warnings)
Note {
"""
Calculations are based on a target velocity of 400 FPM for return/transfer air paths.
The required net free area is the minimum needed - select a grille that meets or exceeds this value.
Verify manufacturer specifications for actual net free area of selected grilles.
"""
}
}
}
private struct RoundedContainer<Body: HTML>: HTML, Sendable where Body: Sendable {
let title: String
let body: Body
init(title: String, @HTMLBuilder body: () -> Body) {
self.title = title
self.body = body()
}
var content: some HTML<HTMLTag.div> {
div(.class("rounded-xl p-6")) {
h4(.class("text-xl font-bold")) { title }
body
}
}
}
}