Module:Ru Paul's Drag Race tables - Revision history

Wugapodes: + normal background table color

2020-07-13T23:55:12Z

+ normal background table color

← Previous revision		Revision as of 23:55, 13 July 2020
Line 50:		Line 50:
	["brown"] = "#E97500",		["brown"] = "#E97500",
	["grey"] = "#808080",		["grey"] = "#808080",
	["gray"] = "#808080"		["gray"] = "#808080",
			["silver"] = "#F8F9FA" -- Actually just the usual background table color
	}		}

Wugapodes: add automatic key maker

2020-07-13T23:51:55Z

add automatic key maker

← Previous revision		Revision as of 23:51, 13 July 2020
Line 29:		Line 29:
	function p._sortRows(a,b)		function p._sortRows(a,b)
	return a[1] > b[1]		return a[1] > b[1]
			end

			function p._revSortRows(a,b)
			return a[1] < b[1]
	end		end

Line 275:		Line 279:
	function p._key( frame )		function p._key( frame )
	local templateFrame = frame:getParent()		local templateFrame = frame:getParent()
			local args = templateFrame.args
	local ret = ''		local ret = ''
	local order = mw.text.split(~~templateFrame~~.order,',%s*')		local order = mw.text.split(args.order,',%s*')
			args.order = nil
	local reverseIndex = {}		local reverseIndex = {}
	for i,v in order do		for i,v in ipairs(order) do
	reverseIndex[v] = i		reverseIndex[v] = i
	end		end
	local rowTable = {}		local rowTable = {}
	for k,v in pairs(~~templateFrame~~) do		for k,v in pairs(args) do
			if k ~= 'order' then
	box = p._makeColorBox( k )
	~~text~~ = v .. ~~"\n"~~		box = p._makeColorBox( k )
	row = { reverseIndex[k], box .. text }		text = v .. "\n"
			row = { reverseIndex[k], box .. text }
	table.insert(rowTable,row)		table.insert(rowTable,row)
			end
	end		end
	table.sort(rowTable,p.~~_sortRows~~)		table.sort(rowTable,p._revSortRows)
	for i=1,20 do		for i=1,20 do
	if ~~rowList~~[i] == nil then		if rowTable[i] == nil then
	break		break
	end		end
Line 299:		Line 307:

	function p._makeColorBox( key )		function p._makeColorBox( key )
	local template = ':<span style="background-color:HEXCODE; border:1px solid #000000;"></span> '		local template = ':<span style="background-color:HEXCODE; border:1px solid #000000;">    </span> '
	color = p.colorMap[key]		color = p.colorMap[key]
	return string.gsub(template, 'HEXCODE', color)		return string.gsub(template, 'HEXCODE', color)

Wugapodes: make key

2020-07-13T23:37:14Z

make key

@@ Line 13: / Line 13: @@
 function p.progressTable( frame )
 	return p._progressTable( frame )
 end
@@ Line 263: / Line 268: @@
+	}
 	return retRow
 end

Wugapodes: document a bit better, rearrange code so it's more readable

2020-07-12T03:30:56Z

document a bit better, rearrange code so it's more readable

Show changes

Wugapodes: fix bugs

2020-07-11T20:58:28Z

fix bugs

← Previous revision		Revision as of 20:58, 11 July 2020
Line 170:		Line 170:
	break		break
	elseif i % 3 == 1 then -- First in triplet is contestant name		elseif i % 3 == 1 then -- First in triplet is contestant name
	contestantData[arg] = {}		contestantData[arg] = {{}}
	elseif i % 3 == 2 then -- Second in triple is color codes		elseif i % 3 == 2 then -- Second in triple is color codes
	contestantData[templateFrame.args[i-1]][1] = arg		contestantData[templateFrame.args[i-1]][1] = arg
Line 203:		Line 203:
	local high = 0		local high = 0
	for k,v in pairs(contestantData) do		for k,v in pairs(contestantData) do
			data[k] = {}
	data[k][1] = mw.text.split(contestantData[k][1],',%s*')		data[k][1] = mw.text.split(contestantData[k][1],',%s*')
	data[k][2] = mw.text.split(contestantData[k][2],',%s*')		data[k][2] = mw.text.split(contestantData[k][2],',%s*')
	if #data[k][1] > high then		if #data[k][1] > high then
	high = #data[k]		high = #data[k][1]
	end		end
	end		end
Line 212:		Line 213:
	end		end

	function p._makeRow( contestant, ~~data~~, width )		function p._makeRow( contestant, tableData, width )
	row = "\|-\n! scope='row'\| " .. contestant		row = "\|-\n! scope='row'\| " .. contestant .. "\n"
	colors = ~~data~~[1]		colors = tableData[1]
	labels = ~~data~~[2]		labels = tableData[2]
	final = 0		final = 0
	for i=1,20 do		for i=1,20 do
	-- If we've reached the end of the list...		-- If we've reached the end of the list...
	if ~~placements~~[i] == nil then		if colors[i] == nil then
	final = i		final = i
	-- ...and the entries span the entire width of the table, then finish		-- ...and the entries span the entire width of the table, then finish
