Add National holiday support and database migration

- Added new day position: National holiday (N)
- Extended Location enum and CLI parsing
- Added idempotent SQLite migration to update events.position CHECK constraint
- Updated list and compact views to handle national holidays
- Updated CHANGELOG for v0.8.2
- Updated README with new position documentation

Author: umpire274

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+
+## [0.8.2] — 2026-01-08
+
+### ✨ Added
+
+- Added a new day position **National holiday** (**N**) to represent public holidays that do not affect personal holiday allowance. 
+- Introduced support for `--pos n` / `--pos national` in the `add` command to mark national holidays. 
+- Added idempotent database migration to extend the `events.position` CHECK constraint with the new `N` value.
+
+### 🧠 Changed
+
+- Updated daily and compact list views to properly display **National holiday** days with neutral time and ΔWORK values. 
+- Improved semantic distinction between **Holiday** (personal leave) and **National holiday** (public holiday) in reports and summaries.
+
+### 🐞 Fixes
+
+- Ensured database migrations safely no-op when the schema is already aligned. 
+- Fixed SQL escaping issues in migration logging statements.
+
+### 🧹 Internal
+
+- Extended Location enum and related parsing/formatting utilities. 
+- Refined migration logging for better traceability and robustness.
+
+---
+
 ## [0.8.1] - 2026-01-07
 
 ### ✨ New

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rtimelogger"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2024"
 authors = ["Umpire274 <umpire274@gmail.com>"]
 description = "A simple cross-platform CLI tool to track working hours, lunch breaks, and calculate surplus time"

Cargo.toml

@@ -14,75 +14,22 @@ and computes **expected exit time** and **daily surplus** accurately.
 
 ---
 
-## 🚀 What’s new in **v0.8.0**
+## 🚀 What’s new in **v0.8.2**
 
-Version **0.8.0** is the first **stable release** based on the new **timeline engine**.
+### 🗄️ Database migration
 
-### ✅ Timeline engine (stable)
+Starting from **v0.8.2**, rTimelogger automatically migrates the database schema to support the new `National holiday`
+position.
 
-* Unlimited **IN / OUT pairs per day**
-* Deterministic reconstruction:
-  **events → timeline → pairs**
-* Correct handling of:
+- The migration extends the `events.position` CHECK constraint
+- The migration is **idempotent** (no changes are applied if the schema is already up to date)
+- No manual action is required
 
-    * lunch breaks
-    * working gaps
-    * multi-position days
-* Legacy `work_sessions` logic fully retired
+### 🧭 Notes
 
----
-
-### 🔗 Working gap support
-
-Time **between pairs** can be explicitly controlled:
-
-* `--work-gap` → gap counts as working time
-* `--no-work-gap` → gap does **not** count as working time
-
-Features:
-
-* Stored in the database
-* Editable retroactively
-* Fully reflected in:
-
-    * worked time
-    * expected exit
-    * surplus
-
-Visual indicators:
-
-* 🔗 working gap
-* ✂️ non-working gap
-
----
-
-### 🧮 Accurate calculations
-
-* Worked time:
-
-    * sum of all pairs
-    * minus non-working gaps
-    * plus working gaps only when marked
-* Expected exit:
-
-    * based on first IN
-    * configured minimum working time
-    * lunch rules and lunch window
-* Surplus is correct in **all multi-pair scenarios**
-
----
-
-### 🧠 Consistency improvements
-
-* `OUT` events inherit position from `IN` when `--pos` is omitted
-* Pair details show the **actual position of each pair**
-* Clean event listing:
-
-    * no duplicated dates
-    * aligned output
-* Unified CLI message system:
-
-    * ℹ️ info · ⚠️ warning · ❌ error · ✅ success
+- Holiday should be used for personal leave days
+- National holiday should be used for public holidays defined by law or company calendar
+- Future versions may introduce calendar-based automation for national holidays
 
 ---
 
@@ -94,6 +41,7 @@ Visual indicators:
     * `O` Office
     * `R` Remote
     * `C` Client / On-site
+    * `N` National holiday
     * `H` Holiday
     * `M` Mixed
 * Automatic calculation of:
@@ -187,7 +135,8 @@ sudo mv rtimelogger /usr/local/bin/
 ### 🪟 Windows
 
 Download the prebuilt zip file, extract it, and move `rtimelogger.exe` to a directory in your `PATH`, e.g.,
