Module:Medical cases chart/sandbox2 - Revision history

Kohraa Mondel: removed unused code

2022-01-26T18:34:10Z

removed unused code

← Previous revision		Revision as of 18:34, 26 January 2022
Line 400:		Line 400:
	local nData1 = barargs[xData1Key] or barargs[4]		local nData1 = barargs[xData1Key] or barargs[4]
	local nData2 = barargs[xData2Key] or barargs[2]		local nData2 = barargs[xData2Key] or barargs[2]


	-- local nData1Diff1Max, nData1Diff1MaxDate, nData12Diff1Max, nData2Diff1MaxDate
	-- local nData1i7Max, nData1i7MaxDate, nData12i7Max, nData2i7MaxDate

	if bIsW1 and nData1 then		if bIsW1 and nData1 then
	tBarStats.nData1 = nData1		tBarStats.nData1 = nData1

Kohraa Mondel: removed unused code

2022-01-26T18:06:07Z

removed unused code

@@ Line 12: / Line 12: @@
 local p = {}
 function p._toggleButton(active, customtoggles, id, label)
@@ Line 576: / Line 538: @@
 									change = '+' .. lang:formatNum(nChange)
 								end
 							else -- change type is "percent", "only percent" or undefined
 								local percent = 100 * nChange / prevnum -- calculate percent

Kohraa Mondel: finished stas summary on mause-over

2022-01-22T18:52:50Z

finished stas summary on mause-over

Show changes

Kohraa Mondel: intermediate save

2022-01-21T18:13:58Z

intermediate save

← Previous revision		Revision as of 18:13, 21 January 2022
Line 539:		Line 539:
	sCmnt = sCmnt .. ", 14 days before: +" .. lang:formatNum(nP14Diff1)		sCmnt = sCmnt .. ", 14 days before: +" .. lang:formatNum(nP14Diff1)
	end		end
	if not (nData1Diff1Max == nil) and not (sCmnt == "") then		if col == 1 and not (nData1Diff1Max == nil) and not (sCmnt == "") then
	sCmnt = sCmnt .. ", all-time max: +" .. lang:formatNum(nData1Diff1Max) .. " at " .. nData1Diff1MaxDate		sCmnt = sCmnt .. ", all-time max: +" .. lang:formatNum(nData1Diff1Max) .. " at " .. nData1Diff1MaxDate
	end		end

Kohraa Mondel: intermediate for more stats

2022-01-21T18:04:26Z

intermediate for more stats

@@ Line 345: / Line 345: @@
 	local rows, prevRow, tStats = {}, {}, {}
 	for line in mw.text.gsplit(args.data, '\n') do
 		local i, barargs = 1, {}
@@ Line 425: / Line 427: @@
 		-- update tStats if at least one column changetype is 'w'
-		local tBarStats = {}
+		local tBarStats = nil
 		if barargs[1] and (bIsW1 or bIsW2) then
 			bValid, barargs.nDate = pcall(getUnix, barargs[1])
@@ Line 437: / Line 439: @@
 			local nData2 = barargs[xData2Key] or barargs[2]
 			if bIsW1 and nData1 then
 				tBarStats.nData1 = nData1
 				tBarStats.nPop = nPop
@@ Line 442: / Line 454: @@
 					if not (tBarStats1.nData1 == nil) then
 						tBarStats.nData1Diff1 = nData1 - tBarStats1.nData1
 					end
 				end
@@ Line 498: / Line 514: @@
 			end
 				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 num - prevnum ~= 0 then --data has changed since previous row
 							local nChange = num - prevnum

Kohraa Mondel: intermediate save for more stats

2022-01-20T17:21:26Z

intermediate save for more stats

@@ Line 12: / Line 12: @@
 local p = {}
@@ Line 334: / Line 333: @@
 	end
-	local nChngTp2 = args.changetype2
+	local sChngTp1 = args.changetype1
 	local nPop = args.population
-	local bIsW1 = nChngTp1 == 'w' and nPop
+	local bIsW1 = sChngTp1 == 'w' and nPop
-	local bIsW2 = nChngTp2 == 'w' and nPop
+	local bIsW2 = sChngTp2 == 'w' and nPop
 	local rows, prevRow, tStats = {}, {}, {}
@@ Line 420: / Line 424: @@
 		end
 		if barargs[1] and (bIsW1 or bIsW2) then
-			bValid, nDate = pcall(getUnix, barargs[1])
+			bValid, barargs.nDate = pcall(getUnix, barargs[1])
 			assert(bValid, 'invalid date "' .. barargs[1] .. '"')
-			tStats[nDate] = {}
+			barargs.nDate = tonumber(barargs.nDate)
-			local tStats7 = tStats[barargs.nDate-604800] -- 7 days before info
+			local tBarStats1 = tStats[barargs.nDate-86400] -- previous days info
-			local tStats14 = tStats[barargs.nDate-1209600] -- 14 days before info
+			local tBarStats7 = tStats[barargs.nDate-604800] -- 7 days before info
 		end
@@ Line 449: / Line 502: @@
 				if not change and not barargs['firstright' .. col] then
 						if num - prevnum ~= 0 then --data has changed since previous row
 							local nChange = num - prevnum
