Jelajahi Sumber

fix tins calculations

polscm32 2 tahun lalu
induk
melakukan
0383947730

+ 4 - 2
FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift

@@ -7,6 +7,7 @@ struct PumpView: View {
     @Binding var expiresAtDate: Date?
     @Binding var expiresAtDate: Date?
     @Binding var timerDate: Date
     @Binding var timerDate: Date
     @Binding var boluses: [PumpHistoryEvent]
     @Binding var boluses: [PumpHistoryEvent]
+    @Binding var screenHours: Int16
 
 
     @State var state: Home.StateModel
     @State var state: Home.StateModel
 
 
@@ -110,10 +111,11 @@ struct PumpView: View {
     func calculateTINS() -> String {
     func calculateTINS() -> String {
         let date = Date()
         let date = Date()
         let calendar = Calendar.current
         let calendar = Calendar.current
-        let offset = state.scale
+        let offset = screenHours
 
 
         var offsetComponents = DateComponents()
         var offsetComponents = DateComponents()
-        offsetComponents.hour = -offset.rawValue
+//        offsetComponents.hour = -offset.rawValue
+        offsetComponents.hour = -Int(offset)
 
 
         let startTime = calendar.date(byAdding: offsetComponents, to: date)!
         let startTime = calendar.date(byAdding: offsetComponents, to: date)!
         print("******************")
         print("******************")

+ 1 - 0
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -190,6 +190,7 @@ extension Home {
                 expiresAtDate: $state.pumpExpiresAtDate,
                 expiresAtDate: $state.pumpExpiresAtDate,
                 timerDate: $state.timerDate,
                 timerDate: $state.timerDate,
                 boluses: $state.boluses,
                 boluses: $state.boluses,
+                screenHours: $state.hours,
                 state: state
                 state: state
             )
             )
             .onTapGesture {
             .onTapGesture {