Module:OrdersController - Revision history

76561198157077871: Merge from OrdersController2 to implement filtering by settlement difficulty

2025-10-21T01:46:36Z

Merge from OrdersController2 to implement filtering by settlement difficulty

76561198157077871 at 21:40, 17 September 2025

2025-09-17T21:40:33Z

← Older revision		Revision as of 21:40, 17 September 2025
Line 451:		Line 451:
	desiredCaption = resolveCaption(desiredCaption, selectList, searchNameList, tierFilter, timedFilter, difficultyFilter, excludeList)		desiredCaption = resolveCaption(desiredCaption, selectList, searchNameList, tierFilter, timedFilter, difficultyFilter, excludeList)

	return renderTable(desiredCaption, viewParameters, collapsed)		return renderTable(desiredCaption, viewParameters, splitDifficulty, collapsed)
	end		end

76561198157077871 at 21:20, 17 September 2025

2025-09-17T21:20:01Z

76561198157077871 at 20:54, 17 September 2025

2025-09-17T20:54:07Z

← Older revision		Revision as of 20:54, 17 September 2025
Line 433:		Line 433:
	currentFrame = frame		currentFrame = frame

	loadIDs(selectList, searchNameList, tierFilter, timedFilter, difficultyFilter, excludeList)		loadIDs(selectList, searchNameList, searchRequirementsList, searchRewardsList, tierFilter, timedFilter, difficultyFilter, excludeList)

	if #orderIDs < 1 then		if #orderIDs < 1 then

76561198157077871 at 20:51, 17 September 2025

2025-09-17T20:51:34Z

← Older revision		Revision as of 20:51, 17 September 2025
Line 20:		Line 20:
	local ARG_ID_LIST = "id"		local ARG_ID_LIST = "id"
	local ARG_NAME_LIST = "name"		local ARG_NAME_LIST = "name"
			local ARG_REQUIREMENTS_LIST = "requirements"
			local ARG_REWARDS_LIST = "rewards"
	local ARG_DESCRIPTION_LIST = "description"		local ARG_DESCRIPTION_LIST = "description"
	local ARG_SEARCH_ALL_LIST = "search"		local ARG_SEARCH_ALL_LIST = "search"
Line 96:		Line 98:
	---@param source string the source of cornerstones		---@param source string the source of cornerstones
	---@param excludeList table list of ids		---@param excludeList table list of ids
	local function loadIDs(selectList, searchNameList, tier, timed, difficulty, excludeList)		local function loadIDs(selectList, searchNameList, searchRequirementsList, searchRewardsList, tier, timed, difficulty, excludeList)

	orderIDs = {}		orderIDs = {}
Line 115:		Line 117:
	for _, searchName in ipairs(searchNameList) do		for _, searchName in ipairs(searchNameList) do
	local newIDs = OrdersData.getAllOrdersIDsWhereName(searchName)		local newIDs = OrdersData.getAllOrdersIDsWhereName(searchName)
			loadOrderIDs(newIDs, tier, timed, difficulty, excludeList)
			attemptedSearch = true
			end
			end

			-- Add any requirements matches
			if searchRequirementsList and #searchRequirementsList > 0 then
			for _, searchRequirements in ipairs(searchRequirementsList) do
			local newIDs = OrdersData.getAllOrdersIDsWhereRequirements(searchRequirements)
			loadOrderIDs(newIDs, tier, timed, difficulty, excludeList)
			attemptedSearch = true
			end
			end

			-- Add any rewards matches
			if searchRewardsList and #searchRewardsList > 0 then
			for _, searchRewards in ipairs(searchRewardsList) do
			local newIDs = OrdersData.getAllOrdersIDsWhereRewards(searchRewards)
	loadOrderIDs(newIDs, tier, timed, difficulty, excludeList)		loadOrderIDs(newIDs, tier, timed, difficulty, excludeList)
	attemptedSearch = true		attemptedSearch = true
