Changeset 455 for trunk

Timestamp:

Apr 6, 2025, 8:01:55 PM (8 months ago)

Author:

roby

Message:

• CLIENT

-- Modifica alla funzione election day
-- Modificata l'esportazione su file da xls a csv
-- Modificato il controllo di fine scrutinio per la funzione di proiezione

Location:

trunk

Files:

• admin/versione.php (modified) (1 diff)
• client/modules/Elezioni/affluenze.php (modified) (1 diff)
• client/modules/Elezioni/affluenzephp5.php (modified) (1 diff)
• client/modules/Elezioni/crea_pagina.php (modified) (1 diff)
• client/modules/Elezioni/crea_paginaphp5.php (modified) (1 diff)
• client/modules/Elezioni/crea_paginaphp7.php (modified) (1 diff)
• client/temi/bootstrap/index.php (modified) (1 diff)
• client/temi/bootstrap/pagine/electionday.php (modified) (2 diffs)
• client/temi/bootstrap/pagine/tab_link_opendata.php (modified) (6 diffs)
• client/versione.php (modified) (1 diff)

trunk/admin/versione.php

@@ -1 +1 @@
 <?php
 
-$versione = "3.0 rev 454";
+$versione = "3.0 rev 455";
 $version_number = $versione;
-$datarel = "05 aprile 2025";
+$datarel = "06 aprile 2025";
 $version = "Eleonline $version_number (<i>Data Release: $datarel</i>)";
 

trunk/client/modules/Elezioni/affluenze.php

