95
95
--- @param time table
96
96
--- @return OrgDate
97
97
function Date :from_time_table (time )
98
- local timestamp_end = time . timestamp_end or self .timestamp_end
99
- local timestamp = time . timestamp or self .timestamp
98
+ local timestamp_end = self .timestamp_end
99
+ local timestamp = self .timestamp
100
100
local range_diff = timestamp_end and timestamp_end - timestamp or 0
101
101
timestamp = os.time (set_date_opts (time , {}, true ))
102
102
local opts = set_date_opts (os.date (' *t' , timestamp ))
@@ -105,17 +105,17 @@ function Date:from_time_table(time)
105
105
else
106
106
opts .date_only = self .date_only
107
107
end
108
- opts .dayname = time . dayname or self .dayname
109
- opts .adjustments = time . adjustments or self .adjustments
110
- opts .type = time . type or self .type
111
- opts .active = time . active or self .active
112
- opts .range = time . range or self .range
113
- if time . timestamp_end or self .timestamp_end then
108
+ opts .dayname = self .dayname
109
+ opts .adjustments = self .adjustments
110
+ opts .type = self .type
111
+ opts .active = self .active
112
+ opts .range = self .range
113
+ if self .timestamp_end then
114
114
opts .timestamp_end = timestamp + range_diff
115
115
end
116
- opts .is_date_range_start = time . is_date_range_start or self .is_date_range_start
117
- opts .is_date_range_end = time . is_date_range_end or self .is_date_range_end
118
- opts .related_date_range = time . related_date_range or self .related_date_range
116
+ opts .is_date_range_start = self .is_date_range_start
117
+ opts .is_date_range_end = self .is_date_range_end
118
+ opts .related_date_range = self .related_date_range
119
119
return Date :new (opts )
120
120
end
121
121
0 commit comments