Line 382:		Line 402:
	local excludeList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_EXCLUDE_LIST], true, true)		local excludeList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_EXCLUDE_LIST], true, true)
	local searchNameList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_NAME_LIST], false)		local searchNameList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_NAME_LIST], false)
			local searchRequirementsList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_REQUIREMENTS_LIST], false)
			local searchRewardsList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_REWARDS_LIST], false)
	local searchAllList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_SEARCH_ALL_LIST], false)		local searchAllList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_SEARCH_ALL_LIST], false)
	local tierFilter = OrdersData.normalizeTierText(frame.args[ARG_TIER])		local tierFilter = OrdersData.normalizeTierText(frame.args[ARG_TIER])
Line 387:		Line 409:
	local difficultyFilter = OrdersData.normalizeDifficultyText(frame.args[ARG_DIFFICULTY])		local difficultyFilter = OrdersData.normalizeDifficultyText(frame.args[ARG_DIFFICULTY])

	-- Substitute the search all terms for ~~name if it wasn't~~ provided ~~but search-all was~~.		-- Substitute the search all terms for each non-provided list.
	if searchAllList and #searchAllList > 0 then		if searchAllList and #searchAllList > 0 then
	if #searchNameList < 1 then		if #searchNameList < 1 then
	searchNameList = searchAllList		searchNameList = searchAllList
			end
			if #searchRequirementsList < 1 then
			searchRequirementsList = searchAllList
			end
			if #searchRewardsList < 1 then
			searchRequirementsList = searchAllList
	end		end
	end		end

76561198157077871 at 01:42, 28 August 2025

2025-08-28T01:42:35Z

← Older revision		Revision as of 01:42, 28 August 2025
Line 236:		Line 236:
	local timeLimit = OrdersData.getTimeLimit(id)		local timeLimit = OrdersData.getTimeLimit(id)
	local difficulty = OrdersData.getDifficultyByIDAndRowNum(id, difficultyRow)		local difficulty = OrdersData.getDifficultyByIDAndRowNum(id, difficultyRow)
	local requirements = OrdersData.getFormattedRequirementsByIDAndRowNum(id, difficultyRow)		local requirements = ControllerUtilities.findAndReplaceSpriteTagsWithFiles(OrdersData.getFormattedRequirementsByIDAndRowNum(id, difficultyRow), currentFrame)
	local rewards = ControllerUtilities.findAndReplaceSpriteTagsWithFiles(OrdersData.getRewardsFormattedByID(id), currentFrame)		local rewards = ControllerUtilities.findAndReplaceSpriteTagsWithFiles(OrdersData.getRewardsFormattedByID(id), currentFrame)
	local rowSpan = totalRows		local rowSpan = totalRows

76561198157077871 at 21:03, 3 August 2025

2025-08-03T21:03:42Z

← Older revision		Revision as of 21:03, 3 August 2025
Line 153:		Line 153:
	desiredCaption = "" .. #orderIDs		desiredCaption = "" .. #orderIDs

	if timed and timed ~= "" then		if timed and timed ~= "" and timed == "true" then
	desiredCaption = desiredCaption .. " " .. ~~timed~~		desiredCaption = desiredCaption .. " Timed"
			addedToText = true
			end

			if timed and timed ~= "" and timed == "false" then
			desiredCaption = desiredCaption .. " Non-Timed"
	addedToText = true		addedToText = true
	end		end

	if tier and tier ~= "" then		if tier and tier ~= "" then
	desiredCaption = desiredCaption .. " " .. tier .. " Order"		desiredCaption = desiredCaption .. " Tier " .. tier .. " Order"
	addedToText = true		addedToText = true
	else		else

76561198157077871 at 20:26, 3 August 2025

2025-08-03T20:26:12Z

