Changeset 356 for trunk/client/modules/Elezioni

Timestamp:

Sep 28, 2021, 10:33:21 PM (3 years ago)

Author:

roby

Message:

 

Location:

trunk/client/modules/Elezioni

Files:

• blocchi/app_android.php (deleted)
• blocchi/bar_affluenze.php (deleted)
• blocchi/myrss.php (deleted)
• blocchi/off_Votanti.php (deleted)
• blocchi/translation.php (deleted)
• gruppo.php (modified) (7 diffs)

trunk/client/modules/Elezioni/gruppo.php

@@ -172 +172 @@
                 }
                 $condcirc='';
+                $condcircns="";
                 if ($circo){ //gestione circoscrizionali
                         if(!$id_circ){
@@ -186 +187 @@
                         list($num_circ)=$res_cir->fetch(PDO::FETCH_NUM);
                         $condcirc="and id_circ=$id_circ";  //variabile aggiunta nelle select per le circ.
+                        $condcircns="and t2.id_circ=$id_circ";                  
                         $sql="SELECT count(t1.num_sez),min(t1.num_sez),max(t1.num_sez) from ".$prefix."_ele_sezioni as t1, ".$prefix."_ele_sede as t2 where t1.id_cons=$id_cons and t1.id_sede=t2.id_sede and t2.id_circ=$id_circ";
                         $res_sez = $dbi->prepare("$sql");
@@ -197 +199 @@
                 }
                 elseif (strstr( $op,'circo')){
-                        $sql="SELECT count(num_circ),min(num_circ),max(num_circ) from ".$prefix."_ele_circoscrizione where id_cons=$id_cons";
+                        $sql="SELECT count(num_circ),min(num_circ),max(num_circ) from ".$prefix."_ele_circoscrizione where id_cons=$id_cons  $condcirc";
                         $res_sez = $dbi->prepare("$sql");
                         $res_sez->execute();
                 }
                 else{
-                        $sql="SELECT count(num_sez),min(num_sez),max(num_sez) from ".$prefix."_ele_sezioni where id_cons=$id_cons";
+                        $sql="SELECT count(num_sez),min(num_sez),max(num_sez) from ".$prefix."_ele_sezioni where id_cons=$id_cons $condcirc";
                         $res_sez = $dbi->prepare("$sql");
                         $res_sez->execute();
@@ -208 +210 @@
                 if($res_sez->rowCount()) list($tot_sez,$numsezmin,$numsezmax)=$res_sez->fetch(PDO::FETCH_NUM); 
                 else {$tot_sez=0;$numsezmin=0;$numsezmax=0;}
-                $sql="SELECT count(num_sez) from ".$prefix."_ele_sezioni where id_cons=$id_cons";
+                $sql="SELECT count(t1.num_sez) from ".$prefix."_ele_sezioni as t1 left join ".$prefix."_ele_sede as t2 on t1.id_sede=t2.id_sede where t1.id_cons=$id_cons $condcircns";
                 $res_sez = $dbi->prepare("$sql");
                 $res_sez->execute();
@@ -276 +278 @@
                         // dei voti di lista...oltre naturalmnte alle condizioni messe in variabile
                         // 4 aprile 2006 by luc
+#echo "TEST; Condizione scelta lista/gruppo: if ($votog && $tab==gruppo)<br>circo: $circo -- condcirc: $condcirc<br>";
+                        $tabns=$tab;
                         if ($votog && $tab=="gruppo"){ // camera e senato 2006
                                 $t="t9";
                                 $tab="lista";
+                                $tabns=$tab;
                                 $tab15="gruppo";
                                 $add_1= ",".$prefix."_ele_gruppo as t9";
@@ -288 +293 @@
                                 $and_1='';
                         }
+                        if(($genere==5 and $circo)) $condcircns="and ".$prefix."_ele_$tabns.id_circ=$id_circ";  else $condcircns="";
                         // fine della modifica
-                         
-                        $sql="SELECT count(id_sez) from ".$prefix."_ele_voti_$tab15 where id_cons='$id_cons' group by id_$tab15"; 
+                        $sql="SELECT count(".$prefix."_ele_voti_$tabns.id_sez) from ".$prefix."_ele_voti_$tabns left join ".$prefix."_ele_$tabns on ".$prefix."_ele_voti_$tabns.id_$tabns=".$prefix."_ele_$tabns.id_$tabns where ".$prefix."_ele_voti_$tabns.id_cons='$id_cons' $condcircns group by ".$prefix."_ele_voti_$tabns.id_$tabns"; 
+//echo "TEST:   numero sezioni scrutinate: $sql";                
                         $res_scr = $dbi->prepare("$sql");
                         $res_scr->execute();
@@ -503 +509 @@
                         if (!$csv){
                                 echo "<h5> Sezioni scrutinate";
-                                if ($tipo_cons!=4) echo ": $tot_scr su $tuttelesez &nbsp;&nbsp;&nbsp;  ";
+                                if ($tipo_cons!=4) ;echo ": $tot_scr su $tuttelesez &nbsp;&nbsp;&nbsp;  ";
                                 echo "</h5>&nbsp;";
                         }