Module:Sports table/Custom/sandbox - Revision history

S.A. Julio: .

2024-10-15T05:15:51Z

← Previous revision		Revision as of 05:15, 15 October 2024
Line 74:		Line 74:
	col_style[num_cols] = fa_letter..'f'		col_style[num_cols] = fa_letter..'f'
	col_style[num_cols+1] = fa_letter..'a'		col_style[num_cols+1] = fa_letter..'a'
	num_cols = ~~num_cols + 2~~		col_style[num_cols+2] = 'diff_'..fa_letter..'f_'..fa_letter..'a'
	col_style[num_cols] = 'diff_'..fa_letter..'f_'..fa_letter..'a'
	fa_letter = string.upper(fa_letter)		fa_letter = string.upper(fa_letter)
			Args['col_header'..num_cols] = Args['col_header'..num_cols] or
			'<abbr title="'..fa_word_plur..' for">'..fa_letter..'F</abbr>'
			num_cols = num_cols + 1
			Args['col_header'..num_cols] = Args['col_header'..num_cols] or
			'<abbr title="'..fa_word_plur..' against">'..fa_letter..'A</abbr>'
			num_cols = num_cols + 1
	Args['col_header'..num_cols] = Args['col_header'..num_cols] or		Args['col_header'..num_cols] = Args['col_header'..num_cols] or
	'<abbr title="'..fa_word_sing..' difference">'..fa_letter..'D</abbr>'		'<abbr title="'..fa_word_sing..' difference">'..fa_letter..'D</abbr>'
Line 88:		Line 93:
	for cc=1,num_cols do		for cc=1,num_cols do
	col_style[cc] = Args['colstyle'..cc] or col_style[cc] or ''		col_style[cc] = Args['colstyle'..cc] or col_style[cc] or ''
	col_style[cc] = string.lower(col_style[cc])
	end		end
	-- Store num_cols so it may be returned		-- Store num_cols so it may be returned
Line 147:		Line 151:
	elseif stylecc == 'pts' or stylecc == 'points' then		elseif stylecc == 'pts' or stylecc == 'points' then
	head_text = '<abbr title="Points">Pts</abbr>'		head_text = '<abbr title="Points">Pts</abbr>'
			always_show = true
			elseif stylecc == 'pct' or stylecc == 'percentage' then
			head_text = '<abbr title="Win percentage">PCT</abbr>'
	always_show = true		always_show = true
	elseif stylecc == 'ppg' then		elseif stylecc == 'ppg' then
			head_text = '<abbr title="Points per game">PPG</abbr>'
			always_show = true
			elseif stylecc == 'ppga' then
	head_text = '<abbr title="Points per game">PPG</abbr>'		head_text = '<abbr title="Points per game">PPG</abbr>'
	always_show = true		always_show = true
Line 198:		Line 208:
	matches_text = Args['matches_'..team_code_ii] or matches		matches_text = Args['matches_'..team_code_ii] or matches
	end		end
			local s_pts = (tonumber(Args['adjust_points_'..team_code_ii]) or 0) + (tonumber(Args['startpoints_'..team_code_ii]) or 0)
	local points = win_pointswins + draw_pointsdraws + loss_pointslosses + rw_pointsrw		local points = win_pointswins + draw_pointsdraws + loss_pointslosses + rw_pointsrw + s_pts
			local pct = ''
			if matches == 0 then
			-- Escape for zero matches
			pct = '—'
			else
			pct = mm._precision_format(wins / matches, 3)
			end
	local ppg = ''		local ppg = ''
	if matches == 0 then		if matches == 0 then
Line 214:		Line 232:
	draws = numorval(Args['draw_'..team_code_ii])		draws = numorval(Args['draw_'..team_code_ii])
	losses = numorval(Args['loss_'..team_code_ii])		losses = numorval(Args['loss_'..team_code_ii])
			end
			local ppga = ''
			if matches == 0 then
			-- Escape for zero matches
			ppga = '—'
			else
			ppga = mm._precision_format(points / matches, 3)
	end		end

