Module:Navbox timeline: Difference between revisions

No edit summary
Tag: Reverted
Replaced month text with numbers
 
(4 intermediate revisions by the same user not shown)
Line 6: Line 6:
local p = {}
local p = {}


-- Convert date string to fractional year for timeline positioning
-- Convert year-month to numeric value for comparison
local function dateToNumber(year, month)
return year * 12 + (month or 1) - 1
end
 
-- Convert numeric value back to year and month
local function numberToDate(num)
local year = math.floor(num / 12)
local month = (num % 12) + 1
return year, month
end
 
-- Get month abbreviation
local function getMonthNum(month)
return tostring(month)
end
 
 
-- Parse date string (supports YYYY, YYYY-MM, or YYYY-YYYY formats)
local function parseDate(dateStr)
local function parseDate(dateStr)
if not dateStr then return nil end
if not dateStr then return nil, nil end
-- Handle year-month format (YYYY-MM or YYYY/MM)
-- Match YYYY-MM format
local year, month = dateStr:match('^(%d%d%d%d)[%-/](%d%d?)$')
local year, month = dateStr:match('^(%d%d%d%d)%-(%d%d?)$')
if year and month then
if year and month then
year = tonumber(year)
return tonumber(year), tonumber(month)
month = tonumber(month)
if month < 1 or month > 12 then
error('Invalid month: ' .. month .. ' (must be 1-12)', 0)
end
-- Convert to fractional year (e.g., 2020.5 for June 2020)
return year + (month - 1) / 12
end
end
-- Handle year only
-- Match YYYY format
local yearOnly = dateStr:match('^(%d%d%d%d)$')
year = dateStr:match('^(%d%d%d%d)$')
if yearOnly then
if year then
return tonumber(yearOnly)
return tonumber(year), 1
end
end
return nil
return nil, nil
end
end


