Changeset 324 for trunk/admin/modules

Timestamp:

Jun 20, 2019, 10:20:57 PM (5 years ago)

Author:

roby

Message:

 

Location:

trunk/admin/modules/Elezioni

Files:

• ele_controlli.php (modified) (1 diff)
• ele_voti.php (modified) (2 diffs)

trunk/admin/modules/Elezioni/ele_controlli.php

@@ -366 +366 @@
                                         $totsl+=$svl;
                                         $tnl+=$nl;
-                                        if(($votig+$svl)<($votil+$svg+$nl))
+                                        if(($votig+$svl)<($votil+$svg+$nl) and $disg)
                                         { $err=1; $tipo='lista'; break; }
                                 }

trunk/admin/modules/Elezioni/ele_voti.php

@@ -390 +390 @@
         global $aid, $prefix, $dbi, $id_lista,$genere,$id_cons_gen,$id_gruppo,$sezi,$circo,$votog,$votol,$votoc,$conscirc;
 global $tipo_cons,$limite,$dettnulli,$disgiunto;
-
 $bgcolor1="#7777ff";
 $bgcolor2=$_SESSION['bgcolor2'];
+
+if ($genere==4){
+        $sql="SELECT voti_uomini,voti_donne, voti_complessivi FROM ".$prefix."_ele_voti_parziale where id_sez='$id_sez' and id_cons='$id_cons' order by data desc,orario desc limit 0,1";
+        $result = $dbi->prepare("$sql");
+        $result->execute();
+
+
+        list( $voti_u, $voti_d, $voti_t) = $result->fetch(PDO::FETCH_NUM);
+        echo "<table  class=\"table-menu\" style=\"width: 50%; color: black;\">"
+        ."<tr><td></td><td align=\"center\"></td><td bgcolor=\"$bgcolor1\" align=\"center\">"._VOTIU."</td><td bgcolor=\"$bgcolor1\" align=\"center\">"._VOTID."</td><td bgcolor=\"$bgcolor1\" align=\"center\">"._VOTIT."</td></tr>"
+        ."<tr><td></td><td bgcolor=\"$bgcolor1\" align=\"center\">"._TOT_ULT."</td><td bgcolor=\"$bgcolor2\" align=\"center\">$voti_u</td><td align=\"center\" bgcolor=\"$bgcolor2\">$voti_d</td><td bgcolor=\"$bgcolor2\" align=\"center\">$voti_t</td></tr>";
+        echo "</table>";
+}
+$sql="select validi,nulli,bianchi,contestati from ".$prefix."_ele_sezioni where id_sez='$id_sez' ";
+$result = $dbi->prepare("$sql");
+$result->execute();
+list($v1,$v2,$v3,$v4)=$result->fetch(PDO::FETCH_NUM);
+if($v1+$v2+$v3+$v4>0){
     //controlla se sono stati inseriti i votanti
 $sql="SELECT preferenze, id_fascia, id_conf,solo_gruppo, disgiunto from ".$prefix."_ele_cons_comune where id_cons='$id_cons'";
@@ -830 +847 @@
                 echo "}\n";
                 echo "</script>\n";
-
+}
 #if (!((!$votog) and ($genere==3 OR $genere==5) and ($fascia>$limite)))
         finale($id_cons,$do,$id_circ,$id_sede,$id_sez,$ops);