Module:Tournoi - Historique des versions

Banz le 14 septembre 2020 à 01:09

2020-09-14T01:09:08Z

← Version précédente		Version du 14 septembre 2020 à 01:09
Ligne 190 :		Ligne 190 :
	:wikitext(getTeamArg(round, SCORE_NAME, team))		:wikitext(getTeamArg(round, SCORE_NAME, team))
	:newline()		:newline()
	~~else~~
	~~row:newline()~~
	end		end

Ligne 359 :		Ligne 357 :
	end		end
	local teamCell = addBlank(widthRow, getWidth(TEAM_NAME, '150px'))		local teamCell = addBlank(widthRow, getWidth(TEAM_NAME, '150px'))
	~~local~~ scoreCell = addBlank(widthRow, getWidth(SCORE_NAME, '25px'))		local scoreCell
			if not hideScores then
			scoreCell = addBlank(widthRow, getWidth(SCORE_NAME, '25px'))
			end
	addBlank(titleRow)		addBlank(titleRow)
	addBlank(widthRow, r < rounds and '5px' or nil)		addBlank(widthRow, r < rounds and '5px' or nil)
Ligne 370 :		Ligne 371 :
	end		end
	teamCell:wikitext(' ')		teamCell:wikitext(' ')
	scoreCell:wikitext(' ')		if scoreCell then
			scoreCell:wikitext(' ')
			end
	end		end
	end		end

Banz le 14 septembre 2020 à 00:57

2020-09-14T00:57:12Z

← Version précédente		Version du 14 septembre 2020 à 00:57
Ligne 190 :		Ligne 190 :
	:wikitext(getTeamArg(round, SCORE_NAME, team))		:wikitext(getTeamArg(round, SCORE_NAME, team))
	:newline()		:newline()
			else
			row:newline()
	end		end

Banz le 14 septembre 2020 à 00:53

2020-09-14T00:53:24Z

← Version précédente		Version du 14 septembre 2020 à 00:53
Ligne 169 :		Ligne 169 :
	:css('border-top-width', '1px')		:css('border-top-width', '1px')
	:css('border-left-width', '1px')		:css('border-left-width', '1px')
	:css('border-right-width', '0')		:css('border-right-width', '1px')
	:css('border-bottom-width', '0')		:css('border-bottom-width', '0')
	:css('padding', '0 2px')		:css('padding', '0 2px')
Ligne 184 :		Ligne 184 :
	:css('border-style', 'solid')		:css('border-style', 'solid')
	:css('border-top-width', '1px')		:css('border-top-width', '1px')
	:css('border-left-width', '~~1px~~')		:css('border-left-width', '0')
	:css('border-right-width', '1px')		:css('border-right-width', '1px')
	:css('border-bottom-width', '0')		:css('border-bottom-width', '0')

Banz le 14 septembre 2020 à 00:26

2020-09-14T00:26:45Z

← Version précédente		Version du 14 septembre 2020 à 00:26
Ligne 135 :		Ligne 135 :

	function renderTeam(row, round, team, top, compact)		function renderTeam(row, round, team, top, compact)
			local scoreCell
	local seedCell		local seedCell
	local seedArg = getTeamArg(round, SEED_NAME, team)		local seedArg = getTeamArg(round, SEED_NAME, team)
Ligne 178 :		Ligne 179 :

	if (not hideScores) then		if (not hideScores) then
	~~local~~ scoreCell = row:tag('td')		scoreCell = row:tag('td')
	:css('text-align', 'center')		:css('text-align', 'center')
	:css('border-color', '#aaa')		:css('border-color', '#aaa')
Ligne 196 :		Ligne 197 :
	:css('border-bottom-width', '1px')		:css('border-bottom-width', '1px')
	end		end
	scoreCell:attr('rowspan', '2')		if scoreCell then
	:css('border-bottom-width', '1px')		scoreCell:attr('rowspan', '2')
			:css('border-bottom-width', '1px')
			end
	teamCell:attr('rowspan', '2')		teamCell:attr('rowspan', '2')
	:css('border-right-width', '1px')		:css('border-right-width', '1px')