Line 228:		Line 229:
	row = row .. "\| colspan='" .. width + 1 - i .. "' bgcolor='darkgray' \|\n"		row = row .. "\| colspan='" .. width + 1 - i .. "' bgcolor='darkgray' \|\n"
	break		break
	elseif string.find(placements[i],"BTM") ~= nil then
	colorKey = "BTM"
	else
	colorKey = string.gsub(placements[i],"%s+","")
	end		end
	text = labels[i]		text = labels[i]
	~~row~~ = ~~row .. "\| style='background:" ..~~ p.colorMap[colors[i]~~] ..~~ "~~;' \|~~" ~~.. text ..~~ "\n"		color = p.colorMap[colors[i]:gsub("%s+","")]
			row = row .. "\| style='background:" .. color .. ";' \|" .. text .. "\n"
	end		end
	retRow = {		retRow = {

Wugapodes: implement pallette from Wikipedia:Manual of Style/Accessibility/Colors; modify to use triplets so that users can specify text

2020-07-11T20:38:50Z

implement pallette from Wikipedia:Manual of Style/Accessibility/Colors; modify to use triplets so that users can specify text

← Previous revision		Revision as of 20:38, 11 July 2020
Line 139:		Line 139:
	return ret .. "\|}"		return ret .. "\|}"
	end		end
			-------------------------------
		⚫	-- Contestant progress table --
			-------------------------------

			p.colorMap = { -- See [[Wikipedia:Manual of Style/Accessibility/Colors]]
			["red"] = "#FF7B7B",
			['orange'] = "#FFA7AF",
			["yellow"] = "#FAFA00",
			["chartreuse"] = "#A8FF4F",
			["green"] = "#7BFF7B",
			["spring"] = "#4FFFA8",
			["cyan"] = "#00FAFA",
			["dodger"] = "#4FA8FF",
			["blue"] = "#8888FF",
			["indigo"] = "#BB76FF",
			["magenta"] = "#FF29FF",
			["pink"] = "#FF52A9",
			["brown"] = "#E97500",
			["grey"] = "#808080",
			["gray"] = "#808080"
			}

⚫	-- Contestant progress table
	function p.progressTable( frame )		function p.progressTable( frame )
	local templateFrame = frame:getParent()		local templateFrame = frame:getParent()
	local contestantData = {}		local contestantData = {}
	ret = ""		ret = ""
	for i=1,20 do		for i=1,50 do
	arg = templateFrame.args[i]		arg = templateFrame.args[i]
	if arg == nil then		if arg == nil then
	break		break
	elseif i % 2 == 1 then		elseif i % 3 == 1 then -- First in triplet is contestant name
	contestantData[arg] = {}		contestantData[arg] = {}
			elseif i % 3 == 2 then -- Second in triple is color codes
	else
	contestantData[templateFrame.args[i-1]] = arg		contestantData[templateFrame.args[i-1]][1] = arg
			else -- Third in triplet is text
			contestantData[templateFrame.args[i-2]][2] = arg
	end		end
	end		end
Line 181:		Line 203:
	local high = 0		local high = 0
	for k,v in pairs(contestantData) do		for k,v in pairs(contestantData) do
	data[k] = mw.text.split(contestantData[k],',%s')		data[k][1] = mw.text.split(contestantData[k][1],',%s*')
			data[k][2] = mw.text.split(contestantData[k][2],',%s*')
	if #data[k] > high then		if #data[k][1] > high then
	high = #data[k]		high = #data[k]
	end		end
Line 189:		Line 212:
	end		end

	function p._makeRow( contestant, ~~placements~~, width )		function p._makeRow( contestant, data, width )
	row = "\|-\n! scope='row'\| " .. contestant		row = "\|-\n! scope='row'\| " .. contestant
			colors = data[1]
			labels = data[2]
	final = 0		final = 0
	for i=1,20 do		for i=1,20 do
			-- If we've reached the end of the list...
	if placements[i] == nil then		if placements[i] == nil then
	final = i		final = i
			-- ...and the entries span the entire width of the table, then finish
	if i > width then		if i > width then
	break		break
	end		end
			-- ...otherwise, fill the rest of the columns with darkgray
	row = row .. "\| colspan='" .. width + 1 - i .. "' bgcolor='darkgray' \|\n"		row = row .. "\| colspan='" .. width + 1 - i .. "' bgcolor='darkgray' \|\n"
	break		break
Line 205:		Line 233:
	colorKey = string.gsub(placements[i],"%s+","")		colorKey = string.gsub(placements[i],"%s+","")
	end		end
	text = ~~p._getProgressText(placements~~[i])		text = labels[i]
	row = row .. "\| style='background:" .. p.~~_getColor(colorKey)~~ .. ";' \|" .. text .. "\n"		row = row .. "\| style='background:" .. p.colorMap[colors[i]] .. ";' \|" .. text .. "\n"
	end		end
	retRow = {		retRow = {
Line 213:		Line 241:
	}		}
	return retRow		return retRow
	end

	function p._getColor( key )
	if key == "WIN" then
	return "royalblue" -- The contestant won the challenge and won the Lip Sync against the Lip Sync Assassin.
	elseif key == "WINTIE" then
	return "darkblue" -- The contestant won the challenge and tied in the Lip Sync against the Lip Sync Assassin.
	elseif key == "WINLOSE" then
	return "yellow" -- The contestant won the challenge, but lost the Lip Sync against the Lip Sync Assassin.
	elseif key == "HIGH" then
	return "lightblue" -- The contestant received positive critiques and was ultimately declared safe.
	elseif key == "SAFE" then
	return "#F8F9FA" -- Safe
	elseif key == "SAFECRIT" then
	return "cornsilk" -- The contestant received critiques but was ultimately declared safe.
	elseif key == "LOW" then
	return "lightpink" -- The contestant received negative critiques but was ultimately declared safe.
	elseif key == "BTM" then
	return "tomato" -- The contestant was up for elimination.
	elseif key == "ELIM" then
	return "red" -- The contestant was eliminated.
	else
	return "black"
	end
	end

	function p._getProgressText( key )
	key = string.gsub(key,"%s+","")
	if key == "ELIM" then
	return "'''ELIM'''"
	elseif string.find(key, "WIN") ~= nil then
	if key == "WIN" or key == "WINTIE" then
	return "<span style='color:white; font-weight: bold;'>WIN</span>"
	end
	return "WIN"
	elseif #key < 5 then
	return key
	elseif string.find(key, "SAFE") ~= nil then
	return "SAFE"
	end
	end		end

Wugapodes: close table

2020-07-11T20:10:47Z

close table

← Previous revision		Revision as of 20:10, 11 July 2020
Line 174:		Line 174:
	ret = ret .. rowList[i][2]		ret = ret .. rowList[i][2]
	end		end
	return ret		return ret .. "\|}"
	end		end

Wugapodes: Wugapodes moved page Module:Drag Race contestant table to Module:Ru Paul's Drag Race tables without leaving a redirect: generalize name

2020-07-11T07:20:28Z

Wugapodes moved page Module:Drag Race contestant table to Module:Ru Paul's Drag Race tables without leaving a redirect: generalize name

← Previous revision	Revision as of 07:20, 11 July 2020
(No difference)

Wugapodes: text weight and color, fix sort bug

2020-07-11T07:18:28Z

text weight and color, fix sort bug

← Previous revision		Revision as of 07:18, 11 July 2020
Line 167:		Line 167:
	table.insert(rowList,p._makeRow(k,v,width))		table.insert(rowList,p._makeRow(k,v,width))
	end		end
	-- table.sort(rowList,p._sortRows)		table.sort(rowList,p._sortRows)
	for i=1,20 do		for i=1,20 do
	if rowList[i] == nil then		if rowList[i] == nil then
Line 191:		Line 191:
	function p._makeRow( contestant, placements, width )		function p._makeRow( contestant, placements, width )
	row = "\|-\n! scope='row'\| " .. contestant		row = "\|-\n! scope='row'\| " .. contestant
			final = 0
	for i=1,20 do		for i=1,20 do
	if placements[i] == nil then		if placements[i] == nil then
			final = i
	if i > width then		if i > width then
	break		break
Line 207:		Line 209:
	end		end
	retRow = {		retRow = {
	i,		final,
	row		row
	}		}
Line 241:		Line 243:
	if key == "ELIM" then		if key == "ELIM" then
	return "'''ELIM'''"		return "'''ELIM'''"
⚫	elseif #key < 5 then
⚫	return key
	elseif string.find(key, "WIN") ~= nil then		elseif string.find(key, "WIN") ~= nil then
			if key == "WIN" or key == "WINTIE" then
			return "<span style='color:white; font-weight: bold;'>WIN</span>"
			end
	return "WIN"		return "WIN"
		⚫	elseif #key < 5 then
		⚫	return key
	elseif string.find(key, "SAFE") ~= nil then		elseif string.find(key, "SAFE") ~= nil then
	return "SAFE"		return "SAFE"
Line 251:		Line 256:

	function p._sortRows(a,b)		function p._sortRows(a,b)
	return a[1] < b[1]		return a[1] > b[1]
	end		end

Wugapodes: fix color bug

2020-07-11T07:11:47Z

fix color bug

@@ Line 158: / Line 158: @@
 	ret = ret .. [=[{| class="wikitable" style="text-align:center;"
 	|+Progress of contests including rank/position in each episode
-	|! scope="col"| Contestant
+	! scope="col"| Contestant
 	]=]
 	for i=1,width do
@@ Line 190: / Line 190: @@
 function p._makeRow( contestant, placements, width )
 	row = "|-\n! scope='row'| " .. contestant
 	for i=1,20 do
@@ Line 215: / Line 204: @@
 		end
 		text = p._getProgressText(placements[i])
-		row = row .. "| style='background:'" .. colors[colorKey] .. ";' |" .. text .. "\n"
+		row = row .. "| style='background:" .. p._getColor(colorKey) .. ";' |" .. text .. "\n"
 	end
 	retRow = {
@@ Line 222: / Line 211: @@
+	}
 	return retRow
 end