Changeset 217 for trunk

Timestamp:

May 23, 2014, 9:40:17 AM (11 years ago)

Author:

roby

Message:

admin: perfezionamento della rev 216

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

@@ -157 +157 @@
                         }
                 }
-                $res4= mysql_query("SELECT t1.preferenze,t1.id_fascia,t2.limite FROM ".$prefix."_ele_cons_comune as t1 left join ".$prefix."_ele_conf on t1.id_conf=t2.id_conf where t1.id_cons='$id_cons'", $dbi);
+                $res4= mysql_query("SELECT t1.preferenze,t1.id_fascia,t2.limite FROM ".$prefix."_ele_cons_comune as t1 left join ".$prefix."_ele_conf as t2 on t1.id_conf=t2.id_conf where t1.id_cons='$id_cons'", $dbi);
                 if($res4) list($testpref,$fascia,$limite)=mysql_fetch_row($res4); else {$testpref=0;$fascia=0;$limite=0;}
 
@@ -186 +186 @@
 
                                                         if(($testvotil*$testpref)<$testvotic) { $testcand=1;break;}
+                                                        $res4= mysql_query("SELECT 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_cons='$id_cons' and  t1.id_sez='$id_sez' and t2.id_lista='$testlista'", $dbi);
+                                                        while(list($testvotic)=mysql_fetch_row($res4))
+                                                                if($testvotil<$testvotic) { $testcand=1;break;}
                                                 }
                                                 if($genere==4 or $votog) $contestatilista=0;
@@ -606 +609 @@
                         elseif($ctrvoticand)
                                 $segna="style=\"background-color: #99CC33;\"";
-
-
-
-
-
-
+                        $res4= mysql_query("SELECT 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_cons='$id_cons' and  t1.id_sez='$id_sez' and t2.id_lista='$id_rif'", $dbi);
+                        while(list($testvotic)=mysql_fetch_row($res4))
+                                if($votisezlis<$testvotic) { $segna="style=\"background-color: #dd0000;\"";}
+                        
                         $sel = ($id_rif == $id_lista) ? "selected" : "";
                                 echo "<option $segna value=\"$id_rif\" $sel>";

trunk/admin/versione.php

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

trunk/client/versione.php

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