Ligne 207 :		Ligne 210 :
	end		end
	teamCell:css('border-bottom-width', '1px')		teamCell:css('border-bottom-width', '1px')
	scoreCell:css('border-bottom-width', '1px')		if scoreCell then
			scoreCell:css('border-bottom-width', '1px')
			end
	end		end
	end		end

Banz le 14 septembre 2020 à 00:24

2020-09-14T00:24:36Z

← Version précédente		Version du 14 septembre 2020 à 00:24
Ligne 7 :		Ligne 7 :
	local rounds		local rounds
	local padding		local padding
			local hideColspanModifier = 0
	local hideSeeds		local hideSeeds
	local showSeeds		local showSeeds
			local hideScores
	local tracking = ''		local tracking = ''

Ligne 19 :		Ligne 21 :
	local SEED_NAME = 'graine'		local SEED_NAME = 'graine'
	local TEAM_NAME = 'équipe'		local TEAM_NAME = 'équipe'
			local SCORES_NAME = 'scores'
	local SCORE_NAME = 'score'		local SCORE_NAME = 'score'
	local GROUP_NAME = 'groupe'		local GROUP_NAME = 'groupe'
Ligne 174 :		Ligne 177 :
	end		end

	local scoreCell = row:tag('td')		if (not hideScores) then
	:css('text-align', 'center')		local scoreCell = row:tag('td')
	:css('border-color', '#aaa')		:css('text-align', 'center')
	:css('border-style', 'solid')		:css('border-color', '#aaa')
	:css('border-top-width', '1px')		:css('border-style', 'solid')
	:css('border-left-width', '1px')		:css('border-top-width', '1px')
	:css('border-right-width', '1px')		:css('border-left-width', '1px')
	:css('border-bottom-width', '0')		:css('border-right-width', '1px')
	:css('background-color', '#f9f9f9')		:css('border-bottom-width', '0')
	:wikitext(getTeamArg(round, SCORE_NAME, team))		:css('background-color', '#f9f9f9')
	:newline()		:wikitext(getTeamArg(round, SCORE_NAME, team))
			:newline()
			end

	if not compact then		if not compact then
Ligne 225 :		Ligne 230 :
	if height > 0 then		if height > 0 then
	blank = addBlank(rows[offset])		blank = addBlank(rows[offset])
	:attr('colspan', ~~hideSeeds and '4' or '~~5')		:attr('colspan', hideColspanModifier + 5)
	:attr('rowspan', height)		:attr('rowspan', height)
	:css('border-color', 'black')		:css('border-color', 'black')
Ligne 262 :		Ligne 267 :
	if height > 0 then		if height > 0 then
	blank = addBlank(rows[offset])		blank = addBlank(rows[offset])
	:attr('colspan', ~~hideSeeds and '4' or '~~5')		:attr('colspan', hideColspanModifier + 5)
	:css('border-color', 'black')		:css('border-color', 'black')
	:css('border-style', 'solid')		:css('border-style', 'solid')
Ligne 295 :		Ligne 300 :
	addBlank(rows[i])		addBlank(rows[i])
	:attr('rowspan', '2')		:attr('rowspan', '2')
	:attr('colspan', (~~hideSeeds and 4 or~~ 5) * round - 1)		:attr('colspan', (hideColspanModifier + 5) * round - 1)
	:css('text-align', 'center')		:css('text-align', 'center')
	:css('border-color', 'black')		:css('border-color', 'black')
Ligne 336 :		Ligne 341 :
	addBlank(widthRow, r > 1 and '5px' or nil)		addBlank(widthRow, r > 1 and '5px' or nil)
	titleRow:tag('td')		titleRow:tag('td')
	:attr('colspan', ~~hideSeeds and '2' or '~~3')		:attr('colspan', hideColspanModifier + 3)
	:css('text-align', 'center')		:css('text-align', 'center')
	:css('border', '1px solid #aaa')		:css('border', '1px solid #aaa')
