Changeset 208 for trunk/admin

Timestamp:

May 11, 2014, 12:49:20 AM (11 years ago)

Author:

roby

Message:

admin: altre modifiche per gestione fasce
tabella di riepilogo, voti di lista per comuni con sistema maggioritario
autorizzazione comuni, correzione legge in modifica

client: correzione in dati generali

Location:

trunk/admin

Files:

• modules/Elezioni/ele_associazioni.php (modified) (1 diff)
• modules/Elezioni/ele_riepilogo.php (modified) (2 diffs)
• modules/Elezioni/ele_voti.php (modified) (1 diff)
• versione.php (modified) (1 diff)

trunk/admin/modules/Elezioni/ele_associazioni.php

@@ -188 +188 @@
                 while(list($id,$descr_conf)=mysql_fetch_row($rescomu)){
                         $sel='';
-                        if ($idcomune and $id == $id_conf) $sel="selected"; elseif ($id==1) $sel="selected";
+                        if ($idcomune and $id == $id_conf) $sel="selected"; 
                         echo "<option value=\"$id\" $sel>$descr_conf";
                 }

trunk/admin/modules/Elezioni/ele_riepilogo.php

@@ -47 +47 @@
         list($totm,$totf) = mysql_fetch_row($res);
         $totel=$totm+$totf;
-        $res = mysql_query("SELECT data,orario FROM `soraldo_ele_rilaff` where id_cons_gen=$id_cons_gen order by data desc, orario desc limit 0,1", $dbi);
+        $res = mysql_query("SELECT data,orario FROM ".$prefix."_ele_rilaff where id_cons_gen=$id_cons_gen order by data desc, orario desc limit 0,1", $dbi);
         list($giorno,$ora)=mysql_fetch_row($res);
         $res = mysql_query("SELECT sum(voti_donne),sum(voti_uomini),sum(voti_complessivi) FROM ".$prefix."_ele_voti_parziale where id_cons='$id_cons' and data='$giorno' and orario='$ora'", $dbi);
@@ -66 +66 @@
         if ($genere==5 and !$votog) {
         $totnullil=$nullilista+$contestatilista;
+        $id_conf=0;
+        $res = mysql_query("SELECT t1.id_conf,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($res) list($id_conf,$fascia,$limite) = mysql_fetch_row($res);
+        if ($id_conf and $fascia<=$limite) {
         echo "<fieldset><legend>"._VOTI_LISTA."</legend>";
+        echo "<table border=\"1\" width=\"100%\"><tr><th><b>"._VALIDI."</b></th><th>"._NULLI."</th><th>"._BIANCHI."</th><th>"._CONTESTATI."</th><th>"._VOTINULLI."</th><th>"._TOTNON."</th></TR>";
+        ECHO "<TR><TH>".number_format($validi,0,',','.')."</TH><TH>".number_format($nulli,0,',','.')."</TH><TH>".number_format($bianchi,0,',','.')."</TH><TH>".number_format($contestati,0,',','.')."</TH><TH>".number_format($votinulli,0,',','.')."</TH><TH>".number_format($totnulli,0,',','.')."</TH></TR></table><br/>";
+        ECHO "</fieldset><br/><br/><br/>";
+        }else{
+                echo "<fieldset><legend>"._VOTI_LISTA."</legend>";
         echo "<table border=\"1\" width=\"100%\"><tr><th>"._VALIDI."</th><th>"._VOTINULLI."</th><th>"._CONTESTATI."</th>";
         // if ($genere==5 and !$votog)
                 echo "<th>"._SOLO_GRUPPO."</th>";
         echo "<th>"._TOTNON."</th></TR>";
-        ECHO "<TR><TH>".number_format($validilista,0,',','.')."</TH><TH>".number_format($nullilista,0,',','.')."</TH><TH>".number_format($contestatilista,0,',','.')."</TH>";
+
+                ECHO "<TR><TH>".number_format($validilista,0,',','.')."</TH><TH>".number_format($nullilista,0,',','.')."</TH><TH>".number_format($contestatilista,0,',','.')."</TH>";
         if($genere==5 and !$votog)
                 echo "<TH>".number_format($sg,0,',','.')."</TH>";
         echo "<TH>".number_format($totnullil,0,',','.')."</TH></TR></table><br/>";
         ECHO "</fieldset>";
+        }
         }
         echo "</center>";

trunk/admin/modules/Elezioni/ele_voti.php

@@ -806 +806 @@
 
         if(!$votog) {
-           if ((($genere==3) OR ($genere==5)) and !$id_lista and ($fascia>$limite)) {
+           if ((($genere==3) OR ($genere==5)) and !$id_lista and ($fascia>$limite or !$id_conf)) {
                         $valista=$arg[$i++]; 
                         $result = mysql_query("update ".$prefix."_ele_sezioni set solo_gruppo='".$arg[$i]."' where id_sez='$id_sez'",$dbi);

trunk/admin/versione.php

@@ -1 +1 @@
 <?php
-$versione="2.0 rev 206";
+$versione="2.0 rev 208";
 ?>