feat(sickleave): add marker-based Sick Leave with optional date range

- Introduce --pos s (Sick Leave)
- Support optional --from/--to (range mode)
- Treat Sick Leave as non-working marker day
- Exclude from ΔWORK calculations
- Refactor apply() and list rendering
- Update recalc_pairs_for_date signature

Author: umpire274

CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [0.8.6] - 2026-02-10
+
+### Added
+
+- New `Sick Leave` position (`--pos s`)
+- Support for optional date range with `--from` and `--to` (usable only with `--pos s`)
+- Marker-day logic for Sick Leave (stored as sentinel event at 00:00, similar to Holiday)
+
+### Changed
+
+- `Sick Leave` is now treated as a non-working marker day:
+    - No IN/OUT times displayed in `list`
+    - No contribution to daily or monthly ΔWORK totals
+    - No target (TGT) calculation
+- Validation updated:
+    - `--from/--to` allowed only with `--pos s`
+    - If omitted, `--pos s` applies to the provided date only
+- Refactored `apply()` logic for cleaner separation between:
+    - marker days (Holiday, NationalHoliday, SickLeave)
+    - working days
+- `recalc_pairs_for_date` signature updated to accept `&Connection`
+  (allows usage inside transactions)
+
+### Fixed
+
+- Prevented incorrect IN/OUT display (`00:00`) for Sick Leave in `list`
+- Prevented unintended ΔWORK surplus calculation for Sick Leave days
+- Improved argument validation consistency in `add` command
+
+---
+
 ## v0.8.5 — 2026-01-13
 
 ### Added

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rtimelogger"
-version = "0.8.5"
+version = "0.8.6"
 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

@@ -5,6 +5,31 @@ use crate::errors::{AppError, AppResult};
 use crate::models::location::Location;
 use crate::utils::date;
 use crate::utils::time::parse_optional_time;
