Changeset 289 for trunk/admin/modules/Elezioni/ele_controlli.php

Timestamp:

Apr 24, 2019, 11:18:11 PM (6 years ago)

Author:

roby

Message:

 

File:

• trunk/admin/modules/Elezioni/ele_controlli.php (modified) (2 diffs)

trunk/admin/modules/Elezioni/ele_controlli.php

@@ -242 +242 @@
                 ##############################
         $err=0; $err2=0;
+        $sql="SELECT preferenze,disgiunto,solo_gruppo FROM ".$prefix."_ele_cons_comune where id_cons='$id_cons'";
+        $res = $dbi->prepare("$sql");
+        $res->execute();
+        list($prefs,$disg,$solog)=$res->fetch(PDO::FETCH_NUM);
         if($id_lista){
-                $sql="SELECT preferenze FROM ".$prefix."_ele_cons_comune where id_cons='$id_cons'";
-                $res = $dbi->prepare("$sql");
-                $res->execute();
-                list($prefs)=$res->fetch(PDO::FETCH_NUM);
                 $sql="select voti from ".$prefix."_ele_voti_lista where id_lista='$id_lista' and id_sez='$id_sez'";
                 $res = $dbi->prepare("$sql");
@@ -294 +294 @@
                 }
                 if ($validil+$contestatil+$nullil+$totsg!=$votiv and $validil+$contestatil+$nullil+$solol>0) $err=1;
-                if($tnl!=$nullil || $totsl!=$solol) $err=1;
+                if(($solog && !$disg && $tnl!=$nullil) || $totsl!=$solol) $err=1;
         }