Module:Medical cases chart - Revision history

Ahecht: add weeklyoffset

2025-04-22T17:39:17Z

add weeklyoffset

← Previous revision		Revision as of 17:39, 22 April 2025
Line 661:		Line 661:

	local bars, dateList = {}, {}		local bars, dateList = {}, {}
			args.weeklyoffset = tonumber(args.weeklyoffset) or 0
	for i, row in ipairs(rows) do -- build rows		for i, row in ipairs(rows) do -- build rows
	if (not yesno(args.weekly)) or (math.mod(i-1, 7) == 0) then		if (not yesno(args.weekly)) or (math.mod(i-1+args.weeklyoffset, 7) == 0) then
	row.divisor = divisor		row.divisor = divisor
	row.numwidth = args.numwidth		row.numwidth = args.numwidth
Line 813:		Line 814:
	buildargs.population = args.population		buildargs.population = args.population
	buildargs.weekly = args.weekly		buildargs.weekly = args.weekly
			buildargs.weeklyoffset = args.weeklyoffset

	local dateList		local dateList

Ahecht: Add "weekly" parameter

2025-03-18T18:11:44Z

Add "weekly" parameter

← Previous revision		Revision as of 18:11, 18 March 2025
Line 569:		Line 569:
	value = changetype == 'o' and '' or lang:formatNum(num) -- set value to num if changetype isn't 'o'		value = changetype == 'o' and '' or lang:formatNum(num) -- set value to num if changetype isn't 'o'
	if not change and not barargs['firstright' .. col] then		if not change and not barargs['firstright' .. col] then
			if yesno(args.weekly) then
			prevnum = nil
			if barargs.nDate and rows then
			local tPrevWeekRow = p._findIntervalRow(rows, barargs.nDate-7243600, 3600, false)
			if tPrevWeekRow then
			prevnum = tPrevWeekRow[(col==1) and 4 or 2]
			end
			end
			end
	if prevnum and prevnum ~= 0 then -- data on previous row		if prevnum and prevnum ~= 0 then -- data on previous row
	if num - prevnum ~= 0 then --data has changed since previous row		if num - prevnum ~= 0 then --data has changed since previous row
