Module:Date - Revision history

Ondo: 3 revisions imported from :wikipedia:Module:Date: see Topic:Vtixlm0q28eo6jtf

2021-05-21T11:44:38Z

3 revisions imported from wikipedia:Module:Date: see Topic:Vtixlm0q28eo6jtf

← Older revision	Revision as of 11:44, 21 May 2021
(No difference)

Ondo: 3 revisions imported from :wikipedia:Module:Date: see Topic:Vtixlm0q28eo6jtf

2021-05-21T11:42:30Z

3 revisions imported from wikipedia:Module:Date: see Topic:Vtixlm0q28eo6jtf

← Older revision	Revision as of 11:42, 21 May 2021
(No difference)

Ondo: 24 revisions imported from :wikipedia:Module:Date: see Topic:Vtixlm0q28eo6jtf

2021-05-21T11:42:06Z

24 revisions imported from wikipedia:Module:Date: see Topic:Vtixlm0q28eo6jtf

← Older revision	Revision as of 11:42, 21 May 2021
(No difference)

wikipedia>Johnuniq: update from sandbox: implement show=M (minutes) and show=s (seconds); better method to fill a partial date

2020-08-03T02:55:18Z

update from sandbox: implement show=M (minutes) and show=s (seconds); better method to fill a partial date

← Older revision		Revision as of 02:55, 3 August 2020
Line 907:		Line 907:
	-- Return filled date1, date2 (two full dates).		-- Return filled date1, date2 (two full dates).
	local function filled(a, b)		local function filled(a, b)
			-- Return date a filled, if necessary, with month and/or day from date b.
			-- The filled day is truncated to fit the number of days in the month.
	local fillmonth, fillday		local fillmonth, fillday
	if not a.month then		if not a.month then
Line 915:		Line 917:
	end		end
	if fillmonth or fillday then -- need to create a new date		if fillmonth or fillday then -- need to create a new date
	if (~~fillmonth or~~ a.month) == ~~2 and~~ (fillday or a.day~~) == 29 then~~		a = Date(a, {
	~~-- Avoid invalid date~~, ~~for example with {{age\|2013\|29 Feb 2016}} or {{age\|Feb 2013\|29 Jan 2015}}.~~		month = fillmonth,
	~~if not is_leap_year~~(a.year, a.calendar) ~~then~~		day = math.min(fillday or a.day, days_in_month(a.year, fillmonth or a.month, a.calendar))
	~~fillday = 28~~		})
	~~end~~
	~~end~~
	~~a = Date(a, { month = fillmonth, day = fillday~~ })
	end		end
	return a		return a
Line 1,402:		Line 1,401:
	end		end
	local H, M, S = diff.hours, diff.minutes, diff.seconds		local H, M, S = diff.hours, diff.minutes, diff.seconds
	if code == 'dh' or code == 'dhm' or code == 'dhms' or code == 'h' or code == 'hm' or code == 'hms' then		if code == 'dh' or code == 'dhm' or code == 'dhms' or code == 'h' or code == 'hm' or code == 'hms' or code == 'M' or code == 's' then
	local days = floor(diff.age_days + extra_days)		local days = floor(diff.age_days + extra_days)
	local inc_hour		local inc_hour
Line 1,417:		Line 1,416:
	inc_hour = true		inc_hour = true
	end		end
			end
			elseif code == 'M' then
			if S >= 30 then
			M = M + 1
	end		end
	else		else
Line 1,443:		Line 1,446:
	elseif code == 'hm' then		elseif code == 'hm' then
	return hours, M		return hours, M
			elseif code == 'M' or code == 's' then
			M = hours * 60 + M
			if code == 'M' then
			return M
			end
			return M * 60 + S
	end		end
	return hours, M, S		return hours, M, S

wikipedia>Johnuniq: fix bug that can occur in {{age}} if attempt to make an invalid yyyy-02-29 date if need to fill month/day from other date

2020-02-29T10:08:10Z

fix bug that can occur in {{age}} if attempt to make an invalid yyyy-02-29 date if need to fill month/day from other date

