Changeset 208 for trunk


Ignore:
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
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/modules/Elezioni/ele_associazioni.php

    r199 r208  
    188188                while(list($id,$descr_conf)=mysql_fetch_row($rescomu)){
    189189                        $sel='';
    190                         if ($idcomune and $id == $id_conf) $sel="selected"; elseif ($id==1) $sel="selected";
     190                        if ($idcomune and $id == $id_conf) $sel="selected";
    191191                        echo "<option value=\"$id\" $sel>$descr_conf";
    192192                }

  • trunk/admin/modules/Elezioni/ele_riepilogo.php

    r174 r208  
    4747        list($totm,$totf) = mysql_fetch_row($res);
    4848        $totel=$totm+$totf;
    49         $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);
     49        $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);
    5050        list($giorno,$ora)=mysql_fetch_row($res);
    5151        $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);
    … …  
    6666        if ($genere==5 and !$votog) {
    6767        $totnullil=$nullilista+$contestatilista;
     68        $id_conf=0;
     69        $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);
     70        if($res) list($id_conf,$fascia,$limite) = mysql_fetch_row($res);
     71        if ($id_conf and $fascia<=$limite) {
    6872        echo "<fieldset><legend>"._VOTI_LISTA."</legend>";
     73        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>";
     74        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/>";
     75        ECHO "</fieldset><br/><br/><br/>";
     76        }else{
     77                echo "<fieldset><legend>"._VOTI_LISTA."</legend>";
    6978        echo "<table border=\"1\" width=\"100%\"><tr><th>"._VALIDI."</th><th>"._VOTINULLI."</th><th>"._CONTESTATI."</th>";
    7079        // if ($genere==5 and !$votog)
    7180                echo "<th>"._SOLO_GRUPPO."</th>";
    7281        echo "<th>"._TOTNON."</th></TR>";
    73         ECHO "<TR><TH>".number_format($validilista,0,',','.')."</TH><TH>".number_format($nullilista,0,',','.')."</TH><TH>".number_format($contestatilista,0,',','.')."</TH>";
     82
     83                ECHO "<TR><TH>".number_format($validilista,0,',','.')."</TH><TH>".number_format($nullilista,0,',','.')."</TH><TH>".number_format($contestatilista,0,',','.')."</TH>";
    7484        if($genere==5 and !$votog)
    7585                echo "<TH>".number_format($sg,0,',','.')."</TH>";
    7686        echo "<TH>".number_format($totnullil,0,',','.')."</TH></TR></table><br/>";
    7787        ECHO "</fieldset>";
     88        }
    7889        }
    7990        echo "</center>";

  • trunk/admin/modules/Elezioni/ele_voti.php

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

  • trunk/admin/versione.php

    r206 r208  
    11<?php
    2 $versione="2.0 rev 206";
     2$versione="2.0 rev 208";
    33?>

  • trunk/client/modules/Elezioni/index.php

    r207 r208  
    249249       
    250250       
     251        // camera e senato con raggruppamenti
     252         $res3 = mysql_query("select * from ".$prefix."_ele_lista where id_cons='$id_cons' ",$dbi);
     253     $liste = mysql_num_rows($res3);
     254        if($liste and $genere!=4){
     255         echo "<td><b><a href=\"modules.php?name=Elezioni&amp;op=liste&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune\">"._LISTE."</a></b></td>";
     256        }
     257       
    251258       
    252259
    … …  
    268275        $gruppo = mysql_num_rows($res2);
    269276       
    270         // camera e senato con raggruppamenti
    271         if($votog){
    272          echo "<td><b><a href=\"modules.php?name=Elezioni&amp;op=liste&amp;id_cons_gen=$id_cons_gen&amp;id_comune=$id_comune\">"._LISTE."</a></b></td>";
    273          $res3 = mysql_query("select * from ".$prefix."_ele_lista where id_cons='$id_cons' ",$dbi);
    274          $liste = mysql_num_rows($res3);
    275         }
    276        
    277277        if($circo==1) $circo=$sedi;
    278278        $res4 = mysql_query("select sum(maschi),sum(femmine), sum(maschi+femmine)  from ".$prefix."_ele_sezioni where id_cons=$id_cons", $dbi);
    … …  
    286286        ."</td><td><b>$sez</b>"
    287287        ."</td><td><b>$gruppo</b>";
     288//        if ($tipo_cons >9) echo"</td><td><b>$liste</b>";
     289        if ($liste and $genere!=4) echo"</td><td><b>$liste</b>";
    288290
    289291        if ($genere>2 && !$votoc) echo"</td><td><b>$candi</b>";
    290292       
    291 //        if ($tipo_cons >9) echo"</td><td><b>$liste</b>";
    292         if ($votog) echo"</td><td><b>$liste</b>";
    293293        echo "</td></tr></table>";
    294294        //CloseTable();

  • trunk/client/versione.php

    r206 r208  
    11<?php
    2 $versione="2.0 rev 206";
     2$versione="2.0 rev 208";
    33?>

  • trunk/install/sql/eleonline.sql

    r201 r208  
    886886/*!40000 ALTER TABLE `soraldo_ele_tipo` DISABLE KEYS */;
    887887LOCK TABLES `soraldo_ele_tipo` WRITE;
    888 INSERT INTO `soraldo_ele_tipo` VALUES (1,'PROVINCIALI','it',3,'0','0','0','0'),(2,'REFERENDUM','it',0,'0','0','0','0'),(3,'COMUNALI','it',5,'0','0','0','0'),(4,'CIRCOSCRIZIONALI','it',5,'0','0','0','1'),(5,'BALLOTTAGGIO COMUNALI','it',1,'0','0','0','0'),(6,'CAMERA','it',2,'0','0','0','0'),(7,'SENATO','it',2,'0','0','0','0'),(8,'EUROPEE','it',4,'0','0','0','0'),(9,'REGIONALI','it',5,'0','0','0','0'),(10,'SENATO CON GRUPPI','it',5,'1','0','1','0'),(11,'CAMERA CON GRUPPI','it',5,'1','0','1','0'),(12,'PROVINCIALI CON COLLEGI','it',3,'0','0','0','1'),(13,'BALLOTTAGGIO PROVINCIALI','it',1,'0','0','0','0'),(14,'EUROPEE CON COLLEGI','it',4,'0','0','0','1'),(15,'CAMERA CON GRUPPI E COLLEGI','it',5,'1','0','1','1'),(16,'SENATO CON GRUPPI E COLLEGI','it',5,'1','0','1','1'),(17,'REGIONALI CON COLLEGI','it',5,'0','0','0','1');
     888INSERT INTO `soraldo_ele_tipo` VALUES (1,'PROVINCIALI','it',3,'0','0','0','0'),(2,'REFERENDUM','it',0,'0','0','0','0'),(3,'COMUNALI','it',5,'0','0','0','0'),(4,'CIRCOSCRIZIONALI','it',5,'0','0','0','1'),(5,'BALLOTTAGGIO COMUNALI','it',1,'0','0','0','0'),(6,'CAMERA','it',2,'0','0','0','0'),(7,'SENATO','it',2,'0','0','0','0'),(8,'EUROPEE','it',4,'1','0','0','0'),(9,'REGIONALI','it',5,'0','0','0','0'),(10,'SENATO CON GRUPPI','it',5,'1','0','1','0'),(11,'CAMERA CON GRUPPI','it',5,'1','0','1','0'),(12,'PROVINCIALI CON COLLEGI','it',3,'0','0','0','1'),(13,'BALLOTTAGGIO PROVINCIALI','it',1,'0','0','0','0'),(14,'EUROPEE CON COLLEGI','it',4,'0','0','0','1'),(15,'CAMERA CON GRUPPI E COLLEGI','it',5,'1','0','1','1'),(16,'SENATO CON GRUPPI E COLLEGI','it',5,'1','0','1','1'),(17,'REGIONALI CON COLLEGI','it',5,'0','0','0','1');
    889889UNLOCK TABLES;
    890890/*!40000 ALTER TABLE `soraldo_ele_tipo` ENABLE KEYS */;
Note: See TracChangeset for help on using the changeset viewer.