Changeset 289 for trunk

Timestamp:

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

Author:

roby

Message:

 

Location:

trunk/admin/modules/Elezioni

Files:

• ele_controlli.php (modified) (2 diffs)
• ele_voti.php (modified) (3 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;
         }
 

trunk/admin/modules/Elezioni/ele_voti.php

@@ -834 +834 @@
 /////////////////////////////////////////////
 
-function rec_voti() {
+function rec_votibak() {
         global $prefix, $dbi,$aid,$id_cons,$ops,$genere,$votog,$fileout,$id_comune,$limite,$update,$dettnulli,$disgiunto,$tipo_cons;
         
@@ -1294 +1294 @@
 ///////////////////////////
 
-function rec_finale() {
+function rec_finalebak() {
 global $prefix, $dbi,$aid,$id_cons,$fileout,$genere,$votog;
 
@@ -1733 +1733 @@
 ///////////////////////////
 
-function rec_voti_gruppi() {
+function rec_voti_gruppibak() {
 global $prefix, $dbi,$aid, $tipo_cons, $genere,$id_cons,$ops,$fileout,$dettnulli;
 if ($fileout) while (!$fp = fopen($fileout,"a"));