From 14f4931999190e6cdee30c30cfa2eecd8dcc391c Mon Sep 17 00:00:00 2001
From: Robert Vokac <robertvokac@nanoboot.org>
Date: Sat, 10 Feb 2024 13:00:19 +0000
Subject: [PATCH] Time improvements - wip3

---
 .../utils/timecalc/app/TimeCalcManager.java   | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java
index 99ba425..83b3423 100644
--- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java
@@ -285,13 +285,31 @@ public class TimeCalcManager {
         } else {
             analogClock.dayOfWeekProperty.bindTo(time.dayOfWeek);
         }
+        if(testProperties.containsKey("current.hour")) {
+            calNow.set(Calendar.HOUR, Integer.parseInt((String) testProperties.get("current.hour")));
+            analogClock.hourProperty.setValue(Integer.valueOf((String) testProperties.get("current.hour")));
+        } else {
+            analogClock.hourProperty.bindTo(time.hourProperty);
+        }
+        if(testProperties.containsKey("current.minute")) {
+            calNow.set(Calendar.MINUTE, Integer.parseInt((String) testProperties.get("current.minute")));
+            analogClock.minuteProperty.setValue(Integer.valueOf((String) testProperties.get("current.minute")));
+        } else {
+            analogClock.minuteProperty.bindTo(time.minuteProperty);
+        }
+        if(testProperties.containsKey("current.second")) {
+            calNow.set(Calendar.SECOND, Integer.parseInt((String) testProperties.get("current.second")));
+            analogClock.secondProperty.setValue(Integer.valueOf((String) testProperties.get("current.second")));
+        } else {
+            analogClock.secondProperty.bindTo(time.secondProperty);
+        }
         
-        
-        analogClock.hourProperty.bindTo(time.hourProperty);
-        analogClock.minuteProperty.bindTo(time.minuteProperty);
-        analogClock.secondProperty.bindTo(time.secondProperty);
-        analogClock.millisecondProperty.bindTo(time.millisecondProperty);
-        
+        if(testProperties.containsKey("current.millisecond")) {
+            calNow.set(Calendar.MILLISECOND, Integer.parseInt((String) testProperties.get("current.millisecond")));
+            analogClock.millisecondProperty.setValue(Integer.valueOf((String) testProperties.get("current.millisecond")));
+        } else {
+            analogClock.millisecondProperty.bindTo(time.millisecondProperty);
+        }
         
 
         window.add(analogClock);