Funciona el primer parlamento

Limenius · Nov 21, 2011 · d0a22cf · d0a22cf
1 parent 69973a8
commit d0a22cf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/loader2011.php b/loader2011.php
@@ -17,7 +17,7 @@ function uncommize($text){
 if (($handle = fopen("2011.csv", "r")) !== FALSE) {
     $data = fgetcsv($handle, 2000, ",");
     $num = count($data);
-    $provincia_num = 00;
+    $provincia_num = null;
     $rows_counter = 0;
     $partidos = array();
     for ($c=0; $c < $num; $c++) {
@@ -91,18 +91,23 @@ function uncommize($text){
     foreach ($provincias as $provincia) {
         $collection = $db->provincias2011;
         $collection->save($provincia);
-        $totalpp = $totalpp + $provincia['partido-popular-pp'];
-        echo $provincia['Provincia']." PP: ".$provincia['partido-popular-pp']." ".$totalpp."\n";
-        $totalpsoe = $totalpsoe + $provincia['partido-socialista-obrero-espa-ol-psoe'];
-        echo $provincia['Provincia']." PSOE: ".$provincia['partido-socialista-obrero-espa-ol-psoe']." ".$totalpsoe."\n";
-        if(isset($provincia['izquierda-unida-los-verdes-iu-lv'])){
-            $totaliu = $totaliu + $provincia['izquierda-unida-los-verdes-iu-lv'];
-            echo $provincia['Provincia']." IU: ".$provincia['izquierda-unida-los-verdes-iu-lv']." ".$totaliu."\n";
-        }
-        if(isset($provincia['uni-oacute-n-progreso-y-democracia-upyd'])){
-            $totalupyd = $totalupyd + $provincia['uni-oacute-n-progreso-y-democracia-upyd'];
-            echo $provincia['Provincia']." UPyD: ".$provincia['uni-oacute-n-progreso-y-democracia-upyd']." ".$totalupyd."\n";
-        }
+        echo $provincia['Provincia']."\n";
+
+        //$totalpp = 0;
+        //$totalpsoe = 0;
+        //$totaliu = 0;
+        //$totalupyd = $totalpp + $provincia['partido-popular-pp'];
+        //echo $provincia['Provincia']." PP: ".$provincia['partido-popular-pp']." ".$totalpp."\n";
+        //$totalpsoe = $totalpsoe + $provincia['partido-socialista-obrero-espa-ol-psoe'];
+        //echo $provincia['Provincia']." PSOE: ".$provincia['partido-socialista-obrero-espa-ol-psoe']." ".$totalpsoe."\n";
+        //if(isset($provincia['izquierda-unida-los-verdes-iu-lv'])){
+        //    $totaliu = $totaliu + $provincia['izquierda-unida-los-verdes-iu-lv'];
+        //    echo $provincia['Provincia']." IU: ".$provincia['izquierda-unida-los-verdes-iu-lv']." ".$totaliu."\n";
+        //}
+        //if(isset($provincia['uni-oacute-n-progreso-y-democracia-upyd'])){
+        //    $totalupyd = $totalupyd + $provincia['uni-oacute-n-progreso-y-democracia-upyd'];
+        //    echo $provincia['Provincia']." UPyD: ".$provincia['uni-oacute-n-progreso-y-democracia-upyd']." ".$totalupyd."\n";
+        //}
     }
     fclose($handle);
 }

diff --git a/web/js/le.js b/web/js/le.js
@@ -983,7 +983,8 @@ $(document).ready(function(){
                 $('#notes2').fadeIn(1500);
 
             });
-            this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
+            //this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
+            this.parliament = this.paper.g.parliament(625, 460, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
             var that = this;
 
             this.advance = function(){ return AppRouter.navigate("!votosescaño", true);};