Changeset 462 for trunk

Timestamp:

May 7, 2025, 10:04:55 AM (7 months ago)

Author:

roby

Message:

• ADMIN

-- Sistemata la gestione dei documenti per la trasparenza

• CLIENT -> tema bootstrap

-- sistemato il controllo per richiesta di comuni o consultazioni inesistenti
-- riviste le stampe di affluenze e votanti
-- corretta la visualizzazione del facsimile

Location:

trunk/client/temi/bootstrap

Files:

• index.php (modified) (3 diffs)
• pagine/contenuto.php (modified) (1 diff)
• pagine/referendum_risultati.php (modified) (2 diffs)
• pagine/votanti.php (modified) (1 diff)
• query.php (modified) (5 diffs)

trunk/client/temi/bootstrap/index.php

@@ -1 +1 @@
 <?php
 // dati per top header 
-global $dbi,$prefix,$id_comune,$id_cons_gen,$id_cons,$circo,$idcirc;
+global $dbi,$prefix,$id_comune,$id_cons_gen,$id_cons,$circo,$idcirc,$op;
 include(dirname(__FILE__).'/query.php');
 if(isset($_GET["id_cons_gen"])) $idcurcons=$_GET["id_cons_gen"]; else $idcurcons='';
@@ -12 +12 @@
                 $id_cons=$row[0][1];
                 $proiezione=$row[0][2];
+                unset($op);
         }
 }
@@ -19 +20 @@
         $id_cons=$row[0][1];
         $proiezione=$row[0][2];
+        unset($op);
 }else{
         $row=conscomune(0);

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

@@ -1 +1 @@
 <?php 
-if(isset($_GET['op'])) $pagina = intval($_GET['op']); else $pagina=0;
-
+if(isset($op) and $op!='gruppo') $pagina=$op;
+elseif(isset($_GET['op'])) $pagina = intval($_GET['op']); 
+else $pagina=0;
 switch ($pagina) {
     case 0:

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

@@ -64 +64 @@
                                                                                 <div>Scheda</div>
                                                                                 <?php
-                                                                                $facext=strtoupper(substr($val['prognome'],-4,null));
+                                                                                $facext=strtoupper(substr(stripslashes($val['prognome']),-4));
                                                                                 $presenza_facsimile= ($facext=='.PDF') ? 1:0;
 #                                                                               $presenza_facsimile = 1; // o 1 dinamico
@@ -75 +75 @@
                                                                                                 <div>Fac-simile</div>
                                                                                         </a>
-                                                                                <?php } else { ?>
+                                                                                <?php } else { ?>  
                                                                                         <img src="<?php echo $img_url; ?>" class="img-scheda" alt="scheda">
                                                                                 <?php } ?>

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

@@ -104 +104 @@
                         <?php
                         $totuomini=0;$totdonne=0;$totespressi=0;$totvalidi=0;$totnulli=0;$totbianchi=0;$totcontestati=0;
-                        $seztemp=elenco_sezioni(0);
+                        $row=elenco_sezioni(0);
                         $sezioni= array();
-                        foreach($seztemp as $sez) $sezioni[$sez['num_sez']]=$sez['id_sez'];
+                        foreach($row as $sez) $sezioni[$sez['num_sez']]=$sez['id_sez'];
                         if($genere==0)
                                 $voti=voti_referendum($id_gruppo);

trunk/client/temi/bootstrap/query.php

@@ -192 +192 @@
 function default_cons()
 {
-global $dbi,$prefix,$id_comune;
+global $dbi,$prefix,$id_comune,$id_cons_gen,$id_cons;
         $sql="SELECT id_cons FROM ".$prefix."_ele_comuni where id_comune='$id_comune' ";
         $sth = $dbi->prepare("$sql");
@@ -199 +199 @@
         if(!$sth->rowCount())
         {
-                $sql="SELECT site_istat FROM ".$prefix."_config";
+                $sql="SELECT siteistat FROM ".$prefix."_config";
                 $sth = $dbi->prepare("$sql");
                 $sth->execute();
@@ -209 +209 @@
                 if(!$id_cons_pred)
                 {
-                        $sql="SELECT id_cons FROM ".$prefix."_ele_cons_comune where chiusa<'2' order by id_cons desc limit 0,1";
+                        $sql="SELECT id_cons FROM ".$prefix."_ele_cons_comune where id_comune='$id_comune' and chiusa<'2' order by id_cons desc limit 0,1";
                         $sth = $dbi->prepare("$sql");
                         $sth->execute();
@@ -221 +221 @@
                 $sth->execute();
                 $row = $sth->fetchAll();
+                $id_cons_gen=$row[0][0];
+                $id_cons=$row[0][1];
                 if(count($row))
                         return($row);
@@ -228 +230 @@
         $sth->execute();
         $row = $sth->fetchAll();
+        $id_cons_gen=$row[0][0];
+        $id_cons=$row[0][1];
         return ($row);  
 }