-`C:\Windows\System32\` or create a dedicated folder like `C:\Program Files\rtimelogger\` and add it to your system `PATH`.
+`C:\Windows\System32\` or create a dedicated folder like `C:\Program Files\rtimelogger\` and add it to your system
+`PATH`.
 
 ---
 
@@ -205,6 +154,7 @@ Example `rtimelogger.conf`:
 database: /home/user/.rtimelogger/rtimelogger.sqlite
 default_position: O
 min_work_duration: 8h
+lunch_window: 12:30-14:00
 min_duration_lunch_break: 30
 max_duration_lunch_break: 90
 separator_char: "-"
@@ -252,6 +202,69 @@ rtimelogger add 2025-12-15 --out 10:30 --work-gap
 rtimelogger add 2025-12-15 --edit --pair 2 --no-work-gap
 ```
 
+### 📌 Day positions
+
+rTimelogger supports multiple day positions to describe how a working day (or non-working day) is classified.
+
+**Supported positions**
+
+| Code | Name             | Description                                                   |
+|------|------------------|---------------------------------------------------------------|
+| `O`  | Office           | Regular office working day                                    |
+| `R`  | Remote           | Remote working day                                            |
+| `C`  | On-site          | Working day at customer site                                  |
+| `M`  | Mixed            | Mixed working locations                                       |
+| `H`  | Holiday          | Personal holiday (counts against personal leave allowance)    |
+| `N`  | National holiday | Public holiday (does **not** affect personal leave allowance) |
+
+### ➕ Adding a national holiday
+
+To mark a **public/national holiday**, use the `add` command with the national position.
+
+```bash
+rtimelogger add 2025-12-25 --pos n
+```
+
+or
+
+```bash
+rtimelogger add 2025-12-25 --pos national
+```
+
+**Behavior**
+
+- No `--in`, `--out`, `--lunch`, or `--work-gap` parameters are allowed
+- The day is recorded as a non-working public holiday
+- The day does not contribute to worked time
+- The day does not reduce personal holiday allowance
+
+### 📋 List output behavior
+
+**National holiday days**
+
+In both standard and compact list views:
+
+- All time-related fields are displayed as `--:--`
+- Target end (`TGT`) is not computed
+- Worked delta (`ΔWORK`) is neutral (`-`)
+- The day is clearly labeled as **National holiday**
+
+Example:
+
+```text
+2025-12-25 (Thu) | National holiday | --:-- | --:-- | --:-- | --:-- | -
+```
+
+### ⚖️ Holiday vs National holiday
+
+| Aspect                   | Holiday (`H`) | National holiday (`N`) |
+|--------------------------|---------------|------------------------|
+| Working day              | ❌             | ❌                      |
+| Counts as personal leave | ✅             | ❌                      |
+| Expected time            | ❌             | ❌                      |
+| ΔWORK contribution       | ❌             | ❌                      |
+| Requires time entries    | ❌             | ❌                      |
+
 ---
 
 ## 📋 Listing sessions — `rtimelogger list`
@@ -417,6 +430,7 @@ The total accounts for:
 ```bash
 rtimelogger list --period 2025-12 --json
 ```
+
 Outputs the data in JSON format for easy integration with other tools or scripts.
 
 ---

README.md

