Module:HonorUtils - Revision history

DesignerThan: - adding support for crosslink honors

2021-09-05T18:55:42Z

- adding support for crosslink honors

DesignerThan at 14:25, 2 August 2021

2021-08-02T14:25:59Z

DesignerThan: get the latest revision back to find the bug that causes AnswerKey and Requirement tab's to not be displayed for honors without variants

2021-08-02T14:23:18Z

get the latest revision back to find the bug that causes AnswerKey and Requirement tab's to not be displayed for honors without variants

Jomegat: roll back to July 29

2021-08-01T23:15:47Z

roll back to July 29

DesignerThan at 22:05, 31 July 2021

2021-07-31T22:05:58Z

DesignerThan at 20:56, 31 July 2021

2021-07-31T20:56:55Z

DesignerThan at 20:46, 31 July 2021

2021-07-31T20:46:32Z

DesignerThan at 13:31, 31 July 2021

2021-07-31T13:31:19Z

DesignerThan: made it possible to get all variant's of one type (requriements/answerKey)

2021-07-29T22:42:52Z

made it possible to get all variant's of one type (requriements/answerKey)

DesignerThan at 22:30, 27 July 2021

2021-07-27T22:30:33Z

@@ Line 243: / Line 243: @@
 			 parentFrame.args[cntOfVariantsArgString] ~= ''
 			) then
-			mw.log('HonorUtils.getHonorVariants: We variants data from parent Frame!')
+			mw.log('HonorUtils.getHonorVariants: Get variants data from parent Frame!')
 			variantSrcMode = 'parentFrame'
 			cntOfVariants = parentFrame.args[cntOfVariantsArgString]
 		else
-			mw.log('HonorUtils.getHonorVariants: We variants data from vardefine!')
+			mw.log('HonorUtils.getHonorVariants: Get variants data from vardefine!')
 			variantSrcMode = 'vardefine'
 			cntOfVariants = utilities.getVar(cntOfVariantsArgString)
 		end
 	end
-	if (cntOfVariants == nil or cntOfVariants == '' or cntOfVariants == 0) then
+	if (cntOfVariants == nil or cntOfVariants == '' or tonumber(cntOfVariants) == 0) then
 		mw.log('HonorUtils.getHonorVariants: There are no '..variantType..' variants!')
 		return nil

@@ Line 229: / Line 229: @@
 	local parentFrame = frame:getParent()
 	mw.log('HonorUtils.getHonorVariants (frame): '..frame:getTitle())
-	local onLandingPage = false
+	local variantSrcMode = 'dpl' -- it can be 'vardefine', 'parentFrame' or 'dpl' (default)
 	if (variantType == nil or variantType == '') then
 		variantType = 'requirement'
 	end
 	local cntOfVariantsArgString = 'cnt_'..variantType..'_variants'
@@ Line 240: / Line 241: @@
 			 parentFrame:getTitle() == 'Template:HonorLanding' and
 			 parentFrame.args[cntOfVariantsArgString] ~= nil and
 			 parentFrame.args[cntOfVariantsArgString] ~= ''
 			) then
-			onLandingPage = true
+			mw.log('HonorUtils.getHonorVariants: We variants data from parent Frame!')
 			cntOfVariants = parentFrame.args[cntOfVariantsArgString]
 		else
-			mw.log('HonorUtils.getHonorVariants: There are no '..variantType..' variants!')
+			mw.log('HonorUtils.getHonorVariants: We variants data from vardefine!')
-			return nil
+			variantSrcMode = 'vardefine'
 		end
 	end
 	mw.log('HonorUtils.getHonorVariants (cntOfVariants): '..cntOfVariants)
@@ Line 270: / Line 277: @@
 	local tVariants = {}
-	if ( onLandingPage == true ) then
+	if ( variantSrcMode == 'vardefine' ) then
 		for key, variantArg in pairs(tVariantArguments) do
 			tVariants[key] = parentFrame.args[variantArg]

@@ Line 229: / Line 229: @@
 	local parentFrame = frame:getParent()
 	mw.log('HonorUtils.getHonorVariants (frame): '..frame:getTitle())
-	local variantSrcMode = 'dpl' -- it can be 'vardefine', 'parentFrame' or 'dpl' (default)
+	local onLandingPage = false
 	if (variantType == nil or variantType == '') then
 		variantType = 'requirement'
 	end
 	local cntOfVariantsArgString = 'cnt_'..variantType..'_variants'
@@ Line 241: / Line 240: @@
 			 parentFrame:getTitle() == 'Template:HonorLanding' and
 			 parentFrame.args[cntOfVariantsArgString] ~= nil and
 			 parentFrame.args[cntOfVariantsArgString] ~= ''
 			) then
