Changeset 1476

Timestamp:

Sep 28, 2010, 9:19:22 PM (10 years ago)

Author:

roux

Message:

amélioration et extension a synthese du plot de home

Location:

cpc/trunk/project

Files:

• apps/frontend/config/routing.yml (modified) (1 diff)
• apps/frontend/modules/parlementaire/config/view.yml (modified) (1 diff)
• apps/frontend/modules/parlementaire/templates/indexSuccess.php (modified) (2 diffs)
• apps/frontend/modules/parlementaire/templates/topSuccess.php (modified) (1 diff)
• apps/frontend/modules/plot/actions/actions.class.php (modified) (1 diff)
• apps/frontend/modules/plot/actions/components.class.php (modified) (2 diffs)
• apps/frontend/modules/plot/templates/_newGroupes.php (modified) (1 diff)
• apps/frontend/modules/plot/templates/generatePlotGroupesSuccess.php (modified) (3 diffs)
• plugins/xsPChartPlugin/lib/pChart/pChart/pChart.class (modified) (1 diff)
• web/css/xneth/style.css (modified) (1 diff)

cpc/trunk/project/apps/frontend/config/routing.yml

@@ -460 +460 @@
   param: {module: plot, action: generatePlotParlementaire}
 groupes_plot_graph:
-  url: /graphes/groupes/lastyear
+  url: /graphes/groupes/:type
   param: {module: plot, action: generatePlotGroupes}
 preuve_presence_seance:

cpc/trunk/project/apps/frontend/modules/parlementaire/config/view.yml

@@ -7 +7 @@
 plotSuccess:
    javascripts: [overlib.js, pMap.js]
+topSuccess:
+   javascripts: [overlib.js, pMap.js]
+

cpc/trunk/project/apps/frontend/modules/parlementaire/templates/indexSuccess.php

@@ -177 +177 @@
     </div>
   </div>
+  <div class="box_repartition">
+  <h2><span style="margin-right: 5px;"><img alt="activite" src="<?php echo $sf_request->getRelativeUrlRoot(); ?>/images/xneth/ico_graph.png"></span><a href="<?php echo url_for('@top_global'); ?>">Activité parlementaire des 12 derniers mois</a></h2>
+  <?php echo include_component('plot', 'newGroupes', array('type' => 'home')); ?>
+  <?php // echo include_component('plot', 'groupes', array('plot' => 'total')); ?>
+  </div>
+  <div class="box_tags">
+  <h2><span style="margin-right: 5px;"><img alt="tags" src="<?php echo $sf_request->getRelativeUrlRoot(); ?>/images/xneth/assemblee-nationale.png"></span><?php echo link_to('En ce moment à l\'Assemblée Nationale', '@parlementaires_tags'); ?></h2>
+  <?php echo include_component('tag', 'globalActivite'); ?>
+  </div>
   <div class="box_widget">
     <h2><span style="margin-right: 5px;"><img alt="comments" src="<?php echo $sf_request->getRelativeUrlRoot(); ?>/images/xneth/ico_comment.png"></span><a href="<?php echo url_for('@commentaires'); ?>">Les derniers commentaires</a></h2>
@@ -186 +195 @@
     <div style="display: hidden;" id="coms_widget_update"></div>
   </div>
-  <div class="box_repartition">
-  <h2><span style="margin-right: 5px;"><img alt="activite" src="<?php echo $sf_request->getRelativeUrlRoot(); ?>/images/xneth/ico_graph.png"></span><a href="<?php echo url_for('@top_global'); ?>">Activité parlementaire des 12 derniers mois</a></h2>
-  <?php echo include_component('plot', 'newGroupes'); ?> 
-  <?php // echo include_component('plot', 'groupes', array('plot' => 'total')); ?>
-  </div>
-  <div class="box_tags">
-  <h2><span style="margin-right: 5px;"><img alt="tags" src="<?php echo $sf_request->getRelativeUrlRoot(); ?>/images/xneth/assemblee-nationale.png"></span><?php echo link_to('En ce moment à l\'Assemblée Nationale', '@parlementaires_tags'); ?></h2>
-  <?php echo include_component('tag', 'globalActivite'); ?>
-  </div>
 </div>

cpc/trunk/project/apps/frontend/modules/parlementaire/templates/topSuccess.php

@@ -75 +75 @@
 </div>
 <div>
+<div class="aligncenter"><?php echo include_component('plot', 'newGroupes', array('type' => 'all')); ?></div>
 <h3>Explications :</h3>
 <ul>

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