Line 632:		Line 641:
	barargs[9], barargs[10] = fillCols(2, barargs[10])		barargs[9], barargs[10] = fillCols(2, barargs[10])
	end		end


	rows[#rows+1] = barargs		rows[#rows+1] = barargs
	prevRow = barargs		prevRow = barargs
Line 653:		Line 662:
	local bars, dateList = {}, {}		local bars, dateList = {}, {}
	for i, row in ipairs(rows) do -- build rows		for i, row in ipairs(rows) do -- build rows
			if (not yesno(args.weekly)) or (math.mod(i-1, 7) == 0) then
	row.divisor = divisor
	row.~~numwidth~~ = ~~args.numwidth~~		row.divisor = divisor
	row.~~collapsible~~ = args.~~collapsible~~		row.numwidth = args.numwidth
	row.~~duration~~ = args.~~duration~~		row.collapsible = args.collapsible
	row.~~nooverlap~~ = args.~~nooverlap~~		row.duration = args.duration
	row.daysToEnd = (lastDate - (row.nDate or row.nEndDate or row.nAltEndDate)) / 86400		row.nooverlap = args.nooverlap
			row.daysToEnd = (lastDate - (row.nDate or row.nEndDate or row.nAltEndDate)) / 86400
	row.multiyear = multiyear		row.multiyear = multiyear


	bars[#bars+1], dateList[#dateList+1] = p._row(row)		bars[#bars+1], dateList[#dateList+1] = p._row(row)
			end
	end		end

Line 801:		Line 812:
	buildargs.nooverlap = args.nooverlap		buildargs.nooverlap = args.nooverlap
	buildargs.population = args.population		buildargs.population = args.population
			buildargs.weekly = args.weekly

	local dateList		local dateList

Ahecht: Module:Bar box → Module:Bar

2024-07-14T15:58:26Z

Module:Bar box → Module:Bar

← Previous revision		Revision as of 15:58, 14 July 2024
Line 1:		Line 1:
	local yesno = require('Module:Yesno')		local yesno = require('Module:Yesno')
	local BarBox = unpack(require('Module:Bar ~~box~~'))		local BarBox = unpack(require('Module:Bar'))

	local lang = mw.getContentLanguage()		local lang = mw.getContentLanguage()

Kohraa Mondel: more stats for changetype 'w'

2022-01-22T18:56:08Z

more stats for changetype 'w'

Show changes

Kohraa Mondel: added absolute daily change display on mouse-over, if changetype is w (7-days-incidence)

2021-11-17T22:04:04Z

added absolute daily change display on mouse-over, if changetype is w (7-days-incidence)

← Previous revision		Revision as of 22:04, 17 November 2021
Line 435:		Line 435:
	if prevnum and prevnum ~= 0 then -- data on previous row		if prevnum and prevnum ~= 0 then -- data on previous row
	if num - prevnum ~= 0 then --data has changed since previous row		if num - prevnum ~= 0 then --data has changed since previous row
	~~change~~ = num-prevnum		local nChange = num - prevnum
	if changetype == 'a' then -- change type is "absolute"		if changetype == 'a' then -- change type is "absolute"
	if ~~change~~ > 0 then		if nChange > 0 then
	change = '+' .. lang:formatNum(~~change~~)		change = '+' .. lang:formatNum(nChange)
	end		end
	elseif changetype == 'w' and args.population then -- changetype == 'r' or		elseif changetype == 'w' and args.population then -- changetype == 'r' or
Line 445:		Line 445:
	-- find data row from 7 days before +- 1 hour		-- find data row from 7 days before +- 1 hour
	local tIntervRow = p._findIntervalRow(rows, barargs.nDate-7243600, 3600, false)		local tIntervRow = p._findIntervalRow(rows, barargs.nDate-7243600, 3600, false)
			local tPrevDayRow = p._findIntervalRow(rows, barargs.nDate-24*3600, 3600, false)
	if tIntervRow then		if tIntervRow then
	local nDatCol = (col==1) and 4 or 2		local nDatCol = (col==1) and 4 or 2
Line 452:		Line 453:
	else		else
	change = nDiff and ('<span title="7 days incidence per 100,000 population.">' .. tostring(mw.ustring.format('%.1f', nDiff/args.population*100000)) .. '</span>') or i18n.na		change = nDiff and ('<span title="7 days incidence per 100,000 population.">' .. tostring(mw.ustring.format('%.1f', nDiff/args.population*100000)) .. '</span>') or i18n.na
			if tPrevDayRow and tPrevDayRow[nDatCol] then
			value = '<span title="daily change: +' .. lang:formatNum(num - tPrevDayRow[nDatCol]) .. '>' .. value .. '</span>'
			end
	end		end
	else		else
Line 462:		Line 466:

	else -- change type is "percent", "only percent" or undefined		else -- change type is "percent", "only percent" or undefined
	local percent = 100 * ~~change~~ / prevnum -- calculate percent		local percent = 100 * nChange / prevnum -- calculate percent
	local rounding = math.abs(percent) >= 10 and '%.0f' or math.abs(percent) >= 1 and '%.1f' or '%.2f'		local rounding = math.abs(percent) >= 10 and '%.0f' or math.abs(percent) >= 1 and '%.1f' or '%.2f'
	percent = tonumber(rounding:format(percent)) -- round to two sigfigs		percent = tonumber(rounding:format(percent)) -- round to two sigfigs

Kohraa Mondel: Added changetype "w" for weekly incidence along with population parameter that is required to determine incidence (per 100.000 population)

2021-11-07T18:37:31Z

Added changetype "w" for weekly incidence along with population parameter that is required to determine incidence (per 100.000 population)

@@ Line 12: / Line 12: @@
 local p = {}
 function p._toggleButton(active, customtoggles, id, label)
@@ Line 402: / Line 440: @@
 									change = '+' .. lang:formatNum(change)
 								end
 							else -- change type is "percent", "only percent" or undefined
 								local percent = 100 * change / prevnum -- calculate percent
@@ Line 599: / Line 658: @@
 	buildargs.duration = args.duration
 	buildargs.nooverlap = args.nooverlap
 	local dateList

Alexiscoutinho: Finished deprecated parameter renaming

2021-08-26T17:21:27Z

Finished deprecated parameter renaming

← Previous revision		Revision as of 17:21, 26 August 2021
Line 616:		Line 616:
	end		end

	barargs.footer = args.footer ~~or args.caption~~		barargs.footer = args.footer
	local box = BarBox.create(barargs)		local box = BarBox.create(barargs)
	return tostring(box)		return tostring(box)

Alexiscoutinho: Started deprecated parameter renaming

2021-08-26T00:21:43Z

Started deprecated parameter renaming

← Previous revision		Revision as of 00:21, 26 August 2021
Line 616:		Line 616:
	end		end

	barargs.footer = args.caption		barargs.footer = args.footer or args.caption
	local box = BarBox.create(barargs)		local box = BarBox.create(barargs)
	return tostring(box)		return tostring(box)

Alexiscoutinho: Fixed class import

2021-07-29T17:43:58Z

Fixed class import

← Previous revision		Revision as of 17:43, 29 July 2021
Line 1:		Line 1:
	local yesno = require('Module:Yesno')		local yesno = require('Module:Yesno')
	local BarBox = require('Module:Bar box')~~.BarBox~~		local BarBox = unpack(require('Module:Bar box'))

	local lang = mw.getContentLanguage()		local lang = mw.getContentLanguage()

Alexiscoutinho: Revived barColors function which is still used elsewhere

2021-06-27T19:59:56Z

Revived barColors function which is still used elsewhere

← Previous revision		Revision as of 19:59, 27 June 2021
Line 619:		Line 619:
	local box = BarBox.create(barargs)		local box = BarBox.create(barargs)
	return tostring(box)		return tostring(box)
			end

		⚫	local getArgs = require('Module:Arguments').getArgs

			function p.barColors(frame)
			local args = getArgs(frame)
			return p._barColors[tonumber(args[1])]
	end		end

	function p.chart(frame)		function p.chart(frame)
⚫	local getArgs = require('Module:Arguments').getArgs
	local args = getArgs(frame, {		local args = getArgs(frame, {
	valueFunc = function (key, value)		valueFunc = function (key, value)