Changeset 294 for trunk

Timestamp:

May 1, 2019, 11:51:25 AM (6 years ago)

Author:

roby

Message:

 

Location:

trunk

Files:

• admin/modules/Elezioni/ele_voti.php (modified) (1 diff)
• client/modules/Elezioni/index.php (modified) (2 diffs)

trunk/admin/modules/Elezioni/ele_voti.php

@@ -677 +677 @@
 
 
-                $sql="select t1.* from ".$prefix."_ele_candidati as t1 left join ".$prefix."_ele_lista as t2 on (t1.id_lista=t2.id_lista) WHERE t1.id_cons=$id_cons and t1.id_cons=t2.id_cons $ele_lista $circo ORDER BY t2.num_lista,t1.num_cand";
+if($id_lista)           $sql="select t1.* from ".$prefix."_ele_candidati as t1 left join ".$prefix."_ele_lista as t2 on (t1.id_lista=t2.id_lista) WHERE t1.id_cons=$id_cons and t1.id_cons=t2.id_cons $ele_lista $circo ORDER BY t2.num_lista,t1.num_cand";
+else $sql="select 0,'$id_cons',t1.id_lista,'','','','','',0 from ".$prefix."_ele_candidati as t1 left join ".$prefix."_ele_lista as t2 on (t1.id_lista=t2.id_lista) WHERE t1.id_cons=$id_cons and t1.id_cons=t2.id_cons $ele_lista $circo ORDER BY t2.num_lista";
 $result = $dbi->prepare("$sql");
 $result->execute();

trunk/client/modules/Elezioni/index.php

@@ -1041 +1041 @@
                  list($descr_gruppo)=$res_gruppo->fetch(PDO::FETCH_NUM);
                 
-                 }
-  
+                 }else{
+                  $sql="select descrizione  from ".$prefix."_ele_lista where id_lista='$id_lista'";
+        $res_gruppo = $dbi->prepare("$sql");
+        $res_gruppo->execute();
+
+                 list($descr_gruppo)=$res_gruppo->fetch(PDO::FETCH_NUM);
+
+                }
   // numero sezioni scrutinate, escluse circorscrizioni (da aggiungere)
                 if ($circo!=1){
@@ -1050 +1056 @@
                         $res1->execute();
 
-                        $numero=mysql_num_rows($res1);
+                        $numero=$res1->rowCount();
                         $sql="select max(num_sez)  from ".$prefix."_ele_sezioni where id_cons='$id_cons'";
                         $res2 = $dbi->prepare("$sql");