Changeset 1472

Timestamp:

Sep 28, 2010, 7:34:40 PM (10 years ago)

Author:

goya

Message:

graphe d'accueil

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/parlementaire/config/view.yml (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) (2 diffs)
• apps/frontend/modules/plot/templates/generatePlotParlementaireSuccess.php (modified) (1 diff)
• plugins/xsPChartPlugin/lib/pChart/pChart/pChart.class (modified) (4 diffs)

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

@@ -1 +1 @@
 listCircoSuccess:
    javascripts: [jquery.maphilight.min.js]
+indexSuccess:
+   javascripts: [overlib.js, pMap.js]
 showSuccess:
    javascripts: [overlib.js, pMap.js]

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

@@ -157 +157 @@
     $this->data = array();
     $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");
+    $this->data['titres'] = array(" Députés", "Interventions", "Amendements", "Propositions", "Quest. Orales", "Quest. Écrites");
     $n = count($this->data['titres']);
     $stats = unserialize(Doctrine::getTable('VariableGlobale')->findOneByChamp('stats_groupes')->value);
@@ -193 +193 @@
         $this->data['totaux'][$i] += $this->data['groupes'][$groupe][$i];
     foreach ($this->data['groupes'] as $groupe => $arr)
-      for ($i=0;$i<$n;$i++)
-        $this->data['groupes'][$groupe][$i] = $this->data['groupes'][$groupe][$i] / $this->data['totaux'][$i] * 100;
+      for ($i=0;$i<$n;$i++) {
+        $tmp = round($this->data['groupes'][$groupe][$i]  / $this->data['totaux'][$i] * 1000)/10;
+        $this->data['groupes'][$groupe][$i] = round($this->data['groupes'][$groupe][$i] / $this->data['totaux'][$i] * 1000)/10;
+      }
+    for ($i=0;$i<$n;$i++)
+      $this->data['totaux'][$i] = preg_replace('/(\d)(\d{3})$/', '\\1 \\2', $this->data['totaux'][$i]);
   }
 

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?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?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', 'groupesData'));
+$data = unserialize(get_component('plot', 'getGroupesData'));
+$xsize = 433; $ysize = 300 ; $font = 8;
 