Ligne 379 :		Ligne 384 :
	hideSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == NO_VALUE or args[SEEDS_NAME] == N_VALUE))		hideSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == NO_VALUE or args[SEEDS_NAME] == N_VALUE))
	showSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == YES_VALUE or args[SEEDS_NAME] == Y_VALUE))		showSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == YES_VALUE or args[SEEDS_NAME] == Y_VALUE))
			hideScores = (args[SCORES_NAME] and (args[SCORES_NAME] == NO_VALUE or args[SCORES_NAME] == N_VALUE))

			if hideSeeds then
			hideColspanModifier = hideColspanModifier - 1
			end

			if hideScores then
			hideColspanModifier = hideColspanModifier - 1
			end

	if autoSeeds then		if autoSeeds then

Banz le 13 septembre 2020 à 23:47

2020-09-13T23:47:20Z

← Version précédente		Version du 13 septembre 2020 à 23:47
Ligne 20 :		Ligne 20 :
	local TEAM_NAME = 'équipe'		local TEAM_NAME = 'équipe'
	local SCORE_NAME = 'score'		local SCORE_NAME = 'score'
			local GROUP_NAME = 'groupe'
	local YES_VALUE = 'oui'		local YES_VALUE = 'oui'
	local Y_VALUE = 'o'		local Y_VALUE = 'o'
Ligne 289 :		Ligne 290 :
	local group = 1		local group = 1
	for i = step / 2, count, step do		for i = step / 2, count, step do
	local name = ROUND_NAME .. round .. '-~~groupe~~' .. group		local name = ROUND_NAME .. round .. '-' .. GROUP_NAME .. group
	addBlank(rows[i]):css('height', '7px')		addBlank(rows[i]):css('height', '7px')
	addBlank(rows[i + 1]):css('height', '7px')		addBlank(rows[i + 1]):css('height', '7px')

Banz le 13 septembre 2020 à 23:44

2020-09-13T23:44:26Z

← Version précédente		Version du 13 septembre 2020 à 23:44
Ligne 377 :		Ligne 377 :
	local autoSeeds = (args[AUTOSEEDS_NAME] and (args[AUTOSEEDS_NAME] == YES_VALUE or args[AUTOSEEDS_NAME] == Y_VALUE))		local autoSeeds = (args[AUTOSEEDS_NAME] and (args[AUTOSEEDS_NAME] == YES_VALUE or args[AUTOSEEDS_NAME] == Y_VALUE))
	hideSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == NO_VALUE or args[SEEDS_NAME] == N_VALUE))		hideSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == NO_VALUE or args[SEEDS_NAME] == N_VALUE))
	showSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == YES_VALUE or args[SEEDS_NAME] == Y_VALUE)~~) or not(hideSeeds~~)		showSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == YES_VALUE or args[SEEDS_NAME] == Y_VALUE))

	if autoSeeds then		if autoSeeds then

Banz le 13 septembre 2020 à 23:41

2020-09-13T23:41:06Z

← Version précédente		Version du 13 septembre 2020 à 23:41
Ligne 377 :		Ligne 377 :
	local autoSeeds = (args[AUTOSEEDS_NAME] and (args[AUTOSEEDS_NAME] == YES_VALUE or args[AUTOSEEDS_NAME] == Y_VALUE))		local autoSeeds = (args[AUTOSEEDS_NAME] and (args[AUTOSEEDS_NAME] == YES_VALUE or args[AUTOSEEDS_NAME] == Y_VALUE))
	hideSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == NO_VALUE or args[SEEDS_NAME] == N_VALUE))		hideSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == NO_VALUE or args[SEEDS_NAME] == N_VALUE))
	showSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == YES_VALUE or args[SEEDS_NAME] == Y_VALUE))		showSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == YES_VALUE or args[SEEDS_NAME] == Y_VALUE)) or not(hideSeeds)

	if autoSeeds then		if autoSeeds then

Banz le 13 septembre 2020 à 23:36

2020-09-13T23:36:58Z

