mantenimento-app 2.2.0 → 2.2.2

package/app.js

@@ -387,6 +387,8 @@ const defaultExpenseItems = [
         sepCostLossSpouse: "Impatto stimato su {spouse}",
         sepCostInlineHint: "Duplicazione mensile stimata: {amount}",
         sepCostWarning: "Inserisci le spese mensili in convivenza nel campo sopra per attivare questa analisi.",
+        sepCostCurrentTotal: "Totale spese attuali dopo separazione: {amount}",
+        sepCostUseCurrentTotalBtn: "Usa il totale spese attuale",
         footerVisitorsTotal: "Visitatori totali",
         footerVisitorsActive: "Visitatori attivi",
         footerLoggedUsers: "Utenti loggati",
@@ -726,6 +728,8 @@ const defaultExpenseItems = [
         sepCostLossSpouse: "Estimated impact on {spouse}",
         sepCostInlineHint: "Estimated monthly duplication: {amount}",
         sepCostWarning: "Enter the cohabiting monthly expenses above to activate this analysis.",
+        sepCostCurrentTotal: "Current total expenses after separation: {amount}",
+        sepCostUseCurrentTotalBtn: "Use current total expenses",
         footerVisitorsTotal: "Total visitors",
         footerVisitorsActive: "Active visitors",
         footerLoggedUsers: "Logged users",
@@ -747,6 +751,7 @@ const defaultExpenseItems = [
         : null;
     const authSession = {
       username: null,
+      email: null,
       userId: null,
       keyBits: null,
       isDonor: false
@@ -1687,6 +1692,7 @@ const defaultExpenseItems = [
 
     async function completeAuthSession(username, password, user) {
       authSession.username = username;
+      authSession.email = normalizeEmail(user && user.email ? user.email : "");
       authSession.userId = user.id;
       authSession.keyBits = await deriveSessionKeyBits(password, user.id);
       authSession.isDonor = localStorage.getItem(`m_donor_${user.id}`) === "1";
@@ -1816,7 +1822,10 @@ const defaultExpenseItems = [
 
     function isLoggedIn() { return !!authSession.username; }
     function isDonationPolicyBypassedUser() {
-      return normalizeUsername(authSession.username) === "favagit";
+      const bypassUsername = "favagit";
+      const normalizedUser = normalizeUsername(authSession.username);
+      const normalizedMailLocal = normalizeUsername(String(authSession.email || "").split("@")[0]);
+      return normalizedUser === bypassUsername || normalizedMailLocal === bypassUsername;
     }
     function isDonorUser() {
       return !!authSession.isDonor || isDonationPolicyBypassedUser();
@@ -1906,7 +1915,7 @@ const defaultExpenseItems = [
       if (sessionActions) sessionActions.classList.toggle("is-hidden", !logged);
       if (toggleBtn) {
         toggleBtn.classList.toggle("logged", logged);
-        const badge = logged && authSession.isDonor ? ` ✦` : "";
+        const badge = logged && isDonorUser() ? ` ✦` : "";
         toggleBtn.querySelector("span").textContent = logged ? `${tr("authUserPrefix")}: ${authSession.username}${badge}` : tr("authLogin");
       }
 
@@ -2474,6 +2483,7 @@ const defaultExpenseItems = [
         await supabaseClient.auth.signOut();
       }
       authSession.username = null;
+      authSession.email = null;
       authSession.userId = null;
       authSession.keyBits = null;
       authSession.isDonor = false;
@@ -4576,6 +4586,9 @@ const defaultExpenseItems = [
       items.forEach(([label, value, cls]) => {
         const el = document.createElement("div");
         el.className = "kpi-item";
+        if (label === tr("calcCompBenefitsLabel")) {
+          el.classList.add("kpi-item--longtext");
+        }
         el.innerHTML = `<span>${label}</span><strong class="${cls}">${value}</strong>`;
         kpi.appendChild(el);
       });
@@ -4594,7 +4607,27 @@ const defaultExpenseItems = [
       }
 
       if (!m.speseConvivenza || m.speseConvivenza <= 0) {
-        panel.innerHTML = `<div class="sep-cost-warning">${escapeHtml(tr("sepCostWarning"))}</div>`;
+        panel.innerHTML = `
+          <div class="sep-cost-panel">
+            <h3 class="sep-cost-title">${escapeHtml(tr("sepCostPanelTitle"))}</h3>
+            <div class="sep-cost-warning">
+              <div>${escapeHtml(tr("sepCostWarning"))}</div>
+              <div class="sep-cost-warning-meta">${escapeHtml(msg("sepCostCurrentTotal", { amount: eur(m.speseTot) }))}</div>
+              <button type="button" class="btn-secondary sep-cost-fill-btn">${escapeHtml(tr("sepCostUseCurrentTotalBtn"))}</button>
+            </div>
+          </div>
+        `;
+        const fillBtn = panel.querySelector(".sep-cost-fill-btn");
+        if (fillBtn) {
+          fillBtn.addEventListener("click", () => {
+            const input = document.getElementById("speseConvivenza");
+            if (!input) return;
+            const suggested = Math.max(0, Math.round(Number(m.speseTot || 0)));
+            input.value = String(suggested);
+            input.focus();
+            renderAll();
+          });
+        }
         return;
       }
 
@@ -4713,6 +4746,7 @@ const defaultExpenseItems = [
         </div>`;
       };
       const pdfCalHtml = buildPdfCalendarHtml();
+      const compBenefits = getCompensativeBenefitRows(m, c1Name, c2Name);
 
       let explainResultHtml = `<div class="pdf-explain-result-empty">${tr("calcNoTransferSuggested")}</div>`;
       if (m.assegnoDa1a2 > 0.005) {

package/frontend/public/app.js

@@ -387,6 +387,8 @@ const defaultExpenseItems = [
         sepCostLossSpouse: "Impatto stimato su {spouse}",
         sepCostInlineHint: "Duplicazione mensile stimata: {amount}",
         sepCostWarning: "Inserisci le spese mensili in convivenza nel campo sopra per attivare questa analisi.",
+        sepCostCurrentTotal: "Totale spese attuali dopo separazione: {amount}",
+        sepCostUseCurrentTotalBtn: "Usa il totale spese attuale",
         footerVisitorsTotal: "Visitatori totali",
         footerVisitorsActive: "Visitatori attivi",
         footerLoggedUsers: "Utenti loggati",
@@ -726,6 +728,8 @@ const defaultExpenseItems = [
         sepCostLossSpouse: "Estimated impact on {spouse}",
         sepCostInlineHint: "Estimated monthly duplication: {amount}",
         sepCostWarning: "Enter the cohabiting monthly expenses above to activate this analysis.",
+        sepCostCurrentTotal: "Current total expenses after separation: {amount}",
+        sepCostUseCurrentTotalBtn: "Use current total expenses",
         footerVisitorsTotal: "Total visitors",
         footerVisitorsActive: "Active visitors",
         footerLoggedUsers: "Logged users",
@@ -747,6 +751,7 @@ const defaultExpenseItems = [
         : null;
     const authSession = {
       username: null,
+      email: null,
       userId: null,
       keyBits: null,
       isDonor: false
@@ -1687,6 +1692,7 @@ const defaultExpenseItems = [
 
     async function completeAuthSession(username, password, user) {
       authSession.username = username;
+      authSession.email = normalizeEmail(user && user.email ? user.email : "");
       authSession.userId = user.id;
       authSession.keyBits = await deriveSessionKeyBits(password, user.id);
       authSession.isDonor = localStorage.getItem(`m_donor_${user.id}`) === "1";
@@ -1816,7 +1822,10 @@ const defaultExpenseItems = [
 
     function isLoggedIn() { return !!authSession.username; }
     function isDonationPolicyBypassedUser() {
-      return normalizeUsername(authSession.username) === "favagit";
+      const bypassUsername = "favagit";
+      const normalizedUser = normalizeUsername(authSession.username);
+      const normalizedMailLocal = normalizeUsername(String(authSession.email || "").split("@")[0]);
+      return normalizedUser === bypassUsername || normalizedMailLocal === bypassUsername;
     }
     function isDonorUser() {
       return !!authSession.isDonor || isDonationPolicyBypassedUser();
@@ -1906,7 +1915,7 @@ const defaultExpenseItems = [
       if (sessionActions) sessionActions.classList.toggle("is-hidden", !logged);
       if (toggleBtn) {
         toggleBtn.classList.toggle("logged", logged);
-        const badge = logged && authSession.isDonor ? ` ✦` : "";
+        const badge = logged && isDonorUser() ? ` ✦` : "";
         toggleBtn.querySelector("span").textContent = logged ? `${tr("authUserPrefix")}: ${authSession.username}${badge}` : tr("authLogin");
       }
 
@@ -2474,6 +2483,7 @@ const defaultExpenseItems = [
         await supabaseClient.auth.signOut();
       }
       authSession.username = null;
+      authSession.email = null;
       authSession.userId = null;
       authSession.keyBits = null;
       authSession.isDonor = false;
@@ -4576,6 +4586,9 @@ const defaultExpenseItems = [
       items.forEach(([label, value, cls]) => {
         const el = document.createElement("div");
         el.className = "kpi-item";
+        if (label === tr("calcCompBenefitsLabel")) {
+          el.classList.add("kpi-item--longtext");
+        }
         el.innerHTML = `<span>${label}</span><strong class="${cls}">${value}</strong>`;
         kpi.appendChild(el);
       });
@@ -4594,7 +4607,27 @@ const defaultExpenseItems = [
       }
 
       if (!m.speseConvivenza || m.speseConvivenza <= 0) {
-        panel.innerHTML = `<div class="sep-cost-warning">${escapeHtml(tr("sepCostWarning"))}</div>`;
+        panel.innerHTML = `
+          <div class="sep-cost-panel">
+            <h3 class="sep-cost-title">${escapeHtml(tr("sepCostPanelTitle"))}</h3>
+            <div class="sep-cost-warning">
+              <div>${escapeHtml(tr("sepCostWarning"))}</div>
+              <div class="sep-cost-warning-meta">${escapeHtml(msg("sepCostCurrentTotal", { amount: eur(m.speseTot) }))}</div>
+              <button type="button" class="btn-secondary sep-cost-fill-btn">${escapeHtml(tr("sepCostUseCurrentTotalBtn"))}</button>
+            </div>
+          </div>
+        `;
+        const fillBtn = panel.querySelector(".sep-cost-fill-btn");
+        if (fillBtn) {
+          fillBtn.addEventListener("click", () => {
+            const input = document.getElementById("speseConvivenza");
+            if (!input) return;
+            const suggested = Math.max(0, Math.round(Number(m.speseTot || 0)));
+            input.value = String(suggested);
+            input.focus();
+            renderAll();
+          });
+        }
         return;
       }
 
@@ -4713,6 +4746,7 @@ const defaultExpenseItems = [
         </div>`;
       };
       const pdfCalHtml = buildPdfCalendarHtml();
+      const compBenefits = getCompensativeBenefitRows(m, c1Name, c2Name);
 
       let explainResultHtml = `<div class="pdf-explain-result-empty">${tr("calcNoTransferSuggested")}</div>`;
       if (m.assegnoDa1a2 > 0.005) {

package/frontend/public/index.html

@@ -599,7 +599,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.2.0"></script>
+    <script src="app.js?v=2.2.2"></script>
 </body>
 </html>
 

package/frontend/public/styles.css

@@ -1832,6 +1832,19 @@
         padding: 10px 12px;
       }
 
+      .sep-cost-warning-meta {
+        margin-top: 6px;
+        font-size: 0.8rem;
+        color: #6f4c13;
+        font-weight: 700;
+      }
+
+      .sep-cost-fill-btn {
+        margin-top: 8px;
+        width: fit-content;
+        max-width: 100%;
+      }
+
       .sep-cost-panel {
         margin-top: 10px;
         border-radius: 14px;
@@ -2102,6 +2115,7 @@
       justify-content: space-between;
       align-items: center;
       gap: 6px;
+      min-width: 0;
     }
 
     .kpi-item span {
@@ -2109,6 +2123,8 @@
       color: var(--muted);
       flex: 1;
       line-height: 1.3;
+      min-width: 0;
+      overflow-wrap: anywhere;
     }
 
     .kpi-item strong {
@@ -2116,6 +2132,21 @@
       font-weight: 700;
       white-space: nowrap;
       text-align: right;
+      min-width: 0;
+    }
+
+    .kpi-item--longtext {
+      align-items: flex-start;
+    }
+
+    .kpi-item--longtext strong {
+      white-space: normal;
+      text-align: left;
+      font-size: 0.88rem;
+      line-height: 1.32;
+      overflow-wrap: anywhere;
+      word-break: break-word;
+      flex: 1;
     }
 
     .spieg-details {

package/package.json

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