Ivan Valkou 5 лет назад
Родитель
Сommit
3f0add2e86

+ 1 - 0
FreeAPS/Resources/json/defaults/settings/profile.json

@@ -0,0 +1 @@
+{}

+ 1 - 0
FreeAPS/Resources/json/defaults/settings/pumpprofile.json

@@ -0,0 +1 @@
+{}

+ 1 - 1
FreeAPS/Sources/APS/OpenAPS/JavaScriptWorker.swift

@@ -16,7 +16,7 @@ final class JavaScriptWorker {
         let context = JSContext(virtualMachine: virtualMachine)!
         context.exceptionHandler = { _, exception in
             if let error = exception?.toString() {
-                print(error)
+                warning(.openAPS, "JavaScript Error: \(error)")
             }
         }
         return context

+ 2 - 1
FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -475,6 +475,7 @@ extension MainChartView {
                     yPoint = point.y
                 }
                 let lastPoint = lastBasalPoint(fullSize: fullSize)
+                path.addLine(to: CGPoint(x: lastPoint.x, y: yPoint))
                 path.addLine(to: CGPoint(x: lastPoint.x, y: Config.basalHeight))
                 path.addLine(to: CGPoint(x: 0, y: Config.basalHeight))
             }
@@ -598,7 +599,7 @@ extension MainChartView {
     private func lastBasalPoint(fullSize: CGSize) -> CGPoint {
         let lastBasal = Array(tempBasals.suffix(2))
         guard lastBasal.count == 2 else {
-            return .zero
+            return CGPoint(x: timeToXCoordinate(Date().timeIntervalSince1970, fullSize: fullSize), y: Config.basalHeight)
         }
         let endBasalTime = lastBasal[0].timestamp.timeIntervalSince1970 + (lastBasal[1].durationMin?.minutes.timeInterval ?? 0)
         let rateCost = Config.basalHeight / CGFloat(maxBasal)