Module:StormforgedController - Revision history

76561197969631737: finished refactoring for list and inline display versions

2024-05-05T03:38:52Z

finished refactoring for list and inline display versions

← Older revision		Revision as of 03:38, 5 May 2024
Line 38:		Line 38:

	local TEMPLATE_PARAMETER_CAPTION = ARG_CAPTION		local TEMPLATE_PARAMETER_CAPTION = ARG_CAPTION
	~~local TEMPLATE_PARAMETER_SKIP_PRICES = ARG_SKIP_PRICES~~
	local TEMPLATE_PARAMETER_ID = ARG_ID_LIST		local TEMPLATE_PARAMETER_ID = ARG_ID_LIST
	local TEMPLATE_PARAMETER_DESC = ARG_DESCRIPTION		local TEMPLATE_PARAMETER_DESC = ARG_DESCRIPTION
Line 46:		Line 45:
	local TEMPLATE_PARAMETER_UPGRADE_VILLAGER = "price_for_upgrade_in_villagers"		local TEMPLATE_PARAMETER_UPGRADE_VILLAGER = "price_for_upgrade_in_villagers"
	local TEMPLATE_PARAMETER_SHOW_ID = ARG_SHOW_ID		local TEMPLATE_PARAMETER_SHOW_ID = ARG_SHOW_ID
	~~local TEMPLATE_PARAMETER_SHOW_DESCRIPTION = ARG_SHOW_DESCRIPTION~~
	~~local TEMPLATE_PARAMETER_SHOW_REGULAR = ARG_SHOW_REGULAR~~
	local TEMPLATE_PARAMETER_UPGRADE_FROM = "upgrades_from"		local TEMPLATE_PARAMETER_UPGRADE_FROM = "upgrades_from"
	local TEMPLATE_PARAMETER_LIST_TYPE = ARG_LIST_TYPE		local TEMPLATE_PARAMETER_LIST_TYPE = ARG_LIST_TYPE
Line 338:		Line 335:
	---@param id string the id of the cornerstone to display		---@param id string the id of the cornerstone to display
	---@param listType string the type of list to create		---@param listType string the type of list to create
	---@param ~~showingID string flag~~ when needing to show the ID ~~as well~~		---@param isShowingID boolean true when needing to show the ID column
	---@return string the wiki markup assembled by the view (other templates)		---@return string the wiki markup assembled by the view (other templates)
	local function makeMarkupPerListItem(id, listType, ~~showingID~~)		local function makeMarkupPerListItem(id, listType, isShowingID)

	local templateParameters = {		local templateParameters = {
	[TEMPLATE_PARAMETER_ID] = id,		[TEMPLATE_PARAMETER_ID] = id,
	[TEMPLATE_PARAMETER_LIST_TYPE] = listType,		[TEMPLATE_PARAMETER_LIST_TYPE] = listType,
	[TEMPLATE_PARAMETER_SHOW_ID] = ~~showingID~~		[TEMPLATE_PARAMETER_SHOW_ID] = isShowingID and ARG_SHOW_FLAG_VALUE
	}		}

Line 353:		Line 350:
	---makeMarkupForListItems		---makeMarkupForListItems
	---@param listType string the type of list to create		---@param listType string the type of list to create
	---@param ~~showingID string flag~~ when needing to show the ID ~~as well~~		---@param isShowingID boolean true when needing to show the ID column
	---@return string the wiki markup assembled by the view (other templates)		---@return string the wiki markup assembled by the view (other templates)
	local function makeMarkupForListItems(listType, ~~showingID~~)		local function makeMarkupForListItems(listType, isShowingID)

	local markup = ""		local markup = ""
	for _, id in ipairs(altarIDs) do		for _, id in ipairs(altarIDs) do
	markup = markup .. makeMarkupPerListItem(id, listType, ~~showingID~~)		markup = markup .. makeMarkupPerListItem(id, listType, isShowingID)
	end		end

