Changeset 1526

Timestamp:

Oct 2, 2010, 8:38:54 PM (10 years ago)

Author:

roux

Message:

page organisme

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/parlementaire/actions/actions.class.php (modified) (1 diff)
• apps/frontend/modules/parlementaire/templates/_table.php (modified) (3 diffs)
• apps/frontend/modules/parlementaire/templates/listOrganismeSuccess.php (modified) (1 diff)
• lib/model/doctrine/Seance.class.php (modified) (1 diff)
• lib/model/doctrine/Texteloi.class.php (modified) (1 diff)
• web/css/xneth/style.css (modified) (2 diffs)

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

@@ -243 +243 @@
     $this->forward404Unless($this->orga);
 
-    $query = Doctrine::getTable('Parlementaire')->createQuery('p')
-      ->select('p.*, po.fonction as fonction, po.importance as imp')
-      ->leftJoin('p.ParlementaireOrganisme po')
-      ->leftJoin('po.Organisme o')
-      ->where('o.slug = ?', $orga)
-      ->andWhere('p.fin_mandat IS NULL')
-      ->orderBy("po.importance DESC, p.nom_de_famille ASC");
-    $this->parlementaires = array();
-    $this->total = 0;
-    foreach ($query->execute() as $depute) {
-      $this->total++;
-      $imp = $depute->imp;
-      if (isset($this->parlementaires[$imp])) $this->parlementaires[$imp][] = $depute;
-      else $this->parlementaires[$imp] = array($depute);
-    }
-    $query2 = Doctrine::getTable('Seance')->createQuery('s')
-      ->leftJoin('s.Organisme o')
-      ->where('o.slug = ?', $orga)
-      ->orderBy('s.date DESC, s.moment ASC');
-    $this->pagerSeances = Doctrine::getTable('Seance')->getPager($request, $query2);
+    $pageS = $request->getParameter('pages', 1);
+    $pageR = $request->getParameter('page', 1);
+    if ($pageS == 1) {
+      if ($pageR == 1)
+        $this->page = "home";
+      else $this->page = "rapports";
+    } else $this->page = "seances";
+    if ($this->page === "home") {
+      $query = Doctrine::getTable('Parlementaire')->createQuery('p')
+        ->select('p.*, po.fonction as fonction, po.importance as imp')
+        ->leftJoin('p.ParlementaireOrganisme po')
+        ->leftJoin('po.Organisme o')
+        ->where('o.slug = ?', $orga)
+        ->andWhere('p.fin_mandat IS NULL')
+        ->orderBy("po.importance DESC, p.nom_de_famille ASC");
+      $this->parlementaires = array();
+      $this->total = 0;
+      foreach ($query->execute() as $depute) {
+        $this->total++;
+        $imp = $depute->imp;
+        if (isset($this->parlementaires[$imp])) $this->parlementaires[$imp][] = $depute;
+        else $this->parlementaires[$imp] = array($depute);
+      }
+    }
+    if ($this->page === "home" || $this->page === "seances") {
+      $query2 = Doctrine::getTable('Seance')->createQuery('s')
+        ->leftJoin('s.Organisme o')
+        ->where('o.slug = ?', $orga)
+        ->orderBy('s.date DESC, s.moment ASC');
+      $this->pagerSeances = Doctrine::getTable('Seance')->getPager($request, $query2);
+    }
+    if ($this->page === "home" || $this->page === "rapports") {
+      $query3 =  Doctrine::getTable('Texteloi')->createQuery('t')
+        ->leftJoin('t.Organisme o')
+        ->where('o.slug = ?', $orga)
+        ->orderBy('t.numero DESC, t.annexe ASC');
+      $this->pagerRapports = new sfDoctrinePager('Texteloi',10);
+      $this->pagerRapports->setQuery($query3);
+      $this->pagerRapports->setPage($pageR);
+      $this->pagerRapports->init();
+    }
   }
 

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

