feat(sickleave): add Sick Leave marker day with optional --to range

- Introduce --pos s (Sick Leave)
- Store Sick Leave as 00:00 marker event (non-working day)
- Add optional range support via --to (start is DATE)
- Update migrations to allow position 'S'
- Update list rendering to hide times and exclude ΔWORK totals

Author: umpire274

CHANGELOG.md

@@ -4,30 +4,25 @@
 
 ### 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)
+- New position: `Sick Leave` (`--pos s`)
+- Optional Sick Leave range support via `--to` (start date is the command `DATE`)
 
 ### 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)
+- Sick Leave is stored as a non-working marker day (sentinel event at `00:00`, similar to Holiday)
+- `list` rendering updated for Sick Leave marker days:
+    - IN/OUT/TGT shown as `--:--`
+    - ΔWORK does not contribute to daily/monthly totals
+- CLI validation updated:
+    - `--to` is only allowed with `--pos s`
+    - If `--to` is omitted, Sick Leave applies to the single `DATE`
+- Migration updated to support `S` position in `events.position` CHECK constraint
+- Improved `add` handler flow to support Sick Leave marker insertion and range insertion
 
 ### 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
+- Prevented incorrect `00:00` IN time display for Sick Leave in `list`
+- Prevented Sick Leave days from producing surplus/deficit calculations
 
 ---
 

src/cli/commands/add.rs