@@ -39 +39 @@
     $this->mapId = $request->getParameter('mapId');
     $this->forward404Unless($this->mapId);
+    $this->type = $request->getParameter('type');
     $this->getResponse()->setHttpHeader('content-type', 'image/png');
     $this->setLayout(false);

cpc/trunk/project/apps/frontend/modules/plot/actions/components.class.php

@@ -156 +156 @@
   public function executeGetGroupesData() {
     $this->data = array();
+    if (!isset($this->type) || $this->type != "all")
+      $this->type = "home";
     $this->data['groupes'] = array('UMP' => array(),'NC' => array(),'SRC' => array(),'GDR' => array(), 'NI' => array());
-    $this->data['titres'] = array(" Députés", "Interventions", "Amendements", "Propositions", "Quest. Orales", "Quest. Écrites");
+    if ($this->type === "home")
+      $this->data['titres'] = array("Députés", "Interventions", "Amendements", "Propositions", "Quest. Écrites");
+    else $this->data['titres'] = array("", "Interventions", "Longues", "Courtes", "Déposés", "Adoptés", "de Lois", "Écrites", "Orales");
     $n = count($this->data['titres']);
     $stats = unserialize(Doctrine::getTable('VariableGlobale')->findOneByChamp('stats_groupes')->value);
-    $amdmts = Doctrine_Query::create()
+    $query = Doctrine_Query::create()
       ->select('p.groupe_acronyme, count(DISTINCT(a.id)) as ct')
       ->from('Parlementaire p, p.ParlementaireAmendements pa, pa.Amendement a')
       ->where('a.date > ?', date('Y-m-d', time()-60*60*24*365))
-      ->groupBy('p.groupe_acronyme')
-      ->fetchArray();
+      ->groupBy('p.groupe_acronyme');
+    $qamdmts = clone($query);
+    $amdmts = $qamdmts->fetchArray();
+    if ($this->type === "all") {
+      $qamdmts2 = clone($query);
+      $amdmts2 = $qamdmts2->andWhere('a.sort = ?', "Adopté")
+        ->fetchArray();
+    }
     $props = Doctrine_Query::create()
       ->select('p.groupe_acronyme, count(DISTINCT(t.id)) as ct')
@@ -176 +186 @@
     foreach ($this->data['groupes'] as $groupe => $arr) if ($stats[$groupe]) {
       $this->data['groupes'][$groupe][] = $stats[$groupe]['groupe']['nb'];
-      $this->data['groupes'][$groupe][] = $stats[$groupe]['hemicycle_interventions']['somme']+$stats[$groupe]['commission_interventions']['somme'];
+      if ($this->type === "all") {
+        $this->data['groupes'][$groupe][] = $stats[$groupe]['commission_interventions']['somme'];
+        $this->data['groupes'][$groupe][] = $stats[$groupe]['hemicycle_interventions']['somme'];
+        $this->data['groupes'][$groupe][] = $stats[$groupe]['hemicycle_interventions_courtes']['somme'];
+      } else $this->data['groupes'][$groupe][] = $stats[$groupe]['hemicycle_interventions']['somme']+$stats[$groupe]['commission_interventions']['somme'];
     }
     foreach ($amdmts as $amdt)
       $this->data['groupes'][$amdt['groupe_acronyme']][] = $amdt['ct'];
+    if ($this->type === "all")
+      foreach ($amdmts2 as $amdt)
+        $this->data['groupes'][$amdt['groupe_acronyme']][] = $amdt['ct'];
     foreach ($props as $pro)
       $this->data['groupes'][$pro['groupe_acronyme']][] = $pro['ct'];
     foreach ($this->data['groupes'] as $groupe => $arr) if ($stats[$groupe]) {
       $this->data['groupes'][$groupe][] = $stats[$groupe]['questions_ecrites']['somme'];
-      $this->data['groupes'][$groupe][] = $stats[$groupe]['questions_orales']['somme'];
+      if ($this->type === "all")
+        $this->data['groupes'][$groupe][] = $stats[$groupe]['questions_orales']['somme'];
     }
     $this->data['totaux'] = array();

cpc/trunk/project/apps/frontend/modules/plot/templates/_newGroupes.php

@@ -2 +2 @@
 <?php $PictureID = "Map_".rand(1,10000).".map"; ?>
 <a href="<?php echo url_for('@top_global'); ?>">
-<img id="graph_groupes" alt="Répartition de l'activité parlementaire sur les 12 derniers mois" src="<?php echo url_for('@groupes_plot_graph?mapId='.$PictureID); ?>" OnMouseMove="getMousePosition(event);" OnMouseOut="nd();"/>
+<img id="graph_groupes" alt="Répartition de l'activité parlementaire sur les 12 derniers mois" src="<?php echo url_for('@groupes_plot_graph?type='.$type.'&mapId='.$PictureID); ?>" OnMouseMove="getMousePosition(event);" OnMouseOut="nd();"/>
 </a>
-<script> LoadImageMap("graph_groupes", "<?php echo url_for('@groupes_plot_graph?drawAction=map&mapId='.$PictureID); ?>"); </script>
+<script> LoadImageMap("graph_groupes", "<?php echo url_for('@groupes_plot_graph?type='.$type.'&drawAction=map&mapId='.$PictureID); ?>"); </script>
 <?php echo include_partial('plot/groupesLegende', array()); ?>

cpc/trunk/project/apps/frontend/modules/plot/templates/generatePlotGroupesSuccess.php

@@ -1 +1 @@
 <?php
 
-$data = unserialize(get_component('plot', 'getGroupesData'));
-$xsize = 433; $ysize = 300 ; $font = 8;
+$data = unserialize(get_component('plot', 'getGroupesData', array('type' => $type)));
+if ($type === "home")
+  $xsize = 433;
+else $xsize = 720;
+$yadd = 0;
+if ($type === "all")
+ $yadd = 40;
+$ydefsize = 300;
+$ysize = $ydefsize + $yadd;
+$font = 8;
 
 if ($drawAction === "map") {  
@@ -33 +41 @@
 
 $Test = new xsPChart($xsize,$ysize);
-$Test->setGraphArea(40+2*$font,15+4*$font,$xsize-20,$ysize-4*$font);
+$Test->setGraphArea(40+2*$font,15+3*$font+$yadd,$xsize-20,$ysize-4*$font);
 $Test->drawFilledRectangle(7,7,$xsize-7,$ysize-7,240,240,240);
 $Test->drawGraphArea(190,190,190,FALSE);
@@ -39 +47 @@
 $Test->xsSetFontProperties("tahoma.ttf",$font);
 $Test->drawScale($Data2,$DataDescr2,SCALE_NORMAL,50,50,50,TRUE,0,0,TRUE,1,FALSE);
-$Test->drawScale($Data,$DataDescr,SCALE_NORMAL,50,50,50,TRUE,16,0,TRUE,1,TRUE);
+$Test->drawScale($Data,$DataDescr,SCALE_NORMAL,50,50,50,TRUE,0,0,TRUE,1,TRUE);
 $Test->xsSetFontProperties("tahoma.ttf",$font+1);
 $Test->drawTitle(4+2*$font,$ysize-4*$font+18, "TOTAL :",50,50,50);
-$Test->drawGrid(4,TRUE,0,0,0,40);
+if ($type === "all") {
+  $Test->drawTitle(70,52,"Députés",50,50,50);
+  $Test->drawTitle(130,52,"Commission",50,50,50);
+  $Test->drawTitle(208,52,"Hémicycle interventions",50,50,50);
+  $Test->drawTitle(376,52,"Amendements",50,50,50); 
+  $Test->drawTitle(490,52,"Propositions",50,50,50); 
+  $Test->drawTitle(600,52,"Questions",50,50,50);
+  $Test->xsSetFontProperties("tahoma.ttf",$font+5);
+  $Test->drawTitle(60,30,"Répartition de l'activité des députés sur les 12 derniers mois par groupe politique",25,25,25);
+}
+$Test->drawGrid(4,TRUE,0,0,0,30);
 $Test->setColorPalette(0,30,30,200);
 $Test->setColorPalette(1,30,190,255);

cpc/trunk/project/plugins/xsPChartPlugin/lib/pChart/pChart/pChart.class

@@ -499 +499 @@
          if ( $Angle == 0 )
           {
-           $YPos = $YAxisPos+$YAxisOrt*18;
+           $YPos = $YAxisPos+$YAxisOrt*(2*$YLegShift-2);
            imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
           }

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

@@ -251 +251 @@
   text-align:justify;
 }
-.tableau_synthese { height: 500px; overflow: auto; }
+.tableau_synthese {
+  height: 500px;
+  overflow: auto;
+  margin-bottom: 25px;
+}
 .synthese td, .synthese tr { padding: 0px; margin: 0px, border: 0px; height: 25px; }
 .p { width: 112px; }