From 16170317d173a618c0b18d907d17c558ee5aad80 Mon Sep 17 00:00:00 2001
From: francesco <iosellifr@gmail.com>
Date: Tue, 20 Jan 2026 13:07:56 +0100
Subject: [PATCH] Update templates/index.html

---
 templates/index.html | 125 ++++++++++---------------------------------
 1 file changed, 27 insertions(+), 98 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index a3cb952..7e663a9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,33 +5,23 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Software Cemento Rev.0</title>
     <style>
-        :root { --mac-bg: #f2f2f7; --mac-blue: #007aff; --mac-red: #ff3b30; --mac-green: #34c759; --mac-purple: #5856d6; }
+        :root { --mac-bg: #f2f2f7; --mac-blue: #007aff; --mac-red: #ff3b30; --mac-green: #34c759; }
         body { font-family: -apple-system, system-ui, sans-serif; background: var(--mac-bg); padding: 20px; font-size: 14px; color: #1c1c1e; }
         .container { display: flex; flex-wrap: wrap; gap: 20px; justify-content: center; max-width: 1200px; margin: auto; }
         .panel { background: rgba(255,255,255,0.8); backdrop-filter: blur(10px); border-radius: 12px; padding: 20px; flex: 1; min-width: 320px; box-shadow: 0 4px 15px rgba(0,0,0,0.05); }
-        
         table { width: 100%; border-collapse: collapse; margin-bottom: 15px; background: white; border-radius: 8px; overflow: hidden; }
         th { padding: 10px; font-size: 14px; color: white; text-transform: uppercase; }
         td { padding: 8px; text-align: center; border: 1px solid #e5e5ea; font-size: 14px; }
         .h-blue { background: var(--mac-blue); }
         .h-red { background: var(--mac-red); }
-        
-        .input-group { position: relative; display: inline-block; width: 90%; }
         input { width: 100%; border: 1px solid #d1d1d6; border-radius: 5px; padding: 6px 5px; text-align: center; font-size: 14px; box-sizing: border-box; }
         .unit-label { position: absolute; right: 8px; top: 50%; transform: translateY(-50%); color: #8e8e93; pointer-events: none; }
         select { border: 1px solid #d1d1d6; border-radius: 5px; padding: 5px; font-size: 14px; }
-
-        .btn { width: 100%; padding: 12px; border-radius: 8px; border: none; font-weight: 600; cursor: pointer; margin-top: 10px; font-size: 15px; color: white; text-transform: uppercase; transition: opacity 0.2s; }
-        .btn:hover { opacity: 0.8; }
+        .btn { width: 100%; padding: 12px; border-radius: 8px; border: none; font-weight: 600; cursor: pointer; margin-top: 10px; font-size: 15px; color: white; text-transform: uppercase; }
         .btn-calc { background: var(--mac-green); }
-        .btn-exp { background: var(--mac-purple); margin-top: 20px; }
-        .btn-cups { background: var(--mac-blue); margin-top: 10px; }
-        
-        .res-section { margin-bottom: 15px; }
-        .res-section h4 { margin: 0 0 5px 0; text-transform: uppercase; font-size: 12px; color: #8e8e93; }
+        .btn-exp { background: #5856d6; margin-top: 20px; }
         .res-box { background: white; padding: 15px; border-radius: 10px; border: 1px solid #d1d1d6; line-height: 1.6; }
-        hr { border: 0; border-top: 1px solid #d1d1d6; margin: 15px 0; }
-
+        .msg-ok { color: var(--mac-green); font-weight: bold; text-align: center; margin-top: 10px; }
         @media print { .no-print { display: none !important; } .res-box { border: none; } }
     </style>
 </head>
@@ -45,39 +35,16 @@
                     <tr><td>Larghezza</td><td><input type="text" name="l" value="{{form.get('l','0')}}"></td><td><select name="ul">{% for u in ['m','cm','mm'] %}<option value="{{u}}" {% if form.get('ul','m')==u %}selected{% endif %}>{{u}}</option>{% endfor %}</select></td></tr>
                     <tr><td>Profondità</td><td><input type="text" name="p" value="{{form.get('p','0')}}"></td><td><select name="up">{% for u in ['m','cm','mm'] %}<option value="{{u}}" {% if form.get('up','m')==u %}selected{% endif %}>{{u}}</option>{% endfor %}</select></td></tr>
                 </table>
-
                 <table>
                     <tr class="h-red"><th colspan="3">Miscela (Parti)</th></tr>
-                    <tr>
-                        <td>Cemento:<br><input type="text" name="p_cem" value="{{form.get('p_cem','1')}}"></td>
-                        <td>Sabbia:<br><input type="text" name="p_sab" value="{{form.get('p_sab','3')}}"></td>
-                        <td>Ghiaia:<br><input type="text" name="p_ghi" value="{{form.get('p_ghi','5')}}"></td>
-                    </tr>
+                    <tr><td>Cem:<br><input type="text" name="p_cem" value="{{form.get('p_cem','1')}}"></td><td>Sab:<br><input type="text" name="p_sab" value="{{form.get('p_sab','3')}}"></td><td>Ghi:<br><input type="text" name="p_ghi" value="{{form.get('p_ghi','5')}}"></td></tr>
                 </table>
-
                 <table>
-                    <tr class="h-red"><th colspan="3">Peso sacchette (Kg)</th></tr>
-                    <tr>
-                        <td>Cemento:<br><div class="input-group"><input type="text" name="w_cem" value="{{form.get('w_cem','25')}}"><span class="unit-label">Kg</span></div></td>
-                        <td>Sabbia:<br><div class="input-group"><input type="text" name="w_sab" value="{{form.get('w_sab','25')}}"><span class="unit-label">Kg</span></div></td>
-                        <td>Ghiaia:<br><div class="input-group"><input type="text" name="w_ghi" value="{{form.get('w_ghi','25')}}"><span class="unit-label">Kg</span></div></td>
-                    </tr>
+                    <tr class="h-red"><th colspan="3">Peso e Costo sacche</th></tr>
+                    <tr><td>Kg:<input type="text" name="w_cem" value="{{form.get('w_cem','25')}}"></td><td>Kg:<input type="text" name="w_sab" value="{{form.get('w_sab','25')}}"></td><td>Kg:<input type="text" name="w_ghi" value="{{form.get('w_ghi','25')}}"></td></tr>
+                    <tr><td>€:<input type="text" name="c_cem" value="{{form.get('c_cem','1')}}"></td><td>€:<input type="text" name="c_sab" value="{{form.get('c_sab','1')}}"></td><td>€:<input type="text" name="c_ghi" value="{{form.get('c_ghi','1')}}"></td></tr>
                 </table>
-
-                <table>
-                    <tr class="h-red"><th colspan="3">Costo sacchette (€)</th></tr>
-                    <tr>
-                        <td>Cemento:<br><div class="input-group"><input type="text" name="c_cem" value="{{form.get('c_cem','1')}}"><span class="unit-label">€</span></div></td>
-                        <td>Sabbia:<br><div class="input-group"><input type="text" name="c_sab" value="{{form.get('c_sab','1')}}"><span class="unit-label">€</span></div></td>
-                        <td>Ghiaia:<br><div class="input-group"><input type="text" name="c_ghi" value="{{form.get('c_ghi','1')}}"><span class="unit-label">€</span></div></td>
-                    </tr>
-                </table>
-
-                <table>
-                    <tr class="h-red"><th>Attrezzatura</th></tr>
-                    <tr><td>Volume Betoniera: <div class="input-group" style="width:80px;"><input type="text" name="v_bet" value="{{form.get('v_bet','160')}}"><span class="unit-label">L</span></div></td></tr>
-                </table>
-
+                <input type="hidden" name="v_bet" value="{{form.get('v_bet','160')}}">
                 <button type="submit" class="btn btn-calc">Esegui Calcolo</button>
             </form>
         </div>
@@ -86,64 +53,26 @@
             <h3>Risultati</h3>
             {% if res %}
             <div class="res-box">
-                <div class="res-section">
-                    <b>Volume:</b> {{ res.vol }} m³ | <b>Peso:</b> {{ res.peso }} Kg
-                </div>
+                <b>Volume:</b> {{ res.vol }} m³ | <b>Peso:</b> {{ res.peso }} Kg<br>
+                <b>Sacchetti:</b> C:{{res.s_cem}} | S:{{res.s_sab}} | G:{{res.s_ghi}} | <b>Tot:</b> {{res.tot_sacc}}<br>
+                <b>Acqua:</b> {{res.acqua}} L | <b>Costo: {{res.costo_tot}} €</b>
                 <hr>
-                <div class="res-section">
-                    <h4>Acquisti</h4>
-                    Cemento: {{ res.s_cem }} sacchetti (€ {{ res.cost_cem }})<br>
-                    Sabbia: {{ res.s_sab }} sacchetti (€ {{ res.cost_sab }})<br>
-                    Ghiaia: {{ res.s_ghi }} sacchetti (€ {{ res.cost_ghi }})<br>
-                    Acqua: {{ res.acqua }} L<br>
-                    <b>Totale materiale:</b> {{ res.tot_sacc }} sacchetti
-                </div>
-                <div class="res-section">
-                    <h4>Costo stimato</h4>
-                    <b>Costo totale: {{ res.costo_tot }} €</b>
-                </div>
-                <hr>
-                <div class="res-section">
-                    <h4>Per ogni carico ({{ res.n_c }} carichi):</h4>
-                    • Cemento: {{ res.bc_cem }} sacchetti<br>
-                    • Sabbia: {{ res.bc_sab }} sacchetti<br>
-                    • Ghiaia: {{ res.bc_ghi }} sacchetti<br>
-                    • Acqua: {{ res.bc_aq }} L
-                </div>
+                <b>Carico ({{ res.n_c }} carichi):</b> C:{{res.bc_cem}} | S:{{res.bc_sab}} | G:{{res.bc_ghi}} | Aq:{{res.bc_aq}} L
             </div>
-
-            <div class="no-print">
-                <form action="/download" method="POST">
-                    <input type="hidden" name="res_vol" value="{{res.vol}}"><input type="hidden" name="res_peso" value="{{res.peso}}">
-                    <input type="hidden" name="res_aq" value="{{res.acqua}}"><input type="hidden" name="res_tot_s" value="{{res.tot_sacc}}">
-                    <input type="hidden" name="res_costo_t" value="{{res.costo_tot}}"><input type="hidden" name="res_s_cem" value="{{res.s_cem}}">
-                    <input type="hidden" name="res_c_cem" value="{{res.cost_cem}}"><input type="hidden" name="res_s_sab" value="{{res.s_sab}}">
-                    <input type="hidden" name="res_c_sab" value="{{res.cost_sab}}"><input type="hidden" name="res_s_ghi" value="{{res.s_ghi}}">
-                    <input type="hidden" name="res_c_ghi" value="{{res.cost_ghi}}"><input type="hidden" name="res_nc" value="{{res.n_c}}">
-                    <input type="hidden" name="res_bc_cem" value="{{res.bc_cem}}"><input type="hidden" name="res_bc_sab" value="{{res.bc_sab}}">
-                    <input type="hidden" name="res_bc_ghi" value="{{res.bc_ghi}}"><input type="hidden" name="res_bc_aq" value="{{res.bc_aq}}">
-                    <input type="hidden" name="a" value="{{form.get('a')}}"><input type="hidden" name="ua" value="{{form.get('ua')}}">
-                    <input type="hidden" name="l" value="{{form.get('l')}}"><input type="hidden" name="ul" value="{{form.get('ul')}}">
-                    <input type="hidden" name="p" value="{{form.get('p')}}"><input type="hidden" name="up" value="{{form.get('up')}}">
-                    <input type="hidden" name="p_cem" value="{{form.get('p_cem')}}"><input type="hidden" name="p_sab" value="{{form.get('p_sab')}}"><input type="hidden" name="p_ghi" value="{{form.get('p_ghi')}}">
-                    <input type="hidden" name="w_cem" value="{{form.get('w_cem')}}"><input type="hidden" name="w_sab" value="{{form.get('w_sab')}}"><input type="hidden" name="w_ghi" value="{{form.get('w_ghi')}}">
-                    <input type="hidden" name="c_cem" value="{{form.get('c_cem')}}"><input type="hidden" name="c_sab" value="{{form.get('c_sab')}}"><input type="hidden" name="c_ghi" value="{{form.get('c_ghi')}}">
-                    <input type="hidden" name="v_bet" value="{{form.get('v_bet')}}">
-                    <button type="submit" class="btn btn-exp">Esporta TXT Completo</button>
-                </form>
-
-                <form action="/stampa_pdf" method="POST" target="_blank">
-                    <input type="hidden" name="res_vol" value="{{res.vol}}">
-                    <input type="hidden" name="res_peso" value="{{res.peso}}">
-                    <input type="hidden" name="res_tot_s" value="{{res.tot_sacc}}">
-                    <input type="hidden" name="res_costo_t" value="{{res.costo_tot}}">
-                    <button type="submit" class="btn btn-cups">Stampa PDF (CUPS)</button>
-                </form>
-
-                <button onclick="window.print()" class="btn" style="background:#d1d1d6; color:#1c1c1e; margin-top:10px;">Stampa Pagina</button>
-            </div>
-            {% else %}
-            <p style="color:#8e8e93; text-align:center;">Inserisci i dati e premi "Esegui Calcolo".</p>
+            
+            <form method="POST" class="no-print">
+                {% for k,v in form.items() %}<input type="hidden" name="{{k}}" value="{{v}}">{% endfor %}
+                <input type="hidden" name="res_vol" value="{{res.vol}}"><input type="hidden" name="res_peso" value="{{res.peso}}">
+                <input type="hidden" name="res_aq" value="{{res.acqua}}"><input type="hidden" name="res_tot_s" value="{{res.tot_sacc}}">
+                <input type="hidden" name="res_costo_t" value="{{res.costo_tot}}"><input type="hidden" name="res_nc" value="{{res.n_c}}">
+                <input type="hidden" name="res_s_cem" value="{{res.s_cem}}"><input type="hidden" name="res_s_sab" value="{{res.s_sab}}"><input type="hidden" name="res_s_ghi" value="{{res.s_ghi}}">
+                <input type="hidden" name="res_bc_cem" value="{{res.bc_cem}}"><input type="hidden" name="res_bc_sab" value="{{res.bc_sab}}"><input type="hidden" name="res_bc_ghi" value="{{res.bc_ghi}}"><input type="hidden" name="res_bc_aq" value="{{res.bc_aq}}">
+                
+                <button type="submit" name="btn_stampa" class="btn" style="background:var(--mac-blue)">Stampa PDF (CUPS)</button>
+                <button type="submit" formaction="/download" class="btn btn-exp">Esporta TXT</button>
+            </form>
+            
+            {% if msg_stampa %}<div class="msg-ok">{{ msg_stampa }}</div>{% endif %}
             {% endif %}
         </div>
     </div>