@@ -465,7 +465,7 @@ fn print_daily_row(
     let mut surplus_display = "-".to_string();
     let mut surplus_color = colors::GREY;
 
-    if day_position != Location::Holiday {
+    if day_position != Location::Holiday && day_position != Location::NationalHoliday {
         let first_in = timeline.pairs[0].in_event.timestamp();
         first_in_str = first_in.format("%H:%M").to_string();
 
@@ -652,7 +652,7 @@ fn print_daily_row_compact(
     let pos_label = day_position.label();
     let pos_color = day_position.color();
 
-    if day_position == Location::Holiday {
+    if day_position == Location::Holiday || day_position == Location::NationalHoliday {
         println!(
             "{:<dw$} | {}{:<12}{}\x1b[0m | {:<21} | {:^5} | {}Δ -{}\x1b[0m",
             date_str,

src/cli/commands/list.rs

@@ -164,12 +164,11 @@ impl AddLogic {
         // ------------------------------------------------
         // ✅ CASE HOLIDAY: allow --pos H without --in/--out
         // ------------------------------------------------
-        if pos_final == Location::Holiday {
+        if pos_final == Location::Holiday || pos_final == Location::NationalHoliday {
             // Holiday è un marker di giornata: non accetto parametri temporali o lunch/work-gap
             if start.is_some() || end.is_some() || lunch.is_some() || work_gap.is_some() {
                 return Err(AppError::InvalidArgs(
-                    "For --pos H (Holiday) do not specify --in, --out, --lunch or --work-gap."
-                        .into(),
+                    "For holiday days do not specify time-related arguments.".into(),
                 ));
             }
 
@@ -190,15 +189,19 @@ impl AddLogic {
                 date,
                 holiday_time,
                 EventType::In,
-                Location::Holiday,
+                pos_final,
                 Some(0),
                 false,
             );
 
             insert_event(&pool.conn, &ev_holiday)?;
             crate::db::queries::recalc_pairs_for_date(&mut pool.conn, &date)?;
 
-            success(format!("Added HOLIDAY on {}.", date_str));
+            success(match pos_final {
+                Location::Holiday => format!("Added HOLIDAY on {}.", date),
+                Location::NationalHoliday => format!("Added NATIONAL HOLIDAY on {}.", date),
+                _ => unreachable!(),
+            });
             return Ok(());
         }
 

src/core/add.rs

@@ -168,6 +168,76 @@ fn align_db_schemas_to_080_version(conn: &Connection) -> Result<()> {
     Ok(())
 }
 
+fn add_nation_holiday_check_to_events(conn: &Connection) -> Result<()> {
+    if !events_table_exists(conn)? {
+        return Ok(()); // nessuna tabella → niente da migrare
+    }
+
+    // 🔎 Check preliminare
+    if events_position_supports_national_holiday(conn)? {
+        // Tabella già allineata → niente da fare
+        return Ok(());
+    }
+
+    let version = "20260107_1700_add_national_holiday_check_to_events_position";
+
+    // 1) Verifica se già applicata
+    warning("Adding new check onto 'position' column to events table...");
+
+    conn.execute_batch(
+        r#"
+        PRAGMA foreign_keys=OFF;
+        BEGIN;
+
+        ALTER TABLE events RENAME TO events_old;
+
+        CREATE TABLE events (
+            id           INTEGER PRIMARY KEY AUTOINCREMENT,
+            date         TEXT NOT NULL,
+            time         TEXT NOT NULL,
+            kind         TEXT NOT NULL CHECK(kind IN ('in','out')),
+            position     TEXT NOT NULL DEFAULT 'O' CHECK(position IN ('O','R','H','N','C','M')),
+            lunch_break  INTEGER NOT NULL DEFAULT 0,
+            pair         INTEGER NOT NULL DEFAULT 0,
+            work_gap     INTEGER NOT NULL DEFAULT 0,
+            source       TEXT NOT NULL DEFAULT 'cli',
+            meta         TEXT DEFAULT '',
+            created_at   TEXT NOT NULL
+        );
+
+        INSERT INTO events (id, date, time, kind, position, lunch_break, source, meta, created_at)
+        SELECT id, date, time, kind, position, lunch_break, source, meta, created_at
+        FROM events_old;
+
+        DROP TABLE events_old;
+
+        CREATE INDEX IF NOT EXISTS idx_events_date_time ON events(date, time);
+        CREATE INDEX IF NOT EXISTS idx_events_date_kind ON events(date, kind);
+
+        UPDATE sqlite_sequence
+            SET seq = (SELECT IFNULL(MAX(id), 0) FROM events)
+        WHERE name = 'events';
+
+        COMMIT;
+        PRAGMA foreign_keys=ON;
+        "#,
+    )?;
+
+    let msg = "Added new check 'N' position to events";
+
+    conn.execute(
+        r#"
+        INSERT INTO "log" ("date", "operation", "target", "message")
+        VALUES (datetime('now'), 'migration_applied', ?1, ?2)
+        "#,
+        (version, msg),
+    )?;
+
+    success("new check onto 'position' column added.");
+
+    Ok(())
+}
+
 fn backup_before_migration(db_path: &str) -> Result<()> {
     use chrono::Local;
     use std::fs::{self, File};
@@ -329,5 +399,24 @@ pub fn run_pending_migrations(conn: &Connection) -> Result<()> {
     // 6) Perform schema cleanup for 0.8.0+
     align_db_schemas_to_080_version(conn)?;
 
+    // 7) Add national holiday check to events.position
+    add_nation_holiday_check_to_events(conn)?;
+
     Ok(())
 }
+
+fn events_position_supports_national_holiday(conn: &Connection) -> Result<bool> {
+    let sql: String = conn.query_row(
+        r#"
+        SELECT sql
+        FROM sqlite_master
+        WHERE type = 'table'
+          AND name = 'events'
+        "#,
+        [],
+        |row| row.get(0),
+    )?;
+
+    // Check semplice e affidabile
+    Ok(sql.contains("'N'"))
+}