Module:RecipeController2 - Revision history

76561197969631737: fixing services in the list view

2024-10-30T00:59:36Z

fixing services in the list view

← Older revision		Revision as of 00:59, 30 October 2024
Line 506:		Line 506:
	},		},
	}		}
	~~rowText = rowText .. " ("~~
	~~rowText = rowText .. frame:expandTemplate{~~
	~~title = VIEW_GRADES[recipe[INDEX_RECIPE_GRADE]],~~
	~~args = {},~~
	}
	~~rowText = rowText .. ")"~~
	else		else
	-- If past the first building and we're not showing building names, then this will create duplicate entries.		-- If past the first building and we're not showing building names, then this will create duplicate entries.
Line 519:		Line 513:

	-- When queried by building or ingredient, show the product name		-- When queried by building or ingredient, show the product name
	rowText = rowText .. frame:expandTemplate{		if recipe[INDEX_RECIPE_IS_SERVICE] then
	title = VIEW_RESOURCE_LINK,		rowText = rowText .. frame:expandTemplate{
	args = {		title = TEMPLATE_SERVICE_LINK,
	["name"] = GoodsData.getName(recipe[INDEX_RECIPE_PRODUCT_NAME]),		args = {
	["iconfilename"] = GoodsData.getIcon(recipe[INDEX_RECIPE_PRODUCT_NAME]),		["service"] = recipe[INDEX_RECIPE_PRODUCT_NAME],
	["iconsize"] = "small",		["iconsize"] = "small",
	},		}
	}		}
	~~rowText = rowText .. " ("~~		else
	~~rowText = rowText .. frame:expandTemplate{~~		rowText = rowText .. frame:expandTemplate{
	~~title = VIEW_GRADES[recipe[INDEX_RECIPE_GRADE]]~~,		title = VIEW_RESOURCE_LINK,
	~~args = {~~},		args = {
	}		["name"] = GoodsData.getName(recipe[INDEX_RECIPE_PRODUCT_NAME]),
	~~rowText = rowText .. ")</span>"~~		["iconfilename"] = GoodsData.getIcon(recipe[INDEX_RECIPE_PRODUCT_NAME]),
			["iconsize"] = "small",
			},
			}
			end
	end		end

			rowText = rowText .. " ("
			rowText = rowText .. frame:expandTemplate{
			title = VIEW_GRADES[recipe[INDEX_RECIPE_GRADE]],
			args = {},
			}

			rowText = rowText .. ")</span>"

	ret = ret .. rowText		ret = ret .. rowText

76561197969631737: removing locals used for testing; I think it's ready???

2024-10-29T22:08:14Z

removing locals used for testing; I think it's ready???

← Older revision		Revision as of 22:08, 29 October 2024
Line 205:		Line 205:
	---@param requiredIngredient string the name of the ingredient, or nil if any		---@param requiredIngredient string the name of the ingredient, or nil if any
	---@return table a 3-factor compiled table of Recipe objects, [product][grade][amount]		---@return table a 3-factor compiled table of Recipe objects, [product][grade][amount]
	function ~~RecipeController.~~getRecipesFromAllDataModels(requiredProduct, requiredBuilding, requiredIngredient)		local function getRecipesFromAllDataModels(requiredProduct, requiredBuilding, requiredIngredient)

	--Resolve names to IDs, start them all as nil as wildcards.		--Resolve names to IDs, start them all as nil as wildcards.
Line 214:		Line 214:
	if requiredProduct then		if requiredProduct then
	productID = GoodsData.getGoodID(requiredProduct)		productID = GoodsData.getGoodID(requiredProduct)
	-- If it's not a good, then it's a service, which has ID == name		-- If it's not a good, then it's a service, which has ID == name, so set it directly to the name
	if not productID then		if not productID then
	productID = requiredProduct		productID = requiredProduct
Line 224:		Line 224:
	end		end

			-- Ingredients are always goods, never services.
	if requiredIngredient then		if requiredIngredient then
	ingredientID = GoodsData.getGoodID(requiredIngredient)		ingredientID = GoodsData.getGoodID(requiredIngredient)

76561197969631737: moved some code into local functions for readability; now calls service link for services where they are instead of products

2024-10-29T21:52:26Z

moved some code into local functions for readability; now calls service link for services where they are instead of products

Show changes

76561197969631737: now using the building data proxy for basic lookups--recipe searching is still done by calling the models directly

2024-10-29T19:27:10Z

now using the building data proxy for basic lookups--recipe searching is still done by calling the models directly

@@ Line 6: / Line 6: @@
 --region Dependencies
