Module:RenderRecipe - Revision history

76561197969631737: making numbers in swappable ingredients bold too

2023-02-19T14:31:28Z

making numbers in swappable ingredients bold too

← Older revision		Revision as of 14:31, 19 February 2023
Line 250:		Line 250:
	innerTable:tag('tr')		innerTable:tag('tr')
	:tag('td'):css('text-align', 'right')		:tag('td'):css('text-align', 'right')
	:wikitext(quant):done()		:wikitext("<span style=\"font-weight: bold\">" .. quant .. "</span>"):done()
	:tag('td')		:tag('td')
	:wikitext(RenderRecipe.rlTemplate(alt)):done()		:wikitext(RenderRecipe.rlTemplate(alt)):done()

76561197969631737: added bolding to ingredient and product numbers in recipes

2023-02-19T05:44:11Z

added bolding to ingredient and product numbers in recipes

← Older revision		Revision as of 05:44, 19 February 2023
Line 231:		Line 231:
	wikiTableDataRowDataCell:addClass(CSS_CLASS_REQUIRED_INGREDIENT)		wikiTableDataRowDataCell:addClass(CSS_CLASS_REQUIRED_INGREDIENT)
	-- we know there's just one item in group, so we don't need to loop		-- we know there's just one item in group, so we don't need to loop
	wikiTableDataRowDataCell:wikitext(groupOfQuantities[1] .. " " .. RenderRecipe.rlTemplate(group[1]))		wikiTableDataRowDataCell:wikitext("<span style=\"font-weight: bold\">" .. groupOfQuantities[1] .. "</span> " .. RenderRecipe.rlTemplate(group[1]))

	else		else
Line 258:		Line 258:

	-- close up the table row with the product		-- close up the table row with the product
	wikiTableDataRow:tag('td'):wikitext(number .. " " .. RenderRecipe.rlTemplate(product,"large"))		wikiTableDataRow:tag('td'):wikitext("<span style=\"font-weight: bold\">" .. number .. "</span> " .. RenderRecipe.rlTemplate(product,"large"))

	-- pass the table back in case more rows need to be added		-- pass the table back in case more rows need to be added

76561197969631737: will look for a better solution to handling the building stars and time display

2023-02-13T22:44:23Z

will look for a better solution to handling the building stars and time display

← Older revision		Revision as of 22:44, 13 February 2023
Line 204:		Line 204:
	-- write the first cell with the building		-- write the first cell with the building
	local wikiTableDataRow = wikiTable:tag('tr')		local wikiTableDataRow = wikiTable:tag('tr')
	:tag('td'~~):css("float: left"~~)		:tag('td')
	:wikitext(RenderRecipe.blTemplate(building) .. BR .. RenderRecipe.starTemplate(stars) .. BR .. speed)		:wikitext(RenderRecipe.blTemplate(building) .. BR .. RenderRecipe.starTemplate(stars) .. BR .. speed)

Line 249:		Line 249:
	-- write a new row to the inner table and fill it in		-- write a new row to the inner table and fill it in
	innerTable:tag('tr')		innerTable:tag('tr')
	:tag('td'):css('text-align', 'right'):wikitext(quant):done()		:tag('td'):css('text-align', 'right')
	:tag('td'):wikitext(RenderRecipe.rlTemplate(alt)):done()		:wikitext(quant):done()
			:tag('td')
			:wikitext(RenderRecipe.rlTemplate(alt)):done()
	end		end
	end		end

76561197969631737: moving the building link's float-left property into the recipe

2023-02-13T22:41:53Z

moving the building link's float-left property into the recipe

← Older revision		Revision as of 22:41, 13 February 2023
Line 6:		Line 6:
	--		--
	-- The template requires at least one of its two arguments. The first is called		-- The template requires at least one of its two arguments. The first is called
	-- "product". and the second is called "building". Both are passed to ~~the~~		-- "product". and the second is called "building". Both are passed to
	-- RecipeData module, which returns one or more recipes.		-- Module:RecipeData module, which returns one or more recipes.
	--		--
	-- Using the recipe data returned, this module creates an HTML table that		-- Using the recipe data returned, this module creates an HTML table that
