Module:OrdersController2 - Revision history

76561198157077871 at 10:45, 20 October 2025

2025-10-20T10:45:44Z

← Older revision		Revision as of 10:45, 20 October 2025
Line 452:		Line 452:
	local settlementFilter = OrdersData2.normalizeSettlementDifficultyText(frame.args[ARG_SETTLEMENT_DIFFICULTY])		local settlementFilter = OrdersData2.normalizeSettlementDifficultyText(frame.args[ARG_SETTLEMENT_DIFFICULTY])

	---- SettlementFilter should be used independently of other ~~filters~~, error if ~~other filters are~~ applied.		---- SettlementFilter should be used independently of other difficulty filter, error if difficulty filter is applied.
	--if settlementFilter then		if settlementFilter then
	-- if ~~tierFilter or timedFilter or~~ difficultyFilter then		if difficultyFilter then
	-- error("~~Other filters~~ cannot be applied when filtering by settlement difficulty.")		error("Order difficulty filtering cannot be applied when filtering by settlement difficulty.")
	-- end		end
	--end		end

	-- If a difficulty filter or settlement difficulty filter is applied, then only the relevant difficulties should be shown		-- If a difficulty filter or settlement difficulty filter is applied, then only the relevant difficulties should be shown

76561198157077871 at 10:43, 20 October 2025

2025-10-20T10:43:55Z

← Older revision		Revision as of 10:43, 20 October 2025
Line 173:		Line 173:
	-- If no selection, delegate to template.		-- If no selection, delegate to template.
	local addedToText = false		local addedToText = false
			desiredCaption = ""

	~~desiredCaption~~ = "" .. #orderIDs		if not settlement or settlement == "" then
			desiredCaption = desiredCaption .. #orderIDs
			end

	if timed and timed ~= "" and timed == "true" then		if timed and timed ~= "" and timed == "true" then

76561198157077871 at 10:39, 20 October 2025

2025-10-20T10:39:44Z

← Older revision		Revision as of 10:39, 20 October 2025
Line 297:		Line 297:
	for difficultyRow = 1, totalRows do		for difficultyRow = 1, totalRows do
	if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) and OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then		if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) and OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then
	makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, ~~totalRows~~)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 1)
	~~isExtraRow = true~~
	end		end
	end		end
Line 306:		Line 305:
	for difficultyRow = 1, totalRows do		for difficultyRow = 1, totalRows do
	if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) then		if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) then
	makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, ~~totalRows~~)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 1)
	~~isExtraRow = true~~
	end		end
	end		end
Line 315:		Line 313:
	for difficultyRow = 1, totalRows do		for difficultyRow = 1, totalRows do
	if OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then		if OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then
	makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, ~~totalRows~~)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 1)
	~~isExtraRow = true~~
	end		end
	end		end

76561198157077871 at 10:25, 20 October 2025

2025-10-20T10:25:51Z

← Older revision		Revision as of 10:25, 20 October 2025
Line 297:		Line 297:
	for difficultyRow = 1, totalRows do		for difficultyRow = 1, totalRows do
	if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) and OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then		if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) and OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then
	makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 0)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, totalRows)
	isExtraRow = true		isExtraRow = true
	end		end
Line 306:		Line 306:
	for difficultyRow = 1, totalRows do		for difficultyRow = 1, totalRows do
	if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) then		if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) then
	makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 0)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, totalRows)
	isExtraRow = true		isExtraRow = true
	end		end
Line 315:		Line 315:
	for difficultyRow = 1, totalRows do		for difficultyRow = 1, totalRows do
	if OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then		if OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then
	makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 0)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, totalRows)
	isExtraRow = true		isExtraRow = true
	end		end

76561198157077871 at 10:21, 20 October 2025

2025-10-20T10:21:31Z

← Older revision		Revision as of 10:21, 20 October 2025
Line 164:		Line 164:
	---@param excludeList table array of ids that were excluded		---@param excludeList table array of ids that were excluded
	---@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(desiredCaption, selectList, searchNameList, tier, timed, difficulty, excludeList)		local function resolveCaption(desiredCaption, selectList, searchNameList, tier, timed, difficulty, settlement, excludeList)

	-- No matter what, if the author provided a caption, use that.		-- No matter what, if the author provided a caption, use that.
Line 220:		Line 220:

	if difficulty and difficulty ~= "" then		if difficulty and difficulty ~= "" then
	desiredCaption = desiredCaption .. " of difficulty" .. difficulty		desiredCaption = desiredCaption .. " of difficulty " .. difficulty
			addedToText = true
			end

			if settlement and settlement ~= "" then
			desiredCaption = desiredCaption .. " that can be drawn on " .. settlement .. " difficulty"
	addedToText = true		addedToText = true
	end		end
Line 498:		Line 503:

	-- Default display is table.		-- Default display is table.
	desiredCaption = resolveCaption(desiredCaption, selectList, searchNameList, tierFilter, timedFilter, difficultyFilter, excludeList)		desiredCaption = resolveCaption(desiredCaption, selectList, searchNameList, tierFilter, timedFilter, difficultyFilter, settlementFilter, excludeList)

	return renderTable(desiredCaption, viewParameters, specifyDifficulty, collapsed, difficultyFilter, settlementFilter)		return renderTable(desiredCaption, viewParameters, specifyDifficulty, collapsed, difficultyFilter, settlementFilter)

76561198157077871 at 10:00, 20 October 2025

2025-10-20T10:00:48Z

