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

feat: Style updates, begins adding name/label to trunk sizes. Need to remove register id.

Browse Source
This commit is contained in:
Michael Housh
2026-01-15 13:00:46 -05:00
parent 7471e11bd2
commit 4ecd4dba7b
22 changed files with 262 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Sources/ViewController/Views/ComponentLoss/ComponentLossesView.swift
View File

@@ -3,24 +3,31 @@ import ElementaryHTMX
import ManualDCore
import Styleguide
// TODO: Load component losses when view appears??
struct ComponentPressureLossesView: HTML, Sendable {
let componentPressureLosses: [ComponentPressureLoss]
let projectID: Project.ID
private var total: Double {
componentPressureLosses.reduce(into: 0) { $0 += $1.value }
componentPressureLosses.total
}
private var sortedLosses: [ComponentPressureLoss] {
componentPressureLosses.sorted {
$0.value > $1.value
}
}
var body: some HTML {
div(.class("space-y-4")) {
Row {
h1(.class("text-2xl font-bold")) { "Component Pressure Losses" }
LabeledContent("Total") {
Badge(number: total)
}
PlusButton()
.attributes(
.class("btn-primary text-2xl me-2"),
.showModal(id: ComponentLossForm.id())
)
.tooltip("Add component loss")
}
.attributes(.class("px-4"))
@@ -29,20 +36,11 @@ struct ComponentPressureLossesView: HTML, Sendable {
tr(.class("text-xl font-bold")) {
th { "Name" }
th { "Value" }
th {
div(.class("flex justify-end mx-auto")) {
PlusButton()
.attributes(
.class("btn-primary text-2xl me-2"),
.showModal(id: ComponentLossForm.id())
)
.tooltip("Add component loss")
}
}
th(.class("min-w-[200px]")) {}
}
}
tbody {
for row in componentPressureLosses {
for row in sortedLosses {
TableRow(row: row)
}
}

4
Sources/ViewController/Views/DuctSizing/DuctSizingView.swift
View File

@@ -13,7 +13,7 @@ struct DuctSizingView: HTML, Sendable {
var body: some HTML {
div(.class("space-y-4")) {
PageTitleRow {
div(.class("space-y-4")) {
div {
PageTitle("Duct Sizes")
Alert(
@@ -22,7 +22,7 @@ struct DuctSizingView: HTML, Sendable {
"""
)
.hidden(when: rooms.count > 0)
.attributes(.class("text-error font-bold italic"))
.attributes(.class("text-error font-bold italic mt-4"))
}
}

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

@@ -40,7 +40,7 @@ struct TrunkSizeForm: HTML, Sendable {
var body: some HTML {
ModalForm(id: Self.id(container), dismiss: dismiss) {
h1(.class("text-lg font-bold mb-4")) { "Trunk Size" }
h1(.class("text-lg font-bold mb-4")) { "Trunk / Runout Size" }
form(
.class("space-y-4"),
trunk == nil
@@ -72,30 +72,49 @@ struct TrunkSizeForm: HTML, Sendable {
)
}
// Add room select here.
div(.class("grid grid-cols-5 gap-6")) {
h2(.class("label font-bold col-span-5")) { "Associated Supply Runs" }
for room in rooms {
div(.class("flex justify-center items-center col-span-1")) {
div(.class("grid grid-cols-1 justify-center items-center space-y-1")) {
p(.class("label block")) { room.roomName }
input(
.class("checkbox mx-auto"),
.type(.checkbox),
.name("rooms"),
.value("\(room.roomID)_\(room.roomRegister)")
)
.attributes(
.checked,
when: trunk == nil ? false : trunk!.rooms.hasRoom(room)
)
LabeledInput(
"Name",
.type(.text),
.name("name"),
.value(trunk?.name),
.placeholder("Trunk-1 (Optional)")
)
div {
h2(.class("label font-bold col-span-3 mb-6")) { "Associated Supply Runs" }
div(
.class(
"""
grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 justify-center items-center gap-4
"""
)
) {
for room in rooms {
div(.class("block grow")) {
div(.class("grid grid-cols-1 space-y-1")) {
div(.class("flex justify-center")) {
p(.class("label")) { room.roomName }
}
div(.class("flex justify-center")) {
input(
.class("checkbox"),
.type(.checkbox),
.name("rooms"),
.value("\(room.roomID)_\(room.roomRegister)")
)
.attributes(
.checked,
when: trunk == nil ? false : trunk!.rooms.hasRoom(room)
)
}
}
}
}
}
}
SubmitButton()
.attributes(.class("btn-block"))
.attributes(.class("btn-block mt-6"))
}
}
}

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

@@ -11,14 +11,16 @@ extension DuctSizingView {
let rooms: [DuctSizing.RoomContainer]
private var sortedTrunks: [DuctSizing.TrunkContainer] {
trunks.sorted(by: { $0.type.rawValue > $1.type.rawValue })
trunks
.sorted(by: { $0.designCFM.value > $1.designCFM.value })
.sorted(by: { $0.type.rawValue > $1.type.rawValue })
}
var body: some HTML {
table(.class("table table-zebra text-lg")) {
thead {
tr(.class("text-lg")) {
th { "Type" }
th { "Name / Type" }
th { "Associated Supplies" }
th { "Dsn CFM" }
th { "Velocity" }
@@ -45,11 +47,17 @@ extension DuctSizingView {
var body: some HTML<HTMLTag.tr> {
tr {
td {
Badge {
trunk.trunk.type.rawValue
div(.class("grid grid-cols-1 space-y-2")) {
if let name = trunk.name {
p(.class("w-fit")) { name }
}
Badge {
trunk.trunk.type.rawValue
}
.attributes(.class("badge-info"), when: trunk.type == .supply)
.attributes(.class("badge-error"), when: trunk.type == .return)
}
.attributes(.class("badge-info"), when: trunk.type == .supply)
.attributes(.class("badge-error"), when: trunk.type == .return)
}
td {
div(.class("flex flex-wrap space-x-2 space-y-2")) {

2
Sources/ViewController/Views/EffectiveLength/EffectiveLengthForm.swift
View File

@@ -331,7 +331,7 @@ struct GroupTypeSelect: HTML, Sendable {
let selected: EffectiveLength.EffectiveLengthType
var body: some HTML<HTMLTag.label> {
label(.class("select")) {
label(.class("select w-full")) {
span(.class("label")) { "Type" }
select(.name("type"), .id("type")) {
for value in EffectiveLength.EffectiveLengthType.allCases {

5
Sources/ViewController/Views/EffectiveLength/EffectiveLengthsTable.swift
View File

@@ -105,7 +105,7 @@ struct EffectiveLengthsTable: HTML, Sendable {
// Row {
div(.class("flex justify-end mx-auto space-x-4")) {
Badge(number: effectiveLength.totalEquivalentLength, digits: 0)
.attributes(.class("badge-primary text-xl pt-2"))
.attributes(.class("badge-primary badge-lg pt-2"))
// Buttons
div(.class("flex justify-end -mt-2")) {
@@ -118,11 +118,14 @@ struct EffectiveLengthsTable: HTML, Sendable {
.hx.target("#\(effectiveLength.id.idString)"),
.hx.swap(.outerHTML)
)
.tooltip("Delete", position: .bottom)
EditButton()
.attributes(
.class("join-item btn-ghost"),
.showModal(id: EffectiveLengthForm.id(effectiveLength))
)
.tooltip("Edit", position: .bottom)
}
}
}

98
Sources/ViewController/Views/EffectiveLength/EffectiveLengthsView.swift
View File

@@ -38,102 +38,4 @@ struct EffectiveLengthsView: HTML, Sendable {
}
}
// TODO: Remove if using table view.
private struct EffectiveLengthView: HTML, Sendable {
let effectiveLength: EffectiveLength
var straightLengthsTotal: Int {
effectiveLength.straightLengths
.reduce(into: 0) { $0 += $1 }
}
var groupsTotal: Double {
effectiveLength.groups.totalEquivalentLength
}
var id: String {
return "effectiveLenghtCard_\(effectiveLength.id.uuidString.replacing("-", with: ""))"
}
var body: some HTML<HTMLTag.div> {
div(
.class("card h-full bg-base-100 shadow-sm border rounded-lg"),
.id(id)
) {
div(.class("card-body text-lg")) {
Row {
h2 { effectiveLength.name }
div(
.class("space-x-4")
) {
span(.class("text-primary text-sm italic")) {
"Total"
}
Number(self.effectiveLength.totalEquivalentLength, digits: 0)
.attributes(.class("badge badge-outline badge-primary text-lg"))
}
}
.attributes(.class("card-title pb-6"))
Row {
Label { "Straight Lengths" }
ul {
for length in effectiveLength.straightLengths {
li {
Number(length)
}
}
}
}
.attributes(.class("pb-6"))
Row {
span { "Groups" }
span { "Equivalent Length" }
span { "Quantity" }
}
.attributes(.class("label font-bold border-b border-label"))
for group in effectiveLength.groups {
Row {
span { "\(group.group)-\(group.letter)" }
Number(group.value)
Number(group.quantity)
}
}
div(.class("card-actions justify-end pt-6 space-y-4 mt-auto")) {
div(.class("join")) {
TrashButton()
.attributes(
.class("join-item btn-ghost"),
.hx.delete(
route: .project(
.detail(
effectiveLength.projectID,
.equivalentLength(.delete(id: effectiveLength.id))
)
)
),
.hx.confirm("Are you sure?"),
.hx.target("#\(id)"),
.hx.swap(.outerHTML)
)
EditButton()
.attributes(
.class("join-item btn-ghost"),
.showModal(id: EffectiveLengthForm.id(effectiveLength))
)
}
}
EffectiveLengthForm(effectiveLength: effectiveLength)
}
}
}
}
}

3
Sources/ViewController/Views/EquipmentInfo/EquipmentInfoForm.swift
View File

@@ -7,8 +7,9 @@ struct EquipmentInfoForm: HTML, Sendable {
static let id = "equipmentForm"
@Environment(ProjectViewValue.$projectID) var projectID
let dismiss: Bool
let projectID: Project.ID
let equipmentInfo: EquipmentInfo?
var staticPressure: String {

3
Sources/ViewController/Views/EquipmentInfo/EquipmentInfoView.swift
View File

@@ -55,7 +55,8 @@ struct EquipmentInfoView: HTML, Sendable {
}
}
EquipmentInfoForm(
dismiss: true, projectID: projectID, equipmentInfo: equipmentInfo
dismiss: equipmentInfo != nil,
equipmentInfo: equipmentInfo
)
}
}

80
Sources/ViewController/Views/FrictionRate/FrictionRateView.swift
View File

@@ -3,8 +3,6 @@ import ManualDClient
import ManualDCore
import Styleguide
// FIX: Need to update available static, etc. when equipment info is submitted.
struct FrictionRateView: HTML, Sendable {
@Environment(ProjectViewValue.$projectID) var projectID
@@ -13,16 +11,20 @@ struct FrictionRateView: HTML, Sendable {
let equivalentLengths: EffectiveLength.MaxContainer
let frictionRateResponse: ManualDClient.FrictionRateResponse?
var availableStaticPressure: Double? {
private var availableStaticPressure: Double? {
frictionRateResponse?.availableStaticPressure
}
var frictionRateDesignValue: Double? {
private var frictionRateDesignValue: Double? {
frictionRateResponse?.frictionRate
}
var badgeColor: String {
let base = "badge-primary"
private var shouldShowBadges: Bool {
frictionRateDesignValue != nil || availableStaticPressure != nil
}
private var badgeColor: String {
let base = "badge-info"
guard let frictionRateDesignValue else { return base }
if frictionRateDesignValue >= 0.18 || frictionRateDesignValue <= 0.02 {
return "badge-error"
@@ -30,38 +32,68 @@ struct FrictionRateView: HTML, Sendable {
return base
}
var showHighErrors: Bool {
private var showHighErrors: Bool {
guard let frictionRateDesignValue else { return false }
return frictionRateDesignValue >= 0.18
}
var showLowErrors: Bool {
private var showLowErrors: Bool {
guard let frictionRateDesignValue else { return false }
return frictionRateDesignValue <= 0.02
}
private var showNoComponentLossesError: Bool {
componentLosses.count == 0
}
private var showIncompleteSectionsError: Bool {
availableStaticPressure == nil || frictionRateDesignValue == nil
}
private var hasAlerts: Bool {
showLowErrors
|| showHighErrors
|| showNoComponentLossesError
|| showIncompleteSectionsError
}
var body: some HTML {
div(.class("space-y-6")) {
PageTitleRow {
div(.class("grid grid-cols-2 px-4 gap-y-4")) {
div(.class("grid grid-cols-2 px-4 w-full")) {
PageTitle { "Friction Rate" }
div(.class("space-y-4 justify-end")) {
div(.class("space-y-2 justify-end font-bold text-lg")) {
if shouldShowBadges {
if let frictionRateDesignValue {
LabeledContent("Friction Rate Design Value") {
Badge(number: frictionRateDesignValue, digits: 2)
.attributes(.class("\(badgeColor)"))
if let frictionRateDesignValue {
LabeledContent {
span { "Friction Rate Design Value" }
} content: {
Badge(number: frictionRateDesignValue, digits: 2)
.attributes(.class("\(badgeColor) badge-lg"))
.bold()
}
.attributes(.class("justify-end mx-auto"))
}
.attributes(.class("justify-end"))
}
if let availableStaticPressure {
LabeledContent("Available Static Pressure") {
Badge(number: availableStaticPressure, digits: 2)
if let availableStaticPressure {
LabeledContent {
span { "Available Static Pressure" }
} content: {
Badge(number: availableStaticPressure, digits: 2)
}
.attributes(.class("justify-end mx-auto"))
}
.attributes(.class("justify-end"))
LabeledContent {
span { "Component Pressure Losses" }
} content: {
Badge(number: componentLosses.total, digits: 2)
}
.attributes(.class("justify-end mx-auto"))
}
}
@@ -71,16 +103,14 @@ struct FrictionRateView: HTML, Sendable {
"Must complete previous sections."
}
}
.hidden(
when: availableStaticPressure != nil && frictionRateDesignValue != nil
)
.hidden(when: !showIncompleteSectionsError)
Alert {
p {
"No component pressures losses"
}
}
.hidden(when: componentLosses.totalComponentPressureLoss > 0)
.hidden(when: !showNoComponentLossesError)
Alert {
p(.class("block")) {
@@ -107,7 +137,9 @@ struct FrictionRateView: HTML, Sendable {
}
}
.hidden(when: !showHighErrors)
}
.attributes(.class("mt-4"), when: hasAlerts)
}
}

10
Sources/ViewController/Views/Rooms/RoomsView.swift
View File

@@ -65,7 +65,10 @@ struct RoomsView: HTML, Sendable {
}
}
SHRForm(projectID: projectID, sensibleHeatRatio: sensibleHeatRatio)
SHRForm(
sensibleHeatRatio: sensibleHeatRatio,
dismiss: sensibleHeatRatio != nil
)
table(.class("table table-zebra text-lg"), .id("roomsTable")) {
thead {
@@ -194,8 +197,9 @@ struct RoomsView: HTML, Sendable {
struct SHRForm: HTML, Sendable {
static let id = "shrForm"
let projectID: Project.ID
@Environment(ProjectViewValue.$projectID) var projectID
let sensibleHeatRatio: Double?
let dismiss: Bool
var route: String {
SiteRoute.View.router
@@ -204,7 +208,7 @@ struct RoomsView: HTML, Sendable {
}
var body: some HTML {
ModalForm(id: Self.id, dismiss: true) {
ModalForm(id: Self.id, dismiss: dismiss) {
h1(.class("text-xl font-bold mb-6")) {
"Sensible Heat Ratio"
}