|
@@ -136,7 +136,7 @@ export default function TimelineFastSleep(props: {
|
|
|
return TimeFormatter.dateDescription(newTimestamp, true, diffTimeZone || multTimeZone)
|
|
return TimeFormatter.dateDescription(newTimestamp, true, diffTimeZone || multTimeZone)
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
- var real_time_zone = props.data.last_timezone.gmt
|
|
|
|
|
|
|
+ var real_time_zone = props.data.last_timezone?props.data.last_timezone.gmt:''
|
|
|
var newTimestamp = TimeFormatter.transferTimestamp(obj.target_start_time, real_time_zone)
|
|
var newTimestamp = TimeFormatter.transferTimestamp(obj.target_start_time, real_time_zone)
|
|
|
if (diffTimeZone || multTimeZone) {
|
|
if (diffTimeZone || multTimeZone) {
|
|
|
return TimeFormatter.getMonthAndDayByTimestamp(newTimestamp, true) + ' '
|
|
return TimeFormatter.getMonthAndDayByTimestamp(newTimestamp, true) + ' '
|
|
@@ -182,7 +182,7 @@ export default function TimelineFastSleep(props: {
|
|
|
|
|
|
|
|
|
|
|
|
|
var timeZone = ''
|
|
var timeZone = ''
|
|
|
- if (props.data.sleep.real_start_timezone.gmt) {
|
|
|
|
|
|
|
+ if (props.data.sleep.real_start_timezone && props.data.sleep.real_start_timezone.gmt) {
|
|
|
timeZone = ' ' + props.data.sleep.real_start_timezone.gmt
|
|
timeZone = ' ' + props.data.sleep.real_start_timezone.gmt
|
|
|
}
|
|
}
|
|
|
var strDate = multTimeZone ? timeZone : ''
|
|
var strDate = multTimeZone ? timeZone : ''
|
|
@@ -208,7 +208,7 @@ export default function TimelineFastSleep(props: {
|
|
|
}
|
|
}
|
|
|
if (props.data.sleep && props.data.scenario != 'FAST') {
|
|
if (props.data.sleep && props.data.scenario != 'FAST') {
|
|
|
var timeZone = ''
|
|
var timeZone = ''
|
|
|
- if (props.data.sleep.real_end_timezone.gmt) {
|
|
|
|
|
|
|
+ if (props.data.sleep.real_end_timezone && props.data.sleep.real_end_timezone.gmt) {
|
|
|
timeZone = ' ' + props.data.sleep.real_end_timezone.gmt
|
|
timeZone = ' ' + props.data.sleep.real_end_timezone.gmt
|
|
|
}
|
|
}
|
|
|
var status = getStatus(false, false, props.data)
|
|
var status = getStatus(false, false, props.data)
|