Line 367:		Line 364:
	---renderList		---renderList
	---@param listType string the type of list to create		---@param listType string the type of list to create
	---@param ~~showingID string flag~~ when needing to show the ID ~~as well~~		---@param isShowingID boolean true when needing to show the ID column
	---@return string the wiki markup assembled by the view (other templates)		---@return string the wiki markup assembled by the view (other templates)
	local function renderList(listType, ~~showingID~~)		local function renderList(listType, isShowingID)

	return makeMarkupForListItems(listType, ~~showingID~~)		return makeMarkupForListItems(listType, isShowingID)
	end		end

	---makeMarkupPerLink		---makeMarkupPerLink
	---@param id string the id of the cornerstone to display		---@param id string the id of the cornerstone to display
	---@param ~~showingID string flag~~ when needing to show the ID ~~as well~~		---@param isShowingID boolean true when needing to show the ID column
	---@return string the wiki markup assembled by the view (other templates)		---@return string the wiki markup assembled by the view (other templates)
	local function makeMarkupPerLink(id, ~~showingID~~)		local function makeMarkupPerLink(id, isShowingID)

	local templateParameters = {		local templateParameters = {
Line 387:		Line 384:
	local link = currentFrame:expandTemplate{ title = TEMPLATE_INLINE_LINK, args = templateParameters }		local link = currentFrame:expandTemplate{ title = TEMPLATE_INLINE_LINK, args = templateParameters }

	if ~~showingID == ARG_SHOW_FLAG_VALUE~~ then		if isShowingID then
	return link .. " ('" .. id .. "')"		return link .. " ('" .. id .. "')"
	else		else
Line 395:		Line 392:

	---makeMarkupForInlineLinks		---makeMarkupForInlineLinks
	---@param ~~showingID string flag~~ when needing to show the ID ~~as well~~		---@param isShowingID boolean true when needing to show the ID column
	---@return string the wiki markup assembled by the view (other templates)		---@return string the wiki markup assembled by the view (other templates)
	local function makeMarkupForInlineLinks(~~showingID~~)		local function makeMarkupForInlineLinks(isShowingID)

	local markup = ""		local markup = ""
Line 404:		Line 401:
	markup = markup .. ", "		markup = markup .. ", "
	end		end
	markup = markup .. makeMarkupPerLink(id, ~~showingID~~)		markup = markup .. makeMarkupPerLink(id, isShowingID)
	end		end

Line 411:		Line 408:

	---renderInline		---renderInline
	---@param ~~showingID string flag~~ when needing to show the ID ~~as well~~		---@param isShowingID boolean true when needing to show the ID column
	---@return string the wiki markup assembled by the view (other templates)		---@return string the wiki markup assembled by the view (other templates)
	local function renderInlineLinks(~~showingID~~)		local function renderInlineLinks(isShowingID)

	return makeMarkupForInlineLinks(~~showingID~~)		return makeMarkupForInlineLinks(isShowingID)
	end		end

76561197969631737: moved a method to an outside utility, improved automated captions, refactored function parameters for clearer passing through of template parameters

2024-05-05T03:31:34Z

moved a method to an outside utility, improved automated captions, refactored function parameters for clearer passing through of template parameters

Show changes

76561197969631737: fixing no parameters working again

2024-05-03T01:49:07Z

fixing no parameters working again

← Older revision		Revision as of 01:49, 3 May 2024
Line 145:		Line 145:
	if selectList then		if selectList then
	loadStormforgedIDs(selectList, excludeList)		loadStormforgedIDs(selectList, excludeList)
	attemptedSearch = true		-- It's actually always true, but it can be blank.
			if #selectList > 0 then
			attemptedSearch = true
			end
	end		end

76561197969631737: adding ability to show id and hide description

2024-05-03T01:28:21Z

adding ability to show id and hide description

Show changes

76561197969631737: Fixed a logic error in resolveCaption

2024-05-02T21:58:53Z

Fixed a logic error in resolveCaption

← Older revision		Revision as of 21:58, 2 May 2024
Line 212:		Line 212:
	end		end

	if selectList then		if selectList and #selectList > 0 then
	if #selectList == 1 then		if #selectList == 1 then
	return "Stormforged Cornerstone with id '" .. selectList[1] .. "'"		return "Stormforged Cornerstone with id '" .. selectList[1] .. "'"

76561197969631737: Fixed a logic error in resolveCaption

2024-05-02T21:57:27Z

Fixed a logic error in resolveCaption

← Older revision		Revision as of 21:57, 2 May 2024
Line 200:		Line 200:
	--- If no caption was specified and also none of those filtering parameters, then leave it up to the template by returning a blank caption.		--- If no caption was specified and also none of those filtering parameters, then leave it up to the template by returning a blank caption.
	---		---
	---@param ~~selectedList~~ table list of ids of the cornerstone to include		---@param selectList table list of ids of the cornerstone to include
	---@param searchName string the second search parameter, a name		---@param searchName string the second search parameter, a name
	---@param searchDesc string the third search parameter, a term in a description		---@param searchDesc string the third search parameter, a term in a description
Line 206:		Line 206:
	---@param desiredCaption string the caption requested, if any		---@param desiredCaption string the caption requested, if any
	---@return string an appropriate caption, or blank if it should be default		---@return string an appropriate caption, or blank if it should be default
	local function resolveCaption(~~selectedList~~, searchName, searchDesc, regularID, desiredCaption)		local function resolveCaption(selectList, searchName, searchDesc, regularID, desiredCaption)

	if desiredCaption and desiredCaption ~= "" then		if desiredCaption and desiredCaption ~= "" then
Line 212:		Line 212:
	end		end

	if ~~selectedList and #selectedList > 1~~ then		if selectList then
	~~return~~ #~~selectedList .. " selected Stormforged Cornerstones"~~		if #selectList == 1 then
	~~else~~		return "Stormforged Cornerstone with id '" .. selectList[1] .. "'"
	~~-- Don't have to check for empty; that's already handled before this with a "None found" message.~~		else
	return "Stormforged Cornerstone with id '" .. ~~selectedList~~[1] .. "'"		return #selectList .. " selected Stormforged Cornerstones"
			end

	end		end
	-- Do this first since mentioning could also imply name, but not the other way around.		-- Do this first since mentioning could also imply name, but not the other way around.

76561197969631737: Enabled selecting multiple ids instead of just one

2024-05-02T21:34:54Z

Enabled selecting multiple ids instead of just one

Show changes

76561197969631737: forgot to remove a TODO comment that's all

2024-05-02T02:52:19Z

forgot to remove a TODO comment that's all

← Older revision		Revision as of 02:52, 2 May 2024
Line 32:		Line 32:
	local ARG_DISPLAY_OVERRIDE_OPTION_INLINE = "inline"		local ARG_DISPLAY_OVERRIDE_OPTION_INLINE = "inline"
	local ARG_LIST_TYPE = "list_type"		local ARG_LIST_TYPE = "list_type"

	~~--local DISPLAY_OPTION_TABLE = "table"~~

	local TEMPLATE_PARAMETER_CAPTION = "caption"		local TEMPLATE_PARAMETER_CAPTION = "caption"

76561197969631737: Added display override for inline links

2024-05-02T02:28:32Z

Added display override for inline links

Show changes

76561197969631737: Allowing a display override to a list format instead

2024-05-02T02:16:47Z

Allowing a display override to a list format instead

Show changes