feat: Working on search for purchase orders.
This commit is contained in:
@@ -1,97 +0,0 @@
|
||||
import Vapor
|
||||
|
||||
/// Represents a generic form context that is used to generate form templates
|
||||
/// that are handled by htmx.
|
||||
struct HtmxFormCTX<Context: Content>: Content {
|
||||
let formClass: String?
|
||||
let formId: String
|
||||
let htmxPostTargetUrl: String?
|
||||
let htmxPutTargetUrl: String?
|
||||
let htmxTarget: String
|
||||
let htmxPushUrl: Bool
|
||||
let htmxResetAfterRequest: Bool
|
||||
let htmxSwapOob: String?
|
||||
let htmxSwap: String?
|
||||
let context: Context
|
||||
|
||||
init(
|
||||
formClass: String? = nil,
|
||||
formId: String,
|
||||
htmxTargetUrl: TargetUrl,
|
||||
htmxTarget: String,
|
||||
htmxPushUrl: Bool,
|
||||
htmxResetAfterRequest: Bool = true,
|
||||
htmxSwapOob: HtmxSwap? = nil,
|
||||
htmxSwap: HtmxSwap? = nil,
|
||||
context: Context
|
||||
) {
|
||||
self.formClass = formClass
|
||||
self.formId = formId
|
||||
self.htmxPostTargetUrl = htmxTargetUrl.postUrl
|
||||
self.htmxPutTargetUrl = htmxTargetUrl.putUrl
|
||||
self.htmxTarget = htmxTarget
|
||||
self.htmxPushUrl = htmxPushUrl
|
||||
self.htmxResetAfterRequest = htmxResetAfterRequest
|
||||
self.htmxSwapOob = htmxSwapOob?.rawValue
|
||||
self.htmxSwap = htmxSwap?.rawValue
|
||||
self.context = context
|
||||
}
|
||||
|
||||
enum HtmxSwap: String {
|
||||
case innerHTML
|
||||
case outerHTML
|
||||
case afterbegin
|
||||
case beforebegin
|
||||
case afterend
|
||||
case beforeend
|
||||
case delete
|
||||
case none
|
||||
}
|
||||
|
||||
enum TargetUrl {
|
||||
case put(String)
|
||||
case post(String)
|
||||
|
||||
var putUrl: String? {
|
||||
guard case let .put(url) = self else { return nil }
|
||||
return url
|
||||
}
|
||||
|
||||
var postUrl: String? {
|
||||
guard case let .post(url) = self else { return nil }
|
||||
return url
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct EmptyContent: Content {}
|
||||
|
||||
struct ButtonLabelContext: Content {
|
||||
let buttonLabel: String
|
||||
}
|
||||
|
||||
extension HtmxFormCTX where Context == ButtonLabelContext {
|
||||
init(
|
||||
formClass: String? = nil,
|
||||
formId: String,
|
||||
htmxTargetUrl: TargetUrl,
|
||||
htmxTarget: String,
|
||||
htmxPushUrl: Bool,
|
||||
htmxResetAfterRequest: Bool = true,
|
||||
htmxSwapOob: HtmxSwap? = nil,
|
||||
htmxSwap: HtmxSwap? = nil,
|
||||
buttonLabel: String
|
||||
) {
|
||||
self.init(
|
||||
formClass: formClass,
|
||||
formId: formId,
|
||||
htmxTargetUrl: htmxTargetUrl,
|
||||
htmxTarget: htmxTarget,
|
||||
htmxPushUrl: htmxPushUrl,
|
||||
htmxResetAfterRequest: htmxResetAfterRequest,
|
||||
htmxSwapOob: htmxSwapOob,
|
||||
htmxSwap: htmxSwapOob,
|
||||
context: .init(buttonLabel: buttonLabel)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,8 @@ struct PurchaseOrderViewController: RouteCollection {
|
||||
route.get(use: index)
|
||||
route.get("next", use: nextPage)
|
||||
route.post(use: create(req:))
|
||||
route.post("search", use: postSearch)
|
||||
route.get("search", use: getSearch)
|
||||
route.group("create") {
|
||||
$0.get(use: form)
|
||||
$0.get("vendor-branch-select", use: vendorBranchSelect(req:))
|
||||
@@ -39,11 +41,11 @@ struct PurchaseOrderViewController: RouteCollection {
|
||||
|
||||
@Sendable
|
||||
func form(req: Request) async throws -> HTMLResponse {
|
||||
// guard req.isHtmxRequest else {
|
||||
// return try await req.render {
|
||||
// try await mainPage(PurchaseOrderForm(shouldShow: true), page: .default)
|
||||
// }
|
||||
// }
|
||||
guard req.isHtmxRequest else {
|
||||
return try await req.render {
|
||||
try await mainPage(PurchaseOrderForm(shouldShow: true), page: .default)
|
||||
}
|
||||
}
|
||||
return await req.render { PurchaseOrderForm(shouldShow: true) }
|
||||
}
|
||||
|
||||
@@ -73,12 +75,28 @@ struct PurchaseOrderViewController: RouteCollection {
|
||||
|
||||
@Sendable
|
||||
func create(req: Request) async throws -> HTMLResponse {
|
||||
let create = try req.content.decode(PurchaseOrder.CreateIntermediate.self)
|
||||
let create = try req.content.decode(CreateContext.self).toIntermediate()
|
||||
let user = try req.auth.require(User.self)
|
||||
let purchaseOrder = try await purchaseOrders.create(create.toCreate(createdByID: user.id))
|
||||
return await req.render { PurchaseOrderTable.Row(purchaseOrder: purchaseOrder) }
|
||||
}
|
||||
|
||||
@Sendable
|
||||
func postSearch(req: Request) async throws -> HTMLResponse {
|
||||
let query = try req.content.decode([String: String].self)
|
||||
req.logger.info("query: \(query)")
|
||||
let context = try req.content.decode(SearchContext.self).toSearch()
|
||||
let purchaseOrders = try await purchaseOrders.search(context)
|
||||
req.logger.info("\(purchaseOrders)")
|
||||
return await req.render { PurchaseOrderTable.Rows(page: purchaseOrders) }
|
||||
}
|
||||
|
||||
@Sendable
|
||||
func getSearch(req: Request) async throws -> HTMLResponse {
|
||||
let context = try req.query.decode(SearchQuery.self).toSearchContext()
|
||||
return await req.render { PurchaseOrderSearch(context: context) }
|
||||
}
|
||||
|
||||
private func mainPage<C: HTML>(
|
||||
_ html: C,
|
||||
page: IndexQuery
|
||||
@@ -87,6 +105,7 @@ struct PurchaseOrderViewController: RouteCollection {
|
||||
return MainPage(displayNav: true, route: .purchaseOrders) {
|
||||
div(.class("container")) {
|
||||
html
|
||||
PurchaseOrderSearch()
|
||||
PurchaseOrderTable(page: page)
|
||||
}
|
||||
}
|
||||
@@ -101,3 +120,54 @@ struct IndexQuery: Content {
|
||||
.init(page: 1, limit: 25)
|
||||
}
|
||||
}
|
||||
|
||||
private struct CreateContext: Content {
|
||||
let id: Int?
|
||||
let workOrder: String
|
||||
let materials: String
|
||||
let customer: String
|
||||
let truckStock: Bool?
|
||||
let createdForID: Employee.ID
|
||||
let vendorBranchID: VendorBranch.ID
|
||||
|
||||
func toIntermediate() -> PurchaseOrder.CreateIntermediate {
|
||||
.init(
|
||||
id: id,
|
||||
workOrder: workOrder.isEmpty ? nil : Int(workOrder),
|
||||
materials: materials,
|
||||
customer: customer,
|
||||
truckStock: truckStock,
|
||||
createdForID: createdForID,
|
||||
vendorBranchID: vendorBranchID
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private struct SearchContext: Content {
|
||||
let context: String
|
||||
let search: String
|
||||
|
||||
func toSearch() throws -> PurchaseOrder.SearchContext {
|
||||
switch context {
|
||||
case "employee":
|
||||
return .employee(search)
|
||||
case "customer":
|
||||
return .customer(search)
|
||||
case "vendor":
|
||||
return .vendor(search)
|
||||
default:
|
||||
throw Abort(.badRequest, reason: "Invalid search context.")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct SearchQuery: Content {
|
||||
let context: String
|
||||
|
||||
func toSearchContext() throws -> PurchaseOrderSearchContext {
|
||||
guard let context = PurchaseOrderSearchContext(rawValue: context) else {
|
||||
throw Abort(.badRequest, reason: "Invalid context.")
|
||||
}
|
||||
return context
|
||||
}
|
||||
}
|
||||
|
||||
38
Sources/App/Controllers/View/UtilsViewController.swift
Normal file
38
Sources/App/Controllers/View/UtilsViewController.swift
Normal file
@@ -0,0 +1,38 @@
|
||||
import DatabaseClient
|
||||
import Dependencies
|
||||
import SharedModels
|
||||
import Vapor
|
||||
import VaporElementary
|
||||
|
||||
struct UtilsViewController: RouteCollection {
|
||||
@Dependency(\.database) var database
|
||||
|
||||
func boot(routes: any RoutesBuilder) throws {
|
||||
let route = routes.protected
|
||||
route.group("select") {
|
||||
$0.get("employee", use: employeeSelect(req:))
|
||||
}
|
||||
}
|
||||
|
||||
@Sendable
|
||||
func employeeSelect(req: Request) async throws -> HTMLResponse {
|
||||
let context = try req.query.decode(EmployeeSelectContext.self)
|
||||
let employees = try await database.employees.fetchAll()
|
||||
return await req.render { context.toHTML(employees: employees) }
|
||||
}
|
||||
}
|
||||
|
||||
private struct EmployeeSelectContext: Content {
|
||||
|
||||
let context: EmployeeSelect.Context
|
||||
|
||||
func toHTML(employees: [Employee]) -> EmployeeSelect {
|
||||
switch context {
|
||||
case .form:
|
||||
return .purchaseOrderForm(employees: employees)
|
||||
case .search:
|
||||
return .purchaseOrderSearch(employees: employees)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user