Changeset 343 for trunk/client/modules/Elezioni/grafici.php

Timestamp:

Nov 19, 2020, 9:47:25 PM (4 years ago)

Author:

roby

Message:

segue modifiche della 338

File:

• trunk/client/modules/Elezioni/grafici.php (modified) (3 diffs)

trunk/client/modules/Elezioni/grafici.php

@@ -710 +710 @@
 
 function graf_candidato(){
-global $descr_com, $bgcolor1, $bgcolor5,$bgcolor5, $prefix, $dbi, $offset, $min,$descr_cons, $id_cons,$tipo_cons,$copy,$id_comune,$id_istat,$genere,$votog,$votol,$votoc,$circo,$siteistat;
+global $descr_com, $bgcolor1, $bgcolor5,$bgcolor5, $prefix, $dbi, $offset, $min,$descr_cons, $id_cons,$tipo_cons,$copy,$id_comune,$id_istat,$genere,$votog,$votol,$votoc,$circo,$siteistat,$id_circ;
 
 $logo=verificasimbolo(); // carica_logo da funzioni.php 
-
+if($circo) $circos=" and t2.id_circ='$id_circ'"; else $circos='';
                 $tab="ele_voti_candidati";
 
-                $sql="select *  from ".$prefix."_ele_voti_candidati where id_cons='$id_cons' group by id_sez ";
-        $res = $dbi->prepare("$sql");
-        $res->execute();
+                $sql="select id_sez  from ".$prefix."_ele_voti_candidati where id_sez in (select t1.id_sez from ".$prefix."_ele_sezioni as t1 left join ".$prefix."_ele_sede as t2 on t1.id_sede=t2.id_sede where t2.id_cons=$id_cons $circos) group by id_sez";
+                $res = $dbi->prepare("$sql");
+                $res->execute();
 
                 $numero=$res->rowCount();
-                $sql = "select *  from ".$prefix."_ele_sezioni where id_cons='$id_cons'";
+                $sql="select t1.id_sez from ".$prefix."_ele_sezioni as t1 left join ".$prefix."_ele_sede as t2 on t1.id_sede=t2.id_sede where t2.id_cons=$id_cons $circos";
                 $res = $dbi->prepare("$sql");
                 $res->execute();
@@ -733 +733 @@
                         echo "</td></tr></table>";
                         // tot voti
-                        $sql="select sum(voti)  from ".$prefix."_ele_voti_candidati where id_cons=$id_cons ";
+                        $sql="select sum(voti)  from ".$prefix."_ele_voti_candidati where id_sez in (select t1.id_sez from ".$prefix."_ele_sezioni as t1 left join ".$prefix."_ele_sede as t2 on t1.id_sede=t2.id_sede where t2.id_cons=$id_cons $circos)";
                         $res = $dbi->prepare("$sql");
                         $res->execute();
@@ -741 +741 @@
 
                         if ($genere==4){
-                                $scelta="_ele_lista as t3 on (t1.id_lista=t3.id_lista)";
+                                $scelta="_ele_lista as t2 on (t1.id_lista=t2.id_lista)";
                         }else{
-                                $scelta="_ele_lista as t3 on (t1.id_lista=t3.id_lista)";
+                                $scelta="_ele_lista as t2 on (t1.id_lista=t2.id_lista)";
                         }
                         $i=0;
-                        $sql="select t1.id_lista,  t1.id_cand, t1.nome , t1.cognome, sum(t2.voti) as somma
+                        $sql="select t1.id_lista,  t1.id_cand, t1.nome , t1.cognome, sum(t3.voti) as somma
                                 from ".$prefix."_ele_candidati as t1
-                        left join ".$prefix."_ele_voti_candidati as t2 on (t1.id_cand=t2.id_cand)
+                        left join ".$prefix."_ele_voti_candidati as t3 on (t1.id_cand=t3.id_cand)
                                 left join ".$prefix.$scelta."
-                                where t1.id_cons='$id_cons'
-                                group by t2.id_cand
+                                where t1.id_cons='$id_cons' $circos
+                                group by t3.id_cand
                                  
                                 order by somma desc