Modul:Measure - Versionsgeschichte

Antonsusi am 13. Juni 2017 um 19:07 Uhr

2017-06-13T19:07:37Z

← Nächstältere Version		Version vom 13. Juni 2017, 21:07 Uhr
Zeile 175:		Zeile 175:
	function p.Masz(frame)		function p.Masz(frame)
	local FR = frame:getParent()		local FR = frame:getParent()
	local IsOk, Out = Run(FR,'de')		local IsOk, Out = Run(FR,'dewiki')
	return Out		return Out
	end		end

Antonsusi am 13. Juni 2017 um 19:06 Uhr

2017-06-13T19:06:20Z

← Nächstältere Version		Version vom 13. Juni 2017, 21:06 Uhr
Zeile 108:		Zeile 108:
	local function Run (frame,fmt)		local function Run (frame,fmt)
	local Text = " "		local Text = " "
	local Info =""
	local tData = {}		local tData = {}
	local IsOk = true		local IsOk = true
Zeile 139:		Zeile 138:
	tbl.factorL = 1000;		tbl.factorL = 1000;
	if tbl.data <10000 then		if tbl.data <10000 then
	fmt="~~comma~~";		fmt="de";
	end		end
	end		end
Zeile 147:		Zeile 146:
	tbl.factorL = 100;		tbl.factorL = 100;
	if tbl.data <10000 then		if tbl.data <10000 then
	fmt="~~comma~~";		fmt="de";
	end		end
	end		end
Zeile 155:		Zeile 154:
	end		end
	IsOk, tData = Measure.Convert(tbl)		IsOk, tData = Measure.Convert(tbl)
			tData.data = frame:expandTemplate{title = 'FormatNum', args = {tData.data,fmt}}
	Info ="tData (1)=" .. table.concat(tData,';');
	--tData.data = ~~frame:expandTemplate{title = '~~FormatNum~~', args = {~~tData.data,fmt}}		--tData.data = FormatNum.format(tData.data,fmt)
	tData.data = FormatNum.format(tData.data,fmt)
	Info = Info .. "tData (2)=" .. table.concat(tData,';');
	Info= '<span style="display:none;">'.. Info .. '</span>'
	if tonumber(tData.eps) then		if tonumber(tData.eps) then
	tData.eps = frame:expandTemplate{title = 'FormatNum', args = {tData.eps, fmt}}		tData.eps = frame:expandTemplate{title = 'FormatNum', args = {tData.eps, fmt}}
Zeile 172:		Zeile 168:
	return false, Text		return false, Text
	end		end
	Text = Measure.Format(tData,tPar) ~~.. Info~~;		Text = Measure.Format(tData,tPar);
	return true, Text		return true, Text
	end -- Run		end -- Run
Zeile 179:		Zeile 175:
	function p.Masz(frame)		function p.Masz(frame)
	local FR = frame:getParent()		local FR = frame:getParent()
	local IsOk, Out = Run(FR,'~~comma~~')		local IsOk, Out = Run(FR,'de')
	return Out		return Out
	end		end

Antonsusi am 13. Juni 2017 um 18:59 Uhr

2017-06-13T18:59:28Z

← Nächstältere Version		Version vom 13. Juni 2017, 20:59 Uhr
Zeile 156:		Zeile 156:
	IsOk, tData = Measure.Convert(tbl)		IsOk, tData = Measure.Convert(tbl)
	Info ="tData (1)=" .. table.concat(tData,';');		Info ="tData (1)=" .. table.concat(tData,';');
	tData.data = frame:expandTemplate{title = 'FormatNum', args = {tData.data,fmt}}		--tData.data = frame:expandTemplate{title = 'FormatNum', args = {tData.data,fmt}}
	--tData.data = FormatNum.format(tData.data,fmt)		tData.data = FormatNum.format(tData.data,fmt)
	Info = Info .. "tData~~.data~~ (2)=" .. table.concat(tData,';');		Info = Info .. "tData (2)=" .. table.concat(tData,';');
	Info= '<span style="display:none;">'.. Info .. '</span>'		Info= '<span style="display:none;">'.. Info .. '</span>'
	if tonumber(tData.eps) then		if tonumber(tData.eps) then

Antonsusi am 13. Juni 2017 um 18:55 Uhr

2017-06-13T18:55:37Z

← Nächstältere Version		Version vom 13. Juni 2017, 20:55 Uhr
Zeile 155:		Zeile 155:
	end		end
	IsOk, tData = Measure.Convert(tbl)		IsOk, tData = Measure.Convert(tbl)
	Info ="tData~~.data~~ (1)=" .. ~~tostring~~(tData~~.data~~) ~~.. ";"~~;		Info ="tData (1)=" .. table.concat(tData,';');
	tData.data = frame:expandTemplate{title = 'FormatNum', args = {tData.data,fmt}}		tData.data = frame:expandTemplate{title = 'FormatNum', args = {tData.data,fmt}}
	--tData.data = FormatNum.format(tData.data,fmt)		--tData.data = FormatNum.format(tData.data,fmt)
	Info = Info .. "tData.data (2)=" .. ~~tostring~~(tData~~.data~~);		Info = Info .. "tData.data (2)=" .. table.concat(tData,';');
	Info= '<span style="display:none;">'.. Info .. '</span>'		Info= '<span style="display:none;">'.. Info .. '</span>'
	if tonumber(tData.eps) then		if tonumber(tData.eps) then