← Older revision		Revision as of 10:08, 29 February 2020
Line 915:		Line 915:
	end		end
	if fillmonth or fillday then -- need to create a new date		if fillmonth or fillday then -- need to create a new date
			if (fillmonth or a.month) == 2 and (fillday or a.day) == 29 then
			-- Avoid invalid date, for example with {{age\|2013\|29 Feb 2016}} or {{age\|Feb 2013\|29 Jan 2015}}.
			if not is_leap_year(a.year, a.calendar) then
			fillday = 28
			end
			end
	a = Date(a, { month = fillmonth, day = fillday })		a = Date(a, { month = fillmonth, day = fillday })
	end		end

wikipedia>Johnuniq: update from sandbox: a date difference accepts an option to fill missing fields to handle partial dates

2018-03-29T06:32:10Z

update from sandbox: a date difference accepts an option to fill missing fields to handle partial dates

← Older revision		Revision as of 06:32, 29 March 2018
Line 897:		Line 897:
	end		end
	return date, options		return date, options
			end

			local function autofill(date1, date2)
			-- Fill any missing month or day in each date using the
			-- corresponding component from the other date, if present,
			-- or with 1 if both dates are missing the month or day.
			-- This gives a good result for calculating the difference
			-- between two partial dates when no range is wanted.
			-- Return filled date1, date2 (two full dates).
			local function filled(a, b)
			local fillmonth, fillday
			if not a.month then
			fillmonth = b.month or 1
			end
			if not a.day then
			fillday = b.day or 1
			end
			if fillmonth or fillday then -- need to create a new date
			a = Date(a, { month = fillmonth, day = fillday })
			end
			return a
			end
			return filled(date1, date2), filled(date2, date1)
	end		end

Line 1,160:		Line 1,183:
	options = {},		options = {},
	list = _date_list,		list = _date_list,
			subtract = function (self, rhs, options)
			return DateDiff(self, rhs, options)
			end,
	text = _date_text,		text = _date_text,
	}		}
Line 1,538:		Line 1,564:
	}		}

	function DateDiff(date1, date2) -- for forward declaration above		function DateDiff(date1, date2, options) -- for forward declaration above
	-- Return a table with the difference between two dates (date1 - date2).		-- Return a table with the difference between two dates (date1 - date2).
	-- The difference is negative if date1 is older than date2.		-- The difference is negative if date1 is older than date2.
Line 1,553:		Line 1,579:
	if not (is_date(date1) and is_date(date2) and date1.calendar == date2.calendar) then		if not (is_date(date1) and is_date(date2) and date1.calendar == date2.calendar) then
	return		return
			end
			local wantfill
			if type(options) == 'table' then
			wantfill = options.fill
	end		end
	local isnegative = false		local isnegative = false
