Module:DatesWD - Revision history

Carn at 15:04, 10 January 2020

2020-01-10T15:04:41Z

← Previous revision		Revision as of 15:04, 10 January 2020
Line 2:		Line 2:
	local bool_to_number={ [true]=1, [false]=0 }		local bool_to_number={ [true]=1, [false]=0 }
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
	local err = ""		local err = "-"

	local function purif(str)		local function purif(str)
Line 135:		Line 135:
	local num, wday, mont, yea, format =		local num, wday, mont, yea, format =
	purif(args[1]), purif(args[2]), purif(args[3]), purif(args[4]), args[5]		purif(args[1]), purif(args[2]), purif(args[3]), purif(args[4]), args[5]
			if not format then format = "%Y-%m-%d" end
	if not inbord(num,-5,5) then		if not inbord(num,-5,5) then
	return error("The number must be between -5 and 5")		return error("The number must be between -5 and 5")

2020-01-10T14:38:41Z

change

2020-01-10T13:35:30Z

← Previous revision		Revision as of 13:35, 10 January 2020
Line 123:		Line 123:
	elseif not inbord(nums[2],1,12) then error("Wrong month")		elseif not inbord(nums[2],1,12) then error("Wrong month")
	elseif not inbord(nums[3],1,31) then		elseif not inbord(nums[3],1,31) then
⚫	dateout.year = nums[1]
⚫	dateout.month = nums[2]
⚫	dateout.day = nums[3]
⚫	elseif not inbord(nums[1],1,31) then
	dateout.year = nums[3]		dateout.year = nums[3]
	dateout.month = nums[2]		dateout.month = nums[2]
	dateout.day = nums[1]		dateout.day = nums[1]
		⚫	elseif not inbord(nums[1],1,31) then
		⚫	dateout.year = nums[1]
		⚫	dateout.month = nums[2]
		⚫	dateout.day = nums[3]
	else		else
	-- local lang = mw.getContentLanguage()		-- local lang = mw.getContentLanguage()
Line 185:		Line 185:
	local datetest = numstr2date(input)		local datetest = numstr2date(input)
	if isdate(datetest) then		if isdate(datetest) then
	strout = mw.~~logObject(~~datetest) .. " = " .. gri2jd(datetest)		strout = datetest.day .. "." .. datetest.month .. "." .. datetest.year .. " = " .. gri2jd(datetest)
	return strout		return strout
	else error("Not a date")		else error("Not a date")

2020-01-03T11:32:54Z

@@ Line 86: / Line 86: @@
 end
 	local nums = {}
     local dateout = {}
@@ Line 92: / Line 120: @@
         table.insert(nums,purif(num))
     end
     if #nums ~= 3 then error("Wrong format: 3 numbers expected")
     elseif not inbord(nums[2],1,12) then error("Wrong month")
     elseif not inbord(nums[3],1,31) then
         dateout.year = nums[1]
         dateout.month = nums[2]
         dateout.day = nums[3]
     else
     end
 end
 -- =p.test(mw.getCurrentFrame():newChild{title="обычно не важно",args={"1.1.2020"}})
@@ Line 117: / Line 183: @@
 		return ""
 	else
-		return unpack(str2date(input))
+		local datetest = numstr2date(input)
 	end
 	error("You shouldn't read this too")

2020-01-02T19:49:40Z

@@ Line 62: / Line 62: @@
     error("You shouldn't read this")
 end
 local inborders = function (val, down, up)
@@ Line 78: / Line 86: @@
 end
 function p.test(frame)
 	local args = getArgs(frame, { frameOnly = true })
 	local input = args[1]
-	if not purif(input) then
+	if not input then
 		return ""
 	else
-		inborders(purif(input),1,12)
+		return unpack(str2date(input))
 	end
 	error("You shouldn't read this too")

2020-01-02T17:15:12Z

← Previous revision		Revision as of 17:15, 2 January 2020
Line 2:		Line 2:
	local bool_to_number={ [true]=1, [false]=0 }		local bool_to_number={ [true]=1, [false]=0 }
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
			local err = ""

	function p.NthDay( frame )		function p.NthDay( frame )
Line 50:		Line 51:
	end		end

	local function ~~purif~~(str)		local purif = function (str)
	if str == "" or str == nil then		if str == "" or str == nil then
	return nil		return nil
Line 62:		Line 63:
	end		end

	local function ~~inborders~~(val,~~up,~~down)		local inborders = function (val, down, up)
	if up < down then		if up < down or type(up) ~= "number" or type(down) ~= "number" then
	~~local~~ err = "Range " .. down .. "-" .. up " is not valid."		err = "Range " .. down .. "-" .. up .. " is not valid."
	error(err)		return error(err)
			elseif type(val) ~= "number" then
⚫	~~end~~
	if ~~val~~ < ~~down~~ or val > up ~~then~~		err = "Value " .. val .. " is not valid"
			return error(err)
⚫	~~local~~ err = "Value " .. val .. " not in the " .. down .. "-" .. up .. " range."
	~~error(err)~~		elseif val < down or val > up then
		⚫	err = "Value " .. val .. " not in the " .. down .. "-" .. up .. " range."
			return error(err)
		⚫	else
			return val
	end		end
	end		end
Line 77:		Line 82:
	function p.test(frame)		function p.test(frame)
	local args = getArgs(frame, { frameOnly = true })		local args = getArgs(frame, { frameOnly = true })
	input = args[1]		local input = args[1]
	if not purif(input) then		if not purif(input) then
	return ""		return ""

2019-12-31T17:40:04Z

← Previous revision		Revision as of 17:40, 31 December 2019
Line 1:		Line 1:
	local p = {}		local p = {}
			local bool_to_number={ [true]=1, [false]=0 }
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs

Line 60:		Line 61:
	error("You shouldn't read this")		error("You shouldn't read this")
	end		end

			local function inborders(val,up,down)
			if up < down then
			local err = "Range " .. down .. "-" .. up " is not valid."
			error(err)
			end
			if val < down or val > up then
			local err = "Value " .. val .. " not in the " .. down .. "-" .. up .. " range."
			error(err)
			end
			end

			-- =p.test(mw.getCurrentFrame():newChild{title="обычно не важно",args={"1"}})

	function p.test(frame)		function p.test(frame)
Line 67:		Line 81:
	return ""		return ""
	else		else
			inborders(purif(input),1,12)
	return purif(input)		return purif(input)
	end		end

2019-12-08T17:33:54Z

gradually want to move everything in the function

@@ Line 47: / Line 47: @@
         end
     end
 end

2019-11-24T23:00:47Z

Pppery moved page Module:Calendar DoW to Module:DatesWD without leaving a redirect: Match name with template

← Previous revision	Revision as of 23:00, 24 November 2019
(No difference)

2019-11-24T18:40:46Z

Carn moved page Module:Sandbox/Carn/Calendar to Module:Calendar DoW without leaving a redirect: for use in template

← Previous revision	Revision as of 18:40, 24 November 2019
(No difference)