Line 247:		Line 272:
	cell_data = points		cell_data = points
	end		end
			always_show = true
			elseif stylecc == 'pct' or stylecc == 'percentage' then
			cell_data = pct
	always_show = true		always_show = true
	elseif stylecc == 'ppg' then		elseif stylecc == 'ppg' then
	cell_data = ppg		cell_data = ppg
			always_show = true
			elseif stylecc == 'ppga' then
			cell_data = ppga
	always_show = true		always_show = true
	elseif default_style:match('^([Ww][Ll])')		elseif default_style:match('^([Ww][Ll])')
Line 263:		Line 294:
	end		end
	elseif stylecc:match('^(sum_[^_]_[^_])')		elseif stylecc:match('^(sum_[^_]_[^_])')
	or stylecc:match('^(diff_[^_]_[^_])') ~~then~~		or stylecc:match('^(diff_[^_]_[^_])')
			or stylecc:match('^(ratio_[^_]_[^_])') then
	local op_str = stylecc:match('^([^_])_[^_]_[^_]*')		local op_str = stylecc:match('^([^_])_[^_]_[^_]*')
	local operands = {}		local operands = {}
Line 283:		Line 315:
	elseif opstyle == 'pts' or opstyle == 'points' then		elseif opstyle == 'pts' or opstyle == 'points' then
	operands[opn] = points		operands[opn] = points
			elseif opstyle == 'pct' or opstyle == 'percentage' then
			operands[opn] = pct
	elseif opstyle == 'ppg' then		elseif opstyle == 'ppg' then
			operands[opn] = points / matches
			flag_format = true
			elseif opstyle == 'ppga' then
	operands[opn] = points / matches		operands[opn] = points / matches
	flag_format = true		flag_format = true
Line 292:		Line 329:
	if op_str == 'sum' then		if op_str == 'sum' then
	cell_data = operands[1] + operands[2]		cell_data = operands[1] + operands[2]
			elseif op_str == 'ratio' then
			if operands[2] == 0 then
			cell_data = operands[1] == 0 and '—' or 'MAX'
			else
			cell_data = mm._precision_format(operands[1] / operands[2], 3)
			end
	else		else
	cell_data = operands[1] - operands[2]		cell_data = operands[1] - operands[2]
	if ~~cell_data < 0 and~~ not flag_format then		if not flag_format then
	cell_data = ~~'−'..-cell_data~~		if cell_data < 0 then
			cell_data = '−'..-cell_data
			elseif cell_data > 0 and yesno(Args['plus_sign_diffs']) then
			cell_data = '+'..cell_data
			end
	end		end
	end		end
Line 306:		Line 353:
	cell_data = Args['col'..cc..'_'..team_code_ii] or cell_data		cell_data = Args['col'..cc..'_'..team_code_ii] or cell_data
	if full_table or always_show then		if full_table or always_show then
			local align_col = Args['aligncol'..cc] or ''
	if ranking_col == cc then		if ranking_col == cc then
	col_fw = 'font-weight: bold;'		col_fw = 'font-weight: bold;'
Line 312:		Line 360:
	col_fw = 'font-weight: bold;'		col_fw = 'font-weight: bold;'
	end		end
			-- sanitize the align_col input
⚫	table.insert(t,'\| style="'..col_fw..bg_col..'" \|'..cell_data..'\n')
			if align_col == 'l' or align_col == 'left' then
			align_col = 'text-align: left; '
			elseif align_col == 'r' or align_col == 'right' then
			align_col = 'text-align: right; '
			elseif align_col == 'c' or align_col == 'center' then
			align_col = 'text-align: center; '
			elseif align_col == 'justify' or align_col == 'initial' or align_col == 'inherit' then
			align_col = 'text-align: '..align_col..'; '
			else
			align_col = ''
			end
		⚫	table.insert(t,'\| style="'..align_col..col_fw..bg_col..'" \|'..cell_data..'\n')
	end		end
	end		end