+use chrono::NaiveDate;
+
+fn validate_sickleave_args(
+    pos: Location,
+    from: Option<NaiveDate>,
+    to: Option<NaiveDate>,
+) -> Result<Option<(NaiveDate, NaiveDate)>, AppError> {
+    match (from, to) {
+        (Some(f), Some(t)) => {
+            if pos != Location::SickLeave {
+                return Err(AppError::InvalidArgs(
+                    "--from/--to can only be used with --pos s".into(),
+                ));
+            }
+            if f > t {
+                return Err(AppError::InvalidDateRange { from: f, to: t });
+            }
+            Ok(Some((f, t)))
+        }
+        (None, None) => Ok(None),
+        _ => Err(AppError::InvalidArgs(
+            "Both --from and --to must be provided together.".into(),
+        )),
+    }
+}
 
 /// Add or update a work session.
 pub fn handle(cmd: &Commands, cfg: &crate::config::Config) -> AppResult<()> {
@@ -18,15 +43,12 @@ pub fn handle(cmd: &Commands, cfg: &crate::config::Config) -> AppResult<()> {
         end,
         edit_pair,
         edit,
+        from,
+        to,
     } = cmd
     {
         //
-        // 1. Parse date (mandatory)
-        //
-        let d = date::parse_date(date).ok_or_else(|| AppError::InvalidDate(date.to_string()))?;
-
-        //
-        // 2. Parse position (default = Office)
+        // 1. Parse position (default = Office)
         //
         let pos_final = match pos {
             Some(code) => Location::from_code(code).ok_or_else(|| {
@@ -39,25 +61,34 @@ pub fn handle(cmd: &Commands, cfg: &crate::config::Config) -> AppResult<()> {
         };
 
         //
-        // 3. Parse IN time (optional)
+        // 2. Parse date (mandatory for normal ADD)
+        //    (per SickLeave puoi anche ignorarla, ma se CLI la richiede, la parse qui va bene)
+        //
+        let d = date::parse_date(date).map_err(|_| AppError::InvalidDate(date.to_string()))?;
+
+        //
+        // 3. Parse times (optional input)
         //
-        let start_parsed = parse_optional_time(start.as_ref());
+        let start_parsed = parse_optional_time(start.as_ref())?;
 
         //
         // 4. Parse OUT time (optional)
         //
-        let end_parsed = parse_optional_time(end.as_ref());
+        let end_parsed = parse_optional_time(end.as_ref())?;
 
         //
-        // 5. Parse lunch break (optional)
+        // 4. Lunch break (optional)
         //
-        let lunch_opt = *lunch; // lunch è Option<i32>
+        let lunch_opt = *lunch;
 
         //
-        // 6. Open DB
+        // 5. Open DB
         //
         let mut pool = DbPool::new(&cfg.database)?;
 
+        //
+        // 6. work_gap flag
+        //
         let work_gap: Option<bool> = if *work_gap {
             Some(true)
         } else if *no_work_gap {
@@ -67,21 +98,59 @@ pub fn handle(cmd: &Commands, cfg: &crate::config::Config) -> AppResult<()> {
         };
 
         //
-        // 7. Execute logic
-        //
-        AddLogic::apply(
-            cfg,
-            &mut pool,
-            d,
-            pos_final,
-            start_parsed.unwrap(),
-            lunch_opt,
-            work_gap,
-            end_parsed.unwrap(),
-            *edit,
-            *edit_pair,
-            pos.clone(), // used for audit logging
-        )?;
+        // 7. SickLeave range validation (only if pos == SickLeave or from/to used)
+        //
+        let sick_range = validate_sickleave_args(pos_final, *from, *to)?;
+
+        match sick_range {
+            Some((from_date, to_date)) => {
+                let default_in = chrono::NaiveTime::from_hms_opt(9, 0, 0).unwrap();
+                let default_out = chrono::NaiveTime::from_hms_opt(18, 0, 0).unwrap();
+
+                // (opzionale ma consigliato) vieta start/end nel range malattia
+                if start_parsed.is_some() || end_parsed.is_some() {
+                    return Err(AppError::InvalidArgs(
+                        "--start/--end cannot be used with --pos s (use only --from/--to)".into(),
+                    ));
+                }
+
+                let s = start_parsed.unwrap_or(default_in);
+                let e = end_parsed.unwrap_or(default_out);
+
+                AddLogic::apply(
+                    cfg,
+                    &mut pool,
+                    d,
+                    pos_final,
+                    Some(s),
+                    lunch_opt,
+                    work_gap,
+                    Some(e),
+                    *edit,
+                    *edit_pair,
+                    Some(from_date),
+                    Some(to_date),
+                    pos.clone(),
+                )?;
+            }
+            None => {
+                AddLogic::apply(
+                    cfg,
+                    &mut pool,
+                    d,
+                    pos_final,
+                    start_parsed,
+                    lunch_opt,
+                    work_gap,
+                    end_parsed,
+                    *edit,
+                    *edit_pair,
+                    None,
+                    None,
+                    pos.clone(),
+                )?;
+            }
+        }
     }
 
     Ok(())

src/cli/commands/add.rs

@@ -28,7 +28,8 @@ pub fn handle(cmd: &Commands, cfg: &Config) -> AppResult<()> {
         date: date_str,
     } = cmd
     {
-        let d = date::parse_date(date_str).ok_or_else(|| AppError::InvalidDate(date_str.into()))?;
+        let d =
+            date::parse_date(date_str).map_err(|_| AppError::InvalidDate(date_str.to_string()))?;
 
         //
         // Confirmation prompt

src/cli/commands/del.rs

@@ -495,7 +495,12 @@ fn print_daily_row(
     let mut surplus_display = "-".to_string();
     let mut surplus_color = colors::GREY;
 
-    if day_position != Location::Holiday && day_position != Location::NationalHoliday {
+    let is_marker_day = matches!(
+        day_position,
+        Location::Holiday | Location::NationalHoliday | Location::SickLeave
+    );
+
+    if !is_marker_day {
         let first_in = timeline.pairs[0].in_event.timestamp();
         first_in_str = first_in.format("%H:%M").to_string();
 

src/cli/commands/list.rs

@@ -1,4 +1,6 @@
 use crate::export::ExportFormat;
+use crate::utils::date::parse_date;
+use chrono::NaiveDate;
 use clap::{Parser, Subcommand};
 
 /// Command-line interface definition for rTimelogger
@@ -78,10 +80,10 @@ pub enum Commands {
         /// Date of the event (YYYY-MM-DD)
         date: String,
 
-        /// Position (O = Office, R = Remote, H = Holiday, C = Client, M = Mixed)
+        /// Position (O = Office, R = Remote, H = Holiday, N = National Holiday, C = Client, M = Mixed, S = Sick Leave)
         #[arg(
             long = "pos",
-            help = "Work position: O=Office, R=Remote, H=Holiday, C=Client, M=Mixed"
+            help = "Work position: O=Office, R=Remote, H=Holiday, N=National Holiday, C=Client, M=Mixed, S=Sick Leave"
         )]
         pos: Option<String>,
 
@@ -124,6 +126,14 @@ pub enum Commands {
             help = "Edit existing pair instead of creating a new one"
         )]
         edit: bool,
+
+        /// Start date (YYYY-MM-DD). Only valid with --pos Malattia.
+        #[arg(long, value_parser = parse_date)]
+        from: Option<NaiveDate>,
+
+        /// End date (YYYY-MM-DD). Only valid with --pos Malattia.
+        #[arg(long, value_parser = parse_date)]
+        to: Option<NaiveDate>,
     },
 
     /// Delete a work session by ID