Line 64:		Line 64:
	-- arguments are required; calling this template with no arguments or empty		-- arguments are required; calling this template with no arguments or empty
	-- strings will result in an error message.		-- strings will result in an error message.
	--		-- @param frame a table describing the MediaWiki frame; frame['args'] is a table
	-- @param frame a table describing the MediaWiki frame; frame['args'] is a		-- containg the template arguments; frame['args']['product'] is the first
	-- ~~table~~ containg the template arguments; frame['args']['product'] is the first
	-- argument, assigned to the key 'product'; frame['args']['building'] is the		-- argument, assigned to the key 'product'; frame['args']['building'] is the
	-- second argument, assigned to the key 'building'		-- second argument, assigned to the key 'building'
Line 205:		Line 204:
	-- write the first cell with the building		-- write the first cell with the building
	local wikiTableDataRow = wikiTable:tag('tr')		local wikiTableDataRow = wikiTable:tag('tr')
	:tag('td'):wikitext(RenderRecipe.blTemplate(building) .. BR .. RenderRecipe.starTemplate(stars) .. BR .. speed)		:tag('td'):css("float: left")
			:wikitext(RenderRecipe.blTemplate(building) .. BR .. RenderRecipe.starTemplate(stars) .. BR .. speed)

	-- first fill in any empty cells like in the recipe book, one for each		-- first fill in any empty cells like in the recipe book, one for each

76561197969631737: removing the handling of printing on the template page from the module now that the template page can do it itself

2023-02-13T00:15:32Z

removing the handling of printing on the template page from the module now that the template page can do it itself

← Older revision		Revision as of 00:15, 13 February 2023
Line 77:		Line 77:

	-- extract the arguments we care about from the frame		-- extract the arguments we care about from the frame
	local argProduct = frame.args.product ~~or ""~~		local argProduct = frame.args.product
	local argBuilding = frame.args.building		local argBuilding = frame.args.building

	~~-- show the template code itself when we're getting called from the template page; this argument shouldn't ever have this value anywhere else~~
	~~if "on_the_template_page" == argProduct then~~
	~~return "<code>{{#invoke:RenderRecipe\|renderRecipe\|product={{{1\|}}}\|building={{{2\|}}}}}</code>"~~
	~~end~~

	-- build the table; we'll add to this once we know the arguments are valid, but that's after the if/then blocks start		-- build the table; we'll add to this once we know the arguments are valid, but that's after the if/then blocks start

76561197969631737: fixing the display on the template page with the special argument

2023-02-12T19:51:17Z

fixing the display on the template page with the special argument

← Older revision		Revision as of 19:51, 12 February 2023
Line 77:		Line 77:

	-- extract the arguments we care about from the frame		-- extract the arguments we care about from the frame
	local argProduct = frame.args.product		local argProduct = frame.args.product or ""
	local argBuilding = frame.args.building		local argBuilding = frame.args.building

	-- show the template code itself when we're getting called from the template page; this argument shouldn't ever have this value anywhere else		-- show the template code itself when we're getting called from the template page; this argument shouldn't ever have this value anywhere else
	if ~~argProduct and~~ "on_the_template_page" == argProduct then		if "on_the_template_page" == argProduct then
	return "<code>{{#invoke:RenderRecipe\|renderRecipe\|product={{{1\|}}}\|building={{{2\|}}}}}</code>"		return "<code>{{#invoke:RenderRecipe\|renderRecipe\|product={{{1\|}}}\|building={{{2\|}}}}}</code>"
	end		end

76561197969631737: styling the template as code on the Template page

2023-02-12T18:15:24Z

styling the template as code on the Template page

