Module:Medical cases chart/data - Revision history

Mxn: Fixed off-by-one error

2021-09-01T05:04:01Z

Fixed off-by-one error

← Previous revision		Revision as of 05:04, 1 September 2021
Line 101:		Line 101:
	for i = #records, 1, -1 do		for i = #records, 1, -1 do
	local record = records[i]		local record = records[i]
	if record.streak > 3 then		if i < #records and record.streak > 3 then
	for j = i, i - record.streak + 3, -1 do		for j = i, i - record.streak + 3, -1 do
	table.remove(records, j)		table.remove(records, j)

Mxn: Undid revision 1041730950 by Mxn (talk)

2021-09-01T04:54:46Z

Undid revision 1041730950 by Mxn (talk)

← Previous revision		Revision as of 04:54, 1 September 2021
Line 102:		Line 102:
	local record = records[i]		local record = records[i]
	if record.streak > 3 then		if record.streak > 3 then
	for j = i, j - record.streak + 3, -1 do		for j = i, i - record.streak + 3, -1 do
	table.remove(records, j)		table.remove(records, j)
	end		end

Mxn: Fixed out of bounds error

2021-09-01T04:54:20Z

Fixed out of bounds error

← Previous revision		Revision as of 04:54, 1 September 2021
Line 102:		Line 102:
	local record = records[i]		local record = records[i]
	if record.streak > 3 then		if record.streak > 3 then
	for j = i, i - record.streak + 3, -1 do		for j = i, j - record.streak + 3, -1 do
	table.remove(records, j)		table.remove(records, j)
	end		end

Timbaaa: Add logic for change view format

2020-08-22T15:32:21Z

Add logic for change view format

← Previous revision		Revision as of 15:32, 22 August 2020
Line 21:		Line 21:
	local change = current / previous * 100 - 100		local change = current / previous * 100 - 100
	local sign = change < 0 and "−" or "+"		local sign = change < 0 and "−" or "+"

⚫	return mw.ustring.format("%s%s%%", sign, ~~lang:formatNum(round~~(math.abs(change))))
			if (math.abs(change)) >= 10 then
			return mw.ustring.format("%s%.0f%%", sign, (math.abs(change)))
			end
			if (math.abs(change)) < 1 then
			return mw.ustring.format("%s%.3f%%", sign, (math.abs(change)))
			end
		⚫	return mw.ustring.format("%s%.2f%%", sign, (math.abs(change)))
	end		end

Mxn: Updated tabular data page name

2020-05-28T00:22:08Z

Updated tabular data page name

