feat: Temporary fix for not displaying estimations when minimal values are set using air-handler measurements.
This commit is contained in:
@@ -271,6 +271,7 @@ extension Store where State == EquipmentMeasurementForm.State {
|
||||
@ViewAction(for: EquipmentMeasurementForm.self)
|
||||
public struct EquipmentMeasurementFormView: View {
|
||||
|
||||
@FocusState private var focusedField: EquipmentMeasurementForm.State.Field?
|
||||
@Bindable public var store: StoreOf<EquipmentMeasurementForm>
|
||||
|
||||
public init(store: StoreOf<EquipmentMeasurementForm>) {
|
||||
@@ -322,6 +323,7 @@ public struct EquipmentMeasurementFormView: View {
|
||||
}
|
||||
}
|
||||
}
|
||||
.bind($focusedField, to: $store.focusedField)
|
||||
.onAppear { send(.onAppear) }
|
||||
.textLabelStyle(.boldSecondary)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
@@ -373,6 +375,7 @@ public struct EquipmentMeasurementFormView: View {
|
||||
fractionLength: fractionLength,
|
||||
numberPad: field == .airflow
|
||||
)
|
||||
.focused($focusedField, equals: field)
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
|
||||
@@ -3,6 +3,7 @@ import SharedModels
|
||||
import Styleguide
|
||||
import SwiftUI
|
||||
|
||||
#warning("Use shared settings, don't display filter pressure drop if current flagged measurement pressure drop is not set.")
|
||||
@Reducer
|
||||
public struct EstimationForm {
|
||||
public init() { }
|
||||
|
||||
@@ -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
|
||||
? Positive(wrappedValue: form.filterPressureDrop!)
|
||||
: nil
|
||||
var filterPressureDrop: Positive<Double>? = nil
|
||||
|
||||
if sharedSettings.flaggedEquipmentMeasurement?.filterPressureDrop.wrappedValue != 0 {
|
||||
filterPressureDrop = form.filterPressureDrop != nil
|
||||
? Positive(wrappedValue: form.filterPressureDrop!)
|
||||
: nil
|
||||
}
|
||||
|
||||
let measurement = try await estimatedPressuresClient.estimatedPressure(
|
||||
equipmentMeasurement: equipmentMeasurement,
|
||||
@@ -204,7 +208,7 @@ public struct FlaggedMeasurementsList {
|
||||
let flaggedMeasurement = EquipmentMeasurement.FlaggedMeasurement(
|
||||
budgets: budgets,
|
||||
measurement: measurement,
|
||||
ratedPressures: ratedStaticPressures,
|
||||
ratedPressures: sharedSettings.ratedStaticPressures,
|
||||
tons: form.coolingCapacity
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user