← Older revision		Revision as of 18:15, 12 February 2023
Line 82:		Line 82:
	-- show the template code itself when we're getting called from the template page; this argument shouldn't ever have this value anywhere else		-- show the template code itself when we're getting called from the template page; this argument shouldn't ever have this value anywhere else
	if argProduct and "on_the_template_page" == argProduct then		if argProduct and "on_the_template_page" == argProduct then
	return "{{#invoke:RenderRecipe\|renderRecipe\|product={{{1\|}}}\|building={{{2\|}}}}}"		return "<code>{{#invoke:RenderRecipe\|renderRecipe\|product={{{1\|}}}\|building={{{2\|}}}}}</code>"
	end		end

76561197969631737: enabling the template to print it self from the Template:Recipe page

2023-02-12T18:13:35Z

enabling the template to print it self from the Template:Recipe page

← Older revision		Revision as of 18:13, 12 February 2023
Line 79:		Line 79:
	local argProduct = frame.args.product		local argProduct = frame.args.product
	local argBuilding = frame.args.building		local argBuilding = frame.args.building

			-- show the template code itself when we're getting called from the template page; this argument shouldn't ever have this value anywhere else
			if argProduct and "on_the_template_page" == argProduct then
			return "{{#invoke:RenderRecipe\|renderRecipe\|product={{{1\|}}}\|building={{{2\|}}}}}"
			end

	-- build the table; we'll add to this once we know the arguments are valid, but that's after the if/then blocks start		-- build the table; we'll add to this once we know the arguments are valid, but that's after the if/then blocks start
Line 157:		Line 162:
	-- something was bad about the arguments; can't print them since they may be nil		-- something was bad about the arguments; can't print them since they may be nil
	else		else
	~~-- show the template code itself when we're getting called from the template page; this argument shouldn't ever have this value anywhere else~~
	~~if argProduct and "on_the_template_page" == argProduct then~~
	~~return "{{#invoke:RenderRecipe\|renderRecipe\|product={{{1\|}}}\|building={{{2\|}}}}}"~~
	~~end~~

	return "RenderRecipe error: Invalid template parameters. This template requires at least a product or building."		return "RenderRecipe error: Invalid template parameters. This template requires at least a product or building."

76561197969631737: moving requires to global variables

2023-02-12T17:44:14Z

moving requires to global variables

← Older revision		Revision as of 17:44, 12 February 2023
Line 16:		Line 16:
	-- @module RenderRecipe		-- @module RenderRecipe
	local RenderRecipe = {}		local RenderRecipe = {}



	--		--
	-- ~~Class Variables~~		-- Dependencies
	--		--
	~~local~~ RecipeData = require("Module:RecipeData") -- used to get recipe data		RecipeData = RecipeData or require("Module:RecipeData") -- used to get recipe data

	~~local thisFrame = {} -- save the frame on first call for later use in expandTemplate~~


Line 47:		Line 43:
	local BR = "<br />"		local BR = "<br />"
	local NL = "\n\n"		local NL = "\n\n"



			--
			-- Class Variables
			--
			local thisFrame = {} -- save the frame on first call for later use in expandTemplate


Line 53:		Line 56:
	-- Main rendering functions		-- Main rendering functions
	--		--



	-------------------------------------------------------------------------------		-------------------------------------------------------------------------------

76561197969631737: wrong variable name

2023-02-12T13:55:15Z

wrong variable name

← Older revision		Revision as of 13:55, 12 February 2023
Line 234:		Line 234:
	wikiTableDataRowDataCell:addClass(CSS_CLASS_REQUIRED_INGREDIENT)		wikiTableDataRowDataCell:addClass(CSS_CLASS_REQUIRED_INGREDIENT)
	-- we know there's just one item in group, so we don't need to loop		-- we know there's just one item in group, so we don't need to loop
	wikiTableDataRowDataCell:wikitext(groupOfQuantities[1] .. " " .. RenderRecipe.rlTemplate(~~ingredients~~[1]))		wikiTableDataRowDataCell:wikitext(groupOfQuantities[1] .. " " .. RenderRecipe.rlTemplate(group[1]))

	else		else