Line 1,571:		Line 1,601:
	-------------A===B------------------------- A=2001-04-01 B=2001-04-30		-------------A===B------------------------- A=2001-04-01 B=2001-04-30
	--------C=====================D------------ C=2001-01-01 D=2001-12-31		--------C=====================D------------ C=2001-01-01 D=2001-12-31
	local function zdiff(date1, date2)		if wantfill then
	local diff = date1 - date2		date1, date2 = autofill(date1, date2)
	if diff.isnegative then		else
	return date1 - date1 -- a valid diff in case we call its methods		local function zdiff(date1, date2)
			local diff = date1 - date2
			if diff.isnegative then
			return date1 - date1 -- a valid diff in case we call its methods
			end
			return diff
			end
			local function getdate(date, which)
			return date.partial and date.partial[which] or date
	end		end
	~~return diff~~		local maxdiff = zdiff(getdate(date1, 'last'), getdate(date2, 'first'))
	~~end~~		local mindiff = zdiff(getdate(date1, 'first'), getdate(date2, 'last'))
	~~local function getdate(date, which)~~		local years, months
	~~return date.partial and date.partial[which] or date~~		if maxdiff.years == mindiff.years then
	~~end~~		years = maxdiff.years
	local maxdiff = zdiff(getdate(date1, 'last'), getdate(date2, 'first'))		if maxdiff.months == mindiff.months then
	local mindiff = zdiff(getdate(date1, 'first'), getdate(date2, 'last'))		months = maxdiff.months
	local years, months		else
	if maxdiff.years == mindiff.years then		months = { mindiff.months, maxdiff.months }
	years = maxdiff.years		end
	if maxdiff.months == mindiff.months then
	months = maxdiff.months
	else		else
	~~months~~ = { mindiff.~~months~~, maxdiff.~~months~~ }		years = { mindiff.years, maxdiff.years }
	end		end
	~~else~~		return setmetatable({
	years = ~~{ mindiff.~~years, maxdiff~~.years~~ }		date1 = date1,
			date2 = date2,
			partial = {
			years = years,
			months = months,
			maxdiff = maxdiff,
			mindiff = mindiff,
			},
			isnegative = isnegative,
			iszero = iszero,
			age = _diff_age,
			duration = _diff_duration,
			}, diffmt)
	end		end
	~~return setmetatable({~~
	~~date1 = date1,~~
	~~date2 = date2,~~
	~~partial = {~~
	~~years = years,~~
	~~months = months,~~
	~~maxdiff = maxdiff,~~
	~~mindiff = mindiff,~~
	},
	~~isnegative = isnegative,~~
	~~iszero = iszero,~~
	~~age = _diff_age,~~
	~~duration = _diff_duration,~~
	~~}, diffmt)~~
	end		end
	local y1, m1 = date1.year, date1.month		local y1, m1 = date1.year, date1.month

wikipedia>Johnuniq: update from sandbox: ranges of more time units

2018-02-28T04:45:29Z

update from sandbox: ranges of more time units

← Older revision		Revision as of 04:45, 28 February 2018
Line 1,329:		Line 1,329:
	local function choose(v)		local function choose(v)
	if type(v) == 'table' then		if type(v) == 'table' then
	if not wantrange then		if not wantrange or v[1] == v[2] then
	-- Example: Date('partial', 2005) - Date('partial', 2001) gives		-- Example: Date('partial', 2005) - Date('partial', 2001) gives
	-- diff.years = { 3, 4 } to show the range of possible results.		-- diff.years = { 3, 4 } to show the range of possible results.
Line 1,350:		Line 1,350:
	if code == 'y' then		if code == 'y' then
	return choose(diff.partial.years)		return choose(diff.partial.years)
			end
			if code == 'm' or code == 'w' or code == 'd' then
			return choose({ diff.partial.mindiff:age(code), diff.partial.maxdiff:age(code) })
	end		end
	return nil		return nil
Line 1,571:		Line 1,574:
	local diff = date1 - date2		local diff = date1 - date2
	if diff.isnegative then		if diff.isnegative then
	return ~~{ years = 0, months = 0 }~~		return date1 - date1 -- a valid diff in case we call its methods
	end		end
	return diff		return diff
Line 1,594:		Line 1,597:
	date1 = date1,		date1 = date1,
	date2 = date2,		date2 = date2,
	partial = { years = years, months = months },		partial = {
			years = years,
			months = months,
			maxdiff = maxdiff,
			mindiff = mindiff,
			},
	isnegative = isnegative,		isnegative = isnegative,
	iszero = iszero,		iszero = iszero,

wikipedia>Zzuuzz: Protected "Module:Date": High risk module ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2017-10-10T16:33:41Z

Protected "Module:Date": High risk module ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Older revision	Revision as of 16:33, 10 October 2017
(No difference)

wikipedia>Zzuuzz: Reverted edits by 181.112.152.222 (talk) to last version by Johnuniq

2017-10-10T16:29:32Z

Reverted edits by 181.112.152.222 (talk) to last version by Johnuniq

Show changes

181.112.152.222: repaired

2017-10-10T15:32:40Z

repaired

← Older revision	Revision as of 15:32, 10 October 2017
(No difference)