Changeset 209 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_voti.php (modified) (2 diffs)
• versione.php (modified) (1 diff)

trunk/admin/modules/Elezioni/ele_voti.php

@@ -427 +427 @@
                 //$bgcolor1="#b0b0b0";
 #               echo "<hr><table border=\"0\" width=\"60%\"  align=\"center\"><tr>";
+                echo "<hr><table><tr><td  width=\"200\"><font size =\"4\" color=\"black\" align=\"left\"><b>Sezione N. $num_sez</b></font size></td><td><table><tr>";
+                echo "\n<td bgcolor=\"$bgcolor1\" align=\"center\"><p style=\"margin-left:10px;margin-right:10px;\"><b><a href=\"admin.php?op=voti&amp;id_cons_gen=$id_cons_gen&amp;id_sez=$id_sez&amp;id_circ=$id_circ&amp;id_sede=$id_sede&amp;do=spoglio&amp;ops=1\">"._AFFLUENZE."</a></b></p></td>\n";
+                if(!($genere==4) and !($votog)){ //if(!($genere==4) and !($tipo_cons==10 or $tipo_cons==11)){
+                        echo "<td bgcolor=\"$bgcolor1\" align=\"center\"><p style=\"margin-left:10px;margin-right:10px;\"><b><a href=\"admin.php?op=voti&amp;id_cons_gen=$id_cons_gen&amp;id_sez=$id_sez&amp;id_circ=$id_circ&amp;id_sede=$id_sede&amp;do=spoglio&amp;ops=4\">"._GRUPPO."</a></b></p></td>\n";
+                }
+                if(($genere>2 or $votog)){ //if(($genere>2 or $tipo_cons==10 or $tipo_cons==11)){
+                        echo "<td bgcolor=\"$bgcolor1\" align=\"center\"><p style=\"margin-left:10px;margin-right:10px;\"><b><a href=\"admin.php?op=voti&amp;id_cons_gen=$id_cons_gen&amp;id_sez=$id_sez&amp;id_circ=$id_circ&amp;id_sede=$id_sede&amp;do=spoglio&amp;ops=3\">"._PREFLISTA."</a></b></p></td>\n";
+                }
+                echo "</tr></table></td></tr></table><hr>\n";
+/*
+########################
                 echo "<hr><table class=\"table-menu\"><tr>";
                 echo "\n<td bgcolor=\"$bgcolor1\" align=\"center\"><b><a href=\"admin.php?op=voti&amp;id_cons_gen=$id_cons_gen&amp;id_sez=$id_sez&amp;id_circ=$id_circ&amp;id_sede=$id_sede&amp;do=spoglio&amp;ops=1\">"._AFFLUENZE."</a></b></td>\n";
@@ -435 +446 @@
                         echo "<td bgcolor=\"$bgcolor1\" align=\"center\"><b><a href=\"admin.php?op=voti&amp;id_cons_gen=$id_cons_gen&amp;id_sez=$id_sez&amp;id_circ=$id_circ&amp;id_sede=$id_sede&amp;do=spoglio&amp;ops=3\">"._PREFLISTA."</a></b></td>\n";
                 }
-                echo "</tr></table><hr>\n";
+                echo "</tr></table><hr>\n"; */
 //              echo "\n</td></tr></table>\n";
 #############

trunk/admin/versione.php

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