Leon 1 rok temu
rodzic
commit
591174679d

+ 0 - 1
src/features/daynight/DayNightRing.tsx

@@ -133,7 +133,6 @@ export default function DayNightRing(props: {
         if (authInfo && authInfo.timezone && authInfo.timezone.id) {
             var current1 = dayjs()
             var current = TimeFormatter.tzLocalTime(new Date().getTime(),authInfo.timezone.id)//dayjs().tz(authInfo.timezone.id)
-            debugger
             var offset = current.date() * 24 * 60 + current.hour() * 60 + current.minute() - current1.date() * 24 * 60 - current1.hour() * 60 - current1.minute()
             currentDot.offset = offset
         }

+ 10 - 2
src/pages/clock/SetGoal.tsx

@@ -164,7 +164,10 @@ export default function SetGoal() {
                 fast: {
                     start_time: fastTarget.start_time,
                     end_time: fastTarget.end_time,
-                    method: parseInt(router.params.isSelf + '') == 1 ? 'USER_SET' : 'SUGGEST'
+                    method: parseInt(router.params.isSelf + '') == 1 ? 'USER_SET' : 'SUGGEST',
+                    duration:{
+                        input_value:target.fast.schedule.fast.duration.init_value,
+                    }
                 },
             }
         }
@@ -176,7 +179,12 @@ export default function SetGoal() {
                 end_time: sleepTarget.end_time,
                 method: parseInt(router.params.isSelf + '') == 1 ? 'USER_SET' : 'SUGGEST',
                 latency: {
-                    value: target.sleep.schedule.sleep.latency.default_value,
+                    input_value: target.sleep.schedule.sleep.latency.init_value,
+                },
+                cycle:{
+                    num:{
+                        input_value: target.sleep.schedule.sleep.cycle.num.init_value,
+                    }
                 }
             }
         }

+ 10 - 3
src/pages/clock/Suggest.tsx

@@ -97,8 +97,13 @@ export default function Suggest() {
             var sleep_cycle = obj.cycle
             var sleep_latency = obj.latency.init_value
             var array: any = []
+            var index:number = 0;
             for (var i = 0; i < sleep_cycle.num.options.length; i++) {
                 var count = sleep_cycle.num.options[i] * sleep_cycle.duration.init_value + sleep_latency
+                //sleep.schedule.sleep.cycle.num.init_value = sleep.schedule.sleep.cycle.num.options[suggestIndex]
+                if (sleep_cycle.num.options[i]==sleep_cycle.num.init_value){
+                    index = i
+                }
 
                 var sleep = JSON.parse(JSON.stringify(target.sleep))
                 var startCount = sleep.schedule.sleep.end_time.split(':')[0] * 60 + sleep.schedule.sleep.end_time.split(':')[1] * 1 - count
@@ -116,7 +121,7 @@ export default function Suggest() {
                 })
             }
             setSuggestItem(array)
-            setSuggestIndex(0)
+            setSuggestIndex(index)
 
         }
     }, [])
@@ -135,6 +140,7 @@ export default function Suggest() {
             // }
             // var start = TimeFormatter.padZero(Math.floor(startCount / 60)) + ':' + TimeFormatter.padZero(startCount % 60)
             fast.schedule.fast.start_time = item.time
+            fast.schedule.fast.duration.init_value = fast.schedule.fast.duration.options[suggestIndex]
             dispatch(updateFast({ fast: fast }))
         }
         else if (pageStep == 3) {
@@ -146,6 +152,7 @@ export default function Suggest() {
             }
             var start = TimeFormatter.padZero(Math.floor(startCount / 60)) + ':' + TimeFormatter.padZero(startCount % 60)
             sleep.schedule.sleep.start_time = start
+            sleep.schedule.sleep.cycle.num.init_value = sleep.schedule.sleep.cycle.num.options[suggestIndex]
             dispatch(updateSleep({ sleep: sleep }))
         }
         var step: number = target.step + 1
@@ -264,7 +271,7 @@ export default function Suggest() {
 
     function sleepLatencyValue() {
         var obj = target.sleep.schedule.sleep.latency
-        var value: number = obj.default_value
+        var value: number = obj.init_value
         var min: number = obj.min
         var step: number = obj.step
         var index = (value - min) / step
@@ -329,7 +336,7 @@ export default function Suggest() {
         var value = target.sleep.schedule.sleep.latency
         var time = e[0] * value.step + value.min
         var sleep = JSON.parse(JSON.stringify(target.sleep))
-        sleep.schedule.sleep.latency.default_value = time
+        sleep.schedule.sleep.latency.init_value = time
         dispatch(updateSleep({ sleep: sleep }))
     }