-local DataModelsArray = {
+local BuildingDataProxy = require("Module:BuildingDataProxy")
 	require("Module:CampsData2"),
 	require("Module:FarmsData2"),
@@ Line 118: / Line 120: @@
 	return ingredientsTable
 end
@@ Line 209: / Line 165: @@
 		local ingredientsTable = buildingIngredientsTable(pair)
-		local buildingName = resolveBuildingName(buildingID)
+		local buildingName = BuildingDataProxy.getName(buildingID)
 		-- Services identify their need by name, but goods to not. If it's a service, this is a simple renaming.
@@ Line 263: / Line 219: @@
 	if requiredBuilding then
-		buildingID = resolveBuildingID(requiredBuilding)
+		buildingID = BaseDataModel.getID(requiredBuilding)
 	end
@@ Line 271: / Line 227: @@
 	recipeObjectArray = {}
-	for _, dataModel in ipairs(DataModelsArray) do
+	for _, dataModel in ipairs(DataModelsWithRecipes) do
 		local newRecipeList = getRawRecipes(dataModel, productID, buildingID, ingredientID)
 		recipeObjectArray = compileRecipeLists(recipeObjectArray, newRecipeList)
@@ Line 375: / Line 331: @@
 					local buildingLinkArgs = {}
 					buildingLinkArgs["name"] = buildingName
-					buildingLinkArgs["iconfilename"] = resolveBuildingIcon(buildingName)
+					buildingLinkArgs["iconfilename"] = BuildingDataProxy.getIcon(BuildingDataProxy.getID(buildingName))
 					buildingLinkArgs["iconsize"] = (numBuildings < 2) and VIEW_TABLE_BUILDING_SINGLE_ICON_SIZE or VIEW_TABLE_BUILDING_MULTIPLE_ICON_SIZE
 					-- Redundant to label the building if the author required it--the image alt-text and link still work with name.

76561197969631737: added some luadoc comments; finally deleting all the old code

2024-10-28T03:28:00Z

added some luadoc comments; finally deleting all the old code

Show changes

76561197969631737: resource link view template was being called without icons whoops

2024-10-28T01:38:49Z

resource link view template was being called without icons whoops

← Older revision		Revision as of 01:38, 28 October 2024
Line 1,287:		Line 1,287:
	args = {		args = {
	["name"] = GoodsData.getName(recipe[INDEX_RECIPE_PRODUCT_NAME]),		["name"] = GoodsData.getName(recipe[INDEX_RECIPE_PRODUCT_NAME]),
			["iconfilename"] = GoodsData.getIcon(recipe[INDEX_RECIPE_PRODUCT_NAME]),
	["iconsize"] = "small",		["iconsize"] = "small",
	},		},

76561197969631737: resource link was pointing to ID instead of name of goods

2024-10-28T01:35:12Z

resource link was pointing to ID instead of name of goods

← Older revision		Revision as of 01:35, 28 October 2024
Line 1,286:		Line 1,286:
	title = VIEW_RESOURCE_LINK,		title = VIEW_RESOURCE_LINK,
	args = {		args = {
	["name"] = recipe[INDEX_RECIPE_PRODUCT_NAME],		["name"] = GoodsData.getName(recipe[INDEX_RECIPE_PRODUCT_NAME]),
	["iconsize"] = "small",		["iconsize"] = "small",
	},		},

76561197969631737: removing duplicate list entries when there are multiple buildings that make a recipe (a lot)

2024-10-28T01:34:24Z

removing duplicate list entries when there are multiple buildings that make a recipe (a lot)

← Older revision		Revision as of 01:34, 28 October 2024
Line 1,257:		Line 1,257:
	for _, recipeGradeSubtable in pairs(recipeProductSubtable) do		for _, recipeGradeSubtable in pairs(recipeProductSubtable) do
	for _, recipe in pairs(recipeGradeSubtable) do		for _, recipe in pairs(recipeGradeSubtable) do
	for _, buildingName in ipairs(recipe[INDEX_RECIPE_BUILDINGS_ARRAY]) do		for buildingCount, buildingName in ipairs(recipe[INDEX_RECIPE_BUILDINGS_ARRAY]) do

	local rowText = '\n*<span class="nowrap">'		local rowText = '\n*<span class="nowrap">'
Line 1,277:		Line 1,277:
	rowText = rowText .. ")"		rowText = rowText .. ")"
	else		else
			-- If past the first building and we're not showing building names, then this will create duplicate entries.
			if buildingCount > 1 then
			break
			end

	-- When queried by building or ingredient, show the product name		-- When queried by building or ingredient, show the product name
	rowText = rowText .. frame:expandTemplate{		rowText = rowText .. frame:expandTemplate{

76561197969631737: building-only caption was getting missed; actually easier logic now

2024-10-28T01:30:39Z

building-only caption was getting missed; actually easier logic now

← Older revision		Revision as of 01:30, 28 October 2024
Line 1,132:		Line 1,132:
	if requiredProduct then		if requiredProduct then
	caption = caption .. " for " .. requiredProduct		caption = caption .. " for " .. requiredProduct

	~~if requiredBuilding then~~
	~~return caption .. " in the " .. requiredBuilding .. "."~~
	~~end~~
	end		end

	if requiredIngredient then		if requiredIngredient then
	caption = caption .. " using " .. requiredIngredient		caption = caption .. " using " .. requiredIngredient
			end

	if requiredBuilding then		if requiredBuilding then
	return caption .. " in the " .. requiredBuilding .. "."		return caption .. " in the " .. requiredBuilding .. "."
	~~end~~		else
			return caption .. "."
	end		end

	~~return caption .. "."~~
	end		end

76561197969631737: Adding unsetting to blank parameters

2024-10-28T01:23:40Z

Adding unsetting to blank parameters

@@ Line 1,456: / Line 1,456: @@
 	local requiredIngredient = frame.args.ingredient
 	local displayOverride = frame.args.display
 	-- recipeList is a 3-factor array of Recipe objects, by [product][grade][stackSize]