← Version précédente		Version du 13 septembre 2020 à 23:36
Ligne 383 :		Ligne 383 :
	local seeds = getSeeds()		local seeds = getSeeds()
	for i = 1, table.getn(seeds) do		for i = 1, table.getn(seeds) do
	local argname = getTeamArgName(1, ~~'seed'~~, i)		local argname = getTeamArgName(1, SEED_NAME, i)
	if not args[argname] then		if not args[argname] then
	args[argname] = seeds[i]		args[argname] = seeds[i]

Banz le 13 septembre 2020 à 23:29

2020-09-13T23:29:37Z

← Version précédente		Version du 13 septembre 2020 à 23:29
Ligne 10 :		Ligne 10 :
	local showSeeds		local showSeeds
	local tracking = ''		local tracking = ''

			local WIDTH_NAME = 'largeur'
			local ROUND_NAME = 'manche'
			local ROUNDS_NAME = 'manches'
			local COMPACT_NAME = 'compact'
			local AUTOSEEDS_NAME = 'autograines'
			local SEEDS_NAME = 'graines'
			local SEED_NAME = 'graine'
			local TEAM_NAME = 'équipe'
			local SCORE_NAME = 'score'
			local YES_VALUE = 'oui'
			local Y_VALUE = 'o'
			local NO_VALUE = 'non'
			local N_VALUE = 'n'
			local FINALS_LABEL = 'Finale'
			local SEMIFINALS_LABEL = 'Demi-finales'
			local QUARTERFINALS_LABEL = 'Quarts de finale'
			local ROUNDOF_LABEL = '%d<sup>ème</sup> de finale'

	function getSeeds()		function getSeeds()
Ligne 77 :		Ligne 95 :

	function getWidth(param, default)		function getWidth(param, default)
	local arg = args[param .. '-~~taille~~']		local arg = args[param .. '-' .. WIDTH_NAME]
	if not arg or string.len(arg) == 0 then		if not arg or string.len(arg) == 0 then
	arg = default		arg = default
Ligne 92 :		Ligne 110 :

	function getTeamArgName(round, type, team)		function getTeamArgName(round, type, team)
	return string.format('~~manche~~%d-%s' .. padding, round, type, team)		return string.format(ROUND_NAME .. '%d-%s' .. padding, round, type, team)
	end		end

	function getRoundName(round)		function getRoundName(round)
	local name = args[~~'manche'~~ .. round]		local name = args[ROUND_NAME .. round]
	if name and string.len(name) > 0 then		if name and string.len(name) > 0 then
	return name		return name
Ligne 102 :		Ligne 120 :
	local roundFromLast = rounds - round + 1		local roundFromLast = rounds - round + 1
	if roundFromLast == 1 then		if roundFromLast == 1 then
	return ~~"Finale"~~		return FINALS_LABEL
	elseif roundFromLast == 2 then		elseif roundFromLast == 2 then
	return ~~"Demi-finales"~~		return SEMIFINALS_LABEL
	elseif roundFromLast == 3 then		elseif roundFromLast == 3 then
	return ~~"Quarts de finale"~~		return QUARTERFINALS_LABEL
	else		else
	return ~~"" .~~. math.pow(2, roundFromLast) ~~.. "ème de finale"~~		return string.format(ROUNDOF_LABEL, math.pow(2, roundFromLast))
	end		end
	end		end
Ligne 114 :		Ligne 132 :
	function renderTeam(row, round, team, top, compact)		function renderTeam(row, round, team, top, compact)
	local seedCell		local seedCell
	local seedArg = getTeamArg(round, ~~'graine'~~, team)		local seedArg = getTeamArg(round, SEED_NAME, team)
	-- seed value for the paired team		-- seed value for the paired team
	local pairSeedArg = getTeamArg(round, ~~'graine'~~,		local pairSeedArg = getTeamArg(round, SEED_NAME,
	team % 2 == 0 and team - 1 or team + 1)		team % 2 == 0 and team - 1 or team + 1)
	-- show seed if seed is defined for either or both		-- show seed if seed is defined for either or both
Ligne 136 :		Ligne 154 :
	end		end

	local teamArg = getTeamArg(round, ~~'equipe'~~, team)		local teamArg = getTeamArg(round, TEAM_NAME, team)
	if not teamArg or string.len(teamArg) == 0 then		if not teamArg or string.len(teamArg) == 0 then
	teamArg = ' '		teamArg = ' '
