Changeset 342 for trunk/client/modules/Elezioni

Timestamp:

Nov 18, 2020, 11:05:49 PM (4 years ago)

Author:

roby

Message:

Ulteriori adeguamenti per la rev 338

Location:

trunk/client/modules/Elezioni

Files:

• candidato.php (modified) (1 diff)
• index.php (modified) (5 diffs)
• menu.php (modified) (1 diff)

trunk/client/modules/Elezioni/candidato.php

@@ -136 +136 @@
         
         
-        while(list($id_cand,$id_cons2,$id_lista, $cognome, $nome, $note,, $num_cand) = $result->fetch(PDO::FETCH_NUM)) {
+        while(list($id_cand,$id_cons2,$id_lista, $numlista, $cognome, $nome, $note,, $num_cand) = $result->fetch(PDO::FETCH_NUM)) {
         if ($circo=="1") $circos=" and id_circ='$id_circ'";else $circos='';// per circosc 5-06
                 // dati lista

trunk/client/modules/Elezioni/index.php

@@ -1062 +1062 @@
                                 }
                                         if ($votog)
-                                                        $sql="select id_sez from ".$prefix."_ele_voti_candidati where id_lista in (select id_lista from ".$prefix."_ele_lista where id_cons='$id_cons' $sqlcir) group by id_sez ";
+                                                        $sql="select t1.id_sez from ".$prefix."_ele_voti_candidati as t1 left join ".$prefix."_ele_candidati as t2 on t1.id_cand=t2.id_cand where t2.id_lista in (select id_lista from ".$prefix."_ele_lista where id_cons='$id_cons' $sqlcir) group by t1.id_sez ";
                                         else
                                                         $sql="select id_sez from ".$prefix."_ele_voti_lista where id_lista in (select id_lista from ".$prefix."_ele_lista where id_cons='$id_cons' $sqlcir) group by id_sez ";
-
                                         $res1 = $dbi->prepare("$sql");
                                         $res1->execute();
@@ -1149 +1148 @@
 // funzione visualizzazione delle liste per camera e senato con raggruppamenti/coalizioni
 function liste(){
-global $id_cons,$id_cons_gen,$prefix,$dbi,$min,$offset,$op,$tipo_cons,$prev,$next,$votog,$votol,$circo,$genere,$id_comune;
+global $id_cons,$id_cons_gen,$prefix,$dbi,$min,$offset,$op,$tipo_cons,$prev,$next,$votog,$votol,$circo,$genere,$id_comune,$id_circ;
 //dati();
 $offset=10;
@@ -1155 +1154 @@
 
 // numero sezioni scrutinate sul gruppo
-        if ($circo) $circos = "and id_circ=$id_circ" ; else $circos='';
-        if ($genere==0) $tab="ref"; else $tab="gruppo";
-        $sql="select *  from ".$prefix."_ele_voti_".$tab." where id_cons='$id_cons'  $circos group by id_sez ";
-        $res = $dbi->prepare("$sql");
-        $res->execute();
-
+        if ($circo) $circos = "and t2.id_circ=$id_circ" ; else $circos='';
+        if ($genere==0) {
+                $sql="select *  from ".$prefix."_ele_voti_ref where id_cons='$id_cons' group by id_sez ";
+        }else{
+                $sql="select t1.*  from ".$prefix."_ele_voti_gruppo as t1 left join ".$prefix."_ele_gruppo as t2 on t1.id_gruppo=t2.id_gruppo where t2.id_cons='$id_cons'  $circos group by t1.id_sez ";
+        }
+        $res = $dbi->prepare("$sql");
+        $res->execute();
         $numero=$res->rowCount();
-        $sql="select *  from ".$prefix."_ele_sezioni where id_cons='$id_cons' $circos ";
+        $sql="select t1.*  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();
 
         $sezioni=$res->rowCount();
-        $sql="select chiusa  from ".$prefix."_ele_cons_comune where id_cons='$id_cons' $circos ";
+        $sql="select chiusa  from ".$prefix."_ele_cons_comune where id_cons='$id_cons'";
         $res = $dbi->prepare("$sql");
         $res->execute();
@@ -1181 +1182 @@
         
         // tot liste
-                $sql="SELECT *  FROM ".$prefix."_ele_lista where id_cons='$id_cons'  ";
+                $sql="SELECT t2.*  FROM ".$prefix."_ele_lista as t2 where t2.id_cons='$id_cons' $circos ";
                 $res = $dbi->prepare("$sql");
                 $res->execute();
@@ -1194 +1195 @@
                 list($voti_lista_tutti) = $res_lista_tutti->fetch(PDO::FETCH_NUM);
                 
-                $sql="select id_cons ,id_lista ,id_gruppo, num_lista, descrizione  from ".$prefix."_ele_lista where id_cons='$id_cons'  ORDER BY num_lista  LIMIT $min,$offset";
+                $sql="select id_cons ,id_lista ,id_gruppo, num_lista, descrizione  from ".$prefix."_ele_lista as t2 where id_cons='$id_cons' $circos ORDER BY num_lista  LIMIT $min,$offset";
                 $result = $dbi->prepare("$sql");
                 $result->execute();

trunk/client/modules/Elezioni/menu.php

@@ -175 +175 @@
                 echo "<option value=\"\" >----- "._RISULTATI."</option>"; 
                 $temp = array('gruppo_circo'=>'','gruppo_sezione'=>'','lista_circo'=>'','lista_sezione'=>'','candidato_circo'=>'','candidato_sezione'=>'','consiglieri'=>'');
-                $temp[$op]='selected="selected"';
-                
-                if ($genere!=4) {
+                $temp[$op]='selected="selected"';       
+                if (!$votog) { 
                         if (!$circo and $num_circ>1)
                                 echo "<option value=\"gruppo_circo\" ".$temp['gruppo_circo'].">".substr(_GRUPPO." "._PER." "._CIRCO,0,33)."</option>";