Module:Date - Revision history

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

← Previous 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
			a = Date(a, {
	if (fillmonth or a.month) == 2 and (fillday or a.day) == 29 then
		⚫	month = fillmonth,
	-- 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~~		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

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

← Previous 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

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

Show changes

Johnuniq: update from sandbox: ranges of more time units

2018-02-28T04:45:29Z

update from sandbox: ranges of more time units

← Previous 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,

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))

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

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

Can't load revision 804702103

181.112.152.222: repaired

2017-10-10T15:32:40Z

repaired

Can't load revision 804693755

181.112.152.222: improve

2017-10-10T15:29:01Z

improve

Can't load revision 804693270

181.112.152.222: Enhanced

2017-10-10T15:23:10Z

Enhanced

Can't load revision 804692441

Johnuniq: support date difference codes 'dhms' and 'hms'

2016-10-15T05:49:02Z

support date difference codes 'dhms' and 'hms'

← Previous revision		Revision as of 05:49, 15 October 2016
Line 1,102:		Line 1,102:
	-- Return true if dates identify same date/time where, for example,		-- Return true if dates identify same date/time where, for example,
	-- Date(-4712, 1, 1, 'Julian') == Date(-4713, 11, 24, 'Gregorian') is true.		-- Date(-4712, 1, 1, 'Julian') == Date(-4713, 11, 24, 'Gregorian') is true.
	-- This is ~~only~~ called if lhs and rhs have the same ~~metatable~~.		-- This is called only if lhs and rhs have the same type and the same metamethod.
	if lhs.partial or rhs.partial then		if lhs.partial or rhs.partial then
	-- One date is partial; the other is a partial or a full date.		-- One date is partial; the other is a partial or a full date.
Line 1,114:		Line 1,114:
	-- Return true if lhs < rhs, for example,		-- Return true if lhs < rhs, for example,
	-- Date('1 Jan 2016') < Date('06:00 1 Jan 2016') is true.		-- Date('1 Jan 2016') < Date('06:00 1 Jan 2016') is true.
	-- This is ~~only~~ called if lhs and rhs have the same ~~metatable~~.		-- This is called only if lhs and rhs have the same type and the same metamethod.
	if lhs.partial or rhs.partial then		if lhs.partial or rhs.partial then
	-- One date is partial; the other is a partial or a full date.		-- One date is partial; the other is a partial or a full date.
Line 1,366:		Line 1,366:
	return floor(days/7 + offset)		return floor(days/7 + offset)
	end		end
	local H, M = diff.hours, diff.minutes		local H, M, S = diff.hours, diff.minutes, diff.seconds
	if code == 'dh' or code == 'dhm' or code == 'h' or code == 'hm' then		if code == 'dh' or code == 'dhm' or code == 'dhms' or code == 'h' or code == 'hm' or code == 'hms' 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,375:		Line 1,375:
	inc_hour = true		inc_hour = true
	end		end
	elseif ~~diff.seconds~~ >= 30 then		elseif code == 'dhm' or code == 'hm' then
	M = M + 1		if S >= 30 then
	if M >= 60 ~~then~~		M = M + 1
	M = 0		if M >= 60 then
	inc_hour = true		M = 0
			inc_hour = true
			end
	end		end
			else
			-- Nothing needed because S is an integer.
	end		end
	if inc_hour then		if inc_hour then
Line 1,390:		Line 1,394:
	end		end
	end		end
	if code == 'dh' then		if code == 'dh' or code == 'dhm' or code == 'dhms' then
		⚫	if code == 'dh' then
	return days, H		return days, H
⚫	~~elseif~~ code == '~~h' or code == 'hm~~' then
	~~local~~ ~~hours~~ = ~~days * 24 +~~ H		elseif code == 'dhm' then
	if ~~code~~ == ~~'h' then~~		return days, H, M
			else
⚫	return hours
			return days, H, M, S
	end		end
			end
			local hours = days * 24 + H
			if code == 'h' then
		⚫	return hours
			elseif code == 'hm' then
	return hours, M		return hours, M
	end		end
	return ~~days~~, H, M		return hours, M, S
	end		end
	if wantround then		if wantround then
Line 1,408:		Line 1,418:
	end		end
	elseif code == 'ymdhm' or code == 'ymwdhm' then		elseif code == 'ymdhm' or code == 'ymwdhm' then
	if ~~diff.seconds~~ >= 30 then		if S >= 30 then
	M = M + 1		M = M + 1
	if M >= 60 then		if M >= 60 then