McVahl: oops

2020-12-12T12:30:40Z

oops

← Previous revision		Revision as of 12:30, 12 December 2020
Line 257:		Line 257:
	else		else
	cell_data = mm._precision_format(wins / matches, 3)		cell_data = mm._precision_format(wins / matches, 3)
	if ~~operands[2]~~ > 0 then		if losses > 0 then
	-- Drop the leading zero (from the string)		-- Drop the leading zero (from the string)
	cell_data = string.sub(cell_data,2,string.len(cell_data))		cell_data = string.sub(cell_data,2,string.len(cell_data))
Line 263:		Line 263:
	end		end
	elseif stylecc:match('^(sum_[^_]_[^_])')		elseif stylecc:match('^(sum_[^_]_[^_])')
	or stylecc:match('^(diff_[^_]_[^_])')		or stylecc:match('^(diff_[^_]_[^_])') then
	or stylecc:match('^(pct_[^_]_[^_])') then
	local op_str = stylecc:match('^([^_])_[^_]_[^_]*')		local op_str = stylecc:match('^([^_])_[^_]_[^_]*')
	local operands = {}		local operands = {}

McVahl: assign default_style

2020-12-12T12:26:26Z

assign default_style

← Previous revision		Revision as of 12:26, 12 December 2020
Line 178:		Line 178:
	local col_style = pp.get_col_styles(Args)		local col_style = pp.get_col_styles(Args)
	local num_cols = col_style['num_cols']		local num_cols = col_style['num_cols']
			local default_style = Args['default_style'] or ''
	local ranking_col = tonumber(Args['ranking_col']) or col_style['ranking_col'] or num_cols		local ranking_col = tonumber(Args['ranking_col']) or col_style['ranking_col'] or num_cols
	local win_points = tonumber(Args['winpoints']) or 3		local win_points = tonumber(Args['winpoints']) or 3

McVahl: move perc logic as stylecc instead

2020-12-12T12:23:29Z

move perc logic as stylecc instead

@@ Line 250: / Line 250: @@
 			cell_data = ppg
 			always_show = true
 		elseif stylecc:match('^(sum_[^_]*_[^_]*)')
 			or stylecc:match('^(diff_[^_]*_[^_]*)')
@@ Line 281: / Line 292: @@
 			if op_str == 'sum' then
 				cell_data = operands[1] + operands[2]
 			else
 				cell_data = operands[1] - operands[2]

McVahl: fix pct if total number of matches is equal to zero; drop leading zero for pct

2020-12-12T12:13:12Z

fix pct if total number of matches is equal to zero; drop leading zero for pct

← Previous revision		Revision as of 12:13, 12 December 2020
Line 282:		Line 282:
	cell_data = operands[1] + operands[2]		cell_data = operands[1] + operands[2]
	elseif op_str == 'pct' then		elseif op_str == 'pct' then
	~~cell_data~~ = ~~mm._precision_format(operands[1] / (~~operands[1] + operands[2]~~), 3)~~		local matches = operands[1] + operands[2]
			if matches == 0 then
			cell_data = '—'
			else
			cell_data = mm._precision_format(operands[1] / matches, 3)
			if losses > 0 or draws > 0 then
			-- Drop the leading zero (from the string)
			cell_data = string.sub(cell_data,2,string.len(cell_data))
			end
			end
	else		else
	cell_data = operands[1] - operands[2]		cell_data = operands[1] - operands[2]

McVahl: sync live

2020-12-12T12:11:12Z

sync live