Antonsusi am 13. Juni 2017 um 18:46 Uhr

2017-06-13T18:46:48Z

← Nächstältere Version		Version vom 13. Juni 2017, 20:46 Uhr
Zeile 108:		Zeile 108:
	local function Run (frame,fmt)		local function Run (frame,fmt)
	local Text = " "		local Text = " "
			local Info =""
	local tData = {}		local tData = {}
	local IsOk = true		local IsOk = true
Zeile 154:		Zeile 155:
	end		end
	IsOk, tData = Measure.Convert(tbl)		IsOk, tData = Measure.Convert(tbl)
			Info ="tData.data (1)=" .. tostring(tData.data) .. ";";
	tData.data = frame:expandTemplate{title = 'FormatNum', args = {tData.data,fmt}}		tData.data = frame:expandTemplate{title = 'FormatNum', args = {tData.data,fmt}}
	--tData.data = FormatNum.format(tData.data,fmt)		--tData.data = FormatNum.format(tData.data,fmt)
			Info = Info .. "tData.data (2)=" .. tostring(tData.data);
			Info= '<span style="display:none;">'.. Info .. '</span>'
	if tonumber(tData.eps) then		if tonumber(tData.eps) then
	tData.eps = frame:expandTemplate{title = 'FormatNum', args = {tData.eps, fmt}}		tData.eps = frame:expandTemplate{title = 'FormatNum', args = {tData.eps, fmt}}
Zeile 168:		Zeile 172:
	return false, Text		return false, Text
	end		end
	Text = Measure.Format(tData,tPar);		Text = Measure.Format(tData,tPar) .. Info;
	return true, Text		return true, Text
	end -- Run		end -- Run

Antonsusi am 30. Oktober 2016 um 19:35 Uhr

2016-10-30T19:35:41Z

← Nächstältere Version		Version vom 30. Oktober 2016, 21:35 Uhr
Zeile 137:		Zeile 137:
	tbl.unitL = "m";		tbl.unitL = "m";
	tbl.factorL = 1000;		tbl.factorL = 1000;
			if tbl.data <10000 then
			fmt="comma";
			end
	end		end
	if tbl.unit =="km²" and tbl.unitL=="" then		if tbl.unit =="km²" and tbl.unitL=="" then

Antonsusi am 30. Oktober 2016 um 18:27 Uhr

2016-10-30T18:27:44Z

← Nächstältere Version		Version vom 30. Oktober 2016, 20:27 Uhr
Zeile 142:		Zeile 142:
	tbl.unitL = "ha";		tbl.unitL = "ha";
	tbl.factorL = 100;		tbl.factorL = 100;
	if ~~fmt==~~ ~~"dewiki"~~ then		if tbl.data <10000 then
	fmt="~~dewikiint~~";		fmt="comma";
	end		end
	end		end

Antonsusi: Ziel der Vorlage ist es ja gerade, die Zahl der Stellen zu reduzieren.

2016-10-30T18:14:23Z

Ziel der Vorlage ist es ja gerade, die Zahl der Stellen zu reduzieren.

← Nächstältere Version		Version vom 30. Oktober 2016, 20:14 Uhr
Zeile 172:		Zeile 172:
	function p.Masz(frame)		function p.Masz(frame)
	local FR = frame:getParent()		local FR = frame:getParent()
	local IsOk, Out = Run(FR,'~~dewiki~~')		local IsOk, Out = Run(FR,'comma')
	return Out		return Out
	end		end

Antonsusi am 26. Oktober 2016 um 21:22 Uhr

2016-10-26T21:22:59Z

← Nächstältere Version		Version vom 26. Oktober 2016, 23:22 Uhr
Zeile 142:		Zeile 142:
	tbl.unitL = "ha";		tbl.unitL = "ha";
	tbl.factorL = 100;		tbl.factorL = 100;
			if fmt== "dewiki" then
			fmt="dewikiint";
			end
	end		end
	if tbl.unit =="" then		if tbl.unit =="" then

Antonsusi: Adjustings

2013-06-29T21:34:20Z

Adjustings

← Nächstältere Version		Version vom 29. Juni 2013, 23:34 Uhr
Zeile 170:		Zeile 170:
	local FR = frame:getParent()		local FR = frame:getParent()
	local IsOk, Out = Run(FR,'dewiki')		local IsOk, Out = Run(FR,'dewiki')
	return ~~'<span style="color:#009999;">' ..~~ Out ~~.. '</span>'~~		return Out
	end		end

Zeile 176:		Zeile 176:
	local FR = frame:getParent()		local FR = frame:getParent()
	local IsOk, Out = Run(FR,'ch')		local IsOk, Out = Run(FR,'ch')
	return ~~'<span style="color:#990099;">' ..~~ Out ~~.. '</span>'~~		return Out
	end		end