Changeset 216 for trunk

Timestamp:

May 22, 2014, 6:46:40 PM (11 years ago)

Author:

roby

Message:

admin: completamento delle modifiche in rev 215 - sistemazione indicazioni di stato della sezione

Location:

trunk

Files:

• admin/modules/Elezioni/ele_voti.php (modified) (3 diffs)
• admin/versione.php (modified) (1 diff)
• client/versione.php (modified) (1 diff)

trunk/admin/modules/Elezioni/ele_voti.php

@@ -173 +173 @@
                                                 $res3 = mysql_query("$query", $dbi);
                                                 $testcand=0;
+                                                $tutte=1;
                                                 while(list($testlista)=mysql_fetch_row($res3)){
                                                         $res4= mysql_query("SELECT sum(voti) FROM ".$prefix."_ele_voti_lista where id_cons='$id_cons' and id_sez='$id_sez' and id_lista='$testlista'", $dbi);
@@ -180 +181 @@
                                                         $res4= mysql_query("SELECT preferenze FROM ".$prefix."_ele_cons_comune where id_cons='$id_cons'", $dbi);
                                                         if($res4) list($testpref)=mysql_fetch_row($res4); else $testpref=0;
+                                                        $res4= mysql_query("SELECT count(0) FROM ".$prefix."_ele_voti_candidati as t1 left join ".$prefix."_ele_candidati as t2 on t1.id_cand=t2.id_cand where t1.id_cons='$id_cons' and  t1.id_sez='$id_sez' and t2.id_lista='$testlista'", $dbi);
+                                                        list($contains)=mysql_fetch_row($res4);
+                                                        if($contains==0) $tutte=0;
+
                                                         if(($testvotil*$testpref)<$testvotic) { $testcand=1;break;}
                                                 }
                                                 if($genere==4 or $votog) $contestatilista=0;
                                                 if (($votils+$sologruppo+$contestatilista+$votinullilista)==($validi+$sololista) and $validilista==$votils and $testcand==0)
-                                                        {$status=1;$ops=-3;}
+                                                        {$status=$tutte;$ops=-3;}
                                                 else {return 3;}
                                         } #else return 0;
@@ -587 +592 @@
                         list($ctrvoticand)=mysql_fetch_row($result);
                         $result = mysql_query("SELECT sum(t1.voti) from ".$prefix."_ele_voti_candidati as t1 left join ".$prefix."_ele_candidati as t2 on (t1.id_cand=t2.id_cand) where t1.id_sez=$id_sez and t2.id_lista=$id_rif",$dbi);
-                        $ctrvoticand=mysql_num_rows($result);
                         list($votisezcand)=mysql_fetch_row($result);
                         if(($fascia>$limite or !$id_conf) or $genere==4)

trunk/admin/versione.php

@@ -1 +1 @@
 <?php
-$versione="2.0 rev 215";
+$versione="2.0 rev 216";
 ?> 

trunk/client/versione.php

@@ -1 +1 @@
 <?php
-$versione="2.0 rev 215";
+$versione="2.0 rev 216";
 ?>