mantenimento-app 2.4.9 → 2.4.11

package/app.js

@@ -31,6 +31,7 @@ const defaultExpenseItems = [
     const EXPENSE_DETAIL_MAX_CHARS = 560;
     const EXPENSE_DETAIL_MAX_LINES = 10;
     const EXPENSE_DETAIL_MAX_ROWS = 8;
+    const EXPENSE_DETAIL_NOTE_SEPARATOR = "\n---\n";
 
     const QUOTA_MANTENIMENTO_PERC = 35;
 
@@ -256,6 +257,7 @@ const defaultExpenseItems = [
         expenseDetailColDue: "Scadenza",
         expenseDetailAddRow: "Aggiungi riga",
         expenseDetailRemoveRow: "Rimuovi riga",
+        expenseDetailFreeTextPlaceholder: "Note libere aggiuntive...",
         expenseDetailCharsRemaining: "Caratteri rimanenti: {count}",
         expenseRemoveTitle: "Rimuovi voce spesa",
         expenseRemoveBtn: "Rimuovi",
@@ -291,6 +293,8 @@ const defaultExpenseItems = [
         firstHomeLocativeValueHint: "Valore locativo mensile della casa assegnata, usato per valorizzare il beneficio economico implicito.",
         firstHomeMortgageAmountLabel: "Rata mutuo mensile ({currency})",
         firstHomeMortgageAmountHint: "Importo mensile complessivo della rata del mutuo prima casa.",
+        firstHomeMortgageExpiryLabel: "Scadenza mutuo",
+        firstHomeMortgageExpiryHint: "Data prevista di estinzione del mutuo prima casa.",
         firstHomeAssignedToLabel: "Casa assegnata a",
         firstHomeAssignedToHint: "Seleziona il coniuge a cui e ceduta la prima casa.",
         firstHomeAssignedToNone: "Nessuna cessione",
@@ -313,6 +317,7 @@ const defaultExpenseItems = [
         pdfPrimaryHomeNotDeclared: "Non dichiarato",
         pdfPrimaryHomeAssignedTo: "Assegnata a",
         pdfPrimaryHomeMonthlyAmount: "Rata mensile",
+        pdfPrimaryHomeExpiryDate: "Scadenza mutuo",
         pdfPrimaryHomeSplit: "Ripartizione mutuo",
         pdfPrimaryHomeAppliedOnlyColl: "Considerato solo se casa ceduta al collocatario.",
         pdfExtraordinaryRow: "Spese straordinarie (quota mensile da annuo)",
@@ -623,6 +628,7 @@ const defaultExpenseItems = [
         expenseDetailColDue: "Due date",
         expenseDetailAddRow: "Add row",
         expenseDetailRemoveRow: "Remove row",
+        expenseDetailFreeTextPlaceholder: "Additional free notes...",
         expenseDetailCharsRemaining: "Remaining characters: {count}",
         expenseRemoveTitle: "Remove expense item",
         expenseRemoveBtn: "Remove",
@@ -658,6 +664,8 @@ const defaultExpenseItems = [
         firstHomeLocativeValueHint: "Monthly rental value of the assigned home, used to value the implicit economic benefit.",
         firstHomeMortgageAmountLabel: "Monthly mortgage payment ({currency})",
         firstHomeMortgageAmountHint: "Total monthly amount of the primary-home mortgage payment.",
+        firstHomeMortgageExpiryLabel: "Mortgage expiry date",
+        firstHomeMortgageExpiryHint: "Expected payoff date of the primary-home mortgage.",
         firstHomeAssignedToLabel: "Home assigned to",
         firstHomeAssignedToHint: "Select which spouse receives assignment of the primary home.",
         firstHomeAssignedToNone: "No assignment",
@@ -680,6 +688,7 @@ const defaultExpenseItems = [
         pdfPrimaryHomeNotDeclared: "Not declared",
         pdfPrimaryHomeAssignedTo: "Assigned to",
         pdfPrimaryHomeMonthlyAmount: "Monthly payment",
+        pdfPrimaryHomeExpiryDate: "Mortgage expiry date",
         pdfPrimaryHomeSplit: "Mortgage split",
         pdfPrimaryHomeAppliedOnlyColl: "Counted only when the home is assigned to the custodial parent.",
         pdfExtraordinaryRow: "Extraordinary expenses (monthly share from yearly)",
@@ -1234,6 +1243,8 @@ const defaultExpenseItems = [
       const hintPrimaCasaValoreLocativo = document.getElementById("hintPrimaCasaValoreLocativo");
       const lblPrimaCasaMutuoImporto = document.getElementById("lblPrimaCasaMutuoImporto");
       const hintPrimaCasaMutuoImporto = document.getElementById("hintPrimaCasaMutuoImporto");
+      const lblPrimaCasaMutuoScadenza = document.getElementById("lblPrimaCasaMutuoScadenza");
+      const hintPrimaCasaMutuoScadenza = document.getElementById("hintPrimaCasaMutuoScadenza");
       const lblPrimaCasaAssegnataA = document.getElementById("lblPrimaCasaAssegnataA");
       const hintPrimaCasaAssegnataA = document.getElementById("hintPrimaCasaAssegnataA");
       const lblPrimaCasaMutuoPerc1 = document.getElementById("lblPrimaCasaMutuoPerc1");
@@ -1299,6 +1310,8 @@ const defaultExpenseItems = [
       if (hintPrimaCasaValoreLocativo) hintPrimaCasaValoreLocativo.title = tr("firstHomeLocativeValueHint");
       if (lblPrimaCasaMutuoImporto) lblPrimaCasaMutuoImporto.textContent = msg("firstHomeMortgageAmountLabel", { currency: currentCurrency });
       if (hintPrimaCasaMutuoImporto) hintPrimaCasaMutuoImporto.title = tr("firstHomeMortgageAmountHint");
+      if (lblPrimaCasaMutuoScadenza) lblPrimaCasaMutuoScadenza.textContent = tr("firstHomeMortgageExpiryLabel");
+      if (hintPrimaCasaMutuoScadenza) hintPrimaCasaMutuoScadenza.title = tr("firstHomeMortgageExpiryHint");
       if (lblPrimaCasaAssegnataA) lblPrimaCasaAssegnataA.textContent = tr("firstHomeAssignedToLabel");
       if (hintPrimaCasaAssegnataA) hintPrimaCasaAssegnataA.title = tr("firstHomeAssignedToHint");
       if (lblPrimaCasaMutuoPerc1) lblPrimaCasaMutuoPerc1.textContent = tr("firstHomeSplitLabel");
@@ -1421,6 +1434,18 @@ const defaultExpenseItems = [
       return `${short} ${currentCurrency}`;
     }
 
+    function formatIsoDate(value) {
+      const iso = String(value || "").trim();
+      if (!/^\d{4}-\d{2}-\d{2}$/.test(iso)) return "";
+      const d = new Date(`${iso}T00:00:00`);
+      if (Number.isNaN(d.getTime())) return iso;
+      return new Intl.DateTimeFormat(getCurrentLocale(), {
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit"
+      }).format(d);
+    }
+
     function escapeHtml(value) {
       return String(value || "")
         .replaceAll("&", "&")
@@ -1471,25 +1496,48 @@ const defaultExpenseItems = [
       syncExpenseDetailTableFromStore(textarea);
     }
 
-    function parseExpenseDetailRows(raw) {
-      const lines = String(raw || "")
+    function parseExpenseDetailPayload(raw) {
+      const source = String(raw || "").trim();
+      let tablePart = source;
+      let notePart = "";
+      const sepIdx = source.indexOf(EXPENSE_DETAIL_NOTE_SEPARATOR);
+      if (sepIdx >= 0) {
+        tablePart = source.slice(0, sepIdx).trim();
+        notePart = source.slice(sepIdx + EXPENSE_DETAIL_NOTE_SEPARATOR.length).trim();
+      }
+
+      const tableLines = tablePart
         .split(/\r?\n/)
         .map((line) => line.trim())
         .filter(Boolean);
-      if (!lines.length) return [{ what: "", amount: "", due: "" }];
-      return lines
-        .map((line) => {
-          const cols = line.split("|").map((part) => part.trim());
-          if (cols.length >= 2) {
-            return {
-              what: cols[0] || "",
-              amount: cols[1] || "",
-              due: cols.slice(2).join(" | ") || ""
-            };
-          }
-          return { what: line, amount: "", due: "" };
-        })
-        .slice(0, EXPENSE_DETAIL_MAX_ROWS);
+      const rows = [];
+      const looseNoteLines = [];
+      tableLines.forEach((line) => {
+        const cols = line.split("|").map((part) => part.trim());
+        if (cols.length >= 2) {
+          rows.push({
+            what: cols[0] || "",
+            amount: cols[1] || "",
+            due: cols.slice(2).join(" | ") || ""
+          });
+        } else {
+          looseNoteLines.push(line);
+        }
+      });
+
+      const resolvedNote = [notePart, looseNoteLines.join("\n")]
+        .filter(Boolean)
+        .join(notePart && looseNoteLines.length ? "\n" : "")
+        .trim();
+
+      return {
+        rows: (rows.length ? rows : [{ what: "", amount: "", due: "" }]).slice(0, EXPENSE_DETAIL_MAX_ROWS),
+        note: resolvedNote
+      };
+    }
+
+    function parseExpenseDetailRows(raw) {
+      return parseExpenseDetailPayload(raw).rows;
     }
 
     function sanitizeExpenseDetailCell(value) {
@@ -1510,7 +1558,14 @@ const defaultExpenseItems = [
       return compact.map((row) => `${row.what} | ${row.amount} | ${row.due}`.trim()).join("\n");
     }
 
-    function buildExpenseDetailTableHtml(textareaId, rows) {
+    function serializeExpenseDetailPayload(rows, note) {
+      const tablePart = serializeExpenseDetailRows(rows);
+      const safeNote = String(note || "").trim();
+      if (!safeNote) return tablePart;
+      return `${tablePart}${tablePart ? EXPENSE_DETAIL_NOTE_SEPARATOR : ""}${safeNote}`;
+    }
+
+    function buildExpenseDetailTableHtml(textareaId, rows, note = "") {
       const safeRows = (Array.isArray(rows) && rows.length ? rows : [{ what: "", amount: "", due: "" }])
         .slice(0, EXPENSE_DETAIL_MAX_ROWS);
       const rowsHtml = safeRows.map((row) => {
@@ -1535,6 +1590,7 @@ const defaultExpenseItems = [
           <tbody>${rowsHtml}</tbody>
         </table>
         <button type="button" class="btn-secondary spese-detail-add-row" data-row-add="${textareaId}">${escapeHtml(tr("expenseDetailAddRow"))}</button>
+        <textarea class="spese-detail-note" data-detail-note-for="${textareaId}" rows="2" maxlength="360" placeholder="${escapeHtml(tr("expenseDetailFreeTextPlaceholder"))}">${escapeHtml(note || "")}</textarea>
       </div>`;
     }
 
@@ -1552,7 +1608,9 @@ const defaultExpenseItems = [
       const textareaId = String(tableWrap.getAttribute("data-detail-table") || "");
       const textarea = textareaId ? document.getElementById(textareaId) : null;
       if (!textarea) return;
-      const serialized = serializeExpenseDetailRows(readExpenseDetailRowsFromTable(tableWrap));
+      const noteEl = tableWrap.querySelector(`textarea[data-detail-note-for='${textareaId}']`);
+      const note = String(noteEl && noteEl.value ? noteEl.value : "");
+      const serialized = serializeExpenseDetailPayload(readExpenseDetailRowsFromTable(tableWrap), note);
       textarea.value = serialized.slice(0, EXPENSE_DETAIL_MAX_CHARS);
       updateExpenseDetailCounter(textarea);
     }
@@ -1562,10 +1620,12 @@ const defaultExpenseItems = [
       const host = document.getElementById(`${textarea.id}TableHost`);
       if (!host) return;
       const existing = host.querySelector(`[data-detail-table='${textarea.id}']`);
-      const existingSerialized = serializeExpenseDetailRows(existing ? readExpenseDetailRowsFromTable(existing) : []);
+      const existingNote = existing ? String(existing.querySelector(`textarea[data-detail-note-for='${textarea.id}']`)?.value || "") : "";
+      const existingSerialized = serializeExpenseDetailPayload(existing ? readExpenseDetailRowsFromTable(existing) : [], existingNote);
       const storeSerialized = String(textarea.value || "").trim();
       if (existing && existingSerialized === storeSerialized) return;
-      host.innerHTML = buildExpenseDetailTableHtml(textarea.id, parseExpenseDetailRows(storeSerialized));
+      const payload = parseExpenseDetailPayload(storeSerialized);
+      host.innerHTML = buildExpenseDetailTableHtml(textarea.id, payload.rows, payload.note);
       syncExpenseDetailStoreFromTable(host.querySelector(`[data-detail-table='${textarea.id}']`));
     }
 
@@ -3724,6 +3784,7 @@ const defaultExpenseItems = [
         primaCasaMutuoEnabled: firstHome.enabled ? 1 : 0,
         primaCasaValoreLocativo: num("primaCasaValoreLocativo"),
         primaCasaMutuoImporto: firstHome.amount,
+        primaCasaMutuoScadenza: firstHome.expiry,
         primaCasaAssegnataA: firstHome.assignedTo,
         primaCasaMutuoPerc1: firstHome.share1,
         straordAnn1: num("straordAnn1"),
@@ -3765,6 +3826,8 @@ const defaultExpenseItems = [
       const aFam2 = Number(payload.aFam2 || 0);
       const primaCasaMutuoEnabled = Number(payload.primaCasaMutuoEnabled || 0) > 0;
       const primaCasaMutuoImporto = Math.max(0, Number(payload.primaCasaMutuoImporto || 0));
+      const primaCasaMutuoScadenzaRaw = String(payload.primaCasaMutuoScadenza || "").trim();
+      const primaCasaMutuoScadenza = /^\d{4}-\d{2}-\d{2}$/.test(primaCasaMutuoScadenzaRaw) ? primaCasaMutuoScadenzaRaw : "";
       const primaCasaAssegnataA = (String(payload.primaCasaAssegnataA || "") === "1" || String(payload.primaCasaAssegnataA || "") === "2")
         ? String(payload.primaCasaAssegnataA)
         : "";
@@ -3904,7 +3967,7 @@ const defaultExpenseItems = [
         quotaDiretta1, quotaDiretta2,
         saldo1, saldo2,
         assegnoBaseDa1a2, assegnoBaseDa2a1,
-        primaCasaMutuoEnabled, primaCasaMutuoImporto, primaCasaAssegnataA, primaCasaValoreLocativo,
+        primaCasaMutuoEnabled, primaCasaMutuoImporto, primaCasaMutuoScadenza, primaCasaAssegnataA, primaCasaValoreLocativo,
         primaCasaMutuoPerc1, primaCasaMutuoPerc2,
         primaCasaConsidered, primaCasaTransfer1to2, primaCasaTransfer2to1,
         compensativeBenefits,
@@ -4008,16 +4071,19 @@ const defaultExpenseItems = [
     function getFirstHomeMortgageInput() {
       const enabled = !!document.getElementById("primaCasaMutuoEnabled")?.checked;
       const amount = Math.max(0, num("primaCasaMutuoImporto"));
+      const expiryRaw = String(document.getElementById("primaCasaMutuoScadenza")?.value || "").trim();
+      const expiry = /^\d{4}-\d{2}-\d{2}$/.test(expiryRaw) ? expiryRaw : "";
       const assignedToRaw = String(document.getElementById("primaCasaAssegnataA")?.value || "").trim();
       const assignedTo = (assignedToRaw === "1" || assignedToRaw === "2") ? assignedToRaw : "";
       const share1 = Math.min(100, Math.max(0, num("primaCasaMutuoPerc1")));
       const share2 = 100 - share1;
-      return { enabled, amount, assignedTo, share1, share2 };
+      return { enabled, amount, expiry, assignedTo, share1, share2 };
     }
 
     function updateFirstHomeMortgageUi() {
       const enabledEl = document.getElementById("primaCasaMutuoEnabled");
       const amountEl = document.getElementById("primaCasaMutuoImporto");
+      const expiryEl = document.getElementById("primaCasaMutuoScadenza");
       const assignedEl = document.getElementById("primaCasaAssegnataA");
       const shareEl = document.getElementById("primaCasaMutuoPerc1");
       const splitInfoEl = document.getElementById("primaCasaMutuoSplitInfo");
@@ -4033,6 +4099,7 @@ const defaultExpenseItems = [
 
       const isEnabled = !!enabledEl.checked;
       amountEl.disabled = !isEnabled;
+      if (expiryEl) expiryEl.disabled = !isEnabled;
       assignedEl.disabled = !isEnabled;
       shareEl.disabled = !isEnabled;
       if (splitWrapEl) splitWrapEl.classList.toggle("is-disabled", !isEnabled);
@@ -4563,6 +4630,7 @@ const defaultExpenseItems = [
       setVal("assegnoFam2", Number(payload.aFam2 || 0));
       setChecked("primaCasaMutuoEnabled", Number(payload.primaCasaMutuoEnabled || 0) > 0);
       setVal("primaCasaMutuoImporto", Number(payload.primaCasaMutuoImporto || 0));
+      setVal("primaCasaMutuoScadenza", String(payload.primaCasaMutuoScadenza || ""));
       setVal("primaCasaAssegnataA", (String(payload.primaCasaAssegnataA || "") === "1" || String(payload.primaCasaAssegnataA || "") === "2") ? String(payload.primaCasaAssegnataA) : "");
       setVal("primaCasaMutuoPerc1", Math.min(100, Math.max(0, Number((payload.primaCasaMutuoPerc1 === undefined ? 50 : payload.primaCasaMutuoPerc1) || 0))));
       setVal("straordAnn1", Number(payload.straordAnn1 || 0));
@@ -4737,6 +4805,7 @@ const defaultExpenseItems = [
         ? `
         <tr><td>${tr("pdfPrimaryHomeAssignedTo")}</td><td>${primaryHomeAssignedLabel}</td></tr>
         <tr><td>${tr("pdfPrimaryHomeMonthlyAmount")}</td><td>${eur(m.primaCasaMutuoImporto || 0)}</td></tr>
+        <tr><td>${tr("pdfPrimaryHomeExpiryDate")}</td><td>${escapeHtml(formatIsoDate(m.primaCasaMutuoScadenza) || tr("pdfPrimaryHomeNotDeclared"))}</td></tr>
         <tr><td>${tr("pdfPrimaryHomeSplit")}</td><td>${c1NameEsc} ${(m.primaCasaMutuoPerc1 || 0).toFixed(0)}% · ${c2NameEsc} ${(m.primaCasaMutuoPerc2 || 0).toFixed(0)}%</td></tr>
         <tr><td>${tr("pdfPrimaryHomeAppliedOnlyColl")}</td><td>${m.primaCasaConsidered ? "OK" : tr("pdfPrimaryHomeNotDeclared")}</td></tr>`
         : `<tr><td>${tr("pdfPrimaryHomeMortgage")}</td><td>${tr("pdfPrimaryHomeNotDeclared")}</td></tr>`;
@@ -5255,6 +5324,7 @@ const defaultExpenseItems = [
         ? `
         <tr><td>${tr("pdfPrimaryHomeAssignedTo")}</td><td>${primaryHomeAssignedLabel}</td></tr>
         <tr><td>${tr("pdfPrimaryHomeMonthlyAmount")}</td><td>${eur(m.primaCasaMutuoImporto || 0)}</td></tr>
+        <tr><td>${tr("pdfPrimaryHomeExpiryDate")}</td><td>${escapeHtml(formatIsoDate(m.primaCasaMutuoScadenza) || tr("pdfPrimaryHomeNotDeclared"))}</td></tr>
         <tr><td>${tr("pdfPrimaryHomeSplit")}</td><td>${c1NameEsc} ${(m.primaCasaMutuoPerc1 || 0).toFixed(0)}% · ${c2NameEsc} ${(m.primaCasaMutuoPerc2 || 0).toFixed(0)}%</td></tr>
         <tr><td>${tr("pdfPrimaryHomeAppliedOnlyColl")}</td><td>${m.primaCasaConsidered ? "OK" : tr("pdfPrimaryHomeNotDeclared")}</td></tr>`
         : `<tr><td>${tr("pdfPrimaryHomeMortgage")}</td><td>${tr("pdfPrimaryHomeNotDeclared")}</td></tr>`;
@@ -6163,6 +6233,7 @@ ${scenarioLab.length ? `
         primaCasaMutuoEnabled: document.getElementById("primaCasaMutuoEnabled")?.checked ? 1 : 0,
         primaCasaValoreLocativo: num("primaCasaValoreLocativo"),
         primaCasaMutuoImporto: num("primaCasaMutuoImporto"),
+        primaCasaMutuoScadenza: String(document.getElementById("primaCasaMutuoScadenza")?.value || ""),
         primaCasaAssegnataA: String(document.getElementById("primaCasaAssegnataA")?.value || ""),
         primaCasaMutuoPerc1: num("primaCasaMutuoPerc1"),
         straordAnn1: num("straordAnn1"),
@@ -6290,8 +6361,10 @@ ${scenarioLab.length ? `
       });
       const firstHomeEnabled = document.getElementById("primaCasaMutuoEnabled");
       const firstHomeAssigned = document.getElementById("primaCasaAssegnataA");
+      const firstHomeExpiry = document.getElementById("primaCasaMutuoScadenza");
       if (firstHomeEnabled) firstHomeEnabled.checked = !!firstHomeEnabled.defaultChecked;
       if (firstHomeAssigned) firstHomeAssigned.value = "";
+      if (firstHomeExpiry) firstHomeExpiry.value = firstHomeExpiry.defaultValue || "";
       permanenceCalendarState.byMonth = {};
       speseConvivenzaAutoMode = true;
       selectedScenarioIdx = -1;
@@ -6446,10 +6519,11 @@ ${scenarioLab.length ? `
         const textareaId = String(addRowBtn.getAttribute("data-row-add") || "");
         const textarea = textareaId ? document.getElementById(textareaId) : null;
         if (!textarea) return;
-        const rows = parseExpenseDetailRows(textarea.value);
+        const payload = parseExpenseDetailPayload(textarea.value);
+        const rows = payload.rows;
         if (rows.length < EXPENSE_DETAIL_MAX_ROWS) {
           rows.push({ what: "", amount: "", due: "" });
-          textarea.value = serializeExpenseDetailRows(rows);
+          textarea.value = serializeExpenseDetailPayload(rows, payload.note);
           syncExpenseDetailTableFromStore(textarea);
           refreshExpenseDetailButtonState();
         }
@@ -6491,6 +6565,12 @@ ${scenarioLab.length ? `
         const tableWrap = e.target.closest("[data-detail-table]");
         syncExpenseDetailStoreFromTable(tableWrap);
         refreshExpenseDetailButtonState();
+        return;
+      }
+      if (e.target && e.target.matches(".spese-detail-note")) {
+        const tableWrap = e.target.closest("[data-detail-table]");
+        syncExpenseDetailStoreFromTable(tableWrap);
+        refreshExpenseDetailButtonState();
       }
     });
 
@@ -6630,7 +6710,7 @@ ${scenarioLab.length ? `
         }
         updateModeUi();
         renderAll();
-      } else if (e.target && (e.target.id === "primaCasaMutuoEnabled" || e.target.id === "primaCasaAssegnataA")) {
+      } else if (e.target && (e.target.id === "primaCasaMutuoEnabled" || e.target.id === "primaCasaAssegnataA" || e.target.id === "primaCasaMutuoScadenza")) {
         updateFirstHomeMortgageUi();
         renderAll();
       }

package/backend/calculate-model.js

@@ -35,6 +35,8 @@ function calculateModel(input) {
   const primaCasaMutuoEnabled = toNumber(input.primaCasaMutuoEnabled) > 0;
   const primaCasaValoreLocativo = Math.max(0, toNumber(input.primaCasaValoreLocativo));
   const primaCasaMutuoImporto = Math.max(0, toNumber(input.primaCasaMutuoImporto));
+  const primaCasaMutuoScadenzaRaw = String(input.primaCasaMutuoScadenza || '').trim();
+  const primaCasaMutuoScadenza = /^\d{4}-\d{2}-\d{2}$/.test(primaCasaMutuoScadenzaRaw) ? primaCasaMutuoScadenzaRaw : '';
   const primaCasaAssegnataA = String(input.primaCasaAssegnataA || '');
   const rawMutuoPerc1 = input.primaCasaMutuoPerc1 === undefined ? 50 : input.primaCasaMutuoPerc1;
   const primaCasaMutuoPerc1 = clamp(toNumber(rawMutuoPerc1), 0, 100);
@@ -163,7 +165,7 @@ function calculateModel(input) {
     quotaDiretta1, quotaDiretta2,
     saldo1, saldo2,
     assegnoBaseDa1a2, assegnoBaseDa2a1,
-    primaCasaMutuoEnabled, primaCasaValoreLocativo, primaCasaMutuoImporto,
+    primaCasaMutuoEnabled, primaCasaValoreLocativo, primaCasaMutuoImporto, primaCasaMutuoScadenza,
     primaCasaAssegnataA: assigned,
     primaCasaMutuoPerc1, primaCasaMutuoPerc2,
     primaCasaConsidered, primaCasaTransfer1to2, primaCasaTransfer2to1,

package/frontend/public/app.js

@@ -31,6 +31,7 @@ const defaultExpenseItems = [
     const EXPENSE_DETAIL_MAX_CHARS = 560;
     const EXPENSE_DETAIL_MAX_LINES = 10;
     const EXPENSE_DETAIL_MAX_ROWS = 8;
+    const EXPENSE_DETAIL_NOTE_SEPARATOR = "\n---\n";
 
     const QUOTA_MANTENIMENTO_PERC = 35;
 
@@ -256,6 +257,7 @@ const defaultExpenseItems = [
         expenseDetailColDue: "Scadenza",
         expenseDetailAddRow: "Aggiungi riga",
         expenseDetailRemoveRow: "Rimuovi riga",
+        expenseDetailFreeTextPlaceholder: "Note libere aggiuntive...",
         expenseDetailCharsRemaining: "Caratteri rimanenti: {count}",
         expenseRemoveTitle: "Rimuovi voce spesa",
         expenseRemoveBtn: "Rimuovi",
@@ -291,6 +293,8 @@ const defaultExpenseItems = [
         firstHomeLocativeValueHint: "Valore locativo mensile della casa assegnata, usato per valorizzare il beneficio economico implicito.",
         firstHomeMortgageAmountLabel: "Rata mutuo mensile ({currency})",
         firstHomeMortgageAmountHint: "Importo mensile complessivo della rata del mutuo prima casa.",
+        firstHomeMortgageExpiryLabel: "Scadenza mutuo",
+        firstHomeMortgageExpiryHint: "Data prevista di estinzione del mutuo prima casa.",
         firstHomeAssignedToLabel: "Casa assegnata a",
         firstHomeAssignedToHint: "Seleziona il coniuge a cui e ceduta la prima casa.",
         firstHomeAssignedToNone: "Nessuna cessione",
@@ -313,6 +317,7 @@ const defaultExpenseItems = [
         pdfPrimaryHomeNotDeclared: "Non dichiarato",
         pdfPrimaryHomeAssignedTo: "Assegnata a",
         pdfPrimaryHomeMonthlyAmount: "Rata mensile",
+        pdfPrimaryHomeExpiryDate: "Scadenza mutuo",
         pdfPrimaryHomeSplit: "Ripartizione mutuo",
         pdfPrimaryHomeAppliedOnlyColl: "Considerato solo se casa ceduta al collocatario.",
         pdfExtraordinaryRow: "Spese straordinarie (quota mensile da annuo)",
@@ -623,6 +628,7 @@ const defaultExpenseItems = [
         expenseDetailColDue: "Due date",
         expenseDetailAddRow: "Add row",
         expenseDetailRemoveRow: "Remove row",
+        expenseDetailFreeTextPlaceholder: "Additional free notes...",
         expenseDetailCharsRemaining: "Remaining characters: {count}",
         expenseRemoveTitle: "Remove expense item",
         expenseRemoveBtn: "Remove",
@@ -658,6 +664,8 @@ const defaultExpenseItems = [
         firstHomeLocativeValueHint: "Monthly rental value of the assigned home, used to value the implicit economic benefit.",
         firstHomeMortgageAmountLabel: "Monthly mortgage payment ({currency})",
         firstHomeMortgageAmountHint: "Total monthly amount of the primary-home mortgage payment.",
+        firstHomeMortgageExpiryLabel: "Mortgage expiry date",
+        firstHomeMortgageExpiryHint: "Expected payoff date of the primary-home mortgage.",
         firstHomeAssignedToLabel: "Home assigned to",
         firstHomeAssignedToHint: "Select which spouse receives assignment of the primary home.",
         firstHomeAssignedToNone: "No assignment",
@@ -680,6 +688,7 @@ const defaultExpenseItems = [
         pdfPrimaryHomeNotDeclared: "Not declared",
         pdfPrimaryHomeAssignedTo: "Assigned to",
         pdfPrimaryHomeMonthlyAmount: "Monthly payment",
+        pdfPrimaryHomeExpiryDate: "Mortgage expiry date",
         pdfPrimaryHomeSplit: "Mortgage split",
         pdfPrimaryHomeAppliedOnlyColl: "Counted only when the home is assigned to the custodial parent.",
         pdfExtraordinaryRow: "Extraordinary expenses (monthly share from yearly)",
@@ -1234,6 +1243,8 @@ const defaultExpenseItems = [
       const hintPrimaCasaValoreLocativo = document.getElementById("hintPrimaCasaValoreLocativo");
       const lblPrimaCasaMutuoImporto = document.getElementById("lblPrimaCasaMutuoImporto");
       const hintPrimaCasaMutuoImporto = document.getElementById("hintPrimaCasaMutuoImporto");
+      const lblPrimaCasaMutuoScadenza = document.getElementById("lblPrimaCasaMutuoScadenza");
+      const hintPrimaCasaMutuoScadenza = document.getElementById("hintPrimaCasaMutuoScadenza");
       const lblPrimaCasaAssegnataA = document.getElementById("lblPrimaCasaAssegnataA");
       const hintPrimaCasaAssegnataA = document.getElementById("hintPrimaCasaAssegnataA");
       const lblPrimaCasaMutuoPerc1 = document.getElementById("lblPrimaCasaMutuoPerc1");
@@ -1299,6 +1310,8 @@ const defaultExpenseItems = [
       if (hintPrimaCasaValoreLocativo) hintPrimaCasaValoreLocativo.title = tr("firstHomeLocativeValueHint");
       if (lblPrimaCasaMutuoImporto) lblPrimaCasaMutuoImporto.textContent = msg("firstHomeMortgageAmountLabel", { currency: currentCurrency });
       if (hintPrimaCasaMutuoImporto) hintPrimaCasaMutuoImporto.title = tr("firstHomeMortgageAmountHint");
+      if (lblPrimaCasaMutuoScadenza) lblPrimaCasaMutuoScadenza.textContent = tr("firstHomeMortgageExpiryLabel");
+      if (hintPrimaCasaMutuoScadenza) hintPrimaCasaMutuoScadenza.title = tr("firstHomeMortgageExpiryHint");
       if (lblPrimaCasaAssegnataA) lblPrimaCasaAssegnataA.textContent = tr("firstHomeAssignedToLabel");
       if (hintPrimaCasaAssegnataA) hintPrimaCasaAssegnataA.title = tr("firstHomeAssignedToHint");
       if (lblPrimaCasaMutuoPerc1) lblPrimaCasaMutuoPerc1.textContent = tr("firstHomeSplitLabel");
@@ -1421,6 +1434,18 @@ const defaultExpenseItems = [
       return `${short} ${currentCurrency}`;
     }
 
+    function formatIsoDate(value) {
+      const iso = String(value || "").trim();
+      if (!/^\d{4}-\d{2}-\d{2}$/.test(iso)) return "";
+      const d = new Date(`${iso}T00:00:00`);
+      if (Number.isNaN(d.getTime())) return iso;
+      return new Intl.DateTimeFormat(getCurrentLocale(), {
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit"
+      }).format(d);
+    }
+
     function escapeHtml(value) {
       return String(value || "")
         .replaceAll("&", "&")
@@ -1471,25 +1496,48 @@ const defaultExpenseItems = [
       syncExpenseDetailTableFromStore(textarea);
     }
 
-    function parseExpenseDetailRows(raw) {
-      const lines = String(raw || "")
+    function parseExpenseDetailPayload(raw) {
+      const source = String(raw || "").trim();
+      let tablePart = source;
+      let notePart = "";
+      const sepIdx = source.indexOf(EXPENSE_DETAIL_NOTE_SEPARATOR);
+      if (sepIdx >= 0) {
+        tablePart = source.slice(0, sepIdx).trim();
+        notePart = source.slice(sepIdx + EXPENSE_DETAIL_NOTE_SEPARATOR.length).trim();
+      }
+
+      const tableLines = tablePart
         .split(/\r?\n/)
         .map((line) => line.trim())
         .filter(Boolean);
-      if (!lines.length) return [{ what: "", amount: "", due: "" }];
-      return lines
-        .map((line) => {
-          const cols = line.split("|").map((part) => part.trim());
-          if (cols.length >= 2) {
-            return {
-              what: cols[0] || "",
-              amount: cols[1] || "",
-              due: cols.slice(2).join(" | ") || ""
-            };
-          }
-          return { what: line, amount: "", due: "" };
-        })
-        .slice(0, EXPENSE_DETAIL_MAX_ROWS);
+      const rows = [];
+      const looseNoteLines = [];
+      tableLines.forEach((line) => {
+        const cols = line.split("|").map((part) => part.trim());
+        if (cols.length >= 2) {
+          rows.push({
+            what: cols[0] || "",
+            amount: cols[1] || "",
+            due: cols.slice(2).join(" | ") || ""
+          });
+        } else {
+          looseNoteLines.push(line);
+        }
+      });
+
+      const resolvedNote = [notePart, looseNoteLines.join("\n")]
+        .filter(Boolean)
+        .join(notePart && looseNoteLines.length ? "\n" : "")
+        .trim();
+
+      return {
+        rows: (rows.length ? rows : [{ what: "", amount: "", due: "" }]).slice(0, EXPENSE_DETAIL_MAX_ROWS),
+        note: resolvedNote
+      };
+    }
+
+    function parseExpenseDetailRows(raw) {
+      return parseExpenseDetailPayload(raw).rows;
     }
 
     function sanitizeExpenseDetailCell(value) {
@@ -1510,7 +1558,14 @@ const defaultExpenseItems = [
       return compact.map((row) => `${row.what} | ${row.amount} | ${row.due}`.trim()).join("\n");
     }
 
-    function buildExpenseDetailTableHtml(textareaId, rows) {
+    function serializeExpenseDetailPayload(rows, note) {
+      const tablePart = serializeExpenseDetailRows(rows);
+      const safeNote = String(note || "").trim();
+      if (!safeNote) return tablePart;
+      return `${tablePart}${tablePart ? EXPENSE_DETAIL_NOTE_SEPARATOR : ""}${safeNote}`;
+    }
+
+    function buildExpenseDetailTableHtml(textareaId, rows, note = "") {
       const safeRows = (Array.isArray(rows) && rows.length ? rows : [{ what: "", amount: "", due: "" }])
         .slice(0, EXPENSE_DETAIL_MAX_ROWS);
       const rowsHtml = safeRows.map((row) => {
@@ -1535,6 +1590,7 @@ const defaultExpenseItems = [
           <tbody>${rowsHtml}</tbody>
         </table>
         <button type="button" class="btn-secondary spese-detail-add-row" data-row-add="${textareaId}">${escapeHtml(tr("expenseDetailAddRow"))}</button>
+        <textarea class="spese-detail-note" data-detail-note-for="${textareaId}" rows="2" maxlength="360" placeholder="${escapeHtml(tr("expenseDetailFreeTextPlaceholder"))}">${escapeHtml(note || "")}</textarea>
       </div>`;
     }
 
@@ -1552,7 +1608,9 @@ const defaultExpenseItems = [
       const textareaId = String(tableWrap.getAttribute("data-detail-table") || "");
       const textarea = textareaId ? document.getElementById(textareaId) : null;
       if (!textarea) return;
-      const serialized = serializeExpenseDetailRows(readExpenseDetailRowsFromTable(tableWrap));
+      const noteEl = tableWrap.querySelector(`textarea[data-detail-note-for='${textareaId}']`);
+      const note = String(noteEl && noteEl.value ? noteEl.value : "");
+      const serialized = serializeExpenseDetailPayload(readExpenseDetailRowsFromTable(tableWrap), note);
       textarea.value = serialized.slice(0, EXPENSE_DETAIL_MAX_CHARS);
       updateExpenseDetailCounter(textarea);
     }
@@ -1562,10 +1620,12 @@ const defaultExpenseItems = [
       const host = document.getElementById(`${textarea.id}TableHost`);
       if (!host) return;
       const existing = host.querySelector(`[data-detail-table='${textarea.id}']`);
-      const existingSerialized = serializeExpenseDetailRows(existing ? readExpenseDetailRowsFromTable(existing) : []);
+      const existingNote = existing ? String(existing.querySelector(`textarea[data-detail-note-for='${textarea.id}']`)?.value || "") : "";
+      const existingSerialized = serializeExpenseDetailPayload(existing ? readExpenseDetailRowsFromTable(existing) : [], existingNote);
       const storeSerialized = String(textarea.value || "").trim();
       if (existing && existingSerialized === storeSerialized) return;
-      host.innerHTML = buildExpenseDetailTableHtml(textarea.id, parseExpenseDetailRows(storeSerialized));
+      const payload = parseExpenseDetailPayload(storeSerialized);
+      host.innerHTML = buildExpenseDetailTableHtml(textarea.id, payload.rows, payload.note);
       syncExpenseDetailStoreFromTable(host.querySelector(`[data-detail-table='${textarea.id}']`));
     }
 
@@ -3724,6 +3784,7 @@ const defaultExpenseItems = [
         primaCasaMutuoEnabled: firstHome.enabled ? 1 : 0,
         primaCasaValoreLocativo: num("primaCasaValoreLocativo"),
         primaCasaMutuoImporto: firstHome.amount,
+        primaCasaMutuoScadenza: firstHome.expiry,
         primaCasaAssegnataA: firstHome.assignedTo,
         primaCasaMutuoPerc1: firstHome.share1,
         straordAnn1: num("straordAnn1"),
@@ -3765,6 +3826,8 @@ const defaultExpenseItems = [
       const aFam2 = Number(payload.aFam2 || 0);
       const primaCasaMutuoEnabled = Number(payload.primaCasaMutuoEnabled || 0) > 0;
       const primaCasaMutuoImporto = Math.max(0, Number(payload.primaCasaMutuoImporto || 0));
+      const primaCasaMutuoScadenzaRaw = String(payload.primaCasaMutuoScadenza || "").trim();
+      const primaCasaMutuoScadenza = /^\d{4}-\d{2}-\d{2}$/.test(primaCasaMutuoScadenzaRaw) ? primaCasaMutuoScadenzaRaw : "";
       const primaCasaAssegnataA = (String(payload.primaCasaAssegnataA || "") === "1" || String(payload.primaCasaAssegnataA || "") === "2")
         ? String(payload.primaCasaAssegnataA)
         : "";
@@ -3904,7 +3967,7 @@ const defaultExpenseItems = [
         quotaDiretta1, quotaDiretta2,
         saldo1, saldo2,
         assegnoBaseDa1a2, assegnoBaseDa2a1,
-        primaCasaMutuoEnabled, primaCasaMutuoImporto, primaCasaAssegnataA, primaCasaValoreLocativo,
+        primaCasaMutuoEnabled, primaCasaMutuoImporto, primaCasaMutuoScadenza, primaCasaAssegnataA, primaCasaValoreLocativo,
         primaCasaMutuoPerc1, primaCasaMutuoPerc2,
         primaCasaConsidered, primaCasaTransfer1to2, primaCasaTransfer2to1,
         compensativeBenefits,
@@ -4008,16 +4071,19 @@ const defaultExpenseItems = [
     function getFirstHomeMortgageInput() {
       const enabled = !!document.getElementById("primaCasaMutuoEnabled")?.checked;
       const amount = Math.max(0, num("primaCasaMutuoImporto"));
+      const expiryRaw = String(document.getElementById("primaCasaMutuoScadenza")?.value || "").trim();
+      const expiry = /^\d{4}-\d{2}-\d{2}$/.test(expiryRaw) ? expiryRaw : "";
       const assignedToRaw = String(document.getElementById("primaCasaAssegnataA")?.value || "").trim();
       const assignedTo = (assignedToRaw === "1" || assignedToRaw === "2") ? assignedToRaw : "";
       const share1 = Math.min(100, Math.max(0, num("primaCasaMutuoPerc1")));
       const share2 = 100 - share1;
-      return { enabled, amount, assignedTo, share1, share2 };
+      return { enabled, amount, expiry, assignedTo, share1, share2 };
     }
 
     function updateFirstHomeMortgageUi() {
       const enabledEl = document.getElementById("primaCasaMutuoEnabled");
       const amountEl = document.getElementById("primaCasaMutuoImporto");
+      const expiryEl = document.getElementById("primaCasaMutuoScadenza");
       const assignedEl = document.getElementById("primaCasaAssegnataA");
       const shareEl = document.getElementById("primaCasaMutuoPerc1");
       const splitInfoEl = document.getElementById("primaCasaMutuoSplitInfo");
@@ -4033,6 +4099,7 @@ const defaultExpenseItems = [
 
       const isEnabled = !!enabledEl.checked;
       amountEl.disabled = !isEnabled;
+      if (expiryEl) expiryEl.disabled = !isEnabled;
       assignedEl.disabled = !isEnabled;
       shareEl.disabled = !isEnabled;
       if (splitWrapEl) splitWrapEl.classList.toggle("is-disabled", !isEnabled);
@@ -4563,6 +4630,7 @@ const defaultExpenseItems = [
       setVal("assegnoFam2", Number(payload.aFam2 || 0));
       setChecked("primaCasaMutuoEnabled", Number(payload.primaCasaMutuoEnabled || 0) > 0);
       setVal("primaCasaMutuoImporto", Number(payload.primaCasaMutuoImporto || 0));
+      setVal("primaCasaMutuoScadenza", String(payload.primaCasaMutuoScadenza || ""));
       setVal("primaCasaAssegnataA", (String(payload.primaCasaAssegnataA || "") === "1" || String(payload.primaCasaAssegnataA || "") === "2") ? String(payload.primaCasaAssegnataA) : "");
       setVal("primaCasaMutuoPerc1", Math.min(100, Math.max(0, Number((payload.primaCasaMutuoPerc1 === undefined ? 50 : payload.primaCasaMutuoPerc1) || 0))));
       setVal("straordAnn1", Number(payload.straordAnn1 || 0));
@@ -4737,6 +4805,7 @@ const defaultExpenseItems = [
         ? `
         <tr><td>${tr("pdfPrimaryHomeAssignedTo")}</td><td>${primaryHomeAssignedLabel}</td></tr>
         <tr><td>${tr("pdfPrimaryHomeMonthlyAmount")}</td><td>${eur(m.primaCasaMutuoImporto || 0)}</td></tr>
+        <tr><td>${tr("pdfPrimaryHomeExpiryDate")}</td><td>${escapeHtml(formatIsoDate(m.primaCasaMutuoScadenza) || tr("pdfPrimaryHomeNotDeclared"))}</td></tr>
         <tr><td>${tr("pdfPrimaryHomeSplit")}</td><td>${c1NameEsc} ${(m.primaCasaMutuoPerc1 || 0).toFixed(0)}% · ${c2NameEsc} ${(m.primaCasaMutuoPerc2 || 0).toFixed(0)}%</td></tr>
         <tr><td>${tr("pdfPrimaryHomeAppliedOnlyColl")}</td><td>${m.primaCasaConsidered ? "OK" : tr("pdfPrimaryHomeNotDeclared")}</td></tr>`
         : `<tr><td>${tr("pdfPrimaryHomeMortgage")}</td><td>${tr("pdfPrimaryHomeNotDeclared")}</td></tr>`;
@@ -5255,6 +5324,7 @@ const defaultExpenseItems = [
         ? `
         <tr><td>${tr("pdfPrimaryHomeAssignedTo")}</td><td>${primaryHomeAssignedLabel}</td></tr>
         <tr><td>${tr("pdfPrimaryHomeMonthlyAmount")}</td><td>${eur(m.primaCasaMutuoImporto || 0)}</td></tr>
+        <tr><td>${tr("pdfPrimaryHomeExpiryDate")}</td><td>${escapeHtml(formatIsoDate(m.primaCasaMutuoScadenza) || tr("pdfPrimaryHomeNotDeclared"))}</td></tr>
         <tr><td>${tr("pdfPrimaryHomeSplit")}</td><td>${c1NameEsc} ${(m.primaCasaMutuoPerc1 || 0).toFixed(0)}% · ${c2NameEsc} ${(m.primaCasaMutuoPerc2 || 0).toFixed(0)}%</td></tr>
         <tr><td>${tr("pdfPrimaryHomeAppliedOnlyColl")}</td><td>${m.primaCasaConsidered ? "OK" : tr("pdfPrimaryHomeNotDeclared")}</td></tr>`
         : `<tr><td>${tr("pdfPrimaryHomeMortgage")}</td><td>${tr("pdfPrimaryHomeNotDeclared")}</td></tr>`;
@@ -6163,6 +6233,7 @@ ${scenarioLab.length ? `
         primaCasaMutuoEnabled: document.getElementById("primaCasaMutuoEnabled")?.checked ? 1 : 0,
         primaCasaValoreLocativo: num("primaCasaValoreLocativo"),
         primaCasaMutuoImporto: num("primaCasaMutuoImporto"),
+        primaCasaMutuoScadenza: String(document.getElementById("primaCasaMutuoScadenza")?.value || ""),
         primaCasaAssegnataA: String(document.getElementById("primaCasaAssegnataA")?.value || ""),
         primaCasaMutuoPerc1: num("primaCasaMutuoPerc1"),
         straordAnn1: num("straordAnn1"),
@@ -6290,8 +6361,10 @@ ${scenarioLab.length ? `
       });
       const firstHomeEnabled = document.getElementById("primaCasaMutuoEnabled");
       const firstHomeAssigned = document.getElementById("primaCasaAssegnataA");
+      const firstHomeExpiry = document.getElementById("primaCasaMutuoScadenza");
       if (firstHomeEnabled) firstHomeEnabled.checked = !!firstHomeEnabled.defaultChecked;
       if (firstHomeAssigned) firstHomeAssigned.value = "";
+      if (firstHomeExpiry) firstHomeExpiry.value = firstHomeExpiry.defaultValue || "";
       permanenceCalendarState.byMonth = {};
       speseConvivenzaAutoMode = true;
       selectedScenarioIdx = -1;
@@ -6446,10 +6519,11 @@ ${scenarioLab.length ? `
         const textareaId = String(addRowBtn.getAttribute("data-row-add") || "");
         const textarea = textareaId ? document.getElementById(textareaId) : null;
         if (!textarea) return;
-        const rows = parseExpenseDetailRows(textarea.value);
+        const payload = parseExpenseDetailPayload(textarea.value);
+        const rows = payload.rows;
         if (rows.length < EXPENSE_DETAIL_MAX_ROWS) {
           rows.push({ what: "", amount: "", due: "" });
-          textarea.value = serializeExpenseDetailRows(rows);
+          textarea.value = serializeExpenseDetailPayload(rows, payload.note);
           syncExpenseDetailTableFromStore(textarea);
           refreshExpenseDetailButtonState();
         }
@@ -6491,6 +6565,12 @@ ${scenarioLab.length ? `
         const tableWrap = e.target.closest("[data-detail-table]");
         syncExpenseDetailStoreFromTable(tableWrap);
         refreshExpenseDetailButtonState();
+        return;
+      }
+      if (e.target && e.target.matches(".spese-detail-note")) {
+        const tableWrap = e.target.closest("[data-detail-table]");
+        syncExpenseDetailStoreFromTable(tableWrap);
+        refreshExpenseDetailButtonState();
       }
     });
 
@@ -6630,7 +6710,7 @@ ${scenarioLab.length ? `
         }
         updateModeUi();
         renderAll();
-      } else if (e.target && (e.target.id === "primaCasaMutuoEnabled" || e.target.id === "primaCasaAssegnataA")) {
+      } else if (e.target && (e.target.id === "primaCasaMutuoEnabled" || e.target.id === "primaCasaAssegnataA" || e.target.id === "primaCasaMutuoScadenza")) {
         updateFirstHomeMortgageUi();
         renderAll();
       }

package/frontend/public/index.html

@@ -358,11 +358,37 @@
                 </label>
                 <input id="primaCasaMutuoEnabled" type="checkbox" />
               </div>
-              <div class="field">
-                <label for="primaCasaValoreLocativo" class="label-row"><span id="lblPrimaCasaValoreLocativo">Casa (valore locativo) ({currency})</span>
-                  <span class="hint" id="hintPrimaCasaValoreLocativo" title="Valore locativo mensile della casa assegnata, usato per valorizzare il beneficio economico implicito.">i</span>
-                </label>
-                <input id="primaCasaValoreLocativo" type="number" min="0" step="50" value="1000" />
+              <div class="field first-home-mortgage-table-field">
+                <div class="first-home-mortgage-table-wrap">
+                  <table class="first-home-mortgage-table" aria-label="Dati mutuo prima casa">
+                    <thead>
+                      <tr>
+                        <th>
+                          <span class="label-row"><span id="lblPrimaCasaValoreLocativo">Casa (valore locativo) ({currency})</span>
+                            <span class="hint" id="hintPrimaCasaValoreLocativo" title="Valore locativo mensile della casa assegnata, usato per valorizzare il beneficio economico implicito.">i</span>
+                          </span>
+                        </th>
+                        <th>
+                          <span class="label-row"><span id="lblPrimaCasaMutuoImporto">Rata mutuo mensile ({currency})</span>
+                            <span class="hint" id="hintPrimaCasaMutuoImporto" title="Importo mensile complessivo della rata del mutuo prima casa.">i</span>
+                          </span>
+                        </th>
+                        <th>
+                          <span class="label-row"><span id="lblPrimaCasaMutuoScadenza">Scadenza mutuo</span>
+                            <span class="hint" id="hintPrimaCasaMutuoScadenza" title="Data prevista di estinzione del mutuo prima casa.">i</span>
+                          </span>
+                        </th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr>
+                        <td><input id="primaCasaValoreLocativo" type="number" min="0" step="50" value="1000" /></td>
+                        <td><input id="primaCasaMutuoImporto" type="number" min="0" step="50" value="0" /></td>
+                        <td><input id="primaCasaMutuoScadenza" type="date" value="" /></td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </div>
               </div>
               <div class="field">
                 <label for="primaCasaAssegnataA" class="label-row"><span id="lblPrimaCasaAssegnataA">Casa assegnata a</span>
@@ -374,15 +400,9 @@
                   <option value="2">Coniuge 2</option>
                 </select>
               </div>
-              <div class="field">
-                <label for="primaCasaMutuoImporto" class="label-row"><span id="lblPrimaCasaMutuoImporto">Rata mutuo mensile ({currency})</span>
-                  <span class="hint" id="hintPrimaCasaMutuoImporto" title="Importo mensile complessivo della rata del mutuo prima casa.">i</span>
-                </label>
-                <input id="primaCasaMutuoImporto" type="number" min="0" step="50" value="0" />
-              </div>
               <div class="field first-home-split-field">
                 <label for="primaCasaMutuoPerc1" class="label-row"><span id="lblPrimaCasaMutuoPerc1">Quota mutuo a carico</span>
-                  <span class="hint" id="hintPrimaCasaMutuoPerc1" title="Percentuale della rata mutuo pagata da Coniuge 1. La quota dell'altro coniuge e complementare a 100%.">i</span>
+                  <span class="hint" id="hintPrimaCasaMutuoPerc1" title="Percentuale della rata mutuo pagata da ciascun Coniuge.">i</span>
                 </label>
                 <div class="mortgage-split-slider" id="primaCasaMutuoSliderWrap">
                   <div class="mortgage-split-side mortgage-split-side-left" id="primaCasaSplitLeft">
@@ -630,7 +650,7 @@
   <script src="supabase.min.js"></script>
   <script src="fabric.min.js"></script>
   <script src="html2pdf.bundle.min.js"></script>
-    <script src="app.js?v=2.4.9"></script>
+    <script src="app.js?v=2.4.11"></script>
 </body>
 </html>
 

package/frontend/public/styles.css

@@ -949,6 +949,35 @@
       grid-column: 1 / -1;
     }
 
+    .extra-box-first-home .first-home-mortgage-table-field {
+      grid-column: 1 / -1;
+    }
+
+    .first-home-mortgage-table-wrap {
+      overflow-x: auto;
+      padding-bottom: 2px;
+    }
+
+    .first-home-mortgage-table {
+      width: 100%;
+      min-width: 560px;
+      border-collapse: separate;
+      border-spacing: 6px;
+      table-layout: fixed;
+    }
+
+    .first-home-mortgage-table th {
+      text-align: left;
+      font-size: 0.8rem;
+      color: #2a5954;
+      font-weight: 800;
+      padding: 0 2px;
+    }
+
+    .first-home-mortgage-table td {
+      padding: 0;
+    }
+
     .extra-box-first-home .field {
       border-radius: 12px;
       padding: 8px 9px 7px;
@@ -966,6 +995,7 @@
     }
 
     .extra-box-first-home .field input[type="number"],
+    .extra-box-first-home .field input[type="date"],
     .extra-box-first-home .field select {
       border-width: 1.5px;
       box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8) inset;
@@ -982,6 +1012,7 @@
     }
 
     .extra-box-first-home .field input[type="number"]:focus,
+    .extra-box-first-home .field input[type="date"]:focus,
     .extra-box-first-home .field select:focus {
       border-color: rgba(27, 141, 127, 0.4);
       box-shadow: 0 0 0 3px rgba(27, 141, 127, 0.14), 0 1px 0 rgba(255, 255, 255, 0.85) inset;
@@ -1592,6 +1623,20 @@
       font-size: 0.67rem;
     }
 
+    .spese-detail-note {
+      width: 100%;
+      margin-top: 6px;
+      border: 1px solid #bfd5d0;
+      border-radius: 6px;
+      background: #ffffff;
+      color: #214b47;
+      font-size: 0.72rem;
+      line-height: 1.3;
+      padding: 6px 7px;
+      resize: vertical;
+      min-height: 46px;
+    }
+
     .spese-detail-counter {
       margin-top: 3px;
       font-size: 0.66rem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mantenimento-app",
-  "version": "2.4.9",
+  "version": "2.4.11",
   "description": "Frontend + backend architecture for the mantenimento calculator",
   "type": "commonjs",
   "main": "backend/calculate-model.js",