Module:RoundN - Revision history

Paine Ellsworth: per edit request on talk page - fix the node_function{orphan} bug

2024-03-07T13:54:05Z

per edit request on talk page - fix the node_function{orphan} bug

← Previous revision		Revision as of 13:54, 7 March 2024
Line 731:		Line 731:
	end		end
	col.n = 0		col.n = 0
			col.t2 = nil
	for r = bumps + 1, rows, p.unit * 2 do		for r = bumps + 1, rows, p.unit * 2 do
	tab.r = rowNum[r]:tag'td'		tab.r = rowNum[r]:tag'td'
Line 739:		Line 740:
	col.n = col.n + 2		col.n = col.n + 2
	col.t2 = skipMatch[col.tot + col.n / 2 + 1] and 3 or ((skipMatch[col.top + col.n] and 1 or 0) + (skipMatch[col.top + col.n + 1] and 2 or 0))		col.t2 = skipMatch[col.tot + col.n / 2 + 1] and 3 or ((skipMatch[col.top + col.n] and 1 or 0) + (skipMatch[col.top + col.n + 1] and 2 or 0))
	if col.t == 0 then		if col.t == 0 then --draws the ']' when a PAIR of matches needs lines
	tab.r		tab.r
	:attr{rowspan = maxSpan(p.unit * 2, r, rows)}		:attr{rowspan = maxSpan(p.unit * 2, r, rows)}
Line 746:		Line 747:
	['border-left'] = 0		['border-left'] = 0
	})		})
			else --draws the lines when only top OR bottom match need lines
	else
	tab.r		tab.r
	:attr{rowspan = maxSpan(p.unit, r, rows)}		:attr{rowspan = maxSpan(p.unit, r, rows)}

Frietjes: adjust

2022-12-22T18:13:01Z

adjust

← Previous revision		Revision as of 18:13, 22 December 2022
Line 297:		Line 297:
	local text = v or f[1] and '' or ' '		local text = v or f[1] and '' or ' '
	if f.bold then		if f.bold then
	text = mw.ustring.gsub(text, '(%(%[%[~~.-?~~%]%]%))', '<span style="font-weight:normal">%1</span>')		text = mw.ustring.gsub(text, '(%(%[%[[^%[%]]*%]%]%))', '<span style="font-weight:normal">%1</span>')
	end		end
	tab.r = rowNum[r]:tag'td'		tab.r = rowNum[r]:tag'td'

Frietjes: less aggressive per talk page

2022-12-22T18:07:31Z

less aggressive per talk page

← Previous revision		Revision as of 18:07, 22 December 2022
Line 297:		Line 297:
	local text = v or f[1] and '' or ' '		local text = v or f[1] and '' or ' '
	if f.bold then		if f.bold then
	text = mw.ustring.gsub(text, '(%(%[%[.*)', '<span style="font-weight:normal">%1</span>')		text = mw.ustring.gsub(text, '(%(%[%[.-?%]%]%))', '<span style="font-weight:normal">%1</span>')
	end		end
	tab.r = rowNum[r]:tag'td'		tab.r = rowNum[r]:tag'td'

Frietjes: unbold aet and pen per request

2022-12-21T21:20:11Z

unbold aet and pen per request

← Previous revision		Revision as of 21:20, 21 December 2022
Line 294:		Line 294:
	else		else
	cell = p.teamBoxPadTab		cell = p.teamBoxPadTab
			end
			local text = v or f[1] and '' or ' '
			if f.bold then
			text = mw.ustring.gsub(text, '(%(%[%[.*)', '<span style="font-weight:normal">%1</span>')
	end		end
	tab.r = rowNum[r]:tag'td'		tab.r = rowNum[r]:tag'td'
Line 299:		Line 303:
	:css(cell)		:css(cell)
	:attr{rowspan = 2}		:attr{rowspan = 2}
	:node(mw.html.create(f.bold and 'b'):wikitext(~~v or f[1] and '' or ' '~~))		:node(mw.html.create(f.bold and 'b'):wikitext(text))
	end		end
	end		end

Frietjes: removing tracking and unused parameters per talk page

2022-12-21T21:05:27Z

removing tracking and unused parameters per talk page