← Previous revision		Revision as of 12:11, 12 December 2020
Line 198:		Line 198:
	end		end
	local points = win_pointswins + draw_pointsdraws + loss_pointslosses + rw_pointsrw		local points = win_pointswins + draw_pointsdraws + loss_pointslosses + rw_pointsrw
	local ppg = ~~mm._precision_format(points / matches, 2)~~		local ppg = ''
	if matches == 0 then		if matches == 0 then
	-- Escape for zero matches		-- Escape for zero matches
	ppg = '—'		ppg = '—'
			else
			ppg = mm._precision_format(points / matches, 2)
	end		end
	-- Use actual values if wins, draws, and losses are not numeric		-- Use actual values if wins, draws, and losses are not numeric

McVahl: Undid revision 993771364 by McVahl (talk)

2020-12-12T12:10:35Z

Undid revision 993771364 by McVahl (talk)

← Previous revision		Revision as of 12:10, 12 December 2020
Line 280:		Line 280:
	cell_data = operands[1] + operands[2]		cell_data = operands[1] + operands[2]
	elseif op_str == 'pct' then		elseif op_str == 'pct' then
	~~local matches~~ = operands[1] + operands[2]		cell_data = mm._precision_format(operands[1] / (operands[1] + operands[2]), 3)
	if matches == 0 then
	cell_data = '—'
	else
	cell_data = mm._precision_format(operands[1] / matches, 3)
	if losses > 0 or draws > 0 then
	-- Drop the leading zero (from the string)
	cell_data = string.sub(cell_data,2,string.len(cell_data))
	end
	end
	else		else
	cell_data = operands[1] - operands[2]		cell_data = operands[1] - operands[2]

McVahl: fix pct if total number of matches is equal to zero; drop leading zero for pct

2020-12-12T12:05:46Z

fix pct if total number of matches is equal to zero; drop leading zero for pct

← Previous revision		Revision as of 12:05, 12 December 2020
Line 280:		Line 280:
	cell_data = operands[1] + operands[2]		cell_data = operands[1] + operands[2]
	elseif op_str == 'pct' then		elseif op_str == 'pct' then
	~~cell_data~~ = ~~mm._precision_format(operands[1] / (~~operands[1] + operands[2]~~), 3)~~		local matches = operands[1] + operands[2]
			if matches == 0 then
			cell_data = '—'
			else
			cell_data = mm._precision_format(operands[1] / matches, 3)
			if losses > 0 or draws > 0 then
			-- Drop the leading zero (from the string)
			cell_data = string.sub(cell_data,2,string.len(cell_data))
			end
			end
	else		else
	cell_data = operands[1] - operands[2]		cell_data = operands[1] - operands[2]

McVahl: fix pct operand divisor

2020-06-10T05:46:44Z

fix pct operand divisor

← Previous revision		Revision as of 05:46, 10 June 2020
Line 280:		Line 280:
	cell_data = operands[1] + operands[2]		cell_data = operands[1] + operands[2]
	elseif op_str == 'pct' then		elseif op_str == 'pct' then
	cell_data = mm._precision_format(operands[1] / operands[2], 3)		cell_data = mm._precision_format(operands[1] / (operands[1] + operands[2]), 3)
	else		else
	cell_data = operands[1] - operands[2]		cell_data = operands[1] - operands[2]

McVahl: damn it, single regex with multiple opts not working

2020-06-10T05:39:45Z

damn it, single regex with multiple opts not working

← Previous revision		Revision as of 05:39, 10 June 2020
Line 248:		Line 248:
	cell_data = ppg		cell_data = ppg
	always_show = true		always_show = true
	elseif stylecc:match('^(~~(?:sum\|diff\|pct)_~~[^_]_[^_])') ~~then~~		elseif stylecc:match('^(sum_[^_]_[^_])')
			or stylecc:match('^(diff_[^_]_[^_])')
			or stylecc:match('^(pct_[^_]_[^_])') then
	local op_str = stylecc:match('^([^_])_[^_]_[^_]*')		local op_str = stylecc:match('^([^_])_[^_]_[^_]*')
	local operands = {}		local operands = {}