← Older revision		Revision as of 20:26, 3 August 2025
Line 232:		Line 232:
	local difficulty = OrdersData.getDifficultyByIDAndRowNum(id, difficultyRow)		local difficulty = OrdersData.getDifficultyByIDAndRowNum(id, difficultyRow)
	local requirements = OrdersData.getFormattedRequirementsByIDAndRowNum(id, difficultyRow)		local requirements = OrdersData.getFormattedRequirementsByIDAndRowNum(id, difficultyRow)
	local rewards = ControllerUtilities.findAndReplaceSpriteTagsWithFiles(OrdersData.getRewardsFormattedByID(id))		local rewards = ControllerUtilities.findAndReplaceSpriteTagsWithFiles(OrdersData.getRewardsFormattedByID(id), currentFrame)
	local rowSpan = totalRows		local rowSpan = totalRows

76561198157077871 at 20:24, 3 August 2025

2025-08-03T20:24:15Z

← Older revision		Revision as of 20:24, 3 August 2025
Line 232:		Line 232:
	local difficulty = OrdersData.getDifficultyByIDAndRowNum(id, difficultyRow)		local difficulty = OrdersData.getDifficultyByIDAndRowNum(id, difficultyRow)
	local requirements = OrdersData.getFormattedRequirementsByIDAndRowNum(id, difficultyRow)		local requirements = OrdersData.getFormattedRequirementsByIDAndRowNum(id, difficultyRow)
	local rewards = OrdersData.getRewardsFormattedByID(id)		local rewards = ControllerUtilities.findAndReplaceSpriteTagsWithFiles(OrdersData.getRewardsFormattedByID(id))
	local rowSpan = totalRows		local rowSpan = totalRows

76561198157077871 at 23:13, 2 August 2025

2025-08-02T23:13:24Z

← Older revision		Revision as of 23:13, 2 August 2025
Line 24:		Line 24:
	local ARG_TIER = "tier"		local ARG_TIER = "tier"
	local ARG_TIMED = "timed"		local ARG_TIMED = "timed"
	local ~~ARG_VALID_DIFFICULTIES~~ = "difficulty"		local ARG_DIFFICULTY = "difficulty"
	local ARG_EXCLUDE_LIST = "exclude"		local ARG_EXCLUDE_LIST = "exclude"
	local ARG_CAPTION = "caption"		local ARG_CAPTION = "caption"
Line 74:		Line 74:

	if OrdersData.isOrderIDValid(id) and not excludeList[id:lower()] and not isIDAlreadyAdded[id:lower()] then		if OrdersData.isOrderIDValid(id) and not excludeList[id:lower()] and not isIDAlreadyAdded[id:lower()] then
	~~if id == "[R] Ghost Hostility Low" then~~

	~~mw.log(tierToCheck)~~
	~~end~~
	-- In this situation, nil values mean to skip the filter.		-- In this situation, nil values mean to skip the filter.
	local isTierMatch = not tierToCheck or "" == tierToCheck or OrdersData.isTierMatchByID(id, tierToCheck)		local isTierMatch = not tierToCheck or "" == tierToCheck or OrdersData.isTierMatchByID(id, tierToCheck)
	~~if id == "[R] Ghost Hostility Low" then~~

	~~mw.log(isTierMatch)~~
	~~end~~
	local isTimedMatch = not timedToCheck or "" == timedToCheck or OrdersData.isTimedMatchByID(id, timedToCheck)		local isTimedMatch = not timedToCheck or "" == timedToCheck or OrdersData.isTimedMatchByID(id, timedToCheck)
	local isDifficultyMatch = not difficultyToCheck or "" == difficultyToCheck or OrdersData.isDifficultyMatchByID(id, difficultyToCheck)		local isDifficultyMatch = not difficultyToCheck or "" == difficultyToCheck or OrdersData.isDifficultyMatchByID(id, difficultyToCheck)
Line 130:		Line 123:
	if not attemptedSearch then		if not attemptedSearch then
	local newIDs = OrdersData.getAllOrderIDs()		local newIDs = OrdersData.getAllOrderIDs()
	~~mw.log("not attemptedSearch")~~
	~~mw.log(tier)~~
	loadOrderIDs(newIDs, tier, timed, difficulty, excludeList)		loadOrderIDs(newIDs, tier, timed, difficulty, excludeList)
	end		end