← Previous revision		Revision as of 00:22, 28 May 2020
Line 1:		Line 1:
	--- Example usage:		--- Example usage:
	--- {{#invoke:Medical cases chart/data\|externalData\|page=COVID-19 ~~Cases~~ in Santa Clara County, California.tab\|recoveries=hospitalized\|cases=totalConfirmedCases}}		--- {{#invoke:Medical cases chart/data\|externalData\|page=COVID-19 cases in Santa Clara County, California.tab\|recoveries=hospitalized\|cases=totalConfirmedCases}}
	--- =p._externalData({datapage="COVID-19 ~~Cases~~ in Santa Clara County, California.tab",datarecoveries="hospitalized",datacases="totalConfirmedCases"})		--- =p._externalData({datapage="COVID-19 cases in Santa Clara County, California.tab",datarecoveries="hospitalized",datacases="totalConfirmedCases"})

	local p = {}		local p = {}

Mxn at 00:58, 2 May 2020

2020-05-02T00:58:57Z

← Previous revision		Revision as of 00:58, 2 May 2020
Line 69:		Line 69:
	}		}
	local prevRecord = records[#records] or {}		local prevRecord = records[#records] or {}
	if casesIndex and not prevRecord.cases and record.cases > 0 then		if casesIndex and not prevRecord.cases and record.cases and record.cases > 0 then
	record.options.firstright1 = "y"		record.options.firstright1 = "y"
	end		end
	if deathsIndex and prevRecord.deaths == 0 and record.deaths > 0 then		if deathsIndex and prevRecord.deaths == 0 and record.deaths and record.deaths > 0 then
	record.options.firstright2 = "y"		record.options.firstright2 = "y"
	end		end

Pppery at 01:17, 23 April 2020

2020-04-23T01:17:37Z

← Previous revision		Revision as of 01:17, 23 April 2020
Line 1:		Line 1:
	--- Example usage:		--- Example usage:
	--- {{#invoke~~:Module~~:Medical cases chart/data\|externalData\|page=COVID-19 Cases in Santa Clara County, California.tab\|recoveries=hospitalized\|cases=totalConfirmedCases}}		--- {{#invoke:Medical cases chart/data\|externalData\|page=COVID-19 Cases in Santa Clara County, California.tab\|recoveries=hospitalized\|cases=totalConfirmedCases}}
	--- =p._externalData({datapage="COVID-19 Cases in Santa Clara County, California.tab",datarecoveries="hospitalized",datacases="totalConfirmedCases"})		--- =p._externalData({datapage="COVID-19 Cases in Santa Clara County, California.tab",datarecoveries="hospitalized",datacases="totalConfirmedCases"})

Ahecht: rename "page name" to page to make calling it simpler, prepend arguments with "data" to avoid collisions with arguments for Module:Medical cases chart

2020-04-22T22:00:05Z

rename "page name" to page to make calling it simpler, prepend arguments with "data" to avoid collisions with arguments for Module:Medical cases chart

← Previous revision		Revision as of 22:00, 22 April 2020
Line 1:		Line 1:
	--- Example usage:		--- Example usage:
	--- {{#invoke:Module:Medical cases chart/data\|externalData\|page ~~name~~=COVID-19 Cases in Santa Clara County, California.tab\|recoveries=hospitalized\|cases=totalConfirmedCases}}		--- {{#invoke:Module:Medical cases chart/data\|externalData\|page=COVID-19 Cases in Santa Clara County, California.tab\|recoveries=hospitalized\|cases=totalConfirmedCases}}
	--- =p._externalData({~~["page name"]~~="COVID-19 Cases in Santa Clara County, California.tab",~~recoveries~~="hospitalized",~~cases~~="totalConfirmedCases"})		--- =p._externalData({datapage="COVID-19 Cases in Santa Clara County, California.tab",datarecoveries="hospitalized",datacases="totalConfirmedCases"})

	local p = {}		local p = {}
Line 25:		Line 25:

	function p._externalData(args)		function p._externalData(args)
	local data = mw.ext.data.get(args~~["page name"]~~)		local data = mw.ext.data.get(args.datapage)

	local dateIndex		local dateIndex
Line 34:		Line 34:
	local class5Index		local class5Index
	for i, field in ipairs(data.schema.fields) do		for i, field in ipairs(data.schema.fields) do
	if field.name == "date" or field.name == args.~~date~~ then		if field.name == "date" or field.name == args.datadate then
	dateIndex = i		dateIndex = i
	elseif field.name == "deaths" or field.name == args.~~deaths~~ then		elseif field.name == "deaths" or field.name == args.datadeaths then
	deathsIndex = i		deathsIndex = i
	elseif field.name == "recoveries" or field.name == args.~~recoveries~~ then		elseif field.name == "recoveries" or field.name == args.datarecoveries then
	recoveriesIndex = i		recoveriesIndex = i
	elseif field.name == "cases" or field.name == args.~~cases~~ then		elseif field.name == "cases" or field.name == args.datacases then
	casesIndex = i		casesIndex = i
	elseif field.name == "class4" or field.name == args.~~class4~~ then		elseif field.name == "class4" or field.name == args.dataclass4 then
	class4Index = i		class4Index = i
	elseif field.name == "class5" or field.name == args.~~class5~~ then		elseif field.name == "class5" or field.name == args.dataclass5 then
	class5Index = i		class5Index = i
	end		end
	end		end
	assert(dateIndex, "Date field not found.")		assert(dateIndex, "Date field not found.")
	assert(deathsIndex or not args.~~deaths~~, "Deaths field not found.")		assert(deathsIndex or not args.datadeaths, "Deaths field not found.")
	assert(recoveriesIndex or not args.~~recoveries~~, "Recoveries field not found.")		assert(recoveriesIndex or not args.datarecoveries, "Recoveries field not found.")
	assert(casesIndex or not args.~~cases~~, "Cases field not found.")		assert(casesIndex or not args.datacases, "Cases field not found.")
	assert(class4Index or not args.~~class4~~, "Class 4 field not found.")		assert(class4Index or not args.dataclass4, "Class 4 field not found.")
	assert(class5Index or not args.~~class5~~, "Class 5 field not found.")		assert(class5Index or not args.dataclass5, "Class 5 field not found.")

	-- Restructure the data as tables with keys.		-- Restructure the data as tables with keys.
Line 131:		Line 131:

	function p.externalData(frame)		function p.externalData(frame)
			local args = {}
⚫	return p._externalData(~~frame.~~args)
			for k,v in pairs(frame.args) do
			if (v or '') ~= '' then
			args['data'..k] = v
			end
			end
		⚫	return p._externalData(args)
	end		end
	return p		return p

Ahecht: Make more easily callable from other modules

2020-04-22T21:50:01Z

Make more easily callable from other modules

← Previous revision		Revision as of 21:50, 22 April 2020
Line 1:		Line 1:
	--- Example usage:		--- Example usage:
	--- {{#invoke:Module:Medical cases chart/data\|externalData\|page name=COVID-19 Cases in Santa Clara County, California.tab\|recoveries=hospitalized\|cases=totalConfirmedCases}}		--- {{#invoke:Module:Medical cases chart/data\|externalData\|page name=COVID-19 Cases in Santa Clara County, California.tab\|recoveries=hospitalized\|cases=totalConfirmedCases}}
	--- =p.~~externalData~~(~~mw.getCurrentFrame():newChild{args=~~{["page name"]="COVID-19 Cases in Santa Clara County, California.tab",recoveries="hospitalized",cases="totalConfirmedCases"}})		--- =p._externalData({["page name"]="COVID-19 Cases in Santa Clara County, California.tab",recoveries="hospitalized",cases="totalConfirmedCases"})

	local p = {}		local p = {}
Line 7:		Line 7:
	local english = mw.getLanguage("en")		local english = mw.getLanguage("en")

	function round(x)		local function round(x)
	return (math.modf(x + (x < 0 and -0.5 or 0.5)))		return (math.modf(x + (x < 0 and -0.5 or 0.5)))
	end		end

	function formatChange(previous, current)		local function formatChange(previous, current)
	if not previous or previous == 0 then		if not previous or previous == 0 then
	return		return
Line 24:		Line 24:
	end		end

	function p.~~externalData~~(~~frame~~)		function p._externalData(args)
	local data = mw.ext.data.get(~~frame.~~args["page name"])		local data = mw.ext.data.get(args["page name"])

	local dateIndex		local dateIndex
Line 34:		Line 34:
	local class5Index		local class5Index
	for i, field in ipairs(data.schema.fields) do		for i, field in ipairs(data.schema.fields) do
	if field.name == "date" or field.name == ~~frame.~~args.date then		if field.name == "date" or field.name == args.date then
	dateIndex = i		dateIndex = i
	elseif field.name == "deaths" or field.name == ~~frame.~~args.deaths then		elseif field.name == "deaths" or field.name == args.deaths then
	deathsIndex = i		deathsIndex = i
	elseif field.name == "recoveries" or field.name == ~~frame.~~args.recoveries then		elseif field.name == "recoveries" or field.name == args.recoveries then
	recoveriesIndex = i		recoveriesIndex = i
	elseif field.name == "cases" or field.name == ~~frame.~~args.cases then		elseif field.name == "cases" or field.name == args.cases then
	casesIndex = i		casesIndex = i
	elseif field.name == "class4" or field.name == ~~frame.~~args.class4 then		elseif field.name == "class4" or field.name == args.class4 then
	class4Index = i		class4Index = i
	elseif field.name == "class5" or field.name == ~~frame.~~args.class5 then		elseif field.name == "class5" or field.name == args.class5 then
	class5Index = i		class5Index = i
	end		end
	end		end
	assert(dateIndex, "Date field not found.")		assert(dateIndex, "Date field not found.")
	assert(deathsIndex or not ~~frame.~~args.deaths, "Deaths field not found.")		assert(deathsIndex or not args.deaths, "Deaths field not found.")
	assert(recoveriesIndex or not ~~frame.~~args.recoveries, "Recoveries field not found.")		assert(recoveriesIndex or not args.recoveries, "Recoveries field not found.")
	assert(casesIndex or not ~~frame.~~args.cases, "Cases field not found.")		assert(casesIndex or not args.cases, "Cases field not found.")
	assert(class4Index or not ~~frame.~~args.class4, "Class 4 field not found.")		assert(class4Index or not args.class4, "Class 4 field not found.")
	assert(class5Index or not ~~frame.~~args.class5, "Class 5 field not found.")		assert(class5Index or not args.class5, "Class 5 field not found.")

	-- Restructure the data as tables with keys.		-- Restructure the data as tables with keys.
Line 130:		Line 130:
	end		end

			function p.externalData(frame)
			return p._externalData(frame.args)
			end
	return p		return p

Mxn: Also fill in gaps in cases

2020-04-21T22:03:51Z

Also fill in gaps in cases

← Previous revision		Revision as of 22:03, 21 April 2020
Line 77:		Line 77:
	if deathsIndex and (prevRecord.deaths or prevRecord.assumedDeaths) and not record.deaths then		if deathsIndex and (prevRecord.deaths or prevRecord.assumedDeaths) and not record.deaths then
	record.assumedDeaths = prevRecord.deaths or prevRecord.assumedDeaths		record.assumedDeaths = prevRecord.deaths or prevRecord.assumedDeaths
			end
			if casesIndex and (prevRecord.cases or prevRecord.assumedCases) and not record.cases then
			record.assumedCases = prevRecord.cases or prevRecord.assumedCases
	end		end
	if record.deaths == prevRecord.deaths		if record.deaths == prevRecord.deaths
Line 111:		Line 114:
	tostring(record.deaths or record.assumedDeaths or ""),		tostring(record.deaths or record.assumedDeaths or ""),
	tostring(record.recoveries or ""),		tostring(record.recoveries or ""),
	tostring(record.cases or ""),		tostring(record.cases or record.assumedCases or ""),
	tostring(record.class4 or ""),		tostring(record.class4 or ""),
	tostring(record.class5 or ""),		tostring(record.class5 or ""),
	record.cases and lang:formatNum(record.cases) or "",		record.cases and lang:formatNum(record.cases) or "",
	record.cases and formatChange(prevRecord.cases, record.cases) or "",		record.cases and formatChange(prevRecord.cases or prevRecord.assumedCases, record.cases) or "",
	record.deaths and lang:formatNum(record.deaths) or "",		record.deaths and lang:formatNum(record.deaths) or "",
	record.deaths and formatChange(prevRecord.deaths or prevRecord.assumedDeaths, record.deaths) or "",		record.deaths and formatChange(prevRecord.deaths or prevRecord.assumedDeaths, record.deaths) or "",