@@ -2 +2 @@
 $ct = 0;
 if (isset($list)) {
+  if (!isset($colonnes))
+    $colonnes = 3;
+  if (isset($imp))
+    echo '<h3 class="aligncenter">'.ucfirst($deputes[0]->fonction).(count($deputes) > 1 ? 's' : '').'</h3>';
   echo '<table><tr>';
   $totaldep = count($deputes);
-  $div = floor($totaldep/3)+1;
-  if ($div > 1 && $totaldep % 3 == 0)
+  $div = floor($totaldep/$colonnes)+1;
+  if ($div > 1 && $totaldep % $colonnes == 0)
     $div--;
   $td = 0;
   if ($totaldep == 1) {
-    echo '<td/><td>';
+    if ($colonnes == 2)
+      echo '<td class="list_td_small"/>';
+    else echo '<td/>';
     $td++;
-  } else if ($totaldep == 2 || $totaldep == 4)
-    echo '<td class="list_td_small"/><td>';
-  else echo '<td>';
+  } else if ($colonnes != 2 && ($totaldep == 2 || $totaldep == 4))
+    echo '<td class="list_td_small"/>';
+  echo '<td>';
 }
 foreach($deputes as $depute) {
@@ -31 +37 @@
     ?></a></span><br/>
     <span class="list_left">
-      <?php if (isset($imp)) {
-          echo ' '.$depute->fonction;
-          if (!isset($nogroupe))
-            echo '&nbsp;&mdash;&nbsp;<a href="'.url_for('@list_parlementaires_groupe?acro='.$depute->groupe_acronyme).'"><span class="couleur_'.strtolower($depute->getGroupeAcronyme()).'">'.$depute->getGroupeAcronyme().'</span></a>';
-        } else
-          echo preg_replace('/\s([A-Z]+)$/', ' <a href="'.url_for('@list_parlementaires_groupe?acro='.$depute->groupe_acronyme).'"><span class="couleur_'.strtolower($depute->getGroupeAcronyme()).'">'."\\1</span></a>", $depute->getStatut()); ?>
+      <?php echo preg_replace('/\s([A-Z]+)$/', ' <a href="'.url_for('@list_parlementaires_groupe?acro='.$depute->groupe_acronyme).'"><span class="couleur_'.strtolower($depute->getGroupeAcronyme()).'">'."\\1</span></a>", $depute->getStatut()); ?>
     </span>
     <span class="list_right"><?php
@@ -56 +57 @@
 if (isset($list)) {
   echo '</td>';
-  if ($totaldep == 2 || $totaldep == 4)
+  if (($colonnes == 2 && $totaldep == 1) || ($colonnes != 2 && ($totaldep == 2 || $totaldep == 4)))
     echo '<td class="list_td_small"/>';
-  else while ($td < 2) {
+  else while ($td < $colonnes - 1) {
     $td++;
     echo '<td/>';

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

@@ +1 @@
+<?php use_helper('Text') ?>
 <h1><?php echo $orga->getNom(); $sf_response->setTitle($orga->getNom()); ?></h1>
-<?php include_component('article', 'show', array('categorie'=>'Organisme', 'object_id'=>$orga->id)); ?>
-<?php if ($total && $pagerSeances->getPage() < 2) {
-  if ($orga->type == 'extra') : ?>
-<h2>Organisme extra-parlementaire composé de <?php echo $total; ?> député<?php if ($total > 1) echo 's'; ?>&nbsp;:</h2>
-<?php else : ?>
-<h2><?php if (preg_match('/commission/i', $orga->getNom())) echo 'Comm'; else echo 'M'; ?>ission parlementaire composée de <?php echo $total; ?> député<?php if ($total > 1) echo 's'; ?>&nbsp;:</h2>
-<?php endif; ?>
-<div class="liste">
-<?php $listimp = array_keys($parlementaires);
-  foreach($listimp as $i) {
+<?php $nrap = $pagerRapports->getNbResults();
+$nse = $pagerSeances->getNbResults();
+if ($page === "home") {
+  include_component('article', 'show', array('categorie'=>'Organisme', 'object_id'=>$orga->id));
+  $divclass = "";
+  $colonnes = 3;
+  if ($nse || $nrap) {
+    $divclass = '<div class="listeleft">';
+    $colonnes = 2;
+  }
+  if ($total && $pagerSeances->getPage() == 1 && ($pagerRapports->getPage() == 1)) {
+    if ($orga->type == 'extra')
+      echo '<h2>Organisme extra-parlementaire composé de '.$total.' député'.($total > 1 ? 's' : '').'&nbsp;:</h2>';
+    else echo '<h2>'.(preg_match('/commission/i', $orga->getNom()) ? 'Comm' : 'M').'ission parlementaire composée de '.$total.' député'.($total > 1 ? 's' : '').'&nbsp;:</h2>';
+  }
+  echo $divclass.'<div class="liste">';
+  $listimp = array_keys($parlementaires);
+  foreach ($listimp as $i) {
     echo '<div class="list_table">';
-    include_partial('parlementaire/table', array('deputes' => $parlementaires[$i], 'list' => 1, 'imp' => $i));
+    include_partial('parlementaire/table', array('deputes' => $parlementaires[$i], 'list' => 1, 'colonnes' => $colonnes, 'imp' => $i));
     echo '</div>';
-  } 
+  }
   echo '</div>';
-} 
-if ($pagerSeances->getNbResults()) : ?>
-<div><h3>Les dernières réunions de la <?php if (preg_match('/commission/i', $orga->getNom())) echo 'Comm'; else echo 'M'; ?>ission</h3>
-<ul>
-<?php foreach($pagerSeances->getResults() as $seance) : ?>
-<li><?php $subtitre = $seance->getTitre();
-  if ($seance->nb_commentaires > 0) {
-    $subtitre .= ' ('.$seance->nb_commentaires.' commentaire';
-    if ($seance->nb_commentaires > 1) $subtitre .= 's';
-    $subtitre .= ')';
+}
+if ($page === "home" && ($nse || $nrap))
+  echo '</div><div class="listeright">';
+else echo '<div>';
+if ($page != "seances" && $nrap) {
+  echo '<h3>';
+  if ($page === "home")
+    echo 'Ses derniers rapports';
+  else echo 'Rapports de la '.(preg_match('/commission/i', $orga->getNom()) ? 'comm' : 'm').'ission';
+  echo '&nbsp;:</h3><ul>';
+  $curid = 0;
+  foreach($pagerRapports->getResults() as $rap) {
+    $shortid = preg_replace('/-[atv].*$/', '', preg_replace('/[A-Z]/', '', $rap->id));
+    if ($curid != $shortid) {
+      echo '<li>';
+      $curid = $shortid;
+      $doctitre = preg_replace('/ (de|pour|par) l[ea\'\s]+ '.$orga->nom.'/i', '', $rap->getTitreCommission());
+      if ($pagerRapports->getPage() == 1) $doctitre = truncate_text($doctitre, 120);
+      echo link_to($doctitre, '@document?id='.$curid).'</li>';
+    }
   }
-  echo link_to($subtitre, '@interventions_seance?seance='.$seance->id); ?></li>
-<?php endforeach ; ?>
-</ul>
-<?php include_partial('intervention/paginate', array('pager'=>$pagerSeances, 'link'=>'@list_parlementaires_organisme?slug='.$orga->getSlug().'&')); ?>
+  echo '</ul>';
+  include_partial('parlementaire/paginate', array('pager'=>$pagerRapports, 'link'=>'@list_parlementaires_organisme?slug='.$orga->getSlug().'&'));
+}
+if ($page != "rapports" && $nse) {
+  echo '<h3>';
+  if ($page === "home")
+    echo 'Ses dernières réunions';
+  else echo 'Réunions de la '.(preg_match('/commission/i', $orga->getNom()) ? 'comm' : 'm').'ission';
+  echo '&nbsp;:</h3><ul>';
+  $curdate = "";
+  foreach($pagerSeances->getResults() as $seance) {
+    $newdate = myTools::displayDate($seance->date);
+    if ($curdate != $newdate) {
+      if ($curdate != "")
+        echo '</li>';
+      $curdate = $newdate;
+      echo '<li>'.$newdate.'&nbsp;: ';
+    } else echo '&nbsp;&mdash; ';
+    $subtitre = $seance->getShortMoment();
+    if ($seance->nb_commentaires > 0) {
+      $subtitre .= ' (<span class="list_com">'.$seance->nb_commentaires.' commentaire';
+      if ($seance->nb_commentaires > 1) $subtitre .= 's';
+      $subtitre .= '</span>)';
+    }
+    echo link_to($subtitre, '@interventions_seance?seance='.$seance->id);
+  }
+  echo '</ul>';
+  include_partial('intervention/paginate', array('pager'=>$pagerSeances, 'link'=>'@list_parlementaires_organisme?slug='.$orga->getSlug().'&')); 
+} ?>
 </div>
-<?php endif; ?>
-<br/>
+<?php if ($page != "home") echo '<h3 class="aligncenter">'.link_to('Voir la composition de la commission', '@list_parlementaires_organisme?slug='.$orga->slug).'</h3>'; ?>

cpc/trunk/project/lib/model/doctrine/Seance.class.php

@@ -83 +83 @@
     return $moment;
   }
-  
+ 
+  public function getShortMoment() {
+    return preg_replace('/^0/', '', str_replace('00', '', str_replace(':', 'h', $this->moment)));
+  }
+ 
   public function setDate($date) {
     if (!$this->_set('date', $date))

cpc/trunk/project/lib/model/doctrine/Texteloi.class.php

@@ -279 +279 @@
   }
 
+  public function getTitreCommission() {
+    $str = $this->getShortTitre();
+    if ($this->_get('titre'))
+      $str .= " ".$this->_get('titre');
+    $str = preg_replace('/^,\s*/', '', preg_replace('/\s*,\s*/', ', ', $str));
+    return $str;
+  }
+
   public function getContenu() {
     $c = $this->_get('contenu');

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

@@ -1567 +1567 @@
 .synthese td, .synthese th { padding: 0px; margin: 0px; text-align: center}
 .left {
-width: 48%;
-float: left;
-}
-.right{
-float: right;
-width: 50%;
+  width: 48%;
+  float: left;
+}
+.right {
+  float: right;
+  width: 50%;
+}
+.listeleft {
+  float: left;
+  width: 64%;
+}
+.listeright {
+  float: right;
+  width: 35%;
 }
 
@@ -1766 +1774 @@
   margin-bottom: 30px;
 }
+.list_table h3 {
+  margin-top: 0px;
+  margin-bottom: 5px;
+}
 .list_table table {
   width: 100%;