From 869416e4012d4a5f5a1166b0c339ff2cb1f6a576 Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Mon, 9 Mar 2020 14:24:59 +0100
Subject: [PATCH] Aggiunta variabile revisione in stampa Preventivi

---
 modules/preventivi/variables.php |   3 +
 plugins/revisioni/edit.php       | 122 ++++++++++++++++++-------------
 2 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/modules/preventivi/variables.php b/modules/preventivi/variables.php
index 24e229d95..58dfdfb90 100755
--- a/modules/preventivi/variables.php
+++ b/modules/preventivi/variables.php
@@ -5,6 +5,8 @@ $r = $dbo->fetchOne('SELECT *,
     an_anagrafiche.email
 FROM co_preventivi INNER JOIN an_anagrafiche ON co_preventivi.idanagrafica=an_anagrafiche.idanagrafica WHERE co_preventivi.id='.prepare($id_record));
 
+$revisione = $dbo->fetchNum('SELECT * FROM co_preventivi WHERE master_revision = (SELECT master_revision FROM co_preventivi WHERE id = '.prepare($id_record).') AND id < '.prepare($id_record)) + 1;
+
 // Variabili da sostituire
 return [
     'email' => $r['email'],
@@ -13,4 +15,5 @@ return [
     'descrizione' => $r['descrizione'],
     'data' => Translator::dateToLocale($r['data_bozza']),
     'id_anagrafica' => $r['idanagrafica'],
+    'revisione' => $revisione,
 ];
diff --git a/plugins/revisioni/edit.php b/plugins/revisioni/edit.php
index 4eea9bc12..717cb81ab 100755
--- a/plugins/revisioni/edit.php
+++ b/plugins/revisioni/edit.php
@@ -1,69 +1,91 @@
 <?php
+
 include_once __DIR__.'/../../../core.php';
 
-echo "<form action='".$rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record."' method='post'>";
-echo "  <input type='hidden' name='backto' value='record-edit'>";
-echo "  <input type='hidden' name='op' value='edit_revision'>";
-echo "  <input type='hidden' name='id_plugin' value='".$id_plugin."'>";
-echo "  <input type='hidden' name='id_record' value='".$id_record."'>";
+$revisione_principale = $dbo->fetchOne('SELECT master_revision FROM co_preventivi WHERE id = '.prepare($id_record));
 
-$rs_master_revision = $dbo->fetchArray('SELECT master_revision FROM co_preventivi WHERE id='.prepare($id_record));
+$revisioni = $dbo->fetchArray('SELECT * FROM co_preventivi WHERE master_revision = '.prepare($revisione_principale['master_revision']).' OR id = '.prepare($revisione_principale['master_revision']).' ORDER BY created_at');
 
-echo "  <input type='hidden' name='master_revision' value='".$rs_master_revision[0]['master_revision']."'>";
+echo "
+<form action='".$rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record."' method='post'>
+    <input type='hidden' name='backto' value='record-edit'>
+    <input type='hidden' name='op' value='edit_revision'>
+    <input type='hidden' name='id_plugin' value='".$id_plugin."'>
+    <input type='hidden' name='id_record' value='".$id_record."'>
+    <input type='hidden' name='master_revision' value='".$revisione_principale['master_revision']."'>
 
-$rs_revisioni = $dbo->fetchArray('SELECT * FROM co_preventivi WHERE master_revision='.prepare($rs_master_revision[0]['master_revision']).' OR id='.prepare($rs_master_revision[0]['master_revision']).' ORDER BY created_at');
+    <div class='alert alert-info'>
+        <i class='fa fa-info-circle'></i> ".tr('Seleziona la spunta e clicca salva per cambiare la revisione del preventivo')."
+    </div>
 
-echo "  <div class='row'>";
-echo "      <div class='col-md-12'>";
+    <table class='table table-condensed table-bordered'>
+        <tr>
+            <th style='width:50px;' class='text-center'>#</th>
+            <th>Descrizione</th>
+            <th style='width:50px;'></th>
+        </tr>";
 
-echo "          <div class='alert alert-info'><i class='fa fa-info-circle'></i> Seleziona la spunta e clicca salva per cambiare la revisione del preventivo</div>";
-echo "          <table class='table table-condensed table-bordered'>";
-echo "              <tr>
-                        <th style='width:50px;' class='text-center'>#</th>
-                        <th>Descrizione</th>
-                        <th style='width:50px;'></th>
-                    </tr>";
-for ($i = 0; $i < sizeof($rs_revisioni); ++$i) {
-    if ($rs_revisioni[$i]['master_revision'] == $rs_revisioni[$i]['id'] || $rs_revisioni[$i]['default_revision'] == 1) {
+foreach ($revisioni as $i => $revisione) {
+    if ($revisione['master_revision'] == $revisione['id'] || $revisione['default_revision'] == 1) {
         $disabled = 'disabled';
     } else {
         $disabled = '';
     }
-    if ($rs_revisioni[$i]['default_revision']) {
+
+    if ($revisione['default_revision']) {
         $cheched = 'checked';
     } else {
         $cheched = '';
     }
-    echo "          <tr>
-                        <td class='text-center'>
-                            <input type='radio' class='revision_changer' name='idrevisione' value='".$rs_revisioni[$i]['id']."' ".$cheched.'>
-                        </td>
-                        <td>
-                            Revisione '.($i + 1).' creata il '.Translator::dateToLocale($rs_revisioni[$i]['created_at']).' alle '.date('H:i', strtotime($rs_revisioni[$i]['created_at']))."
-                        </td>
-                        <td class='text-center'>"; ?>
-                            <button type='button' class='btn btn-danger <?php echo $disabled; ?>' onclick='if(confirm("Vuoi cancellare questa revisione?")){$("#idrevisione").val("<?php echo $rs_revisioni[$i]['id']; ?>");$("#form_deleterevision").submit();}' <?php echo $disabled; ?>><i class='fa fa-trash'></i></button>
-    <?php
-    echo '
-                        </td>
-                    </tr>';
+
+    echo "
+        <tr>
+            <td class='text-center'>
+                <input type='radio' class='revision_changer' name='idrevisione' value='".$revisione['id']."' ".$cheched.'>
+            </td>
+            <td>
+                '.tr('Revisione _NUM_ creata il _DATE_ alle _TIME_', [
+                    '_NUM_' => ($i + 1),
+                    '_DATE_' => dateFormat($revisione['created_at']),
+                    '_TIME_' => timeFormat($revisione['created_at']),
+                ])."
+            </td>
+            <td class='text-center'>
+                <button type='button' class='btn btn-danger ".$disabled."' onclick='delete_revision(".$revisione['id'].")' ".$disabled.">
+                    <i class='fa fa-trash'></i>
+                </button>
+            </td>
+        </tr>";
 }
-echo '          </table>';
 
-echo '      </div>';
-echo '  </div>';
-echo "  <div class='row'>";
-echo "      <div class='col-md-12 text-center'>";
-echo '           <button '.((sizeof($rs_revisioni) < 2) ? 'disabled' : '')." type='submit' class='btn btn-primary' ><i class='fa fa-refresh'></i> ".tr('Cambia revisione').'</button>';
-echo '      </div>';
-echo '  </div>';
-echo '</form>';
+echo '
+    </table>';
 
-echo "<form action='".$rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record."' method='post' id='form_deleterevision'>";
-echo "  <input type='hidden' name='backto' value='record-edit'>";
-echo "  <input type='hidden' name='op' value='delete_revision'>";
-echo "  <input type='hidden' name='id_plugin' value='".$id_plugin."'>";
-echo "  <input type='hidden' name='id_record' value='".$id_record."'>";
-echo "  <input type='hidden' name='idrevisione' id='idrevisione' value=''>";
-echo '</form>';
-?>
\ No newline at end of file
+echo "
+    <div class='row'>
+        <div class='col-md-12 text-center'>
+            <button ".((count($revisioni) < 2) ? 'disabled' : '')." type='submit' class='btn btn-primary'>
+                <i class='fa fa-refresh'></i> ".tr('Cambia revisione').'
+            </button>
+        </div>
+    </div>
+</form>';
+
+echo "
+<form action='".$rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record."' method='post' id='form_deleterevision'>
+    <input type='hidden' name='backto' value='record-edit'>
+    <input type='hidden' name='op' value='delete_revision'>
+    <input type='hidden' name='id_plugin' value='".$id_plugin."'>
+    <input type='hidden' name='id_record' value='".$id_record."'>
+    <input type='hidden' name='idrevisione' id='idrevisione' value=''>
+</form>";
+
+echo '
+<script>
+function delete_revision(id) {
+    if(confirm("'.tr('Vuoi cancellare questa revisione?').'")){
+        $("#idrevisione").val(id);
+        $("#form_deleterevision").submit();
+    }
+}
+</script>';