From 1773ed4af700cb20cb85ea231deab96a12846f47 Mon Sep 17 00:00:00 2001 From: Docker Config Backup Date: Tue, 29 Jul 2025 18:54:37 +0200 Subject: [PATCH] Save before creating restore point: Periodic backup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Auto-saved at 2025-07-29 18:54:37 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- components/timeshift-spreadsheet.tsx | 22 +++++++++++++++++----- logs/auto-commit.log | 3 +++ logs/auto-commit.out.log | 3 +++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/components/timeshift-spreadsheet.tsx b/components/timeshift-spreadsheet.tsx index 861cb4c..375d4b2 100644 --- a/components/timeshift-spreadsheet.tsx +++ b/components/timeshift-spreadsheet.tsx @@ -246,14 +246,17 @@ export function TimeshiftSpreadsheet({ teamId, teamName }: TimeshiftSpreadsheetP styles[`${colLetter}1`] = "height: 97px;" } - // Make day names row (row 2) taller and add top border from column B onwards + // Make day names row (row 2) taller and add top border from column B onwards (except last two columns) for (let col = 0; col < (data[0]?.length || 0); col++) { const colLetter = getExcelColumnName(col) if (col === 0) { // First column (A) - just height styles[`${colLetter}2`] = "height: 50px;" + } else if (colLetter === 'BZ' || colLetter === 'CA') { + // Last two columns (BZ, CA) - height only, no top border + styles[`${colLetter}2`] = "height: 50px;" } else { - // All other columns (B onwards) - height + top border + // All other columns (B onwards except BZ, CA) - height + top border styles[`${colLetter}2`] = "height: 50px; border-top: 1px solid #000000;" } } @@ -275,9 +278,11 @@ export function TimeshiftSpreadsheet({ teamId, teamName }: TimeshiftSpreadsheetP const colLetter = getExcelColumnName(col) const nextColLetter = getExcelColumnName(col + 1) - // Weekend day name row (row 2) - merged cells with top border - styles[`${colLetter}2`] = "background-color: #ffd966; height: 50px; border-top: 1px solid #000000;" // Weekend day name with height and border - styles[`${nextColLetter}2`] = "background-color: #ffd966; height: 50px; border-top: 1px solid #000000;" + // Weekend day name row (row 2) - merged cells with conditional top border + const hasBorder1 = colLetter !== 'BZ' && colLetter !== 'CA' ? " border-top: 1px solid #000000;" : "" + const hasBorder2 = nextColLetter !== 'BZ' && nextColLetter !== 'CA' ? " border-top: 1px solid #000000;" : "" + styles[`${colLetter}2`] = `background-color: #ffd966; height: 50px;${hasBorder1}` // Weekend day name with conditional border + styles[`${nextColLetter}2`] = `background-color: #ffd966; height: 50px;${hasBorder2}` // Weekend date columns (rows 3, 4, 5 - year, month, day) for (let row = 3; row <= 5; row++) { @@ -290,6 +295,13 @@ export function TimeshiftSpreadsheet({ teamId, teamName }: TimeshiftSpreadsheetP // Remove formatting specifically from BZ6 and CA6 cells styles["BZ6"] = "" // Override any formatting for BZ6 styles["CA6"] = "" // Override any formatting for CA6 + + // Add right border to BY column from row 2 to the last employee row + const totalRows = data.length + const employeeStartRow = 8 // Row 8 is first employee (0-indexed: rows 1-6 are headers, row 7 is empty) + for (let row = 2; row <= totalRows; row++) { + styles[`BY${row}`] = (styles[`BY${row}`] || "") + " border-right: 1px solid #000000;" + } } console.log("Initializing jspreadsheet with config:", { diff --git a/logs/auto-commit.log b/logs/auto-commit.log index 32cb0be..c08577e 100644 --- a/logs/auto-commit.log +++ b/logs/auto-commit.log @@ -78,3 +78,6 @@ 2025-07-29 17:54:37 +02:00: 🔖 Creating restore point... 2025-07-29 17:54:40 +02:00: ✅ Restore point created 2025-07-29 18:24:37 +02:00: 🔖 Creating restore point... +2025-07-29 18:24:39 +02:00: ✅ Restore point created +2025-07-29 18:54:37 +02:00: 🔄 Hourly reset: Commit counter reset to 0 +2025-07-29 18:54:37 +02:00: 🔖 Creating restore point... diff --git a/logs/auto-commit.out.log b/logs/auto-commit.out.log index 9a63438..6d8f83d 100644 --- a/logs/auto-commit.out.log +++ b/logs/auto-commit.out.log @@ -74,3 +74,6 @@ 2025-07-29 17:54:37 +02:00: 🔖 Creating restore point... 2025-07-29 17:54:40 +02:00: ✅ Restore point created 2025-07-29 18:24:37 +02:00: 🔖 Creating restore point... +2025-07-29 18:24:39 +02:00: ✅ Restore point created +2025-07-29 18:54:37 +02:00: 🔄 Hourly reset: Commit counter reset to 0 +2025-07-29 18:54:37 +02:00: 🔖 Creating restore point...