feat: Adds manual-d group pdf while working on better picker for groups, fixes issues with trunk table not always rendering properly with certain themes.
This commit is contained in:
@@ -200,6 +200,14 @@ struct EffectiveLengthForm: HTML, Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
a(
|
||||
.href("/files/ManD.Groups.pdf"),
|
||||
.target(.blank),
|
||||
.class("btn btn-link")
|
||||
) {
|
||||
"Click here for Manual-D groups reference."
|
||||
}
|
||||
|
||||
div(.id("groups"), .class("space-y-4")) {
|
||||
if let effectiveLength {
|
||||
for group in effectiveLength.groups {
|
||||
@@ -346,7 +354,7 @@ extension EffectiveLength.EffectiveLengthType {
|
||||
case .return:
|
||||
return [5, 6, 7, 8, 10, 11, 12]
|
||||
case .supply:
|
||||
return [1, 2, 4, 8, 9, 11, 12]
|
||||
return [1, 2, 3, 4, 8, 9, 11, 12]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
import Elementary
|
||||
import ElementaryHTMX
|
||||
import ManualDCore
|
||||
import Styleguide
|
||||
|
||||
struct EffectiveLengthsTable: HTML, Sendable {
|
||||
|
||||
let effectiveLengths: [EffectiveLength]
|
||||
|
||||
private var sortedLengths: [EffectiveLength] {
|
||||
effectiveLengths.sorted {
|
||||
$0.totalEquivalentLength > $1.totalEquivalentLength
|
||||
}
|
||||
.sorted {
|
||||
$0.type.rawValue > $1.type.rawValue
|
||||
}
|
||||
}
|
||||
|
||||
var body: some HTML<HTMLTag.table> {
|
||||
table(.class("table table-zebra text-lg")) {
|
||||
thead {
|
||||
tr(.class("text-lg")) {
|
||||
th { "Type" }
|
||||
th { "Name" }
|
||||
th { "Straight Lengths" }
|
||||
th {
|
||||
div(.class("grid grid-cols-3 gap-2 min-w-[220px]")) {
|
||||
div(.class("flex justify-center col-span-3")) {
|
||||
"Groups"
|
||||
}
|
||||
div { "Group" }
|
||||
div(.class("flex justify-center")) {
|
||||
"T.E.L."
|
||||
}
|
||||
div(.class("flex justify-end")) {
|
||||
"Quantity"
|
||||
}
|
||||
}
|
||||
}
|
||||
th {
|
||||
div(.class("flex justify-end me-[140px]")) {
|
||||
"T.E.L."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
tbody {
|
||||
for row in sortedLengths {
|
||||
EffectiveLenghtRow(effectiveLength: row)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
struct EffectiveLenghtRow: HTML, Sendable {
|
||||
|
||||
let effectiveLength: EffectiveLength
|
||||
|
||||
private var deleteRoute: SiteRoute.View {
|
||||
.project(
|
||||
.detail(
|
||||
effectiveLength.projectID,
|
||||
.equivalentLength(.delete(id: effectiveLength.id))
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
var body: some HTML<HTMLTag.tr> {
|
||||
tr(.id(effectiveLength.id.idString)) {
|
||||
td {
|
||||
// Type
|
||||
Badge {
|
||||
span { effectiveLength.type.rawValue }
|
||||
}
|
||||
.attributes(.class("badge-info"), when: effectiveLength.type == .supply)
|
||||
.attributes(.class("badge-error"), when: effectiveLength.type == .return)
|
||||
|
||||
}
|
||||
td { effectiveLength.name }
|
||||
td {
|
||||
// Lengths
|
||||
div(.class("grid grid-cols-1 gap-2")) {
|
||||
for length in effectiveLength.straightLengths {
|
||||
Number(length)
|
||||
}
|
||||
}
|
||||
}
|
||||
td {
|
||||
div(.class("grid grid-cols-3 gap-2 min-w-[220px]")) {
|
||||
for group in effectiveLength.groups {
|
||||
span { "\(group.group)-\(group.letter)" }
|
||||
div(.class("flex justify-center")) {
|
||||
Number(group.value)
|
||||
}
|
||||
div(.class("flex justify-end")) {
|
||||
Number(group.quantity)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
td {
|
||||
// Total
|
||||
// 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"))
|
||||
|
||||
// Buttons
|
||||
div(.class("flex justify-end -mt-2")) {
|
||||
div(.class("join")) {
|
||||
TrashButton()
|
||||
.attributes(
|
||||
.class("join-item btn-ghost"),
|
||||
.hx.delete(route: deleteRoute),
|
||||
.hx.confirm("Are you sure?"),
|
||||
.hx.target("#\(effectiveLength.id.idString)"),
|
||||
.hx.swap(.outerHTML)
|
||||
)
|
||||
EditButton()
|
||||
.attributes(
|
||||
.class("join-item btn-ghost"),
|
||||
.showModal(id: EffectiveLengthForm.id(effectiveLength))
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
EffectiveLengthForm(effectiveLength: effectiveLength)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -25,7 +25,7 @@ struct EffectiveLengthsView: HTML, Sendable {
|
||||
PageTitle { "Equivalent Lengths" }
|
||||
PlusButton()
|
||||
.attributes(
|
||||
.class("btn-ghost"),
|
||||
.class("btn-ghost me-4"),
|
||||
.showModal(id: EffectiveLengthForm.id(nil))
|
||||
)
|
||||
}
|
||||
@@ -33,30 +33,12 @@ struct EffectiveLengthsView: HTML, Sendable {
|
||||
|
||||
EffectiveLengthForm(projectID: projectID, dismiss: true)
|
||||
|
||||
div {
|
||||
h2(.class("text-xl font-bold pb-4")) { "Supplies" }
|
||||
.attributes(.class("hidden"), when: supplies.count == 0)
|
||||
|
||||
div(.class("grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4")) {
|
||||
for row in supplies {
|
||||
EffectiveLengthView(effectiveLength: row)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
div {
|
||||
h2(.class("text-xl font-bold pb-4")) { "Returns" }
|
||||
.attributes(.class("hidden"), when: returns.count == 0)
|
||||
div(.class("grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 space-x-4 space-y-4")) {
|
||||
for row in returns {
|
||||
EffectiveLengthView(effectiveLength: row)
|
||||
}
|
||||
}
|
||||
}
|
||||
EffectiveLengthsTable(effectiveLengths: effectiveLengths)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Remove if using table view.
|
||||
private struct EffectiveLengthView: HTML, Sendable {
|
||||
|
||||
let effectiveLength: EffectiveLength
|
||||
|
||||
Reference in New Issue
Block a user