Robert 5 месяцев назад
Родитель
Сommit
aad64dbfe9

+ 6 - 1
Trio/Sources/APS/OpenAPS/OpenAPS.swift

@@ -549,9 +549,14 @@ final class OpenAPS {
 
                 if let effectiveHBT, effectiveHBT != defaultHalfBasalTarget {
                     adjustedPreferences.halfBasalExerciseTarget = effectiveHBT
+                    let percentage = Int(TempTargetCalculations.computeAdjustedPercentage(
+                        halfBasalTarget: effectiveHBT,
+                        target: targetValue,
+                        autosensMax: preferences.autosensMax
+                    ))
                     debug(
                         .openAPS,
-                        "checkStandardTT: Updated halfBasalExerciseTarget to \(effectiveHBT) for target \(targetValue) (stored HBT: \(String(describing: activeTempTarget.halfBasalTarget?.decimalValue)), settings HBT: \(defaultHalfBasalTarget))"
+                        "TempTarget: target=\(targetValue), effectiveHBT=\(effectiveHBT), percentage=\(percentage)%, adjustmentType=Custom"
                     )
                 }
             }

+ 15 - 0
Trio/Sources/Modules/Adjustments/AdjustmentsStateModel+Extensions/AdjustmentsStateModel+TempTargets.swift

@@ -138,6 +138,11 @@ extension Adjustments.StateModel {
         let date = self.date
         guard date > Date() else { return }
 
+        let adjustmentType = halfBasalTarget == settingHalfBasalTarget ? "Standard" : "Custom"
+        debug(
+            .default,
+            "TempTarget: target=\(tempTargetTarget), HBT=\(halfBasalTarget), percentage=\(Int(percentage))%, adjustmentType=\(adjustmentType)"
+        )
         let tempTarget = TempTarget(
             name: tempTargetName,
             createdAt: date,
@@ -203,6 +208,11 @@ extension Adjustments.StateModel {
     /// Saves a custom Temp Target and disables existing ones.
     func saveCustomTempTarget() async throws {
         await disableAllActiveTempTargets(createTempTargetRunEntry: true)
+        let adjustmentType = halfBasalTarget == settingHalfBasalTarget ? "Standard" : "Custom"
+        debug(
+            .default,
+            "TempTarget: target=\(tempTargetTarget), HBT=\(halfBasalTarget), percentage=\(Int(percentage))%, adjustmentType=\(adjustmentType)"
+        )
         let tempTarget = TempTarget(
             name: tempTargetName,
             /// We don't need to use the state var date here as we are using a different function for scheduled Temp Targets 'saveScheduledTempTarget()'
@@ -225,6 +235,11 @@ extension Adjustments.StateModel {
 
     /// Creates a new Temp Target preset.
     func saveTempTargetPreset() async throws {
+        let adjustmentType = halfBasalTarget == settingHalfBasalTarget ? "Standard" : "Custom"
+        debug(
+            .default,
+            "TempTarget: target=\(tempTargetTarget), HBT=\(halfBasalTarget), percentage=\(Int(percentage))%, adjustmentType=\(adjustmentType)"
+        )
         let tempTarget = TempTarget(
             name: tempTargetName,
             createdAt: Date(),

+ 4 - 18
Trio/Sources/Modules/Adjustments/View/TempTargets/EditTempTargetForm.swift

@@ -90,11 +90,6 @@ struct EditTempTargetForm: View {
             }
             .onAppear {
                 // Determine if this is a custom slider adjustment or a standard with auto-adjustment
-                debug(
-                    .default,
-                    "checkStandardTT onAppear: halfBasalTarget=\(String(describing: halfBasalTarget)), settingHBT=\(state.settingHalfBasalTarget), percentage=\(percentage), target=\(target)"
-                )
-
                 if halfBasalTarget != nil,
                    halfBasalTarget != state.settingHalfBasalTarget
                 {
@@ -107,22 +102,9 @@ struct EditTempTargetForm: View {
                         autosensMax: state.autosensMax
                     ) != nil
 
-                    debug(
-                        .default,
-                        "checkStandardTT onAppear: isAutoAdjustedStandard=\(isAutoAdjustedStandard)"
-                    )
-
                     if !isAutoAdjustedStandard {
                         tempTargetSensitivityAdjustmentType = .slider
-                        debug(.default, "checkStandardTT onAppear: Setting adjustment type to .slider")
-                    } else {
-                        debug(.default, "checkStandardTT onAppear: Keeping adjustment type as .standard (auto-adjusted)")
                     }
-                } else {
-                    debug(
-                        .default,
-                        "checkStandardTT onAppear: Keeping adjustment type as .standard (HBT is nil or matches settings)"
-                    )
                 }
             }
             .sheet(isPresented: $state.isHelpSheetPresented) {
@@ -346,6 +328,10 @@ struct EditTempTargetForm: View {
             Spacer()
             Button(action: {
                 saveChanges()
+                debug(
+                    .default,
+                    "TempTarget: target=\(target), HBT=\(String(describing: halfBasalTarget)), percentage=\(Int(percentage))%, adjustmentType=\(tempTargetSensitivityAdjustmentType.rawValue)"
+                )
                 do {
                     guard let moc = tempTarget.managedObjectContext else { return }
                     guard moc.hasChanges else { return }