chore: tweak weekly style

Author: tduyng

lua/codeme/ui/renderer.lua

@@ -185,8 +185,8 @@ function M.heatmap(days)
 
 	-- Helper: Calculate date range for a week (numeric format: "02-08" or "30-05")
 	local function get_week_range(week)
-		local first_day = week[1].date -- Monday
-		local last_day = week[7].date -- Sunday
+		local first_day = week[1].date
+		local last_day = week[#week].date -- Last day of week (may be incomplete)
 
 		local f_parsed = parse_date(first_day)
 		local l_parsed = parse_date(last_day)
@@ -202,22 +202,28 @@ function M.heatmap(days)
 		for j = i, math.min(i + 6, #days) do
 			week[#week + 1] = days[j]
 		end
-		if #week == 7 then -- Only add complete weeks
+		-- Accept incomplete weeks (for smart date ranges)
+		if #week > 0 then
 			weeks[#weeks + 1] = week
 		end
 	end
 
 	-- Calculate statistics for summary
 	local max_time = 0
 	local active_days = 0
+	local total_non_future_days = 0
 	for _, day in ipairs(days) do
-		if day.time and day.time > 0 then
-			active_days = active_days + 1
-			max_time = math.max(max_time, day.time)
+		-- Only count non-future days
+		if day.level ~= -1 then
+			total_non_future_days = total_non_future_days + 1
+			if day.time and day.time > 0 then
+				active_days = active_days + 1
+				max_time = math.max(max_time, day.time)
+			end
 		end
 	end
 
-	local consistency = #days > 0 and math.floor((active_days / #days) * 100) or 0
+	local consistency = total_non_future_days > 0 and math.floor((active_days / total_non_future_days) * 100) or 0
 
 	-- Format max time as "4h 10m"
 	local function format_time(seconds)
@@ -286,7 +292,7 @@ function M.heatmap(days)
 		{ { "  🗓️  Activity Heatmap (Last " .. #weeks .. " Weeks)", "exgreen" } },
 		{
 			{ "  📊 ", "exyellow" },
-			{ string.format("%d/%d days active", active_days, #days), "normal" },
+			{ string.format("%d/%d days active", active_days, total_non_future_days), "normal" },
 			{ string.format(" (%d%% consistency)", consistency), "commentfg" },
 			{ " • Peak: ", "commentfg" },
 			{ format_time(max_time), "exgreen" },
@@ -313,22 +319,28 @@ function M.heatmap(days)
 			local line = { { "  " .. week_info.label .. " ", week_info.show_year and "exgreen" or "commentfg" } }
 
 			-- Day cells
-			for _, day in ipairs(week_info.week) do
-				local lvl = math.max(0, math.min(4, day.level or 0))
-
-				-- Mark current week's today with *
-				local is_today = (day.date == today)
-				local cell = chars[lvl + 1]
-
-				if day.level == -1 then
-					-- Future day
-					table.insert(line, { "·   ", "commentfg" })
-				else
-					if is_today and is_current then
-						table.insert(line, { cell .. "*  ", colors[lvl + 1] })
+			for i = 1, 7 do
+				local day = week_info.week[i]
+				if day then
+					local lvl = math.max(0, math.min(4, day.level or 0))
+
+					-- Mark current week's today with *
+					local is_today = (day.date == today)
+					local cell = chars[lvl + 1]
+
+					if day.level == -1 then
+						-- Future day
+						table.insert(line, { "·   ", "commentfg" })
 					else
-						table.insert(line, { cell .. "   ", colors[lvl + 1] })
+						if is_today and is_current then
+							table.insert(line, { cell .. "*  ", colors[lvl + 1] })
+						else
+							table.insert(line, { cell .. "   ", colors[lvl + 1] })
+						end
 					end
+				else
+					-- Pad incomplete weeks with empty cells
+					table.insert(line, { "    ", "normal" })
 				end
 			end
 

lua/codeme/ui/tabs/weekly.lua

@@ -26,6 +26,27 @@ local function get_weekday_date(weekday, monday)
 	return os.date("%Y-%m-%d", monday_time + ((weekday - 1) * 86400))
 end
 
+local function count_week_coding_days(daily_activity)
+	local today = os.date("*t")
+	local weekday = today.wday == 1 and 7 or today.wday - 1 -- Convert Sunday=1 to Monday=1 system
+
+	-- Count days coded so far this week
+	local days_coded = 0
+	for i = 1, weekday do
+		-- Calculate date for each day of the week so far
+		local days_back = weekday - i
+		local check_date = os.time() - (days_back * 24 * 60 * 60)
+		local date_str = os.date("%Y-%m-%d", check_date)
+
+		local stat = daily_activity[date_str]
+		if stat and stat.time and stat.time > 0 then
+			days_coded = days_coded + 1
+		end
+	end
+
+	return days_coded
+end
+
 function M.render(stats)
 	local lines = {}
 
@@ -100,7 +121,7 @@ function M.render(stats)
 	end
 	table.insert(lines, {})
 
-	-- 12 weeks activity headmap
+	-- 12 weeks activity heatmap
 	local hm = stats.weekly_heatmap
 	if hm and #hm > 0 then
 		table.insert(lines, { { "  📅 Activity Heatmap", "exgreen" } })
@@ -121,13 +142,7 @@ function M.render(stats)
 		{ domain.format_duration(daily_avg), "exgreen" },
 	})
 
-	local days_coded = 0
-	for _, stat in pairs(daily_activity) do
-		if stat.time and stat.time > 0 then
-			days_coded = days_coded + 1
-		end
-	end
-
+	local days_coded = count_week_coding_days(daily_activity)
 	table.insert(lines, {
 		{ "     Coding Days: ", "commentfg" },
 		{ string.format("%d/7", days_coded), "exgreen" },
@@ -138,7 +153,7 @@ function M.render(stats)
 		local arrow = diff > 0 and "↑" or diff < 0 and "↓" or "→"
 		local hl = diff > 0 and "exgreen" or diff < 0 and "exred" or "commentfg"
 		table.insert(lines, {
-			{ "  • vs Last Week: ", "commentfg" },
+			{ "     Vs Last Week: ", "commentfg" },
 			{ arrow, hl },
 			{ " " .. domain.format_duration(math.abs(diff)), hl },
 		})