Ligne 164 :		Ligne 182 :
	:css('border-bottom-width', '0')		:css('border-bottom-width', '0')
	:css('background-color', '#f9f9f9')		:css('background-color', '#f9f9f9')
	:wikitext(getTeamArg(round, ~~'score'~~, team))		:wikitext(getTeamArg(round, SCORE_NAME, team))
	:newline()		:newline()

Ligne 271 :		Ligne 289 :
	local group = 1		local group = 1
	for i = step / 2, count, step do		for i = step / 2, count, step do
	local name = ~~'manche'~~ .. round .. '-groupe' .. group		local name = ROUND_NAME .. round .. '-groupe' .. group
	addBlank(rows[i]):css('height', '7px')		addBlank(rows[i]):css('height', '7px')
	addBlank(rows[i + 1]):css('height', '7px')		addBlank(rows[i + 1]):css('height', '7px')
Ligne 325 :		Ligne 343 :
	local seedCell		local seedCell
	if not hideSeeds then		if not hideSeeds then
	seedCell = addBlank(widthRow, getWidth(~~'graine'~~, '25px'))		seedCell = addBlank(widthRow, getWidth(SEED_NAME, '25px'))
	end		end
	local teamCell = addBlank(widthRow, getWidth(~~'equipe'~~, '150px'))		local teamCell = addBlank(widthRow, getWidth(TEAM_NAME, '150px'))
	local scoreCell = addBlank(widthRow, getWidth(~~'score'~~, '25px'))		local scoreCell = addBlank(widthRow, getWidth(SCORE_NAME, '25px'))
	addBlank(titleRow)		addBlank(titleRow)
	addBlank(widthRow, r < rounds and '5px' or nil)		addBlank(widthRow, r < rounds and '5px' or nil)
Ligne 353 :		Ligne 371 :
	end		end

	rounds = tonumber(args~~.manches~~) or 2		rounds = tonumber(args[ROUNDS_NAME]) or 2
	local teams = math.pow(2, rounds)		local teams = math.pow(2, rounds)
	padding = '%0' .. (teams < 10 and 1 or 2) .. 'd'		padding = '%0' .. (teams < 10 and 1 or 2) .. 'd'
	local compact = (args[~~'compacte'~~] and (args[~~'compacte'~~] == ~~'yes'~~ or args[~~'compacte'~~] == ~~'y'~~))		local compact = (args[COMPACT_NAME] and (args[COMPACT_NAME] == YES_VALUE or args[COMPACT_NAME] == Y_VALUE))
	local autoSeeds = (args[~~'autograines'~~] and (args[~~'autograines'~~] == ~~'yes'~~ or args[~~'autograines'~~] == ~~'y'~~))		local autoSeeds = (args[AUTOSEEDS_NAME] and (args[AUTOSEEDS_NAME] == YES_VALUE or args[AUTOSEEDS_NAME] == Y_VALUE))
	hideSeeds = (args[~~'graines'~~] and (args[~~'graines'~~] == ~~'no'~~ or args[~~'graines'~~] == ~~'n'~~))		hideSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == NO_VALUE or args[SEEDS_NAME] == N_VALUE))
	showSeeds = (args[~~'graines'~~] and (args[~~'graines'~~] == ~~'yes'~~ or args[~~'graines'~~] == ~~'y'~~))		showSeeds = (args[SEEDS_NAME] and (args[SEEDS_NAME] == YES_VALUE or args[SEEDS_NAME] == Y_VALUE))

	if autoSeeds then		if autoSeeds then
Ligne 379 :		Ligne 397 :
	:css('border-spacing', '0')		:css('border-spacing', '0')

	if (args['nowrap'] and (args['nowrap'] == ~~'yes'~~ or args['nowrap'] == ~~'y'~~)) then		if (args['nowrap'] and (args['nowrap'] == YES_VALUE or args['nowrap'] == Y_VALUE)) then
	tbl:css('white-space', 'nowrap')		tbl:css('white-space', 'nowrap')
	end		end