update

src/features/trackTimeDuration/components/AllDayRings.tsx

@@ -351,42 +351,7 @@ export default function AllDayRings(props: { schedule: any }) {
     }
 
     function dayDuration() {
-        if (authInfo && authInfo.day_completed && new Date().getTime() > authInfo.day_completed.sunset_ts) {
-            return TimeFormatter.durationFormate(authInfo.day_completed.sunrise_ts, authInfo.day_completed.sunset_ts)
-        }
-
-
-        var now = new Date()
-        var sunriseDate = day.sunriseDate
-        if (sunriseDate) {
-            if (now.getTime() > sunriseDate.getTime()) {
-                return TimeFormatter.countdown(sunriseDate.getTime())
-            }
-        }
-
-
-        var sunRiseObj = day.dayRingSunrise
-        var sunSetObj = day.dayRingSunset
-        var sunRise = parseInt(sunRiseObj.split(':')[0]) * 60 + parseInt(sunRiseObj.split(':')[1])
-        var sunSet = parseInt(sunSetObj.split(':')[0]) * 60 + parseInt(sunSetObj.split(':')[1])
-        if (sunSetObj.indexOf('PM') != -1) {
-            sunSet += 12 * 60
-        }
-
-        var duration = (sunSet - sunRise) * 60 * 1000
-
-        return TimeFormatter.calculateTimeDifference(new Date().getTime(), new Date().getTime() + duration);
-        // var sunRiseObj = day.dayRingSunrise
-        // var sunSetObj = day.dayRingSunset
-        // var sunRise = parseInt(sunRiseObj.split(':')[0]) * 60 + parseInt(sunRiseObj.split(':')[1])
-        // var sunSet = parseInt(sunSetObj.split(':')[0]) * 60 + parseInt(sunSetObj.split(':')[1])
-        // if (sunSetObj.indexOf('PM') != -1) {
-        //     sunSet += 12 * 60
-        // }
-
-        // var duration = (sunSet - sunRise) * 60 * 1000
-
-        // return TimeFormatter.calculateTimeDifference(new Date().getTime(), new Date().getTime() + duration);
+        return global.sunriseDuration
     }
 
     function eatDuration() {

src/features/trackTimeDuration/components/AllRings.tsx

@@ -329,43 +329,7 @@ export default function AllRings(props: { data?: any, time?: any }) {
     }
 
     function nightDuration() {
-        if (authInfo && authInfo.night_completed && new Date().getTime() > authInfo.night_completed.sunrise_ts) {
-            return TimeFormatter.durationFormate(authInfo.night_completed.sunrise_ts, authInfo.night_completed.sunset_ts)
-        }
-
-        var now = new Date()
-        var sunsetDate = nightStore.sunsetDate
-        if (sunsetDate) {
-            if (now.getTime() > sunsetDate.getTime()) {
-                return TimeFormatter.countdown(sunsetDate.getTime())
-            }
-            // return TimeFormatter.countdown(sunsetDate.getTime())
-        }
-
-
-        var sunRiseObj = nightStore.nightRingSunrise
-        var sunSetObj = nightStore.nightRingSunset
-        var sunRise = 24 * 60 + parseInt(sunRiseObj.split(':')[0]) * 60 + parseInt(sunRiseObj.split(':')[1])
-        var sunSet = parseInt(sunSetObj.split(':')[0]) * 60 + parseInt(sunSetObj.split(':')[1])
-        if (sunSetObj.indexOf('PM') != -1) {
-            sunSet += 12 * 60
-        }
-
-        var duration = (sunRise - sunSet) * 60 * 1000
-
-        return TimeFormatter.calculateTimeDifference(new Date().getTime(), new Date().getTime() + duration);
-
-        // var sunRiseObj = nightStore.nightRingSunrise
-        // var sunSetObj = nightStore.nightRingSunset
-        // var sunRise = 24 * 60 + parseInt(sunRiseObj.split(':')[0]) * 60 + parseInt(sunRiseObj.split(':')[1])
-        // var sunSet = parseInt(sunSetObj.split(':')[0]) * 60 + parseInt(sunSetObj.split(':')[1])
-        // if (sunSetObj.indexOf('PM') != -1) {
-        //     sunSet += 12 * 60
-        // }
-
-        // var duration = (sunRise - sunSet) * 60 * 1000
-
-        // return TimeFormatter.calculateTimeDifference(new Date().getTime(), new Date().getTime() + duration);
+        return global.sunsetDuration
     }
 
 

src/features/trackTimeDuration/components/DayNightCard.tsx

@@ -237,6 +237,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
         // var strYesterday = `${yesterday.getFullYear()}-${TimeFormatter.padZero(yesterday.getMonth() + 1)}-${TimeFormatter.padZero(yesterday.getDate())}`
         // var strTomorrow = `${tomorrow.getFullYear()}-${TimeFormatter.padZero(tomorrow.getMonth() + 1)}-${TimeFormatter.padZero(tomorrow.getDate())}`
         if (isMember && data && data.daylights && data.daylights.length > 0) {
+            debugger
             var yesterdayDate = new Date(data.daylights[0].date + 'T' + data.daylights[0].sunset)
             var todaySunriseDate = new Date(data.daylights[1].date + 'T' + data.daylights[1].sunrise)
             var todaySunsetDate = new Date(data.daylights[1].date + 'T' + data.daylights[1].sunset)
@@ -335,6 +336,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
     }
 
     function updateNightStore(date, sunrise, sunset) {
+        debugger
         if (lastNightInfo && lastNightInfo.date.getDate() == new Date(date).getDate() &&
             lastNightInfo.sunrise == sunrise &&
             lastNightInfo.sunset == sunset
@@ -1092,12 +1094,14 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
 
     function getSunsetDuration() {
         if (authInfo && authInfo.night_completed && new Date().getTime() > authInfo.night_completed.sunrise_ts) {
+            global.sunsetDuration = TimeFormatter.durationFormate(authInfo.night_completed.sunrise_ts, authInfo.night_completed.sunset_ts)
             return TimeFormatter.durationFormate(authInfo.night_completed.sunrise_ts, authInfo.night_completed.sunset_ts)
         }
 
         var now = new Date()
         if (props.isNight && sunsetDate) {
             if (now.getTime() > sunsetDate.getTime()) {
+                global.sunsetDuration = TimeFormatter.countdown(sunsetDate.getTime())
                 return TimeFormatter.countdown(sunsetDate.getTime())
             }
             // return TimeFormatter.countdown(sunsetDate.getTime())
@@ -1113,7 +1117,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
         }
 
         var duration = (sunRise - sunSet) * 60 * 1000
-
+        global.sunsetDuration = TimeFormatter.calculateTimeDifference(new Date().getTime(), new Date().getTime() + duration);
         return TimeFormatter.calculateTimeDifference(new Date().getTime(), new Date().getTime() + duration);
 
         // //COMPLETED
@@ -1138,6 +1142,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
 
     function getSunriseDuration() {
         if (authInfo && authInfo.day_completed && new Date().getTime() > authInfo.day_completed.sunset_ts) {
+            global.sunriseDuration = TimeFormatter.durationFormate(authInfo.day_completed.sunrise_ts, authInfo.day_completed.sunset_ts)
             return TimeFormatter.durationFormate(authInfo.day_completed.sunrise_ts, authInfo.day_completed.sunset_ts)
         }
 
@@ -1145,6 +1150,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
         debugger
         if (!props.isNight && sunriseDate) {
             if (now.getTime() > sunriseDate.getTime()) {
+                global.sunriseDuration = TimeFormatter.countdown(sunriseDate.getTime())
                 return TimeFormatter.countdown(sunriseDate.getTime())
             }
         }
@@ -1159,7 +1165,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
         }
 
         var duration = (sunSet - sunRise) * 60 * 1000
-
+        global.sunriseDuration = TimeFormatter.calculateTimeDifference(new Date().getTime(), new Date().getTime() + duration);
         return TimeFormatter.calculateTimeDifference(new Date().getTime(), new Date().getTime() + duration);
     }
 

src/features/trackTimeDuration/components/DayNightDetailPopup.tsx

@@ -374,7 +374,7 @@ export default function DayNightDetailPopup(props: {
 
         </View>
             {
-                props.authInfo.timezone != timeZoneFormatted && <Text className="tz_note_desc">{t('feature.common.diff_tz_desc', { location: props.authInfo.timezone })}</Text>
+                props.authInfo && props.authInfo.timezone && props.authInfo.timezone != timeZoneFormatted && <Text className="tz_note_desc">{t('feature.common.diff_tz_desc', { location: props.authInfo.timezone })}</Text>
             }
         </View>
     }