Line 387:		Line 378:
	local searchNameList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_NAME_LIST], false)		local searchNameList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_NAME_LIST], false)
	local searchAllList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_SEARCH_ALL_LIST], false)		local searchAllList = ControllerUtilities.expandCommaSeparatedStringsIntoTable(frame.args[ARG_SEARCH_ALL_LIST], false)
	~~mw.log(frame.args[ARG_TIER])~~
	local tierFilter = OrdersData.normalizeTierText(frame.args[ARG_TIER])		local tierFilter = OrdersData.normalizeTierText(frame.args[ARG_TIER])
	local timedFilter = OrdersData.normalizeTimedText(frame.args[ARG_TIMED])		local timedFilter = OrdersData.normalizeTimedText(frame.args[ARG_TIMED])
	local difficultyFilter = OrdersData.normalizeDifficultyText(frame.args[ARG_DIFFICULTY])		local difficultyFilter = OrdersData.normalizeDifficultyText(frame.args[ARG_DIFFICULTY])
	~~mw.log(tierFilter)~~

	-- Substitute the search all terms for name if it wasn't provided but search-all was.		-- Substitute the search all terms for name if it wasn't provided but search-all was.

← Older revision		Revision as of 21:20, 17 September 2025
Line 35:		Line 35:
	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 ARG_COLLAPSED = "collapsed"

	local TEMPLATE_PARAMETER_ID = ARG_ID_LIST		local TEMPLATE_PARAMETER_ID = ARG_ID_LIST
Line 239:		Line 240:
	---@param viewParameters table a table of parameters made by and for OrdersView		---@param viewParameters table a table of parameters made by and for OrdersView
	---@return string the wiki markup assembled so far by the view module		---@return string the wiki markup assembled so far by the view module
	local function makeMarkupForTableStart(desiredCaption, viewParameters)		local function makeMarkupForTableStart(desiredCaption, viewParameters, collapsed)

	return OrdersView.startTable(desiredCaption, viewParameters)		return OrdersView.startTable(desiredCaption, viewParameters, collapsed)
	end		end

Line 299:		Line 300:
	---@param viewParameters table a table of parameters made by and for OrdersView		---@param viewParameters table a table of parameters made by and for OrdersView
	---@return string the wiki markup assembled by the view (other templates)		---@return string the wiki markup assembled by the view (other templates)
	local function renderTable(desiredCaption, viewParameters, splitDifficulty)		local function renderTable(desiredCaption, viewParameters, splitDifficulty, collapsed)

	makeMarkupForTableStart(desiredCaption, viewParameters)		makeMarkupForTableStart(desiredCaption, viewParameters, collapsed)
	makeMarkupForTableRows(viewParameters, splitDifficulty)		makeMarkupForTableRows(viewParameters, splitDifficulty)

Line 427:		Line 428:
	local listType = frame.args[ARG_LIST_TYPE]		local listType = frame.args[ARG_LIST_TYPE]
	local isShowingID = ARG_SHOW_FLAG_VALUE == frame.args[ARG_SHOW_ID]		local isShowingID = ARG_SHOW_FLAG_VALUE == frame.args[ARG_SHOW_ID]
			local collapsed = frame.args[ARG_COLLAPSED]

	-- Let the View module itself determine how to use the template parameters relating to the view.		-- Let the View module itself determine how to use the template parameters relating to the view.
Line 449:		Line 451:
	desiredCaption = resolveCaption(desiredCaption, selectList, searchNameList, tierFilter, timedFilter, difficultyFilter, excludeList)		desiredCaption = resolveCaption(desiredCaption, selectList, searchNameList, tierFilter, timedFilter, difficultyFilter, excludeList)

	return renderTable(desiredCaption, viewParameters)		return renderTable(desiredCaption, viewParameters, collapsed)
	end		end