Changeset 1395

Timestamp:

Sep 20, 2010, 3:25:12 AM (10 years ago)

Author:

roux

Message:

premiers essais pour la carte

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/api/actions/actions.class.php (modified) (1 diff)
• apps/frontend/modules/circonscription/templates/listSuccess.php (modified) (1 diff)
• bin/updateDB3.sh (modified) (1 diff)
• bin/update_tops.sh (added)
• web/css/xneth/style.css (modified) (2 diffs)
• web/images/france_deptmts.png (added)
• web/js/jquery.maphilight.min.js (modified) (1 diff)

cpc/trunk/project/apps/frontend/modules/api/actions/actions.class.php

@@ -23 +23 @@
   {
     $date = $request->getParameter('date');
-    $this->forward404Unless(preg_match('/(\d{4})\d{2}/', $date, $d));
+    $this->forward404Unless(preg_match('/(\d{2,4})-?\d{2}/', $date, $d));
+    $date = preg_replace('/-/', '', $date);
+    $date = preg_replace('/^(\d{2})(\d{2})$/', '20\\1\\2', $date);
+    $d[1] = preg_replace('/^(\d{2})$/', '20\\1', $d[1]);
     $vg = Doctrine::getTable('VariableGlobale')->findOneByChamp('stats_month_'.$d[1]);
     $top = unserialize($vg->value);

cpc/trunk/project/apps/frontend/modules/circonscription/templates/listSuccess.php

@@ -1 @@
-<h1 class="list_inter">Toutes les circonscriptions électorales</h1><?php 
-$sf_response->setTitle('Toutes les circonscriptions électorales'); ?>
-<h2>Carte des circonscriptions</h2>
-<p><?php CirconscriptionActions::echoCircoMap("full", 900, 0); ?></p>
-<h2>Liste des départements</h2>
-<div id="circo_table">
-<table>
-<tr><td><ul>
-<?php $div = floor(count($circos)/4)+1; $ct = 0; 
-foreach($circos as $num => $circo) 
-{
-  $ct++ ; 
+<h1 class="list_inter">Toutes les circonscriptions par département</h1><?php 
+$sf_response->setTitle('Toutes les circonscriptions électorales par département - NosDéputés.fr'); ?>
+<?php // CirconscriptionActions::echoCircoMap("full", 900, 0); ?>
+<div class="list_circo">
+<?php $div = floor(count($circos)/6)+1; $ct = 0; 
+foreach($circos as $num => $circo) {
+  $ct++;
   if (preg_match('/^\d$/', $num)) $num = sprintf("%02d",$num);
-  echo '<li>'.link_to($circo, '@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).' ('.strtoupper($num).')</li>';
-  if ($ct == $div || $ct == (2*$div) || $ct == (3*$div)) 
-    echo '</ul></td><td style="width:23%;"><ul>'; 
-  
+  echo '<p onclick="document.location=\''.url_for('@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'\'" class="dept" id="dep'.$num.'">'.link_to($circo, '@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'</p>';
+  if ($ct == 27)
+    break; 
 } ?>
-</ul></td></tr>
-</table>
 </div>
+<?php echo include_partial('circonscription/mapDeptmts', array()); ?>
+<div class="list_circo borderleft">
+<?php $ct = 0;
+foreach($circos as $num => $circo) {
+  $ct++;
+  if ($ct <= 27)
+    continue;
+  if (preg_match('/^\d$/', $num)) $num = sprintf("%02d",$num);
+  echo '<p onclick="document.location=\''.url_for('@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'\'" class="dept" id="dep'.$num.'">'.link_to($circo, '@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'</p>';
+  if ($ct == 55)
+    break; 
+} ?>
+</div>
+<div class="list_circo borderleft">
+<?php $ct = 0;
+foreach($circos as $num => $circo) {
+  $ct++;
+  if ($ct <= 55)
+    continue;
+  if (preg_match('/^\d$/', $num)) $num = sprintf("%02d",$num);
+  echo '<p onclick="document.location=\''.url_for('@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'\'" class="dept" id="dep'.$num.'">'.link_to($circo, '@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'</p>';
+  if ($ct == 66)
+    break;
+} ?>
+</div>
+<div class="list_circo borderleft">
+<?php $ct = 0;
+foreach($circos as $num => $circo) {
+  $ct++;
+  if ($ct <= 66)
+    continue;
+  if (preg_match('/^\d$/', $num)) $num = sprintf("%02d",$num);
+  echo '<p onclick="document.location=\''.url_for('@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'\'" class="dept" id="dep'.$num.'">'.link_to($circo, '@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'</p>';
+  if ($ct == 77)
+    break;
+} ?>
+</div>
+<div class="list_circo borderleft">
+<?php $ct = 0;
+foreach($circos as $num => $circo) {
+  $ct++;
+  if ($ct <= 77)
+    continue;
+  if (preg_match('/^\d$/', $num)) $num = sprintf("%02d",$num);
+  echo '<p onclick="document.location=\''.url_for('@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'\'" class="dept" id="dep'.$num.'">'.link_to($circo, '@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'</p>';
+  if ($ct == 88)
+    break;
+} ?>
+</div>
+<div class="list_circo borderleft">
+<?php $ct = 0;
+foreach($circos as $num => $circo) {
+  $ct++;
+  if ($ct <= 88)
+    continue;
+  if (preg_match('/^\d$/', $num)) $num = sprintf("%02d",$num);
+  echo '<p onclick="document.location=\''.url_for('@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'\'" class="dept" id="dep'.$num.'">'.link_to($circo, '@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'</p>';
+  if ($ct == 96)
+    break;
+} ?>
+</div>
+<div class="list_circo borderleft">
+<h3 class="align_center">DOM-TOMs&nbsp;:</h3>
+<?php $ct = 0;
+foreach($circos as $num => $circo) {
+  $ct++;
+  if ($ct <= 96)
+    continue;
+  if (preg_match('/^\d$/', $num)) $num = sprintf("%02d",$num);
+  echo '<p onclick="document.location=\''.url_for('@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'\'" class="dept" id="dep'.$num.'">'.link_to($circo, '@list_parlementaires_departement?departement='.preg_replace('/ /', '_', $circo)).'</p>';
+ } ?>
+</div>
+

cpc/trunk/project/bin/updateDB3.sh

@@ -129 +129 @@
 
 php symfony top:Deputes
-for month in 06 07 08 09 10 11 12; do
-  php symfony top:Deputes 2007-$month-01
-done
-for year in 2008 2009; do
-  for month in 01 02 03 04 05 06 07 08 09 10 11 12; do
-    php symfony top:Deputes $year-$month-01
-  done
-done
-for month in 01 02 03 04 05 06 07 08 09; do
-  php symfony top:Deputes 2010-$month-01
-done
-
+bash bin/update_tops
 
 #bash bin/update_hardcache_all

cpc/trunk/project/web/css/xneth/style.css

@@ -1099 +1099 @@
 .carte_departement {
   float: right;
-  padding-top: 2px;
-  padding-right: 2px;
+  margin-top: 10px;
+  margin-right: 35px;
 }
 .didascalie {
@@ -1668 +1668 @@
 .list_circo {
   float: left;
-  margin-bottom: 30px;
-  width: 33%;
-}
+  margin-left: 15px;
+  width: 12%;
+  font-size: 12px;
+  text-align: center;
+}
+.dept {
+  padding: 2px;
+  text-align: center;
+}
+.dept:hover {
+  background-color: rgb(198,229,81);
+}
+
 .list_choix {
   text-align: center;

cpc/trunk/project/web/js/jquery.maphilight.min.js

@@ -1 +1 @@
 /* Modified by Gabriel Kerneis for the purpose of NosDeputes.fr */
-(function(C){var A,B,I,J,K,G,E,D,F,H;A=document.namespaces;has_canvas=document.createElement("canvas");has_canvas=has_canvas&&has_canvas.getContext;if(!(has_canvas||A)){C.fn.maphilight=function(){return this};return }if(has_canvas){E=function(M,N,L){if(N<=1){M.style.opacity=N;window.setTimeout(E,10,M,N+0.1,10)}};D=function(L){return Math.max(0,Math.min(parseInt(L,16),255))};F=function(L,M){return"rgba("+D(L.substr(0,2))+","+D(L.substr(2,2))+","+D(L.substr(4,2))+","+M+")"};B=function(L){var M=C('<canvas style="width:'+L.width+"px;height:"+L.height+'px;"></canvas>').get(0);M.getContext("2d").clearRect(0,0,M.width,M.height);return M};I=function(Q,M,L,P){var O,N=Q.getContext("2d");N.beginPath();if(M=="rect"){N.rect(L[0],L[1],L[2]-L[0],L[3]-L[1])}else{if(M=="poly"){N.moveTo(L[0],L[1]);for(O=2;O<L.length;O+=2){N.lineTo(L[O],L[O+1])}}else{if(M=="circ"){N.arc(L[0],L[1],L[2],0,Math.PI*2,false)}}}N.closePath();if(P.fill){N.fillStyle=F(P.fillColor,P.fillOpacity);N.fill()}if(P.stroke){N.strokeStyle=F(P.strokeColor,P.strokeOpacity);N.lineWidth=P.strokeWidth;N.stroke()}if(P.fade){E(Q,0)}};J=function(L,M){L.getContext("2d").clearRect(0,0,L.width,L.height)}}else{document.createStyleSheet().addRule("v\\:*","behavior: url(#default#VML); antialias: true;");document.namespaces.add("v","urn:schemas-microsoft-com:vml");B=function(L){return C('<var style="zoom:1;overflow:hidden;display:block;width:'+L.width+"px;height:"+L.height+'px;"></var>').get(0)};I=function(P,M,L,O){var R,S,N,Q;R='<v:fill color="#'+O.fillColor+'" opacity="'+(O.fill?O.fillOpacity:0)+'" />';S=(O.stroke?'strokeweight="'+O.strokeWidth+'" stroked="t" strokecolor="#'+O.strokeColor+'"':'stroked="f"');N='<v:stroke opacity="'+O.strokeOpacity+'"/>';if(M=="rect"){Q=C('<v:rect filled="t" '+S+' style="zoom:1;margin:0;padding:0;display:block;position:absolute;left:'+L[0]+"px;top:"+L[1]+"px;width:"+(L[2]-L[0])+"px;height:"+(L[3]-L[1])+'px;"></v:rect>')}else{if(M=="poly"){Q=C('<v:shape filled="t" '+S+' coordorigin="0,0" coordsize="'+P.width+","+P.height+'" path="m '+L[0]+","+L[1]+" l "+L.join(",")+' x e" style="zoom:1;margin:0;padding:0;display:block;position:absolute;top:0px;left:0px;width:'+P.width+"px;height:"+P.height+'px;"></v:shape>')}else{if(M=="circ"){Q=C('<v:oval filled="t" '+S+' style="zoom:1;margin:0;padding:0;display:block;position:absolute;left:'+(L[0]-L[2])+"px;top:"+(L[1]-L[2])+"px;width:"+(L[2]*2)+"px;height:"+(L[2]*2)+'px;"></v:oval>')}}}Q.get(0).innerHTML=R+N;C(P).append(Q)};J=function(L){C(L).empty()}}K=function(N){var M,L=N.getAttribute("coords").split(",");for(M=0;M<L.length;M++){L[M]=parseFloat(L[M])}return[N.getAttribute("shape").toLowerCase().substr(0,4),L]};H=function(L){if(!L.complete){return false}if(typeof L.naturalWidth!="undefined"&&L.naturalWidth==0){return false}return true};G={position:"absolute",left:0,top:0,padding:0,border:0};C.fn.maphilight=function(L){L=C.extend({},C.fn.maphilight.defaults,L);return this.each(function(){var N,Q,P,R,O,M;N=C(this);if(!H(this)){return window.setTimeout(function(){N.maphilight()},200)}P=C.metadata?C.extend({},L,N.metadata()):L;R=C('map[name="'+N.attr("usemap").substr(1)+'"]');if(!(N.is("img")&&N.attr("usemap")&&R.size()>0&&!N.hasClass("maphilighted"))){return }Q=C("<div>").css({display:"block",background:"url("+this.src+")",position:"relative",padding:0,width:this.width,height:this.height}).addClass(N.attr("class"));N.before(Q).css("opacity",0).css(G).remove();if(C.browser.msie){N.css("filter","Alpha(opacity=0)")}Q.append(N);O=B(this);C(O).css(G);O.height=this.height;O.width=this.width;M=function(T){var S=K(this);I(O,S[0],S[1],C.metadata?C.extend({},P,C(this).metadata()):P)};if(P.alwaysOn){C(R).find("area[coords]").each(M)}else{C(R).find("area[coords]").mouseover(M).mouseout(function(S){J(O)})}N.before(O);N.addClass("maphilighted")})};C.fn.maphilight.defaults={fill:true,fillColor:"ff0000",fillOpacity:0.2,stroke:true,strokeColor:"ff0000",strokeOpacity:1,strokeWidth:1,fade:false,alwaysOn:false}})(jQuery);
+(function(C){var A,B,I,J,K,G,E,D,F,H;A=document.namespaces;has_canvas=document.createElement("canvas");has_canvas=has_canvas&&has_canvas.getContext;if(!(has_canvas||A)){C.fn.maphilight=function(){return this};return }if(has_canvas){E=function(M,N,L){if(N<=1){M.style.opacity=N;window.setTimeout(E,10,M,N+0.1,10)}};D=function(L){return Math.max(0,Math.min(parseInt(L,16),255))};F=function(L,M){return"rgba("+D(L.substr(0,2))+","+D(L.substr(2,2))+","+D(L.substr(4,2))+","+M+")"};B=function(L){var M=C('<canvas style="width:'+L.width+"px;height:"+L.height+'px;"></canvas>').get(0);M.getContext("2d").clearRect(0,0,M.width,M.height);return M};I=function(Q,M,L,P){var O,N=Q.getContext("2d");N.beginPath();if(M=="rect"){N.rect(L[0],L[1],L[2]-L[0],L[3]-L[1])}else{if(M=="poly"){N.moveTo(L[0],L[1]);for(O=2;O<L.length;O+=2){N.lineTo(L[O],L[O+1])}}else{if(M=="circ"){N.arc(L[0],L[1],L[2],0,Math.PI*2,false)}}}N.closePath();if(P.fill){N.fillStyle=F(P.fillColor,P.fillOpacity);N.fill()}if(P.stroke){N.strokeStyle=F(P.strokeColor,P.strokeOpacity);N.lineWidth=P.strokeWidth;N.stroke()}if(P.fade){E(Q,0)}};J=function(L,M){L.getContext("2d").clearRect(0,0,L.width,L.height)}}else{document.createStyleSheet().addRule("v\\:*","behavior: url(#default#VML); antialias: true;");document.namespaces.add("v","urn:schemas-microsoft-com:vml");B=function(L){return C('<var style="zoom:1;overflow:hidden;display:block;width:'+L.width+"px;height:"+L.height+'px;"></var>').get(0)};I=function(P,M,L,O){var R,S,N,Q;R='<v:fill color="#'+O.fillColor+'" opacity="'+(O.fill?O.fillOpacity:0)+'" />';S=(O.stroke?'strokeweight="'+O.strokeWidth+'" stroked="t" strokecolor="#'+O.strokeColor+'"':'stroked="f"');N='<v:stroke opacity="'+O.strokeOpacity+'"/>';if(M=="rect"){Q=C('<v:rect filled="t" '+S+' style="zoom:1;margin:0;padding:0;display:block;position:absolute;left:'+L[0]+"px;top:"+L[1]+"px;width:"+(L[2]-L[0])+"px;height:"+(L[3]-L[1])+'px;"></v:rect>')}else{if(M=="poly"){Q=C('<v:shape filled="t" '+S+' coordorigin="0,0" coordsize="'+P.width+","+P.height+'" path="m '+L[0]+","+L[1]+" l "+L.join(",")+' x e" style="zoom:1;margin:0;padding:0;display:block;position:absolute;top:0px;left:0px;width:'+P.width+"px;height:"+P.height+'px;"></v:shape>')}else{if(M=="circ"){Q=C('<v:oval filled="t" '+S+' style="zoom:1;margin:0;padding:0;display:block;position:absolute;left:'+(L[0]-L[2])+"px;top:"+(L[1]-L[2])+"px;width:"+(L[2]*2)+"px;height:"+(L[2]*2)+'px;"></v:oval>')}}}Q.get(0).innerHTML=R+N;C(P).append(Q)};J=function(L){C(L).empty()}}K=function(N){var M,L=N.getAttribute("coords").split(",");for(M=0;M<L.length;M++){L[M]=parseFloat(L[M])}return[N.getAttribute("shape").toLowerCase().substr(0,4),L]};H=function(L){if(!L.complete){return false}if(typeof L.naturalWidth!="undefined"&&L.naturalWidth==0){return false}return true};G={position:"absolute",left:0,top:0,padding:0,border:0};C.fn.maphilight=function(L){L=C.extend({},C.fn.maphilight.defaults,L);return this.each(function(){var N,Q,P,R,O,M;N=C(this);if(!H(this)){return window.setTimeout(function(){N.maphilight()},200)}P=C.metadata?C.extend({},L,N.metadata()):L;R=C('map[name="'+N.attr("usemap").substr(1)+'"]');if(!(N.is("img")&&N.attr("usemap")&&R.size()>0&&!N.hasClass("maphilighted"))){return }Q=C("<div>").css({display:"block",background:"url("+this.src+")",position:"relative",padding:0,width:this.width,height:this.height}).addClass(N.attr("class"));N.before(Q).css("opacity",0).css(G).remove();if(C.browser.msie){N.css("filter","Alpha(opacity=0)")}Q.append(N);O=B(this);C(O).css(G);O.height=this.height;O.width=this.width;M=function(T){var S=K(this);I(O,S[0],S[1],C.metadata?C.extend({},P,C(this).metadata()):P)};if(P.alwaysOn){C(R).find("area[coords]").each(M)}else{C(R).find("area[coords]").mouseover(M).mouseout(function(S){J(O)})}N.before(O);N.addClass("maphilighted")})};C.fn.maphilight.defaults={fill:true,fillColor:"C6E551",fillOpacity:0.5,stroke:true,strokeColor:"C6E551",strokeOpacity:1,strokeWidth:1,fade:false,alwaysOn:false}})(jQuery);
 $(function(){$('.carte_departement').maphilight();});