← Older revision		Revision as of 10:00, 20 October 2025
Line 289:		Line 289:
	local orderTier = OrdersData2.getTiers(id)		local orderTier = OrdersData2.getTiers(id)
	if case == "both" then		if case == "both" then
	local ~~initialRows~~ = OrdersData2.getNumberOfDifficulties(id)		local totalRows = OrdersData2.getNumberOfDifficulties(id)
	~~local finalRows = 1~~		for difficultyRow = 1, totalRows do
	for i = 1, ~~initialRows~~ do
	if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) and OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then		if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) and OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then
	makeMarkupPerRow(id, viewParameters, ~~finalRows~~, isExtraRow, 0)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 0)
	~~finalRows = finalRows + 1~~
	isExtraRow = true		isExtraRow = true
	end		end
Line 300:		Line 298:
	end		end
	if case == "difficultyOnly" then		if case == "difficultyOnly" then
	local ~~initialRows~~ = OrdersData2.getNumberOfDifficulties(id)		local totalRows = OrdersData2.getNumberOfDifficulties(id)
	~~local finalRows = 1~~		for difficultyRow = 1, totalRows do
	for i = 1, ~~initialRows~~ do
	if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) then		if (OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow)):find(difficulty) then
	makeMarkupPerRow(id, viewParameters, ~~finalRows~~, isExtraRow, 0)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 0)
	~~finalRows = finalRows + 1~~
	isExtraRow = true		isExtraRow = true
	end		end
Line 311:		Line 307:
	end		end
	if case == "settlementOnly" then		if case == "settlementOnly" then
	local ~~initialRows~~ = OrdersData2.getNumberOfDifficulties(id)		local totalRows = OrdersData2.getNumberOfDifficulties(id)
	~~local finalRows = 1~~		for difficultyRow = 1, totalRows do
	for i = 1, ~~initialRows~~ do
	if OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then		if OrdersData2.isSettlementMatchSpecificOrder(OrdersData2.getDifficultyByIDAndRowNum(id, difficultyRow), orderTier, settlement) then
	makeMarkupPerRow(id, viewParameters, ~~finalRows~~, isExtraRow, 0)		makeMarkupPerRow(id, viewParameters, difficultyRow, isExtraRow, 0)
	~~finalRows = finalRows + 1~~
	isExtraRow = true		isExtraRow = true
	end		end

76561198157077871 at 09:33, 20 October 2025

2025-10-20T09:33:31Z

← Older revision		Revision as of 09:33, 20 October 2025
Line 85:		Line 85:
	local isSettlementMatch = not settlementToCheck or "" == settlementToCheck or OrdersData2.isSettlementMatchByID(id, settlementToCheck)		local isSettlementMatch = not settlementToCheck or "" == settlementToCheck or OrdersData2.isSettlementMatchByID(id, settlementToCheck)

	~~if isSettlementMatch then error(id) end~~
	if isTierMatch and isTimedMatch and isDifficultyMatch and isSettlementMatch then		if isTierMatch and isTimedMatch and isDifficultyMatch and isSettlementMatch then
	table.insert(orderIDs, id)		table.insert(orderIDs, id)

76561198157077871 at 08:25, 20 October 2025

2025-10-20T08:25:25Z

← Older revision		Revision as of 08:25, 20 October 2025
Line 85:		Line 85:
	local isSettlementMatch = not settlementToCheck or "" == settlementToCheck or OrdersData2.isSettlementMatchByID(id, settlementToCheck)		local isSettlementMatch = not settlementToCheck or "" == settlementToCheck or OrdersData2.isSettlementMatchByID(id, settlementToCheck)

			if isSettlementMatch then error(id) end
	if isTierMatch and isTimedMatch and isDifficultyMatch and isSettlementMatch then		if isTierMatch and isTimedMatch and isDifficultyMatch and isSettlementMatch then
	table.insert(orderIDs, id)		table.insert(orderIDs, id)
Line 146:		Line 147:
	if not attemptedSearch then		if not attemptedSearch then
	local newIDs = OrdersData2.getAllOrderIDs()		local newIDs = OrdersData2.getAllOrderIDs()
	~~error(settlement)~~
	loadOrderIDs(newIDs, tier, timed, difficulty, settlement, excludeList)		loadOrderIDs(newIDs, tier, timed, difficulty, settlement, excludeList)
	end		end

76561198157077871 at 08:23, 20 October 2025

2025-10-20T08:23:27Z

← Older revision		Revision as of 08:23, 20 October 2025
Line 146:		Line 146:
	if not attemptedSearch then		if not attemptedSearch then
	local newIDs = OrdersData2.getAllOrderIDs()		local newIDs = OrdersData2.getAllOrderIDs()
	error(~~newIDs[20]~~)		error(settlement)
	loadOrderIDs(newIDs, tier, timed, difficulty, settlement, excludeList)		loadOrderIDs(newIDs, tier, timed, difficulty, settlement, excludeList)
	end		end

76561198157077871 at 08:22, 20 October 2025

2025-10-20T08:22:45Z

← Older revision		Revision as of 08:22, 20 October 2025
Line 146:		Line 146:
	if not attemptedSearch then		if not attemptedSearch then
	local newIDs = OrdersData2.getAllOrderIDs()		local newIDs = OrdersData2.getAllOrderIDs()
	error(newIDs[1])		error(newIDs[20])
	loadOrderIDs(newIDs, tier, timed, difficulty, settlement, excludeList)		loadOrderIDs(newIDs, tier, timed, difficulty, settlement, excludeList)
	end		end