-			mw.log('HonorUtils.getHonorVariants: We variants data from parent Frame!')
+			onLandingPage = true
 			cntOfVariants = parentFrame.args[cntOfVariantsArgString]
 		else
-			mw.log('HonorUtils.getHonorVariants: We variants data from vardefine!')
+			mw.log('HonorUtils.getHonorVariants: There are no '..variantType..' variants!')
-			variantSrcMode = 'vardefine'
+			return nil
 		end
 	end
 	mw.log('HonorUtils.getHonorVariants (cntOfVariants): '..cntOfVariants)
@@ Line 277: / Line 270: @@
 	local tVariants = {}
-	if ( variantSrcMode == 'vardefine' ) then
+	if ( onLandingPage == true ) then
 		for key, variantArg in pairs(tVariantArguments) do
 			tVariants[key] = parentFrame.args[variantArg]

@@ Line 252: / Line 252: @@
 		end
 	end
-	if (cntOfVariants == nil or cntOfVariants == 0) then
+	if (cntOfVariants == nil or cntOfVariants == '' or cntOfVariants == 0) then
 		mw.log('HonorUtils.getHonorVariants: There are no '..variantType..' variants!')
 		return nil

@@ Line 229: / Line 229: @@
 	local parentFrame = frame:getParent()
 	mw.log('HonorUtils.getHonorVariants (frame): '..frame:getTitle())
-	local onLandingPage = false
+	local variantSrcMode = 'dpl' -- it can be 'vardefine', 'parentFrame' or 'dpl' (default)
 	if (variantType == nil or variantType == '') then
 		variantType = 'requirement'
 	end
 	local cntOfVariantsArgString = 'cnt_'..variantType..'_variants'
@@ Line 239: / Line 239: @@
 		-- check if we are on the honor landing page, if so check the template's argument's
 		if ( parentFrame ~= nil and
-			 parentFrame:getTitle() == 'Template:HonorLanding'
+			 parentFrame:getTitle() == 'Template:HonorLanding' and
 			) then
-			onLandingPage = true
+			mw.log('HonorUtils.getHonorVariants: We variants data from parent Frame!')
-			if ( parentFrame.args[cntOfVariantsArgString] ~= nil and
+			variantSrcMode = 'parentFrame'
-			     parentFrame.args[cntOfVariantsArgString] ~= '' ) then
+			cntOfVariants = parentFrame.args[cntOfVariantsArgString]
 		else
-			mw.log('HonorUtils.getHonorVariants: There are no '..variantType..' variants!')
+			mw.log('HonorUtils.getHonorVariants: We variants data from vardefine!')
-			return nil
+			variantSrcMode = 'vardefine'
 		end
 	end
@@ Line 279: / Line 277: @@
 	local tVariants = {}
-	if ( onLandingPage == true ) then
+	if ( variantSrcMode == 'vardefine' ) then
 		for key, variantArg in pairs(tVariantArguments) do
-			if ( useVarDefine == false ) then
+			tVariants[key] = parentFrame.args[variantArg]
 		end
 	else

@@ Line 247: / Line 247: @@
 			else
 				useVarDefine = true
-				cntOfVariants = getVar(cntOfVariantsArgString)
+				cntOfVariants = utilities.getVar(cntOfVariantsArgString)
 			end
 		else
@@ Line 284: / Line 284: @@
 				tVariants[key] = parentFrame.args[variantArg]
 			else
-				tVariants[key] = getVar(variantArg)
+				tVariants[key] = utilities.getVar(variantArg)
 			end
 		end
@@ Line 311: / Line 311: @@
 	lPage = frame:expandTemplate{ title = 'GetHonorLandingPage', args = {page = lPage}}
 	return frame:preprocess( '{{#dpl:|debug=0|title=' .. lPage .. '|include={HonorLanding}:' .. metadata ..'}}' )
 end
 return p

@@ Line 55: / Line 55: @@
 	-- check if only one variant is needed
-	if ( variantType ~= nil and variantType ~= '' and
+	if ( variantType ~= nil and variantType ~= '' ) then
 		if (variantType == 'requirements') then
 			getAnswerVariants = false

@@ Line 22: / Line 22: @@
 	end
 	local tReturn = {
 		variantNumber = variantNumber
+	}
@@ Line 29: / Line 28: @@
 		mw.log('HonorUtils.getActVariantInfo: It is the Requirements Variant '..variantNumber)
 		tReturn['variantType'] = 'requirements'
 	elseif (mw.ustring.find(subPageString, 'Answer Key', 0, notUseLUAPattern) ~= nil ) then
 		mw.log('HonorUtils.getActVariantInfo: It is the Answer Key Variant '..variantNumber)
 		tReturn['variantType'] = 'answerKey'
 	else
 		mw.log('HonorUtils.getActVariantInfo: It is a Subpage with no possibility for variants')