michael/swift-estimated-pressures-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Temporary fix for not displaying estimations when minimal values are set using air-handler measurements.

Browse Source
This commit is contained in:
Michael Housh
2024-06-10 17:05:04 -04:00
parent 3bfcc8a0b2
commit 2e42f3a0e2
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/PressureEstimationsFeature/EquipmentMeasurementForm.swift
View File

@@ -271,6 +271,7 @@ extension Store where State == EquipmentMeasurementForm.State {
@ViewAction(for: EquipmentMeasurementForm.self) @ViewAction(for: EquipmentMeasurementForm.self)
public struct EquipmentMeasurementFormView: View { public struct EquipmentMeasurementFormView: View {
@FocusState private var focusedField: EquipmentMeasurementForm.State.Field?
@Bindable public var store: StoreOf<EquipmentMeasurementForm> @Bindable public var store: StoreOf<EquipmentMeasurementForm>
public init(store: StoreOf<EquipmentMeasurementForm>) { public init(store: StoreOf<EquipmentMeasurementForm>) {
@@ -322,6 +323,7 @@ public struct EquipmentMeasurementFormView: View {
} }
} }
} }
.bind($focusedField, to: $store.focusedField)
.onAppear { send(.onAppear) } .onAppear { send(.onAppear) }
.textLabelStyle(.boldSecondary) .textLabelStyle(.boldSecondary)
.textFieldStyle(.roundedBorder) .textFieldStyle(.roundedBorder)
@@ -373,6 +375,7 @@ public struct EquipmentMeasurementFormView: View {
fractionLength: fractionLength, fractionLength: fractionLength,
numberPad: field == .airflow numberPad: field == .airflow
) )
.focused($focusedField, equals: field)
} }
@ViewBuilder @ViewBuilder

1
Sources/PressureEstimationsFeature/EstimationsForm.swift
View File

@@ -3,6 +3,7 @@ import SharedModels
import Styleguide import Styleguide
import SwiftUI import SwiftUI
#warning("Use shared settings, don't display filter pressure drop if current flagged measurement pressure drop is not set.")
@Reducer @Reducer
public struct EstimationForm { public struct EstimationForm {
public init() { } public init() { }

10
Sources/PressureEstimationsFeature/FlaggedMeasurementsList.swift
View File

@@ -189,11 +189,15 @@ public struct FlaggedMeasurementsList {
) )
} }
return .receive(action: \.receive) { [ratedStaticPressures = state.sharedSettings.equipmentMetadata.ratedStaticPressures] in return .receive(action: \.receive) { [sharedSettings = state.sharedSettings] in
let filterPressureDrop = form.filterPressureDrop != nil var filterPressureDrop: Positive<Double>? = nil
if sharedSettings.flaggedEquipmentMeasurement?.filterPressureDrop.wrappedValue != 0 {
filterPressureDrop = form.filterPressureDrop != nil
? Positive(wrappedValue: form.filterPressureDrop!) ? Positive(wrappedValue: form.filterPressureDrop!)
: nil : nil
}
let measurement = try await estimatedPressuresClient.estimatedPressure( let measurement = try await estimatedPressuresClient.estimatedPressure(
equipmentMeasurement: equipmentMeasurement, equipmentMeasurement: equipmentMeasurement,
@@ -204,7 +208,7 @@ public struct FlaggedMeasurementsList {
let flaggedMeasurement = EquipmentMeasurement.FlaggedMeasurement( let flaggedMeasurement = EquipmentMeasurement.FlaggedMeasurement(
budgets: budgets, budgets: budgets,
measurement: measurement, measurement: measurement,
ratedPressures: ratedStaticPressures, ratedPressures: sharedSettings.ratedStaticPressures,
tons: form.coolingCapacity tons: form.coolingCapacity
) )