@@ -9,25 +9,30 @@ use chrono::NaiveDate;
 
 fn validate_sickleave_args(
     pos: Location,
-    from: Option<NaiveDate>,
+    date: Option<NaiveDate>, // di fatto: Some(d)
     to: Option<NaiveDate>,
 ) -> Result<Option<(NaiveDate, NaiveDate)>, AppError> {
-    match (from, to) {
-        (Some(f), Some(t)) => {
-            if pos != Location::SickLeave {
+    let d = match date {
+        Some(d) => d,
+        None => return Ok(None), // difensivo, ma nel tuo handle passi sempre Some(d)
+    };
+
+    match pos {
+        Location::SickLeave => {
+            let t = to.unwrap_or(d);
+            if d > t {
+                return Err(AppError::InvalidDateRange { from: d, to: t });
+            }
+            Ok(Some((d, t)))
+        }
+        _ => {
+            if to.is_some() {
                 return Err(AppError::InvalidArgs(
-                    "--from/--to can only be used with --pos s".into(),
+                    "--to can only be used with --pos s".into(),
                 ));
             }
-            if f > t {
-                return Err(AppError::InvalidDateRange { from: f, to: t });
-            }
-            Ok(Some((f, t)))
+            Ok(None)
         }
-        (None, None) => Ok(None),
-        _ => Err(AppError::InvalidArgs(
-            "Both --from and --to must be provided together.".into(),
-        )),
     }
 }
 
@@ -43,7 +48,6 @@ pub fn handle(cmd: &Commands, cfg: &crate::config::Config) -> AppResult<()> {
         end,
         edit_pair,
         edit,
-        from,
         to,
     } = cmd
     {
@@ -100,32 +104,26 @@ pub fn handle(cmd: &Commands, cfg: &crate::config::Config) -> AppResult<()> {
         //
         // 7. SickLeave range validation (only if pos == SickLeave or from/to used)
         //
-        let sick_range = validate_sickleave_args(pos_final, *from, *to)?;
+        let sick_range = validate_sickleave_args(pos_final, Some(d), *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(),
+                        "--start/--end cannot be used with --pos s (use only --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),
+                    None,
+                    None,
+                    None,
+                    None,
                     *edit,
                     *edit_pair,
                     Some(from_date),

src/cli/parser.rs

@@ -127,10 +127,6 @@ pub enum Commands {
         )]
         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>,

src/core/add.rs

@@ -79,7 +79,7 @@ impl AddLogic {
         let pos_final = match &pos {
             Some(code) => Location::from_code(code).ok_or_else(|| {
                 AppError::InvalidPosition(format!(
-                    "Invalid location code '{}'. Use a valid code such as 'O', 'R', 'H', 'N', 'C', 'M', 'S'.",
+                    "Invalid location code '{}'. Use a valid code such as 'O', 'R', 'H', 'N', 'C', 'M', 'S'.\n",
                     code
                 ))
             })?,
@@ -193,7 +193,7 @@ impl AddLogic {
                 None => ("✏️", "Pair updated"),
             };
 
-            success(format!("{} {} for pair {}.", icon, msg, pair_num));
+            success(format!("{} {} for pair {}.\n", icon, msg, pair_num));
             return Ok(());
         }
 
@@ -279,10 +279,10 @@ impl AddLogic {
             tx.commit()?;
 
             if from_date == to_date {
-                success(format!("Added SICK LEAVE on {}.", from_date));
+                success(format!("Added SICK LEAVE on {}.\n", from_date));
             } else {
                 success(format!(
-                    "Added SICK LEAVE from {} to {} ({} days).",
+                    "Added SICK LEAVE from {} to {} ({} days).\n",
                     from_date,
                     to_date,
                     (to_date - from_date).num_days() + 1
@@ -336,8 +336,8 @@ impl AddLogic {
             recalc_pairs_for_date(&pool.conn, &date)?;
 
             success(match pos_final {
-                Location::Holiday => format!("Added HOLIDAY on {}.", date_str),
-                Location::NationalHoliday => format!("Added NATIONAL HOLIDAY on {}.", date_str),
+                Location::Holiday => format!("Added HOLIDAY on {}.\n", date_str),
+                Location::NationalHoliday => format!("Added NATIONAL HOLIDAY on {}.\n", date_str),
                 _ => unreachable!(),
             });
             return Ok(());
@@ -371,7 +371,7 @@ impl AddLogic {
             )?;
 
             success(format!(
-                "Lunch updated to {} minutes for {}.",
+                "Lunch updated to {} minutes for {}.\n",
                 lunch_val, date_str
             ));
             return Ok(());
@@ -414,7 +414,7 @@ impl AddLogic {
             let tgt_str = crate::utils::time::format_minutes(tgt_mins);
 
             success(format!(
-                "Added IN at {} on {}. TGT => {}",
+                "Added IN at {} on {}. TGT => {}\n",
                 start_time, date_str, tgt_str
             ));
             return Ok(());
@@ -468,7 +468,7 @@ impl AddLogic {
             recalc_pairs_for_date(&pool.conn, &date)?;
 
             success(format!(
-                "Added OUT on {} ({} → {}).",
+                "Added OUT on {} ({} → {}).\n",
                 date_str, last_in.time, end_time
             ));
             return Ok(());
@@ -511,7 +511,7 @@ impl AddLogic {
             recalc_pairs_for_date(&pool.conn, &date)?;
 
             success(format!(
-                "Added IN/OUT pair on {}: {} → {}.",
+                "Added IN/OUT pair on {}: {} → {}.\n",
                 date_str, start_time, end_time
             ));
             return Ok(());

src/errors.rs

@@ -41,13 +41,13 @@ pub enum AppError {
     #[error("Invalid operation mode: {0}")]
     InvalidOperation(String),
 
-    #[error("Invalid date range: from ({from}) must be <= to ({to})")]
+    #[error("Invalid date range: from ({from}) must be <= to ({to})\n")]
     InvalidDateRange { from: NaiveDate, to: NaiveDate },
 
     // ---------------------------
     // Logic errors
     // ---------------------------
-    #[error("Invalid arguments: {0}")]
+    #[error("Invalid arguments: {0}\n")]
     InvalidArgs(String),
 
     #[error("No events found for date {0}")]
@@ -86,7 +86,7 @@ pub enum AppError {
     // ---------------------------
     // Generic fallback
     // ---------------------------
-    #[error("Internal error: {0}")]
+    #[error("Internal error: {0}\nThis is likely a bug. Please report it to the developers.\n")]
     Other(String),
 }