-$data['groupes'];
-$data['totaux'];
-$data['titres'];
-
-$n = count($data['titres']);
-
-$xsize = 390;
-$xtitre = 80; $ysize = 300; $ylegend = 145; $x0 = 140; $y0 = 112;
-$ticks = 12.5;
-$scale = 14;
-
-if ($drawAction === "map" ) {  
-  $Test = new xsPChart(800,$size);  
+if ($drawAction === "map") {  
+  $Test = new xsPChart($xsize,$ysize);  
   $Test->getImageMap($mapId);
 }
@@ -21 +11 @@
 $DataSet = new xsPData();
 $DataSet->AddPoint($data['titres'], "Serie1");
-$DataSet->AddPoint($presences, "Serie2");
-$DataSet->AddPoint($participations, "Serie3");
-$DataSet->AddPoint($mots, "Serie4");
-$DataSet->AddSerie("Serie2");
-$DataSet->AddSerie("Serie3");
-$DataSet->AddSerie("Serie4");
+$ct = 2;
+foreach ($data['groupes'] as $groupe => $values) {
+  $serie = "Serie".$ct;
+  $DataSet->AddPoint($values, $serie);
+  $DataSet->AddSerie($serie);
+  $DataSet->SetSerieName($groupe, $serie);
+  $ct++;
+}
 $DataSet->SetAbsciseLabelSerie("Serie1");
-$DataSet->SetYAxisName("Séances par semaine");
-
-$DataSetLegend = new xsPData();
-$DataSetLegend->AddPoint($data['labels'], "Serie1");
-$DataSetLegend->AddPoint($presences, "Serie2");
-$DataSetLegend->AddPoint($participations, "Serie3");
-$DataSetLegend->AddSerie("Serie2");
-$DataSetLegend->AddSerie("Serie3");
-$DataSetLegend->SetSerieName(utf8_decode('Présences'),"Serie2");
-$DataSetLegend->SetSerieName("Participations","Serie3");
-$DataSetLegend->SetAbsciseLabelSerie("Serie1");
-
-$DataSetBordure = new xsPData();
-$DataSetBordure->AddPoint($data['labels'], "Serie1");
-$DataSetBordure->AddPoint($presences, "Serie2");
-$DataSetBordure->AddPoint(array_fill(1, count($data['labels']), 0), "Serie5");
-$DataSetBordure->AddSerie("Serie2");
-$DataSetBordure->AddSerie("Serie5");
-$DataSetBordure->SetAbsciseLabelSerie("Serie1");
+$DataSet->SetYAxisUnit(" %");
 
 $DataSet2 = new xsPData();
-$DataSet2->AddPoint($data['labels'], "Serie1");
-$DataSet2->AddPoint($data['vacances'], "Serie6");
-$DataSet2->AddSerie("Serie6");
-$DataSet2->SetAbsciseLabelSerie("Serie1");
-
-if ($questions === 'true' && $type != 'commission') {
-  $DataSet3 = new xsPData();
-  $DataSet3->AddPoint($data['labels'], "Serie1");
-  $DataSet3->AddPoint($data['n_questions'], "Serie7");
-  $DataSet3->AddSerie("Serie7");
-  $DataSet3->SetAbsciseLabelSerie("Serie1");
-  $Data3 = $DataSet3->GetData();
-  $DataDescr3 = $DataSet3->GetDataDescription();
-}
+$DataSet2->AddPoint($data['totaux'], "Serie".$ct);
+$DataSet2->SetAbsciseLabelSerie("Serie".$ct);
+$DataSet2->SetYAxisUnit(" %");
 
 $Data = $DataSet->GetData();
 $DataDescr = $DataSet->GetDataDescription();
-$DataBordure = $DataSetBordure->GetData();
-$DataDescrBordure = $DataSetBordure->GetDataDescription();
-$Data2 = $DataSet2->GetData();
+$Data2 = $DataSet2->getData();
 $DataDescr2 = $DataSet2->GetDataDescription();
-$DataLegend = $DataSetLegend->GetData();
-$DataDescrLegend = $DataSetLegend->GetDataDescription();
 
-$Test = new xsPChart(800,$size);
-$Test->setGraphArea(25+3*$font,3*$font,780,$size-10-2*$font);
-$Test->drawFilledRoundedRectangle(7,7,793,$size-7,5,240,240,240);
-$Test->drawRoundedRectangle(5,5,795,$size - 5,5,230,230,230);
-$Test->drawGraphArea(230,230,230,FALSE);
-$Test->setFixedScale(0,$scale,$scale/$ticks);
+$Test = new xsPChart($xsize,$ysize);
+$Test->setGraphArea(40+2*$font,15+4*$font,$xsize-20,$ysize-4*$font);
+$Test->drawFilledRectangle(7,7,$xsize-7,$ysize-7,240,240,240);
+$Test->drawGraphArea(190,190,190,FALSE);
+$Test->setFixedScale(0,100.7,4);
 $Test->xsSetFontProperties("tahoma.ttf",$font);
-$Test->drawScale($Data,$DataDescr,SCALE_NORMAL,50,50,50,TRUE,0,0,FALSE,1,TRUE);
-if ($link === 'true') {
-  $Test->setColorPalette(0,255,255,255);
-  $Test->setColorPalette(1,255,255,255);
-  $Test->setImageMap(TRUE,$mapId);
-  $Test->drawOverlayBarGraph($DataLegend,$DataDescrLegend,30,100);
-  $Test->setImageMap(FALSE,$mapId);
-}  
-$Test->drawGrid(0,TRUE,0,0,0,100);
-$Test->setColorPalette(0,50,50,50);
-$Test->drawOverlayBarGraph($Data2,$DataDescr2,30,100);
-$Test->setColorPalette(0,255,0,0);
-$Test->setColorPalette(1,255,255,0);
-$Test->setColorPalette(2,0,255,0);
-$Test->drawFilledLineGraph($Data,$DataDescr,78);
-if ($questions === 'true' && $type != 'commission') {
-  $Test->setColorPalette(0,0,0,255);
-  $Test->drawOverlayBarGraph($Data3,$DataDescr3,85,25);
-}
-$Test->setColorPalette(0,255,0,0);
-$Test->setColorPalette(1,0,0,0);
-$Test->drawLineGraph($DataBordure,$DataDescrBordure);
+$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->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);
+$Test->setColorPalette(0,30,30,200);
+$Test->setColorPalette(1,30,190,255);
+$Test->setColorPalette(2,255,50,190);
+$Test->setColorPalette(3,255,30,30);
+$Test->setColorPalette(4,130,130,130);
+$Test->setImageMap(TRUE,$mapId);
+$Test->drawStackedBarGraph($Data,$DataDescr,75,90);
 