@@ -23 +23 @@
     echo "$datipdf $html $style";
 }elseif($xls=="1"){
-        $nomefile="affluenze.xls";
-        header ("Content-Type: application/vnd.ms-excel");
+        $nomefile="affluenze.csv";
+        header ("Content-Type:  text/csv");
         header ("Content-Disposition: inline; filename=$nomefile");
         header("Pragma: no-cache");

trunk/client/modules/Elezioni/affluenzephp5.php

@@ -19 +19 @@
     echo "$datipdf $html $style";
 }elseif($xls=="1"){
-        $nomefile="affluenze.xls";
-        header ("Content-Type: application/vnd.ms-excel");
+        $nomefile="affluenze.csv";
+        header ("Content-Type:  text/csv");
         header ("Content-Disposition: inline; filename=$nomefile");
         header("Pragma: no-cache");

trunk/client/modules/Elezioni/crea_pagina.php

@@ -36 +36 @@
 if ($xls==1) {
 
-        $nomefile=strip_tags(str_replace(array('"', "'", ' ', ','), "_", $datipdf).".xls");
+        $nomefile=strip_tags(str_replace(array('"', "'", ' ', ','), "_", $datipdf).".csv");
 #       $nomefile=$_SESSION['nomefile'].".xls";
-        header ("Content-Type: application/vnd.ms-excel");
+        header ("Content-Type:  text/csv");
         header ("Content-Disposition: inline; filename=$nomefile");
 

trunk/client/modules/Elezioni/crea_paginaphp5.php

@@ -29 +29 @@
         $data=date("d-m-y G:i");
         if ($xls==1) {
-                $nomefile=strip_tags(str_replace(array('"', "'", ' ', ','), "_", $datipdf).".xls");
-                header ("Content-Type: application/vnd.ms-excel");
+                $nomefile=strip_tags(str_replace(array('"', "'", ' ', ','), "_", $datipdf).".csv");
+                header ("Content-Type:  text/csv");
                 header ("Content-Disposition: inline; filename=$nomefile");
                 $datipdf=str_replace("<br/>","\n",$datipdf);

trunk/client/modules/Elezioni/crea_paginaphp7.php

@@ -32 +32 @@
         $data=date("d-m-y G:i");
         if ($xls==1) {
-                $nomefile=strip_tags(str_replace(array('"', "'", ' ', ','), "_", $datipdf).".xls");
-                header ("Content-Type: application/vnd.ms-excel");
+                $nomefile=strip_tags(str_replace(array('"', "'", ' ', ','), "_", $datipdf).".csv");
+                header ("Content-Type:  text/csv");
                 header ("Content-Disposition: inline; filename=$nomefile");
                 $datipdf=str_replace("<br/>","\n",$datipdf);

trunk/client/temi/bootstrap/index.php

@@ -13 +13 @@
         $proiezione=$row[0][11];
 }
-if(count(scrutinio_tot_cand_finale(0))<count(elenco_candidati_liste(0))) $proiezione=0;
+if(scrutinate('candidati')<sezioni_totali()) $proiezione=0;
 $proiezioneattivo=$proiezione;
 $row=tipo_consultazione(0);

trunk/client/temi/bootstrap/pagine/electionday.php

@@ -8 +8 @@
 $trascorsi=$interval->format('%a');
 #echo "<br>$giorniviselday : $trascorsi";
-if($giorniviselday>=$trascorsi) 
-        $attivaelctionday =1;
-else
-        $attivaelctionday = 0;
+$attivaelctionday = 0;
+
+if($giorniviselday>=$trascorsi) {
+        $row=elenco_cons();
+        foreach($row as $val){
+                $giornorif2=date_create($val[2]);
+                $interval = date_diff($giornorif2, $oggi);
+                $trascorsi=$interval->format('%a');
+                if($giorniviselday>=$trascorsi) 
+                        $listacons[]=$val;
+                else
+                        $break;
+        }
+        if(count($listacons)>1)
+                $attivaelctionday =1;
+}
                         
 ?>
@@ -32 +44 @@
                         <div class="row py-4 divided">
                                 <?php 
-                                $row=elenco_cons();
-                                foreach($row as $val){
-                                        $giornorif=date_create($val[2]);
-                                        $interval = date_diff($giornorif, $oggi);
-                                        $trascorsi=$interval->format('%a');
-                                        if($giorniviselday>=$trascorsi) 
-                                                $listacons[]=$val;
-                                        else
-                                                $break;
-                                }
                                 foreach ($listacons as $val) {
                                 ?>

trunk/client/temi/bootstrap/pagine/tab_link_opendata.php

@@ -39 +39 @@
 <div class="d-flex justify-content-end align-items-center">
   <div class="btn-group " role="group" aria-label="Pulsanti azione">
-    <button type="button" class="btn-tab ">
+    <!--button type="button" class="btn-tab ">
       <a href="https://www.example.com/risultati" target="_blank">
         <span>Risultati</span>
@@ -49 +49 @@
         <span>Grafici</span>
         <svg class="icon icon-sm icon-primary ms-auto"><use href="<?php echo $curdir?>/svg/sprites.svg#it-chart-line"></use></svg>
-      </a>
+      </a-->
     </button>
     <button type="button" class="btn-tab">
-      <a href="https://www.example.com/stampa" target="_blank">
+      <a href="modules.php?op=come&info=affluenze_sez&csv=1&id_comune=$il_comune&id_cons_gen=$id_cons_gen" target="_blank">
         <span>Stampa</span>
         <svg class="icon icon-sm icon-primary ms-auto"><use href="<?php echo $curdir?>/svg/sprites.svg#it-print"></use></svg>
@@ -64 +64 @@
     </button>
     <button type="button" class="btn-tab">
-      <a href="https://www.example.com/csv" target="_blank">
+      <a href="modules.php?op=come&info=affluenze_sez&csv=1&id_comune=$il_comune&id_cons_gen=$id_cons_gen&xls=1" target="_blank">
         <span>Esporta in CSV</span>
         <svg class="icon icon-sm icon-primary ms-auto"><use href="<?php echo $curdir?>/svg/sprites.svg#it-file-csv"></use></svg>
@@ -85 +85 @@
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Chiudi"></button>
       </div>
+      <form>
+          <!--input name="minsez" type="hidden" value="1">
+          <input name="offsetsez" type="hidden" value="<?php #echo $totsez;?>"-->
+          <input name="op" type="hidden" value="<?php echo $oplink;?>">
+          <input name="info" type="hidden" value="<?php echo $infolink;?>">
+          <input name="csv" type="hidden" value="1">
+          <input name="id_comune" type="hidden" value="<?php echo $id_comune;?>">
+          <input name="id_cons_gen" type="hidden" value="<?php echo $id_cons_gen;?>">
       <div class="modal-body">
-        <form>
           <div class="row">
             <div class="col">
+                                <fieldset>
+                                        <legend>Stampa Sezioni</legend>
+                                        <div class="form-check">
+                                                <label for="sezmin"><span class="opendata"> Da Sezione</span></label>
+                                                <input name="minsez" type="text" style="width: 80px;" id="sezmin" value="1">
+                                        </div>
+                                        <div class="form-check">
+                                                <label for="maxsez"><span class="opendata"> A Sezione</span></label>
+                                                <input name="offsetsez" type="text" style="width: 80px;" id="maxsez" value="18">
+                                        </div>
+                                </fieldset>
               <fieldset>
                 <legend>Formato documento</legend>
@@ -117 +135 @@
           <?php // foreach($arval as $val) echo "<input type=\"hidden\" name=\"".$val[0]."\" value=\"".$val[1]."\">"; ?>
           <input type="hidden" name="pdf" value="1">
-        </form>
       </div>
       <div class="modal-footer">
@@ -124 +141 @@
       </div>
     </div>
+    </form>
   </div>
 </div>

trunk/client/versione.php

@@ -1 +1 @@
 <?php
-$versione = "3.0 rev 454";
+$versione = "3.0 rev 455";
 $version_number = $versione;
-$datarel = "05 aprile 2025";
+$datarel = "06 aprile 2025";
 $version = "Eleonline $version_number (<i>Data Release: $datarel</i>)";