Module:Data/View - Revision history

Cirdec: Flag column view

2023-03-14T09:02:08Z

Flag column view

@@ Line 113: / Line 113: @@
              end
              return table.concat(result, args.separator or ', ')
          end
      end

Cirdec: list column view

2023-03-14T01:43:07Z

list column view

@@ Line 11: / Line 11: @@
          return d.path(path)
      end
 end
@@ Line 92: / Line 94: @@
               return value
           end
      end
      return view

Cirdec: Support an optional table caption

2023-03-14T01:22:37Z

Support an optional table caption

← Older revision		Revision as of 01:22, 14 March 2023
Line 104:		Line 104:
	end		end

	p.displayTable = function(data, view, columns)		p.displayTable = function(data, view, columns, ...)
	local views = {}		local views = {}
	for i,col in ipairs(columns) do		for i,col in ipairs(columns) do
Line 111:		Line 111:
	end		end

	local result = {'{\| class="wikitable sortable"', '\|-'}		local options = select(1, ...) or {}

			local result = {'{\| class="wikitable sortable"'}
			if options.caption then
			table.insert(result, '\|+')
			table.insert(result, options.caption)
			end
			table.insert(result, '\|-')

	for j,v in ipairs(views) do		for j,v in ipairs(views) do
	local cell = {'!'}		local cell = {'!'}

Cirdec: Produce sort values correctly

2023-03-08T09:32:20Z

Produce sort values correctly

← Older revision		Revision as of 09:32, 8 March 2023
Line 89:		Line 89:
	view.sortValue = function(data)		view.sortValue = function(data)
	local value = getter(data)		local value = getter(data)
	if type(value) == number then		if type(value) == 'number' then
	return ~~tostring(~~value)		return value
	end		end
	end		end

Cirdec: Support for titles to have separate pipe text

2023-03-08T03:10:14Z

Support for titles to have separate pipe text

← Older revision		Revision as of 03:10, 8 March 2023
Line 29:		Line 29:
	format = function(data) return nil end		format = function(data) return nil end
	}		}
			end

			p.displayTitle = function(title, text)
			if title and text then
			return string.format('[[%s\|%s]]', title, p.displayValue(text))
			elseif title then
			return string.format('[[%s]]', title)
			end
			return text
	end		end

	p.title = function(args)		p.title = function(args)
	local getter, view = p.makeView(args)		local getter, view = p.makeView(args)
			local textGetter = nil
			if args.text then
			textGetter = makeGetter(args.text)
			end
	view.format = function(data)		view.format = function(data)
	local ~~value~~ = getter(data)		local title = getter(data)
	if ~~value~~ then		local text = nil
	~~return '[[' .. getter~~(data) ~~.. ']]'~~		if textGetter then
			text = textGetter(data)
	end		end
			return p.displayTitle(title, text)
	end		end
	return view		return view

Cirdec: Missed variable rename, nonbreaking spaces

2023-03-08T02:00:10Z

Missed variable rename, nonbreaking spaces

← Older revision		Revision as of 02:00, 8 March 2023
Line 52:		Line 52:
	local unit = select(1, ...)		local unit = select(1, ...)
	if unit then		if unit then
	return string.format('%s %s', mw.getContentLanguage():formatNum(n), unit)		return string.format('%s %s', mw.getContentLanguage():formatNum(n), unit)
	else		else
	return mw.getContentLanguage():formatNum(n)		return mw.getContentLanguage():formatNum(n)
Line 107:		Line 107:
	for i,row in ipairs(data) do		for i,row in ipairs(data) do
	table.insert(result ,'\|-')		table.insert(result ,'\|-')
	for j,~~view~~ in ipairs(views) do		for j,v in ipairs(views) do
	local cell = {'\|'}		local cell = {'\|'}
	if v.sortValue then		if v.sortValue then
	local sortValue = v.sortValue(row)		local sortValue = v.sortValue(row)
	if sortValue ~= nil then		if sortValue ~= nil then
	table.insert(cell, string.format('data-sort-value="%s"\|', displayValue(sortValue)))		table.insert(cell, string.format('data-sort-value="%s"\|', p.displayValue(sortValue)))
	end		end
	end		end

Cirdec: Module to define data views, display data tables

2023-03-08T01:52:38Z

Module to define data views, display data tables

New page

local p = {}
local d = require('Module:Data')

local makeGetter = function(path)
if type(path) == 'function' then
return path
elseif type(path) == 'string' then
return d.path{path}
elseif type(path) == 'table' then
return d.path(path)
end
end

p.makeView = function(args)
local path = table.remove(args, 1)
local getter = makeGetter(path)
local view = {}
for k,v in pairs(args) do
view[k] = v
end
return getter, view
end

p.viewNotFound = function(name)
return {
heading = string.format("View %s is not defined", name),
format = function(data) return nil end
}
end

p.title = function(args)
local getter, view = p.makeView(args)
view.format = function(data)
local value = getter(data)
if value then
return '[[' .. getter(data) .. ']]'
end
end
return view
end

p.text = function(args)
local getter, view = p.makeView(args)
view.format = getter
return view
end

p.formatNum = function(n, ...)
local unit = select(1, ...)
if unit then
return string.format('%s %s', mw.getContentLanguage():formatNum(n), unit)
else
return mw.getContentLanguage():formatNum(n)
end
end

p.number = function(args)
local getter,view = p.makeView(args)

view.format = function(data)
local value = getter(data)
if args.omitZero and value == 0 then
return ''
end
if type(value) == 'number' then
return p.formatNum(value, args.unit)
end
return value
end
view.sortType = 'number'
view.sortValue = function(data)
local value = getter(data)
if type(value) == number then
return tostring(value)
end
end
return view
end

p.displayValue = function(value)
if value == nil then
return ''
end
return tostring(value)
end

p.displayTable = function(data, view, columns)
local views = {}
for i,col in ipairs(columns) do
v = view[col] or p.viewNotFound(col)
table.insert(views, v)
end

local result = {'{| class="wikitable sortable"', '|-'}
for j,v in ipairs(views) do
local cell = {'!'}
if v.sortType then
table.insert(cell, string.format('data-sort-type="%s"|', tostring(v.sortType)))
end
table.insert(cell, p.displayValue(v.heading))
table.insert(result, table.concat(cell))
end
for i,row in ipairs(data) do
table.insert(result ,'|-')
for j,view in ipairs(views) do
local cell = {'|'}
if v.sortValue then
local sortValue = v.sortValue(row)
if sortValue ~= nil then
table.insert(cell, string.format('data-sort-value="%s"|', displayValue(sortValue)))
end
end
table.insert(cell, p.displayValue(v.format(row)))
table.insert(result, table.concat(cell))
end
end
table.insert(result,'|}')
return table.concat(result, '\n')
end

return p