← Previous revision		Revision as of 21:05, 21 December 2022
Line 348:		Line 348:
	for _, v in ipairs({--more args to boolean		for _, v in ipairs({--more args to boolean
	'widescore',		'widescore',
	'template',
	'article_include',
	'color',		'color',
	'color_repechage',		'color_repechage',
Line 454:		Line 452:
	setmetatable(scoreWidth, _scoreWidth)		setmetatable(scoreWidth, _scoreWidth)
	end		end

	if p.template or p.article_include then
	p.template = mw.title.new(args.name)
	p.templateFixedName = (p.template.namespace == 0 and not p.article_include and 'Template:' or '') .. p.template.fullText
	end
	p.template = p.template and mw.title.new(args:clean('name', {pattern = ''}))
	local head_br = {		local head_br = {
	count = 0,		count = 0,
Line 486:		Line 480:
	or p.RD[#p.RD + k - p.tCols - 1]		or p.RD[#p.RD + k - p.tCols - 1]
	or ('Round of ' .. math.pow(2, p.tCols - k + 1))		or ('Round of ' .. math.pow(2, p.tCols - k + 1))
	drawHead(		drawHead(head.wt)
	k == 1 and p.template and mw.getCurrentFrame():expandTemplate{
	title = 'navbar-header',
	args = {head.wt, p.templateFixedName}
	} or head.wt
	)
	end		end
	end		end
Line 527:		Line 516:
	rowNum[1]:node(c < p.cols and		rowNum[1]:node(c < p.cols and
	mw.clone(bumpBase):attr{rowspan = bump}		mw.clone(bumpBase):attr{rowspan = bump}
	or p.no_column_head and p.template and
	mw.html.create'td':wikitext(mw.getCurrentFrame():expandTemplate{
	title = 'navbar-header',
	args = {'', p.templateFixedName}
	})
	)		)
	end		end
Line 839:		Line 823:
	local args = require'Module:Arguments'.getArgs(frame, {trim = false})		local args = require'Module:Arguments'.getArgs(frame, {trim = false})
	args.columns = args.columns or columns		args.columns = args.columns or columns
		⚫	return p._main(args)
	local tracking = (args['template'] and '[[Category:Pages using RoundN with template]]' or '') ..
	(args['article_include'] and '[[Category:Pages using RoundN with article include]]' or '')
⚫	return ~~tostring(~~p._main(args)~~) .. tracking~~
	end		end

Frietjes at 16:31, 9 December 2022

2022-12-09T16:31:54Z

← Previous revision		Revision as of 16:31, 9 December 2022
Line 841:		Line 841:
	local tracking = (args['template'] and '[[Category:Pages using RoundN with template]]' or '') ..		local tracking = (args['template'] and '[[Category:Pages using RoundN with template]]' or '') ..
	(args['article_include'] and '[[Category:Pages using RoundN with article include]]' or '')		(args['article_include'] and '[[Category:Pages using RoundN with article include]]' or '')
	return p._main(args) .. tracking		return tostring(p._main(args)) .. tracking
	end		end

Frietjes: temporary tracking with Category:Pages using RoundN with template and Category:Pages using RoundN with article include per talk page

2022-12-09T16:29:57Z

temporary tracking with Category:Pages using RoundN with template and Category:Pages using RoundN with article include per talk page

← Previous revision		Revision as of 16:29, 9 December 2022
Line 839:		Line 839:
	local args = require'Module:Arguments'.getArgs(frame, {trim = false})		local args = require'Module:Arguments'.getArgs(frame, {trim = false})
	args.columns = args.columns or columns		args.columns = args.columns or columns
			local tracking = (args['template'] and '[[Category:Pages using RoundN with template]]' or '') ..
⚫	return p._main(args)
			(args['article_include'] and '[[Category:Pages using RoundN with article include]]' or '')
		⚫	return p._main(args) .. tracking
	end		end

TheDJ: define textcolor when defining a backgroundcolor (for accessibility purposes)

2022-07-15T14:24:27Z

define textcolor when defining a backgroundcolor (for accessibility purposes)

← Previous revision		Revision as of 14:24, 15 July 2022
Line 6:		Line 6:
	'Third place'		'Third place'
	},		},
			-- The text and background colors are paired and when you set one, you should set the other (accessibility)
			textColor = {head = '#202122', '#202122', '#202122', '#202122', '#202122'},
	bgColor = {head = '#f2f2f2', 'gold', 'silver', '#C96', '#f9f9f9'},		bgColor = {head = '#f2f2f2', 'gold', 'silver', '#C96', '#f9f9f9'},
	reuseStr = {},		reuseStr = {},
Line 175:		Line 177:
	['text-align'] = 'center',		['text-align'] = 'center',
	border = '1px solid #aaa',		border = '1px solid #aaa',
	background = p.bgColor.head		['background-color'] = p.bgColor.head,
			color = p.textColor.head
	}		}
	end		end
Line 265:		Line 268:
	end		end
	p.teamBoxPadTab = {padding = '0 ' .. p.teamBoxPadding()}		p.teamBoxPadTab = {padding = '0 ' .. p.teamBoxPadding()}
	p.teamBoxNormal = {border = '1px solid #aaa', background = p.bgColor[4]}		p.teamBoxNormal = {border = '1px solid #aaa', ['background-color'] = p.bgColor[4], color = p.textColor[4]}
	local function teamBox(v, r, f)		local function teamBox(v, r, f)
	if p.flex_tree.merge and not v and f.phase == 2 then		if p.flex_tree.merge and not v and f.phase == 2 then
Line 665:		Line 668:
	end		end
	p.teamBoxCSS = (colorFinal or col.color_repechage) and		p.teamBoxCSS = (colorFinal or col.color_repechage) and
	{border = p.teamBoxNormal.border, background = p.bgColor[color_index]}		{border = p.teamBoxNormal.border, ['background-color'] = p.bgColor[color_index], color = p.textColor[color_index]}
	or p.teamBoxNormal		or p.teamBoxNormal
	else		else
	p.teamBoxCSS = (colorFinal or col.color_repechage) and		p.teamBoxCSS = (colorFinal or col.color_repechage) and
	{border = p.teamBoxNormal.border, background = p.bgColor[m.phase + (col.show3rd or 0) + (col.color_repechage or 0)]}		{border = p.teamBoxNormal.border, ['background-color'] = p.bgColor[m.phase + (col.show3rd or 0) + (col.color_repechage or 0)], color = p.textColor[m.phase + (col.show3rd or 0) + (col.color_repechage or 0)]}
	or p.teamBoxNormal		or p.teamBoxNormal
	end		end
Line 853:		Line 856:
	['background-color'] = p.bgColor.head,		['background-color'] = p.bgColor.head,
	border = '1px solid #aaa',		border = '1px solid #aaa',
			color = p.textColor.head,
	['text-align'] = 'center',		['text-align'] = 'center',
	width = width		width = width

Pppery: Per edit request

2022-07-08T19:12:10Z

Per edit request

← Previous revision		Revision as of 19:12, 8 July 2022
Line 659:		Line 659:
	if m.bold.win(m.phase) and (colorFinal or col.color_repechage) then		if m.bold.win(m.phase) and (colorFinal or col.color_repechage) then
	color_index = 1 + (col.show3rd or 0) + (col.color_repechage or 0)		color_index = 1 + (col.show3rd or 0) + (col.color_repechage or 0)
			elseif m.bold.box[#m.nonEmpty] then
⚫	else
	color_index = 2 + (col.show3rd or 0) + (col.color_repechage or 0)		color_index = 2 + (col.show3rd or 0) + (col.color_repechage or 0)
		⚫	else
			color_index = 4
	end		end
	p.teamBoxCSS = (colorFinal or col.color_repechage) and		p.teamBoxCSS = (colorFinal or col.color_repechage) and

Paine Ellsworth: per edit request on talk page - new parameter: color_repechage

2022-06-28T19:53:19Z

per edit request on talk page - new parameter: color_repechage

← Previous revision		Revision as of 19:53, 28 June 2022
Line 348:		Line 348:
	'article_include',		'article_include',
	'color',		'color',
			'color_repechage',
	'3rdplace',		'3rdplace',
	'omit_blanks',		'omit_blanks',
Line 533:		Line 534:
	col.top = m.num		col.top = m.num
	p.span = p.tCols > c and bump * 2 or p.branch_upwards or math.max((bump - 1) / 2, 2)		p.span = p.tCols > c and bump * 2 or p.branch_upwards or math.max((bump - 1) / 2, 2)
			col.color_repechage = p['color_repechage'] and ((c == p.tCols) or ((c == p.tCols-1) and skipMatch[math.pow(2, p.tCols) - 1]))
	col.show3rd = p['3rdplace'] and c == p.tCols and rowNum.third		col.show3rd = p['3rdplace'] and c == p.tCols and rowNum.third
	local colorFinal, bumpMid = p.color and c == p.tCols, p.span > 0 and mw.clone(bumpBase):attr{rowspan = p.span} or nil		local colorFinal, bumpMid = p.color and c == p.tCols, p.span > 0 and mw.clone(bumpBase):attr{rowspan = p.span} or nil
Line 651:		Line 653:
	else		else
	if m.showBox[m.phase] then		if m.showBox[m.phase] then
			if col.color_repechage then
			col.color_repechage = 2
			end
	if p.bold then		if p.bold then
	if m.bold.win(m.phase) and colorFinal then		if m.bold.win(m.phase) and (colorFinal or col.color_repechage) then
	color_index = 1 + (col.show3rd or 0)		color_index = 1 + (col.show3rd or 0) + (col.color_repechage or 0)
	else		else
	color_index = 2 + (col.show3rd or 0)		color_index = 2 + (col.show3rd or 0) + (col.color_repechage or 0)
	end		end
	p.teamBoxCSS = colorFinal and		p.teamBoxCSS = (colorFinal or col.color_repechage) and
	{border = p.teamBoxNormal.border, background = p.bgColor[color_index]}		{border = p.teamBoxNormal.border, background = p.bgColor[color_index]}
	or p.teamBoxNormal		or p.teamBoxNormal
	else		else
	p.teamBoxCSS = colorFinal and		p.teamBoxCSS = (colorFinal or col.color_repechage) and
	{border = p.teamBoxNormal.border, background = p.bgColor[m.phase + (col.show3rd or 0)]}		{border = p.teamBoxNormal.border, background = p.bgColor[m.phase + (col.show3rd or 0) + (col.color_repechage or 0)]}
	or p.teamBoxNormal		or p.teamBoxNormal
	end		end