Module:Sports table/WDL: Difference between revisions
(Created page with "-- Style for football tables local pp = {} function pp.header(t,Args,p_sub,pos_label,group_col,VTE_text,full_table,results_header_txt) -- Load relevant modules local yesno...") |
m (1 revision imported) |
||
(One intermediate revision by the same user not shown) | |||
Line 9: | Line 9: | ||
-- Pre stuff | -- Pre stuff | ||
local team_width = Args['teamwidth'] or '190' | local team_width = Args['teamwidth'] or '190' | ||
local sort_text = '' | local sort_text = yesno(Args['sortable_table'] or 'no') and ' sortable' or '' | ||
local | local show_played = not yesno(Args['hide_played'] or 'no') | ||
local rounds_won = yesno(Args['rounds_won'] or 'no') | |||
table.insert(t,'{|class="wikitable '..sort_text..'" style="text-align:center;"\n') -- Open table | table.insert(t,'{| class="wikitable'..sort_text..'" style="text-align:center;"\n') -- Open table | ||
-- Table title | |||
if Args['title'] then | |||
table.insert(t,'|+ ' .. Args['title'] .. '\n') | |||
end | |||
-- Custom header options | -- Custom header options | ||
local draw_head_text = Args['draw_header'] or '<abbr title="Drawn">D</abbr>' | local draw_head_text = Args['draw_header'] or '<abbr title="Drawn">D</abbr>' | ||
local group_head_text = Args['group_header'] or '<abbr title="Group">Grp</abbr>' | local group_head_text = Args['group_header'] or '<abbr title="Group">Grp</abbr>' | ||
local team_head_text = Args['team_header'] or 'Team' | local team_head_text = Args['team_header'] or 'Team' | ||
local away_goals_head_text = Args['away_goals_header'] or '<abbr title="Away goals">AG</abbr>' | |||
local bonus_head_text = Args['bonus_header'] or '<abbr title="Bonus points">BP</abbr>' | |||
local loss_first = Args['loss_before_draw'] or false | local loss_first = Args['loss_before_draw'] or false | ||
-- What to rank the teams by | -- What to rank the teams by | ||
local ranking_style = Args['ranking_style'] or 'pts' | local ranking_style = Args['ranking_style'] or 'pts' | ||
local show_points, show_perc = false | local show_points, show_perc, show_ppg = false, false, false | ||
ranking_style = string.lower(ranking_style) | ranking_style = string.lower(ranking_style) | ||
if ranking_style=='w' or ranking_style=='win' or ranking_style=='wins' then | if ranking_style=='w' or ranking_style=='win' or ranking_style=='wins' or ranking_style=='none' then | ||
-- Based on wins | -- Based on wins | ||
elseif ranking_style=='perc' or ranking_style=='percentage' or ranking_style=='%' then | elseif ranking_style=='perc' or ranking_style=='percentage' or ranking_style=='%' then | ||
-- Based on percentage | -- Based on percentage | ||
show_perc = true | show_perc = true | ||
elseif ranking_style=='ppg' or ranking_style=='points per game' or ranking_style=='ptspergame' then | |||
-- Based on points per game | |||
show_ppg = true | |||
else | else | ||
-- Based on points | -- Based on points | ||
show_points = true | show_points = true | ||
end | end | ||
local pts_perc_first = yesno((show_points and Args['pts_first']) or (show_perc and Args['perc_first']) or 'no') | |||
local show_away_goals = yesno(Args['show_away_goals'] or 'no') | |||
local show_bonus_points = yesno(Args['show_bonus_points'] or 'no') | |||
local show_draw = yesno(Args['show_draw'] or 'yes') | |||
-- Use points instead of goals for/against | -- Use points instead of goals for/against | ||
local for_against_style = Args['for_against_style'] or 'goals' | local for_against_style = Args['for_against_style'] or 'goals' | ||
Line 42: | Line 54: | ||
fa_word_sing = 'Goal' | fa_word_sing = 'Goal' | ||
fa_word_plur = 'Goals' | fa_word_plur = 'Goals' | ||
elseif for_against_style=='f' or for_against_style=='frame' or for_against_style=='frames' then | |||
fa_letter = 'F' | |||
fa_word_sing = 'Frame' | |||
fa_word_plur = 'Frames' | |||
elseif for_against_style=='m' or for_against_style=='match' or for_against_style=='matches' then | |||
fa_letter = 'M' | |||
fa_word_sing = 'Match' | |||
fa_word_plur = 'Matches' | |||
elseif for_against_style=='game' or for_against_style=='games' then | |||
fa_letter = 'G' | |||
fa_word_sing = 'Game' | |||
fa_word_plur = 'Games' | |||
elseif for_against_style=='p' or for_against_style=='point' or for_against_style=='points' then | elseif for_against_style=='p' or for_against_style=='point' or for_against_style=='points' then | ||
fa_letter = 'P' | fa_letter = 'P' | ||
fa_word_sing = 'Point' | fa_word_sing = 'Point' | ||
fa_word_plur = 'Points' | fa_word_plur = 'Points' | ||
elseif for_against_style=='s' or for_against_style=='set' or for_against_style=='sets' then | |||
fa_letter = 'S' | |||
fa_word_sing = 'Set' | |||
fa_word_plur = 'Sets' | |||
elseif for_against_style=='r' or for_against_style=='run' or for_against_style=='runs' then | |||
fa_letter = 'R' | |||
fa_word_sing = 'Run' | |||
fa_word_plur = 'Runs' | |||
elseif for_against_style=='none' then | elseif for_against_style=='none' then | ||
hide_for_against = true | hide_for_against = true | ||
Line 54: | Line 86: | ||
end | end | ||
-- Whether to use goal ratio (goal average) instead | -- Whether to use goal ratio (goal average) instead | ||
local | local do_ratio = yesno(Args['use_goal_ratio'] or 'no') | ||
local | local do_average = yesno(Args['use_goal_average'] or 'no') | ||
-- | |||
-- Whether to use goal percentage instead | |||
local do_percentage = yesno(Args['use_goal_percentage'] or Args['use_point_percentage'] or 'no') | |||
-- Whether to | -- Whether to suppress the GR/GA/G% column entirely | ||
local | local do_difference = yesno(Args['use_goal_diff'] or 'yes') | ||
-- | -- Use games behind header | ||
local show_GB = yesno(Args['show_GB'] or 'no') | |||
-- Initialize | -- Initialize | ||
Line 70: | Line 103: | ||
tt.tab_text = t -- Actual text | tt.tab_text = t -- Actual text | ||
-- Actual headers | -- Actual headers | ||
tt = p_sub.colhead(tt,28,pos_label) | if pos_label ~= nil then | ||
tt = p_sub.colhead(tt,28,pos_label) -- Position col | |||
end | |||
-- Add group header | -- Add group header | ||
if full_table and group_col then | if full_table and group_col then | ||
Line 76: | Line 111: | ||
end | end | ||
tt = p_sub.colhead(tt,team_width,team_head_text..VTE_text) -- Team col | tt = p_sub.colhead(tt,team_width,team_head_text..VTE_text) -- Team col | ||
tt = p_sub.colhead(tt,28,'<abbr title="Played">Pld</abbr>') | if pts_perc_first then | ||
if show_points then | |||
tt = p_sub.colhead(tt,28,'<abbr title="Points">Pts</abbr>') -- Points col | |||
elseif show_perc then | |||
tt = p_sub.colhead(tt,36,'<abbr title="Win percentage">PCT</abbr>') -- Win percentage col | |||
elseif show_ppg then | |||
tt = p_sub.colhead(tt,36,'<abbr title="Points per game">PPG</abbr>') -- Points per game col | |||
end | |||
end | |||
if show_played then | |||
tt = p_sub.colhead(tt,28,'<abbr title="Played">Pld</abbr>') -- Matches played col | |||
end | |||
if full_table then | if full_table then | ||
tt = p_sub.colhead(tt,28,'<abbr title="Won">W</abbr>') -- Win col | tt = p_sub.colhead(tt,28,'<abbr title="Won">W</abbr>') -- Win col | ||
if loss_first then | if loss_first then | ||
tt = p_sub.colhead(tt,28,'<abbr title="Lost">L</abbr>') -- Loss col | tt = p_sub.colhead(tt,28,'<abbr title="Lost">L</abbr>') -- Loss col | ||
tt = p_sub.colhead(tt,28,draw_head_text) | if show_draw then | ||
tt = p_sub.colhead(tt,28,draw_head_text) -- Draw col | |||
end | |||
else | else | ||
tt = p_sub.colhead(tt,28,draw_head_text) | if show_draw then | ||
tt = p_sub.colhead(tt,28,draw_head_text) -- Draw col | |||
end | |||
tt = p_sub.colhead(tt,28,'<abbr title="Lost">L</abbr>') -- Loss col | tt = p_sub.colhead(tt,28,'<abbr title="Lost">L</abbr>') -- Loss col | ||
end | |||
if rounds_won then | |||
tt = p_sub.colhead(tt,28,'<abbr title="Rounds won">RW</abbr>') -- Rounds won | |||
end | end | ||
if not hide_for_against then | if not hide_for_against then | ||
tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_plur..' for">'..fa_letter..'F</abbr>') -- For col | tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_plur..' for">'..fa_letter..'F</abbr>') -- For col | ||
tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_plur..' against">'..fa_letter..'A</abbr>') -- Against col | tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_plur..' against">'..fa_letter..'A</abbr>') -- Against col | ||
if do_ratio then | if do_ratio or do_average then | ||
tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_sing..' | local ratio_word = do_ratio and ' ratio' or ' average' | ||
local ratio_letter = do_ratio and 'R' or 'Av' | |||
tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_sing..ratio_word..'">'..fa_letter..ratio_letter..'</abbr>') -- Ratio col | |||
elseif do_percentage then | elseif do_percentage then | ||
tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_sing..' percentage">%</abbr>') -- Percentage col | tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_sing..' percentage">%</abbr>') -- Percentage col | ||
elseif do_difference then | |||
tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_sing..' difference">'..fa_letter..'D</abbr>') -- Difference col | tt = p_sub.colhead(tt,28,'<abbr title="'..fa_word_sing..' difference">'..fa_letter..'D</abbr>') -- Difference col | ||
end | end | ||
end | end | ||
end | end | ||
if show_points then | if show_away_goals then | ||
tt = p_sub.colhead(tt,28,away_goals_head_text) -- Away goals col | |||
end | |||
if show_bonus_points then | |||
tt = p_sub.colhead(tt,28,bonus_head_text) -- Bonus points col | |||
end | |||
if not pts_perc_first then | |||
if show_points then | |||
tt = p_sub.colhead(tt,28,'<abbr title="Points">Pts</abbr>') -- Points col | |||
elseif show_perc then | |||
tt = p_sub.colhead(tt,36,'<abbr title="Win percentage">PCT</abbr>') -- Win percentage col | |||
elseif show_ppg then | |||
tt = p_sub.colhead(tt,36,'<abbr title="Points per game">PPG</abbr>') -- Points per game col | |||
end | |||
end | end | ||
if full_table then | if full_table then | ||
if show_GB then -- Games behind header | |||
tt = p_sub.colhead(tt,28,'<abbr title="Games behind">GB</abbr>') | |||
end | |||
tt.count = tt.count+1 | tt.count = tt.count+1 | ||
table.insert(tt.tab_text,results_header_txt) | table.insert(tt.tab_text,results_header_txt) | ||
Line 119: | Line 187: | ||
-- Get custom/default options for in table | -- Get custom/default options for in table | ||
local win_points = tonumber(Args['winpoints']) or 3 | local show_draw = yesno(Args['show_draw'] or 'yes') | ||
local draw_points = tonumber(Args['drawpoints']) or 1 | local win_points = tonumber(Args['winpoints']) or (show_draw and 3 or 2) | ||
local loss_points = tonumber(Args['losspoints']) or 0 | local draw_points = tonumber(Args['drawpoints']) or (show_draw and 1 or 0) | ||
local loss_points = tonumber(Args['losspoints']) or (show_draw and 0 or 1) | |||
local rw_points = tonumber(Args['rwpoints']) or 1 | |||
-- Order of draws and losses -- | -- Order of draws and losses -- | ||
local loss_first = Args['loss_before_draw'] or false | local loss_first = Args['loss_before_draw'] or false | ||
-- Optional rounds won | |||
local rounds_won = yesno(Args['rounds_won'] or 'no') | |||
-- Get some input | -- Get some input | ||
Line 130: | Line 203: | ||
local draws = tonumber(Args['draw_'..team_code_ii]) or 0 | local draws = tonumber(Args['draw_'..team_code_ii]) or 0 | ||
local losses = tonumber(Args['loss_'..team_code_ii]) or 0 | local losses = tonumber(Args['loss_'..team_code_ii]) or 0 | ||
local | local rw = tonumber(Args['rw_'..team_code_ii]) or 0 | ||
local gaig = tonumber(Args['ga_'..team_code_ii] | local gfor = tonumber(Args['gf_'..team_code_ii] or Args['pf_'..team_code_ii] or '0') or '?' | ||
local gaig = tonumber(Args['ga_'..team_code_ii] or Args['pa_'..team_code_ii] or '0') or '?' | |||
local s_pts = tonumber(Args['adjust_points_'..team_code_ii]) or tonumber(Args['startpoints_'..team_code_ii]) or 0 | local s_pts = tonumber(Args['adjust_points_'..team_code_ii]) or tonumber(Args['startpoints_'..team_code_ii]) or 0 | ||
local hth_local = Args['hth_'..team_code_ii] | local hth_local = yesno(Args['show_hth'] or 'yes') and Args['hth_'..team_code_ii] or nil | ||
-- Then calculate some values | -- Then calculate some values | ||
local matches = wins + draws + losses | local matches = wins + draws + losses | ||
local points = win_points*wins + draw_points*draws + loss_points*losses + s_pts | local points = win_points*wins + draw_points*draws + loss_points*losses + rw_points*rw + s_pts | ||
--Some sports use draw as well | --Some sports use draw as well | ||
local win_perc = mm._precision_format((2*wins + draws) / (2*matches), 3) | local win_perc = mm._precision_format((2*wins + draws) / (2*matches), 3) | ||
local ppg = mm._precision_format(points / matches, 2) | |||
if matches == 0 then | if matches == 0 then | ||
-- Escape for zero matches | -- Escape for zero matches | ||
win_perc = '—' | win_perc = '—' | ||
ppg = '—' | |||
elseif losses > 0 then | elseif losses > 0 then | ||
-- Drop the leading zero (from the string) | -- Drop the leading zero (from the string) | ||
win_perc = string.sub(win_perc,2,string.len(win_perc)) | win_perc = string.sub(win_perc,2,string.len(win_perc)) | ||
end | end | ||
-- Show for/against | -- Show for/against | ||
local for_against_style = Args['for_against_style'] or 'goals' | local for_against_style = Args['for_against_style'] or 'goals' | ||
Line 155: | Line 231: | ||
hide_for_against = true | hide_for_against = true | ||
end | end | ||
-- Comparison of for against | -- Comparison of for against | ||
local gcomp | local gcomp = nil | ||
-- Whether to use goal ratio (goal average) or goal percentage instead | -- Whether to use goal ratio (goal average) or goal percentage instead | ||
local skip_sign | local skip_sign | ||
if yesno( | if yesno(Args['use_goal_ratio'] or 'no') or yesno(Args['use_goal_average'] or 'no') then | ||
-- Now it is the goal ratio/goal average | -- Now it is the goal ratio/goal average | ||
if gaig == 0 then | if (gfor == '?') or (gaig == '?') or gaig == 0 then | ||
gcomp = '—' | gcomp = '—' | ||
else | else | ||
gcomp = mm._precision_format(gfor / gaig, 3) | gcomp = mm._precision_format(gfor / gaig, 3) | ||
end | end | ||
elseif yesno( | elseif yesno(Args['use_goal_percentage'] or 'no') then | ||
-- Now it is the percentage | -- Now it is the percentage | ||
if gaig == 0 then | if (gfor == '?') or (gaig == '?') or gaig == 0 then | ||
gcomp = '—' | gcomp = '—' | ||
else | else | ||
gcomp = mm._precision_format(100 * gfor / gaig , 1) | gcomp = mm._precision_format(100 * gfor / gaig , 1) | ||
end | end | ||
else | elseif yesno(Args['use_point_percentage'] or 'no') then | ||
-- Now it is the point percentage | |||
if (gfor == '?') or (gaig == '?') or (gfor + gaig) <= 0 then | |||
gcomp = '—' | |||
else | |||
gcomp = mm._precision_format(100 * gfor / (gfor + gaig) , 2) | |||
end | |||
elseif yesno(Args['use_goal_diff'] or 'yes') then | |||
-- It's goal difference | -- It's goal difference | ||
gcomp = gfor - gaig | if (gfor == '?') or (gaig == '?') then | ||
gcomp = '—' | |||
else | |||
gcomp = gfor - gaig | |||
-- Formatting with signs | |||
if gcomp>0 then | |||
gcomp='+'..gcomp | |||
elseif gcomp < 0 then | |||
gcomp='−'..-gcomp | |||
end | |||
end | |||
end | |||
-- Use actual values if gfor or gaig is not numeric | |||
if (gfor == '?') then gfor = Args['gf_'..team_code_ii] or Args['pf_'..team_code_ii] or '' end | |||
if (gaig == '?') then gaig = Args['ga_'..team_code_ii] or Args['pa_'..team_code_ii] or '' end | |||
-- Show games behind | |||
local show_GB = yesno(Args['show_GB'] or 'no') | |||
local GB_text = '—' | |||
if show_GB then | |||
local GB_team_no = tonumber(Args['GB_team']) or 1 | |||
if ii == GB_team_no then | |||
-- Do nothing, it's vs this team | |||
else | |||
local wins_GB = tonumber(Args['win_'..team_list[GB_team_no]]) or 0 | |||
local losses_GB = tonumber(Args['loss_'..team_list[GB_team_no]]) or 0 | |||
local GB_num = (wins_GB-wins+losses-losses_GB)/2 | |||
-- Display options | |||
if GB_num >0 then | |||
-- Indicates trailing GB_team | |||
GB_text = GB_num | |||
elseif GB_num == 0 then | |||
-- Equal, do nothing to get dash | |||
else | |||
-- Ahead of GB team, should be noted by plus (instead of minus that comes from formula) | |||
GB_text = '+'..-GB_num | |||
end | |||
end | end | ||
end | end | ||
Line 196: | Line 308: | ||
-- What to rank the teams by | -- What to rank the teams by | ||
local ranking_style = Args['ranking_style'] or 'pts' | local ranking_style = Args['ranking_style'] or 'pts' | ||
local rank_points, rank_perc = false | local rank_points, rank_perc, rank_ppg = false, false, false | ||
local win_fw, win_string | local win_fw, win_string | ||
ranking_style = string.lower(ranking_style) | ranking_style = string.lower(ranking_style) | ||
Line 206: | Line 318: | ||
-- Based on percentage | -- Based on percentage | ||
rank_perc = true | rank_perc = true | ||
win_fw=ii_fw | |||
win_string = '' | |||
elseif ranking_style=='ppg' or ranking_style=='points per game' or ranking_style=='ptspergame' then | |||
-- Based on points per game | |||
rank_ppg = true | |||
win_fw=ii_fw | |||
win_string = '' | |||
elseif ranking_style=='none' then | |||
win_fw=ii_fw | win_fw=ii_fw | ||
win_string = '' | win_string = '' | ||
Line 214: | Line 334: | ||
win_string = '' | win_string = '' | ||
end | end | ||
local show_played = not yesno(Args['hide_played'] or 'no') | |||
local show_away_goals = yesno(Args['show_away_goals'] or 'no') | |||
local show_bonus_points = yesno(Args['show_bonus_points'] or 'no') | |||
local pts_perc_first = yesno((rank_points and Args['pts_first']) or (rank_perc and Args['perc_first']) or 'no') | |||
-- Row building | -- Row building | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..matches..'\n') -- Played | if pts_perc_first then | ||
if rank_points then | |||
-- Add − for negative point totals | |||
if points<0 then | |||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | −'..-points..hth_string..'\n') | |||
else | |||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..points..hth_string..'\n') | |||
end | |||
elseif rank_perc then | |||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..win_perc..hth_string..'\n') | |||
elseif rank_ppg then | |||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..ppg..hth_string..'\n') | |||
end | |||
end | |||
if show_played then | |||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..matches..'\n') -- Played | |||
end | |||
if full_table then | if full_table then | ||
-- Use actual values if wins, draws, and losses are not numeric | |||
if (wins == 0 and draws == 0 and losses == 0) then | |||
local function numorval(s) | |||
return s and ((s == '' and 0) or tonumber(s) or s) or 0 | |||
end | |||
wins = numorval(Args['win_'..team_code_ii]) | |||
draws = numorval(Args['draw_'..team_code_ii]) | |||
losses = numorval(Args['loss_'..team_code_ii]) | |||
end | |||
table.insert(t,'| style="'..win_fw..bg_col..'" |'..wins..win_string..'\n') -- Won | table.insert(t,'| style="'..win_fw..bg_col..'" |'..wins..win_string..'\n') -- Won | ||
if loss_first then | if loss_first then | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..losses..'\n') -- Lost | table.insert(t,'| style="'..ii_fw..bg_col..'" |'..losses..'\n') -- Lost | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..draws..'\n') | if show_draw then | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..draws..'\n') -- Drawn | |||
end | |||
else | else | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..draws..'\n') | if show_draw then | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..draws..'\n') -- Drawn | |||
end | |||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..losses..'\n') -- Lost | table.insert(t,'| style="'..ii_fw..bg_col..'" |'..losses..'\n') -- Lost | ||
end | end | ||
if rounds_won then | |||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..rw..'\n') -- Rounds won | |||
end | |||
if not hide_for_against then | if not hide_for_against then | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gfor..'\n') -- GF | table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gfor..'\n') -- GF | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gaig..'\n') -- GA | table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gaig..'\n') -- GA | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gcomp..'\n') -- Goal comparison | if gcomp then | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gcomp..'\n') -- Goal comparison | |||
end | |||
end | end | ||
end | end | ||
if | if show_away_goals then | ||
table.insert(t,'| style="'..bg_col..'" | '..(Args['away_goals_'..team_code_ii] or '')..'\n') | |||
if | end | ||
table.insert(t,'| style=" | if show_bonus_points then | ||
if s_pts < 0 then | |||
table.insert(t,'| style="'..bg_col..'" | −'..-s_pts..'\n') | |||
else | else | ||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..points..hth_string..'\n') | table.insert(t,'| style="'..bg_col..'" | '..s_pts..'\n') | ||
end | |||
end | |||
if not pts_perc_first then | |||
if rank_points then | |||
-- Add − for negative point totals | |||
if points<0 then | |||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | −'..-points..hth_string..'\n') | |||
else | |||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..points..hth_string..'\n') | |||
end | |||
elseif rank_perc then | |||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..win_perc..hth_string..'\n') | |||
elseif rank_ppg then | |||
table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..ppg..hth_string..'\n') | |||
end | end | ||
end | |||
table.insert(t,'| style=" | if show_GB then | ||
table.insert(t,'| style="'..ii_fw..bg_col..'" |'..GB_text..'\n') -- GB | |||
end | end | ||
return {t=t, notes_exist=notes_exist, hth_id_list=hth_id_list} | return {t=t, notes_exist=notes_exist, hth_id_list=hth_id_list} | ||
Line 254: | Line 428: | ||
-- Or functionality will be compromised | -- Or functionality will be compromised | ||
-- ------------------------------------------------------------ | -- ------------------------------------------------------------ | ||
local status_code, status_called = {} | local status_code, status_called = {}, {} | ||
status_code = { A='Advance to a further round', C='Champion', D='Disqualified', | status_code = { A='Advance to a further round', C='Champion', D='Disqualified', | ||
E='Eliminated', G='Guest', H='Host', O='Play-off winner', P='Promoted', Q='Qualified to the phase indicated', | E='Eliminated', G='Guest', H='Host', O='Play-off winner', P='Promoted', Q='Qualified to the phase indicated', | ||
R='Relegated', T='Qualified, but not yet to the particular phase indicated' | R='Relegated', T='Qualified, but not yet to the particular phase indicated'} | ||
local status_letters = (Args['status_order'] or '') .. 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | |||
-- Status position (before or after read and default) | -- Status position (before or after read and default) | ||
local stat_pos_val = Args['status_pos'] or '' | local stat_pos_val = string.lower(Args['status_pos'] or '') | ||
local status_position = 'after' -- Default location | local status_position = 'after' -- Default location | ||
if stat_pos_val=='before' then | if stat_pos_val=='before' then | ||
status_position = 'before' | status_position = 'before' | ||
Line 272: | Line 442: | ||
status_position = 'after' | status_position = 'after' | ||
end | end | ||
-- Read in custom status options | -- Read in custom status options | ||
for l in mw.text.gsplit(status_letters, '') do | |||
status_called[l] = false | |||
status_code[l] = status_code[l] or '?' | |||
status_letters = mw.ustring.gsub(status_letters, '(' .. l ..'.-)' .. l, '%1') | |||
if Args['status_text_' .. l] then | |||
status_code[l] = Args['status_text_' .. l] | |||
end | |||
end | |||
return {code=status_code, called=status_called, letters=status_letters, position=status_position} | return {code=status_code, called=status_called, letters=status_letters, position=status_position} |
Latest revision as of 13:10, 22 September 2019
-- Style for football tables local pp = {}
function pp.header(t,Args,p_sub,pos_label,group_col,VTE_text,full_table,results_header_txt) -- Load relevant modules local yesno = require('Module:Yesno')
-- Create table header -- Pre stuff local team_width = Args['teamwidth'] or '190' local sort_text = yesno(Args['sortable_table'] or 'no') and ' sortable' or local show_played = not yesno(Args['hide_played'] or 'no') local rounds_won = yesno(Args['rounds_won'] or 'no') table.insert(t,'{| class="wikitable'..sort_text..'" style="text-align:center;"\n') -- Open table -- Table title if Args['title'] then table.insert(t,'|+ ' .. Args['title'] .. '\n') end -- Custom header options local draw_head_text = Args['draw_header'] or 'D' local group_head_text = Args['group_header'] or 'Grp' local team_head_text = Args['team_header'] or 'Team' local away_goals_head_text = Args['away_goals_header'] or 'AG' local bonus_head_text = Args['bonus_header'] or 'BP' local loss_first = Args['loss_before_draw'] or false -- What to rank the teams by local ranking_style = Args['ranking_style'] or 'pts' local show_points, show_perc, show_ppg = false, false, false ranking_style = string.lower(ranking_style) if ranking_style=='w' or ranking_style=='win' or ranking_style=='wins' or ranking_style=='none' then -- Based on wins elseif ranking_style=='perc' or ranking_style=='percentage' or ranking_style=='%' then -- Based on percentage show_perc = true elseif ranking_style=='ppg' or ranking_style=='points per game' or ranking_style=='ptspergame' then -- Based on points per game show_ppg = true else -- Based on points show_points = true end local pts_perc_first = yesno((show_points and Args['pts_first']) or (show_perc and Args['perc_first']) or 'no') local show_away_goals = yesno(Args['show_away_goals'] or 'no') local show_bonus_points = yesno(Args['show_bonus_points'] or 'no') local show_draw = yesno(Args['show_draw'] or 'yes') -- Use points instead of goals for/against local for_against_style = Args['for_against_style'] or 'goals' local fa_letter, fa_word_sing, fa_word_plur local hide_for_against = false -- First convert to lower case if it is a string for_against_style = string.lower(for_against_style) if for_against_style=='g' or for_against_style=='goal' or for_against_style=='goals' then fa_letter = 'G' fa_word_sing = 'Goal' fa_word_plur = 'Goals' elseif for_against_style=='f' or for_against_style=='frame' or for_against_style=='frames' then fa_letter = 'F' fa_word_sing = 'Frame' fa_word_plur = 'Frames' elseif for_against_style=='m' or for_against_style=='match' or for_against_style=='matches' then fa_letter = 'M' fa_word_sing = 'Match' fa_word_plur = 'Matches' elseif for_against_style=='game' or for_against_style=='games' then fa_letter = 'G' fa_word_sing = 'Game' fa_word_plur = 'Games' elseif for_against_style=='p' or for_against_style=='point' or for_against_style=='points' then fa_letter = 'P' fa_word_sing = 'Point' fa_word_plur = 'Points'
elseif for_against_style=='s' or for_against_style=='set' or for_against_style=='sets' then fa_letter = 'S' fa_word_sing = 'Set' fa_word_plur = 'Sets' elseif for_against_style=='r' or for_against_style=='run' or for_against_style=='runs' then fa_letter = 'R' fa_word_sing = 'Run' fa_word_plur = 'Runs'
elseif for_against_style=='none' then hide_for_against = true else fa_letter = 'G' fa_word_sing = 'Goal' fa_word_plur = 'Goals' end -- Whether to use goal ratio (goal average) instead local do_ratio = yesno(Args['use_goal_ratio'] or 'no') local do_average = yesno(Args['use_goal_average'] or 'no')
-- Whether to use goal percentage instead local do_percentage = yesno(Args['use_goal_percentage'] or Args['use_point_percentage'] or 'no')
-- Whether to suppress the GR/GA/G% column entirely local do_difference = yesno(Args['use_goal_diff'] or 'yes')
-- Use games behind header local show_GB = yesno(Args['show_GB'] or 'no')
-- Initialize local tt = {} tt.count = 0 -- Up by one after every call tt.tab_text = t -- Actual text -- Actual headers if pos_label ~= nil then tt = p_sub.colhead(tt,28,pos_label) -- Position col end -- Add group header if full_table and group_col then tt = p_sub.colhead(tt,28,group_head_text) -- Group col end tt = p_sub.colhead(tt,team_width,team_head_text..VTE_text) -- Team col if pts_perc_first then if show_points then tt = p_sub.colhead(tt,28,'Pts') -- Points col elseif show_perc then tt = p_sub.colhead(tt,36,'PCT') -- Win percentage col elseif show_ppg then tt = p_sub.colhead(tt,36,'PPG') -- Points per game col end end if show_played then tt = p_sub.colhead(tt,28,'Pld') -- Matches played col end if full_table then tt = p_sub.colhead(tt,28,'W') -- Win col if loss_first then tt = p_sub.colhead(tt,28,'L') -- Loss col if show_draw then tt = p_sub.colhead(tt,28,draw_head_text) -- Draw col end else if show_draw then tt = p_sub.colhead(tt,28,draw_head_text) -- Draw col end tt = p_sub.colhead(tt,28,'L') -- Loss col end if rounds_won then tt = p_sub.colhead(tt,28,'RW') -- Rounds won end if not hide_for_against then tt = p_sub.colhead(tt,28,''..fa_letter..'F') -- For col tt = p_sub.colhead(tt,28,''..fa_letter..'A') -- Against col if do_ratio or do_average then local ratio_word = do_ratio and ' ratio' or ' average' local ratio_letter = do_ratio and 'R' or 'Av' tt = p_sub.colhead(tt,28,''..fa_letter..ratio_letter..'') -- Ratio col elseif do_percentage then tt = p_sub.colhead(tt,28,'%') -- Percentage col elseif do_difference then tt = p_sub.colhead(tt,28,''..fa_letter..'D') -- Difference col end end end if show_away_goals then tt = p_sub.colhead(tt,28,away_goals_head_text) -- Away goals col end if show_bonus_points then tt = p_sub.colhead(tt,28,bonus_head_text) -- Bonus points col end if not pts_perc_first then if show_points then tt = p_sub.colhead(tt,28,'Pts') -- Points col elseif show_perc then tt = p_sub.colhead(tt,36,'PCT') -- Win percentage col elseif show_ppg then tt = p_sub.colhead(tt,36,'PPG') -- Points per game col end end if full_table then if show_GB then -- Games behind header tt = p_sub.colhead(tt,28,'GB') end tt.count = tt.count+1 table.insert(tt.tab_text,results_header_txt) end
return tt end
function pp.row(frame,t,Args,p_sub,notes_exist,hth_id_list,full_table,rand_val,team_list,team_code_ii,ii_start,ii_end,ii_fw,bg_col,N_teams,ii,ii_show) -- Build the inner parts of individual rows
-- Sub-module usage local mm = require('Module:Math') local yesno = require('Module:Yesno')
-- Get custom/default options for in table local show_draw = yesno(Args['show_draw'] or 'yes') local win_points = tonumber(Args['winpoints']) or (show_draw and 3 or 2) local draw_points = tonumber(Args['drawpoints']) or (show_draw and 1 or 0) local loss_points = tonumber(Args['losspoints']) or (show_draw and 0 or 1) local rw_points = tonumber(Args['rwpoints']) or 1
-- Order of draws and losses -- local loss_first = Args['loss_before_draw'] or false
-- Optional rounds won local rounds_won = yesno(Args['rounds_won'] or 'no')
-- Get some input local wins = tonumber(Args['win_'..team_code_ii]) or 0 local draws = tonumber(Args['draw_'..team_code_ii]) or 0 local losses = tonumber(Args['loss_'..team_code_ii]) or 0 local rw = tonumber(Args['rw_'..team_code_ii]) or 0 local gfor = tonumber(Args['gf_'..team_code_ii] or Args['pf_'..team_code_ii] or '0') or '?' local gaig = tonumber(Args['ga_'..team_code_ii] or Args['pa_'..team_code_ii] or '0') or '?' local s_pts = tonumber(Args['adjust_points_'..team_code_ii]) or tonumber(Args['startpoints_'..team_code_ii]) or 0 local hth_local = yesno(Args['show_hth'] or 'yes') and Args['hth_'..team_code_ii] or nil -- Then calculate some values local matches = wins + draws + losses local points = win_points*wins + draw_points*draws + loss_points*losses + rw_points*rw + s_pts
--Some sports use draw as well local win_perc = mm._precision_format((2*wins + draws) / (2*matches), 3) local ppg = mm._precision_format(points / matches, 2) if matches == 0 then -- Escape for zero matches win_perc = '—' ppg = '—' elseif losses > 0 then -- Drop the leading zero (from the string) win_perc = string.sub(win_perc,2,string.len(win_perc)) end
-- Show for/against local for_against_style = Args['for_against_style'] or 'goals' local hide_for_against = false for_against_style = string.lower(for_against_style) if for_against_style=='none' then hide_for_against = true end
-- Comparison of for against local gcomp = nil -- Whether to use goal ratio (goal average) or goal percentage instead local skip_sign if yesno(Args['use_goal_ratio'] or 'no') or yesno(Args['use_goal_average'] or 'no') then -- Now it is the goal ratio/goal average if (gfor == '?') or (gaig == '?') or gaig == 0 then gcomp = '—' else gcomp = mm._precision_format(gfor / gaig, 3) end elseif yesno(Args['use_goal_percentage'] or 'no') then -- Now it is the percentage if (gfor == '?') or (gaig == '?') or gaig == 0 then gcomp = '—' else gcomp = mm._precision_format(100 * gfor / gaig , 1) end elseif yesno(Args['use_point_percentage'] or 'no') then -- Now it is the point percentage if (gfor == '?') or (gaig == '?') or (gfor + gaig) <= 0 then gcomp = '—' else gcomp = mm._precision_format(100 * gfor / (gfor + gaig) , 2) end elseif yesno(Args['use_goal_diff'] or 'yes') then -- It's goal difference if (gfor == '?') or (gaig == '?') then gcomp = '—' else gcomp = gfor - gaig -- Formatting with signs if gcomp>0 then gcomp='+'..gcomp elseif gcomp < 0 then gcomp='−'..-gcomp end end end -- Use actual values if gfor or gaig is not numeric if (gfor == '?') then gfor = Args['gf_'..team_code_ii] or Args['pf_'..team_code_ii] or end if (gaig == '?') then gaig = Args['ga_'..team_code_ii] or Args['pa_'..team_code_ii] or end
-- Show games behind local show_GB = yesno(Args['show_GB'] or 'no') local GB_text = '—' if show_GB then local GB_team_no = tonumber(Args['GB_team']) or 1 if ii == GB_team_no then -- Do nothing, it's vs this team else local wins_GB = tonumber(Args['win_'..team_list[GB_team_no]]) or 0 local losses_GB = tonumber(Args['loss_'..team_list[GB_team_no]]) or 0 local GB_num = (wins_GB-wins+losses-losses_GB)/2 -- Display options if GB_num >0 then -- Indicates trailing GB_team GB_text = GB_num elseif GB_num == 0 then -- Equal, do nothing to get dash else -- Ahead of GB team, should be noted by plus (instead of minus that comes from formula) GB_text = '+'..-GB_num end end end
-- Some local vars local hth_string local tt_return = p_sub.hth(frame,Args,full_table,hth_id_list,hth_local,notes_exist,team_list,team_code_ii,ii_start,ii_end,rand_val) hth_string = tt_return.str hth_id_list = tt_return.list notes_exist = tt_return.notes_exist
-- What to rank the teams by local ranking_style = Args['ranking_style'] or 'pts' local rank_points, rank_perc, rank_ppg = false, false, false local win_fw, win_string ranking_style = string.lower(ranking_style) if ranking_style=='w' or ranking_style=='win' or ranking_style=='wins' then -- Based on wins win_fw = 'font-weight: bold;' win_string = hth_string elseif ranking_style=='perc' or ranking_style=='percentage' or ranking_style=='%' then -- Based on percentage rank_perc = true win_fw=ii_fw win_string = elseif ranking_style=='ppg' or ranking_style=='points per game' or ranking_style=='ptspergame' then -- Based on points per game rank_ppg = true win_fw=ii_fw win_string = elseif ranking_style=='none' then win_fw=ii_fw win_string = else -- Based on points rank_points = true win_fw=ii_fw win_string = end local show_played = not yesno(Args['hide_played'] or 'no') local show_away_goals = yesno(Args['show_away_goals'] or 'no') local show_bonus_points = yesno(Args['show_bonus_points'] or 'no') local pts_perc_first = yesno((rank_points and Args['pts_first']) or (rank_perc and Args['perc_first']) or 'no') -- Row building if pts_perc_first then if rank_points then -- Add − for negative point totals if points<0 then table.insert(t,'| style="font-weight: bold;'..bg_col..'" | −'..-points..hth_string..'\n') else table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..points..hth_string..'\n') end elseif rank_perc then table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..win_perc..hth_string..'\n') elseif rank_ppg then table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..ppg..hth_string..'\n') end end if show_played then table.insert(t,'| style="'..ii_fw..bg_col..'" |'..matches..'\n') -- Played end if full_table then -- Use actual values if wins, draws, and losses are not numeric if (wins == 0 and draws == 0 and losses == 0) then local function numorval(s) return s and ((s == and 0) or tonumber(s) or s) or 0 end wins = numorval(Args['win_'..team_code_ii]) draws = numorval(Args['draw_'..team_code_ii]) losses = numorval(Args['loss_'..team_code_ii]) end
table.insert(t,'| style="'..win_fw..bg_col..'" |'..wins..win_string..'\n') -- Won
if loss_first then table.insert(t,'| style="'..ii_fw..bg_col..'" |'..losses..'\n') -- Lost if show_draw then table.insert(t,'| style="'..ii_fw..bg_col..'" |'..draws..'\n') -- Drawn end else if show_draw then table.insert(t,'| style="'..ii_fw..bg_col..'" |'..draws..'\n') -- Drawn end table.insert(t,'| style="'..ii_fw..bg_col..'" |'..losses..'\n') -- Lost end if rounds_won then table.insert(t,'| style="'..ii_fw..bg_col..'" |'..rw..'\n') -- Rounds won end if not hide_for_against then table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gfor..'\n') -- GF table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gaig..'\n') -- GA if gcomp then table.insert(t,'| style="'..ii_fw..bg_col..'" |'..gcomp..'\n') -- Goal comparison end end
end if show_away_goals then table.insert(t,'| style="'..bg_col..'" | '..(Args['away_goals_'..team_code_ii] or )..'\n') end if show_bonus_points then if s_pts < 0 then table.insert(t,'| style="'..bg_col..'" | −'..-s_pts..'\n') else table.insert(t,'| style="'..bg_col..'" | '..s_pts..'\n') end end if not pts_perc_first then if rank_points then -- Add − for negative point totals if points<0 then table.insert(t,'| style="font-weight: bold;'..bg_col..'" | −'..-points..hth_string..'\n') else table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..points..hth_string..'\n') end elseif rank_perc then table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..win_perc..hth_string..'\n') elseif rank_ppg then table.insert(t,'| style="font-weight: bold;'..bg_col..'" | '..ppg..hth_string..'\n') end end if show_GB then table.insert(t,'| style="'..ii_fw..bg_col..'" |'..GB_text..'\n') -- GB end return {t=t, notes_exist=notes_exist, hth_id_list=hth_id_list} end
function pp.status(Args) -- Declare status options -- ------------------------------------------------------------ -- NOTE: If you add to status_code, also add to status_called and status_letters!! -- Or functionality will be compromised -- ------------------------------------------------------------ local status_code, status_called = {}, {} status_code = { A='Advance to a further round', C='Champion', D='Disqualified', E='Eliminated', G='Guest', H='Host', O='Play-off winner', P='Promoted', Q='Qualified to the phase indicated', R='Relegated', T='Qualified, but not yet to the particular phase indicated'} local status_letters = (Args['status_order'] or ) .. 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-- Status position (before or after read and default) local stat_pos_val = string.lower(Args['status_pos'] or ) local status_position = 'after' -- Default location if stat_pos_val=='before' then status_position = 'before' elseif stat_pos_val=='after' then status_position = 'after' end -- Read in custom status options for l in mw.text.gsplit(status_letters, ) do status_called[l] = false status_code[l] = status_code[l] or '?' status_letters = mw.ustring.gsub(status_letters, '(' .. l ..'.-)' .. l, '%1')
if Args['status_text_' .. l] then status_code[l] = Args['status_text_' .. l] end end
return {code=status_code, called=status_called, letters=status_letters, position=status_position} end
return pp