Changeset 1113 for cpc/trunk/project/apps

Timestamp:

Feb 17, 2010, 1:08:55 PM (11 years ago)

Author:

goya

Message:

update lois pour cimade + liste articles

Location:

cpc/trunk/project/apps/frontend/modules

Files:

• loi/actions/actions.class.php (modified) (1 diff)
• loi/templates/loiSuccess.php (modified) (3 diffs)
• section/actions/components.class.php (modified) (1 diff)

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

@@ -50 +50 @@
       ->orderBy('t.chapitre, t.section')
       ->execute();
-    if (!$this->soussections) {
-      $this->articles = doctrine::getTable('ArticleLoi')->createquery('a')
+    $this->articles = doctrine::getTable('ArticleLoi')->createquery('a')
         ->where('a.texteloi_id = ?', $loi_id)
         ->orderBy('a.ordre')
-        ->execute();
-      $this->amendements = $this->getAmendements($loi_id);
-    } else $this->amendements = count(doctrine::getTable('Amendement')->createquery('a')
+        ->fetchArray();
+    $this->amendements = count(doctrine::getTable('Amendement')->createquery('a')
         ->where('a.texteloi_id = ?', $loi_id)->execute());
     

cpc/trunk/project/apps/frontend/modules/loi/templates/loiSuccess.php

@@ -12 +12 @@
 } ?>
 <div class="sommaireloi">
-<?php if (isset($soussections)) {
+<?php $nart = 0;
+if (isset($soussections)) {
   $chapitre = 0;
   $section = 0;
@@ -40 +41 @@
     }
     echo ')';
+    echo '<br/> &nbsp; Article';
+    if ($ss->nb_articles > 1) echo 's';
+    echo ' ';
+    for ($i=$nart;$i<$nart+$ss->nb_articles;$i++) {
+      echo link_to($articles[$i]['titre'], '@loi_article?loi='.$loi->texteloi_id.'&article='.$articles[$i]['slug']).' &nbsp;';;
+    }
+    $nart += $ss->nb_articles;
   }
   if ($section != 0) echo '</li></ul>';
@@ -49 +57 @@
   }
 } else {
-  $nart = 0;
   foreach ($articles as $a) {
     if ($nart != 0) echo '</li>';

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

@@ -4 +4 @@
 {
   public function executeSimplifions() {
-    $this->lois = Doctrine_Query::create()->select('l.texteloi_id, l.titre, l.nb_commentaires')->from('TitreLoi l')->where('l.chapitre IS NULL')->andWhere('l.section IS NULL')->orderBy('l.date DESC')->fetchArray();
+    $this->lois = Doctrine_Query::create()->select('l.texteloi_id, l.titre, l.nb_commentaires')->from('TitreLoi l')->where('l.chapitre IS NULL')->andWhere('l.section IS NULL')->andWhere('l.nb_commentaires >= 5')->orderBy('l.date DESC')->fetchArray();
   }