-$Test->xsSetFontProperties("tahoma.ttf",$font + 3);
-$pos_titre = 240;
-if ($time === 'lastyear') {
-  if (isset($data['mandat_clos'])) {
-    $pos_titre = 210;
-    $duree = ' sa dernière année de mandat';
-  } else $duree = 's 12 derniers mois';
-  $shortduree = 'annee';
-} else {
-  $duree = " la session ".preg_replace('/^(\d{4})/', '\\1-', $time);
-  $shortduree = $time;
-}
-if ($type === 'total') {
-  $Test->drawTitle($pos_titre,3 + 2*$font,"Participation globale au cours de".$duree." (hémicycle et commissions)",50,50,50,585);
-  $titre = 'globale-'.$shortduree;
-} else {
-  $titre = $type;
-  if ($type === 'commission') $titre .= 's';
-  $Test->drawTitle($pos_titre+30,3 + 2*$font,"Participation en ".$titre." au cours de".$duree,50,50,50,585);
-  $titre .= '-'.$shortduree;
-}
-if ($link === 'true')
-  $Test->setImageMap(TRUE,$mapId);
+//$Test->drawTitle($pos_titre,3 + 2*$font,"Participation globale au cours de".$duree." (hémicycle et commissions)",50,50,50,585);
 
 $Test->xsStroke();

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

@@ -103 +103 @@
 $Test->setFixedScale(0,$scale,$scale/$ticks);
 $Test->xsSetFontProperties("tahoma.ttf",$font);
-$Test->drawScale($Data,$DataDescr,SCALE_NORMAL,50,50,50,TRUE,0,0,FALSE,1,TRUE);
+$Test->drawScale($Data,$DataDescr,SCALE_NORMAL,50,50,50,TRUE,0,0,FALSE,1,FALSE);
 if ($link === 'true') {
   $Test->setColorPalette(0,255,255,255);

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

@@ -290 +290 @@
 
    /* Compute and draw the scale */
-   function drawScale(&$Data,&$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1)
+   function drawScale(&$Data,&$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$TopAxis=FALSE)
     {
      /* Validate the Data and DataDescription array */
@@ -298 +298 @@
 
      $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
-     $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
+     if ($TopAxis == FALSE)
+       $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
+     else $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y1,$R,$G,$B);
 
      if ( $this->VMin == NULL && $this->VMax == NULL)
@@ -467 +469 @@
      $XPos = $this->GArea_X1 + $this->GAreaXOffset;
      $ID = 1; $YMax = NULL;
+     if ($TopAxis == FALSE) {
+      $YAxisPos = $this->GArea_Y2;
+      $YAxisOrt = 1;
+      $YLegShift = 10;
+     } else {
+      $YAxisPos = $this->GArea_Y1;
+      $YAxisOrt = -1;
+      $YLegShift = 7;
+     }
      foreach ( $Data as $Key => $Values )
       {
        if ( $ID % $SkipLabels == 0 )
         {
-         $this->drawLine(floor($XPos),$this->GArea_Y2,floor($XPos),$this->GArea_Y2+5,$R,$G,$B);
+         $this->drawLine(floor($XPos),$YAxisPos,floor($XPos),$YAxisPos+$YAxisOrt*5,$R,$G,$B);
          $Value      = $Data[$Key][$DataDescription["Position"]];
          if ( $DataDescription["Format"]["X"] == "number" )
@@ -488 +499 @@
          if ( $Angle == 0 )
           {
-           $YPos = $this->GArea_Y2+18;
+           $YPos = $YAxisPos+$YAxisOrt*18;
            imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
           }
          else
           {
-           $YPos = $this->GArea_Y2+10+$TextHeight;
+           $YPos = $YAxisPos+$YLegShift+$YAxisOrt*($TextHeight);
            if ( $Angle <= 90 )
-            imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
+            imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth/2+5,$YPos,$C_TextColor,$this->FontName,$Value);
            else
             imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);