@@ Line 457: / Line 523: @@
 								end
 							elseif changetype == 'w' and args.population then -- changetype == 'r' or
-								 -- change type is "r"(olling average over 7 days period) or incidence
+								 -- change type is "r"(olling average over 7 days period) or "w"(eekly incidence per 100.000 pop)
 								if barargs.nDate and rows then
 									-- find data row from 7 days before +- 1 hour
@@ Line 517: / Line 583: @@
 	end
-	error(mw.dumpObject(tStats))
+	--error(mw.dumpObject(tStats))
 	-- calculate and pass repetitive (except daysToEnd) parameters to each row

Kohraa Mondel: intermediate save for more stats

2022-01-07T19:42:33Z

intermediate save for more stats

← Previous revision		Revision as of 19:42, 7 January 2022
Line 12:		Line 12:

	local p = {}		local p = {}



Line 332:		Line 333:
	return lang:formatDate('U', timestamp)		return lang:formatDate('U', timestamp)
	end		end

			local nChngTp1 = args.changetype1
			local nChngTp2 = args.changetype2
			local nPop = args.population
			local bIsW1 = nChngTp1 == 'w' and nPop
			local bIsW2 = nChngTp2 == 'w' and nPop

	local rows, prevRow = {}, {}		local rows, prevRow, tStats = {}, {}, {}
	for line in mw.text.gsplit(args.data, '\n') do		for line in mw.text.gsplit(args.data, '\n') do
	local i, barargs = 1, {}		local i, barargs = 1, {}
	-- parameter parsing, basic type/missing value handling		-- line parameter parsing, basic type/missing value handling
	for parameter in mw.text.gsplit(line, ';') do		for parameter in mw.text.gsplit(line, ';') do
	if parameter:find('^%s*%a') then		if parameter:find('^%s*%a') then
Line 411:		Line 418:
	end		end
	end		end
			end

			if barargs[1] and (bIsW1 or bIsW2) then
			bValid, nDate = pcall(getUnix, barargs[1])
			assert(bValid, 'invalid date "' .. barargs[1] .. '"')
			tStats[nDate] = {}
			local tStats1 = tStats[barargs.nDate-86400] -- previous days info
			local tStats7 = tStats[barargs.nDate-604800] -- 7 days before info
			local tStats14 = tStats[barargs.nDate-1209600] -- 14 days before info
	end		end

Line 500:		Line 516:
	prevRow = barargs		prevRow = barargs
	end		end

			error(mw.dumpObject(tStats))

	-- calculate and pass repetitive (except daysToEnd) parameters to each row		-- calculate and pass repetitive (except daysToEnd) parameters to each row

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

2021-11-17T22:01:36Z

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

← Previous revision		Revision as of 22:01, 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: remove preceeding "i7: " for type "w"

2021-10-31T12:07:08Z

remove preceeding "i7: " for type "w"

← Previous revision		Revision as of 12:07, 31 October 2021
Line 451:		Line 451:
	change = nDiff and ('<span title="7 days rolling average of daily change">r7: ' .. tostring(mw.ustring.format('%.0f', nDiff/7)) .. '</span>') or i18n.na		change = nDiff and ('<span title="7 days rolling average of daily change">r7: ' .. tostring(mw.ustring.format('%.0f', nDiff/7)) .. '</span>') or i18n.na
	else		else
	change = nDiff and ('<span title="7 days incidence per 100,000 population.">~~i7:~~ ' .. 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
	end		end
	else		else

Kohraa Mondel: copy population from args to barargs

2021-10-31T12:01:31Z

copy population from args to barargs

← Previous revision		Revision as of 12:01, 31 October 2021
Line 18:		Line 18:
	-- The first row with nDate within nTime +-nTol is returned.		-- The first row with nDate within nTime +-nTol is returned.
	-- If nDate table entry is nil, the row will be skipped.		-- If nDate table entry is nil, the row will be skipped.
	-- If moving backwards a time stamp is found dating back to before tolerance window, nil is returned.		-- If moving backwards a time stamp is found dating back to before tolerance window, nil is returned.
	-- If the end of tRows is reached without a match for the tolerance window, also nil is returned.		-- If the end of tRows is reached without a match for the tolerance window, also nil is returned.
	-- With bAll present and true all rows back to the specified time window will be returned, or all rows back to		-- With bAll present and true all rows back to the specified time window will be returned, or all rows back to
Line 46:		Line 46:
	end		end
	end		end
	return tRows[nRowNum]		--return tRows[nRowNum]
			return nil
	end		end

Line 443:		Line 444:
	if barargs.nDate and rows then		if barargs.nDate and rows then
	-- find data row from 7 days before +- 1 hour		-- find data row from 7 days before +- 1 hour
	tIntervRow = p._findIntervalRow(rows, barargs.nDate-7243600, 3600, false)		local tIntervRow = p._findIntervalRow(rows, barargs.nDate-7243600, 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 657:		Line 658:
	buildargs.duration = args.duration		buildargs.duration = args.duration
	buildargs.nooverlap = args.nooverlap		buildargs.nooverlap = args.nooverlap
			buildargs.population = args.population

	local dateList		local dateList