Line 34: Line 46:
local function addBlank(args, row, prev, current)
local function addBlank(args, row, prev, current)
if row and prev < current then
if row and prev < current then
if yesno(args.decades) == false then
local duration = current - prev
if yesno(args.months) ~= false then
if duration > 0 then
-- Divide the cell up by months when showing months
row:tag('td')
local date = prev
:addClass('timeline-blank')
:cssText(args.blankstyle)
while date < current do
:attr('colspan', duration)
local dur = math.min(1/12, current - date) -- 1 month duration in fractional years
local colspanMonths = math.max(1, math.round(dur * 12))
row:tag('td')
:addClass('timeline-blank')
:cssText(args.blankstyle)
:attr('colspan', colspanMonths)
date = date + dur
end
else
local yearDiff = current - prev
row:tag('td')
:addClass('timeline-blank')
:cssText(args.blankstyle)
:attr('colspan', math.max(1, math.round(yearDiff)))
end
else
-- Divide the cell up every decade if showing decades at the top
local year = math.floor(prev)
local endYear = math.ceil(current)
while year < endYear do
local dur = math.min(10 - year % 10, endYear - year)
row:tag('td')
:addClass('timeline-blank')
:cssText(args.blankstyle)
:attr('colspan', dur)
year = year + dur
end
end
end
end
end
Line 80: Line 60:
local rows = {
local rows = {
[1] = {},
[1] = {},
minYear = math.huge,
minDate = math.huge,
maxYear = -math.huge,
maxDate = -math.huge,
hasLabels = false
hasLabels = false,
useMonths = yesno(args.months) ~= false
}
}
Line 99: Line 80:
-- Data cell key value pairs
-- Data cell key value pairs
elseif key then
elseif key then
-- Data cell key value pairs
rows[#rows][cellIndex][key] = val
rows[#rows][cellIndex][key] = val
-- New row
-- New row
Line 109: Line 89:
elseif cellIndex > 0
elseif cellIndex > 0
and rows[#rows][cellIndex].item
and rows[#rows][cellIndex].item
and not rows[#rows][cellIndex].startYear
and not rows[#rows][cellIndex].startDate
then
then
local dates = mw.text.split(fullVal, '-', true)
local dates = mw.text.split(fullVal, '-', true)
local startYear = parseDate(dates[1])
local startYear, startMonth, endYear, endMonth
local endYear = parseDate(dates[2]) or (tonumber(os.date('%Y')) + 1)
if #dates == 2 then
-- Handle YYYY-YYYY format
startYear, startMonth = parseDate(dates[1])
endYear, endMonth = parseDate(dates[2])
elseif #dates == 3 then
-- Handle YYYY-MM-YYYY format 
startYear, startMonth = tonumber(dates[1]), tonumber(dates[2])
endYear, endMonth = parseDate(dates[3])
elseif #dates == 4 then
-- Handle YYYY-MM-YYYY-MM format
startYear, startMonth = tonumber(dates[1]), tonumber(dates[2])
endYear, endMonth = tonumber(dates[3]), tonumber(dates[4])
else
-- Single date
startYear, startMonth = parseDate(fullVal)
endYear, endMonth = startYear, (startMonth == 12) and 1 or (startMonth + 1)
if startMonth == 12 then endYear = endYear + 1 end
end
if startYear == nil then
if not startYear then
error('Argument ' .. num .. ' is an invalid time range', 0)
error('Argument ' .. num .. ' is an invalid time range', 0)
end
end
if endYear < startYear then
-- Set defaults
error('Argument ' .. num .. '\'s end year is less than the start year', 0)
startMonth = startMonth or 1
endMonth = endMonth or 1
endYear = endYear or (tonumber(os.date('%Y')) + 1)
local startDate = dateToNumber(startYear, startMonth)
local endDate = dateToNumber(endYear, endMonth)
if endDate <= startDate then
endDate = startDate + 1 -- Minimum duration of 1 month
end
end


rows[#rows][cellIndex].startDate = startDate
rows[#rows][cellIndex].endDate = endDate
rows[#rows][cellIndex].startYear = startYear
rows[#rows][cellIndex].startYear = startYear
rows[#rows][cellIndex].startMonth = startMonth
rows[#rows][cellIndex].endYear = endYear
rows[#rows][cellIndex].endYear = endYear
rows[#rows][cellIndex].endMonth = endMonth


if startYear < rows.minYear then
if startDate < rows.minDate then
rows.minYear = startYear
rows.minDate = startDate
end
end


if endYear > rows.maxYear then
if endDate > rows.maxDate then
rows.maxYear = endYear
rows.maxDate = endDate
end
end
-- New item
-- New item
Line 139: Line 149:
end
end
-- Add overrides from arguments (handle fractional years)
-- Add overrides from arguments
if args.startoffset then
if args.startoffset then
rows.minYear = rows.minYear - tonumber(args.startoffset)
rows.minDate = rows.minDate - tonumber(args.startoffset)
end
end
if args.startyear then
if args.startyear then
local startOverride = parseDate(args.startyear) or tonumber(args.startyear)
local startMonth = tonumber(args.startmonth) or 1
if startOverride and startOverride < rows.minYear then
local customStart = dateToNumber(tonumber(args.startyear), startMonth)
rows.minYear = startOverride
if customStart < rows.minDate then
rows.minDate = customStart
end
end
end
end
if args.endoffset then
if args.endoffset then
rows.maxYear = rows.maxYear + tonumber(args.endoffset)
rows.maxDate = rows.maxDate + tonumber(args.endoffset)
end
end
if args.endyear then
if args.endyear then
local endOverride = parseDate(args.endyear) or tonumber(args.endyear)
local endMonth = tonumber(args.endmonth) or 12
if endOverride and endOverride > rows.maxYear then
local customEnd = dateToNumber(tonumber(args.endyear), endMonth)
rows.maxYear = endOverride
if customEnd > rows.maxDate then
rows.maxDate = customEnd
end
end
end
end


return rows
return rows
end
-- Get month abbreviation
local function getMonthAbbr(month)
local months = {'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
                'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'}
return months[month] or ''
end
end


Line 175: Line 180:
local function renderDates(args, tbl, rows, invert)
local function renderDates(args, tbl, rows, invert)
local showDecades = yesno(args.decades)
local showDecades = yesno(args.decades)
local showMonths = yesno(args.months)
local useMonths = rows.useMonths
local yearRow = tbl:tag('tr')
local yearRow = tbl:tag('tr'):addClass('timeline-row')
:addClass('timeline-row')
-- Create label
-- Create label
if args.label or rows.hasLabels then
if args.label or rows.hasLabels then
local rowspan = 1
if showDecades ~= false then
rowspan = 2
elseif showDecades == false and showMonths ~= false then
rowspan = 2
end
local labelCell = mw.html.create('th')
local labelCell = mw.html.create('th')
:attr('scope', 'col')
:attr('scope', 'col')
:addClass('navbox-group timeline-label')
:addClass('navbox-group timeline-label')
:cssText(args.labelstyle)
:cssText(args.labelstyle)
:attr('rowspan', tostring(rowspan))
:attr('rowspan', (showDecades ~= false and useMonths) and '3' or
(showDecades ~= false or useMonths) and '2' or '1')
:wikitext(args.label or '')
:wikitext(args.label or '')
Line 200: Line 198:
-- Create decade row
-- Create decade row
if showDecades ~= false then
if showDecades ~= false then
local decadeRow = tbl:tag('tr')
local decadeRow = tbl:tag('tr'):addClass('timeline-row')
:addClass('timeline-row')
local currentDate = rows.minDate
local year = math.floor(rows.minYear)
local maxYear = math.ceil(rows.maxYear)
-- Move decade row
if not invert then
if not invert then
decadeRow, yearRow = yearRow, decadeRow
decadeRow, yearRow = yearRow, decadeRow
end
end
while year < maxYear do
while currentDate < rows.maxDate do
local dur = math.min(10 - year % 10, maxYear - year)
local year, month = numberToDate(currentDate)
local nextDecade = math.ceil(year / 10) * 10
local decadeEnd = dateToNumber(nextDecade, 1)
local dur = math.min(decadeEnd - currentDate, rows.maxDate - currentDate)
decadeRow:tag('th')
decadeRow:tag('th')
Line 221: Line 219:
:wikitext(math.floor(year / 10) .. '0s')
:wikitext(math.floor(year / 10) .. '0s')
year = year + dur
currentDate = currentDate + dur
end
end
-- Create month row when decades are disabled but months are enabled
end
elseif showDecades == false and showMonths ~= false then
local monthRow = tbl:tag('tr')
-- Create month row if using months
:addClass('timeline-row')
local monthRow = nil
if useMonths then
-- Move month row
monthRow = tbl:tag('tr'):addClass('timeline-row')
if not invert then
if invert and showDecades ~= false then
monthRow, yearRow = yearRow, monthRow
-- Reorder for footer
end
monthRow, yearRow, decadeRow = decadeRow, monthRow, yearRow
-- Calculate total months in range
local totalMonths = math.ceil((rows.maxYear - rows.minYear) * 12)
local monthWidth = 100 / totalMonths
local currentDate = rows.minYear
while currentDate < rows.maxYear do
local year = math.floor(currentDate)
local month = math.floor((currentDate - year) * 12) + 1
monthRow:tag('th')
:attr('scope', 'col')
:addClass('timeline-month')
:cssText(args.datestyle)
:cssText(args.monthstyle)
:cssText('width:' .. monthWidth .. '%')
:wikitext(getMonthAbbr(month))
currentDate = currentDate + 1/12
end
end
end
end
-- Populate year row element
-- Populate year row
if showDecades == false and showMonths ~= false then
local totalDuration = rows.maxDate - rows.minDate
-- When showing months, each year spans 12 columns
local currentDate = rows.minDate
local year = math.floor(rows.minYear)
local maxYear = math.ceil(rows.maxYear)
while currentDate < rows.maxDate do
local year, month = numberToDate(currentDate)
local nextYear = dateToNumber(year + 1, 1)
local yearDuration = math.min(nextYear - currentDate, rows.maxDate - currentDate)
local width = (yearDuration / totalDuration) * 100
yearRow:tag('th')
:attr('scope', 'col')
:addClass('timeline-year')
:cssText(args.datestyle)
:cssText(args.yearstyle)
:cssText('width:' .. width .. '%')
:attr('colspan', yearDuration)
:wikitext(tostring(year))
for currentYear = year, maxYear - 1 do
-- Add months for this year
yearRow:tag('th')
if useMonths and monthRow then
:attr('scope', 'col')
local yearStart = currentDate
:addClass('timeline-year')
while yearStart < nextYear and yearStart < rows.maxDate do
:cssText(args.datestyle)
local monthYear, monthNum = numberToDate(yearStart)
:cssText(args.yearstyle)
local monthWidth = (1 / totalDuration) * 100
:attr('colspan', '12')
:wikitext(tostring(currentYear))
monthRow:tag('th')
:attr('scope', 'col')
:addClass('timeline-month')
:cssText(args.datestyle)
:cssText(args.monthstyle)
:cssText('width:' .. monthWidth .. '%')
:wikitext(getMonthNum(monthNum))
yearStart = yearStart + 1
end
end
end
else
-- Normal year display
local yearSpan = rows.maxYear - rows.minYear
local width = 100 / yearSpan
local year = math.floor(rows.minYear)
local maxYear = math.ceil(rows.maxYear)
for i = year, maxYear - 1 do
currentDate = nextYear
yearRow:tag('th')
:attr('scope', 'col')
:addClass('timeline-year')
:cssText(args.datestyle)
:cssText(args.yearstyle)
:cssText('width:' .. width .. '%')
:wikitext(showDecades == false and i or i % 10)
end
end
end
end
end
Line 291: Line 277:
-- Render the timeline itself
-- Render the timeline itself
local function renderTimeline(args, tbl, rows)
local function renderTimeline(args, tbl, rows)
local rowElement = nil
local rowSuffix = nil
local prev = rows.minYear
local prevItem = nil
local prevLabel = nil
local labelSpan = 0
for rowNum, row in ipairs(rows) do
for rowNum, row in ipairs(rows) do
local rowElement = tbl:tag('tr')
local rowElement = tbl:tag('tr'):addClass('timeline-row')
:addClass('timeline-row')
if labelSpan <= 0 and (rows.hasLabels or args.label) then
if rows.hasLabels or args.label then
labelSpan = tonumber(row.span) or 1
rowElement:tag('th')
prevLabel = rowElement:tag('th')
:attr('scope', 'row')
:attr('scope', 'row')
:attr('rowspan', labelSpan)
:addClass('navbox-group timeline-label')
:addClass('navbox-group timeline-label')
:cssText(args.labelstyle)
:cssText(args.labelstyle)
:cssText(row.labelstyle)
:cssText(row.labelstyle)
:wikitext(row.label)
:wikitext(row.label or '')
end
end
labelSpan = labelSpan - 1
local prevEndDate = rows.minDate
local prevEndYear = rows.minYear
local prevItem = nil
for cellNum, cell in ipairs(row) do
for cellNum, cell in ipairs(row) do
-- Shrink previous item so new item can start at the start year
if cell.startDate == nil then
if prevItem and prev > prevEndYear then
local colspan = tonumber(prevItem:getAttr('colspan')) or 1
local adjustment = prev - prevEndYear
if yesno(args.decades) == false and yesno(args.months) ~= false then
-- Adjust for months
adjustment = math.round(adjustment * 12)
else
adjustment = math.round(adjustment)
end
prevItem:attr('colspan', math.max(1, colspan - adjustment))
end
 
if cell.startYear == nil then
error('Missing timerange for row ' .. rowNum .. ' cell ' .. cellNum, 0)
error('Missing timerange for row ' .. rowNum .. ' cell ' .. cellNum, 0)
end
end
-- Add blanks before the cell
-- Add blanks before the cell
addBlank(args, rowElement, prevEndYear, cell.startYear)
addBlank(args, rowElement, prevEndDate, cell.startDate)
local colspan = cell.endYear - cell.startYear
if yesno(args.decades) == false and yesno(args.months) ~= false then
-- Each month is one column
colspan = math.max(1, math.round(colspan * 12))
else
colspan = math.max(1, math.round(colspan))
end
prevItem = rowElement:tag('td')
rowElement:tag('td')
:addClass('timeline-item')
:addClass('timeline-item')
:cssText(args.itemstyle)
:cssText(args.itemstyle)
:cssText(cell.style or '')
:cssText(cell.style or '')
:attr('colspan', colspan)
:attr('colspan', cell.endDate - cell.startDate)
:wikitext(cell.item)
:wikitext(cell.item)


prevEndYear = cell.endYear
prevEndDate = cell.endDate
end
end
-- Add blanks to the end of the row
-- Add blanks to the end of the row
addBlank(args, rowElement, prevEndYear, rows.maxYear)
addBlank(args, rowElement, prevEndDate, rows.maxDate)
end
-- Remove any extra rowspan from the label
if prevLabel and labelSpan > 0 then
prevLabel:attr('rowspan', (tonumber(prevLabel:getAttr('rowspan')) or 1) - labelSpan);
end
end
end
end
Line 378: Line 322:
listpadding = '0'
listpadding = '0'
}
}
-- Arguments to passthrough to navbox
local passthrough = {
local passthrough = {
'name', 'title', 'above', 'below', 'state', 'navbar', 'border', 'image',
'name', 'title', 'above', 'below', 'state', 'navbar', 'border', 'image',
'imageleft', 'style', 'bodystyle', 'style', 'bodystyle', 'basestyle',
'imageleft', 'style', 'bodystyle', 'basestyle',
'titlestyle', 'abovestyle', 'belowstyle', 'imagestyle',
'titlestyle', 'abovestyle', 'belowstyle', 'imagestyle',
'imageleftstyle', 'titleclass', 'aboveclass', 'bodyclass', 'belowclass',
'imageleftstyle', 'titleclass', 'aboveclass', 'bodyclass', 'belowclass',
'imageclass'
'imageclass'
}
}
local rows = timelineInfo(args)
local rows = timelineInfo(args)
local wrapper = mw.html.create('table')
local wrapper = mw.html.create('table')
Line 408: Line 353:
targs.templatestyles = 'Module:Navbox timeline/styles.css'
targs.templatestyles = 'Module:Navbox timeline/styles.css'
targs.list1 = tostring(wrapper)
targs.list1 = tostring(wrapper)
targs.bodyclass = (targs.bodyclass or '') .. ' timeline-container' -- Add this line
return navbox(targs)
return navbox(targs)