Changeset 1494

Timestamp:

Sep 29, 2010, 2:11:21 AM (10 years ago)

Author:

roux

Message:

display ss-amdmts adoptés

Location:

cpc/trunk/project/apps/frontend/modules/amendement

Files:

• actions/actions.class.php (modified) (1 diff)
• templates/showSuccess.php (modified) (1 diff)

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

@@ -38 +38 @@
 
      $this->sous_admts = Doctrine_Query::create()
-       ->select('a.id, a.numero')
+       ->select('a.id, a.numero, a.sort')
        ->from('Amendement a, Tagging tg, tg.Tag t')
        ->where('a.texteloi_id = ?', $this->amendement->texteloi_id)

cpc/trunk/project/apps/frontend/modules/amendement/templates/showSuccess.php

@@ -23 +23 @@
 <?php } ?>
 <?php if ($sous_admts) { ?>
-<p>Sous-amendements associés&nbsp: <?php foreach($sous_admts as $sous)
- echo link_to($sous['numero'], '@amendement?loi='.$amendement->texteloi_id.'&numero='.$sous['numero']).' '; ?></p>
+<p>Sous-amendements associés&nbsp: <?php foreach($sous_admts as $sous) {
+    if ($sous['sort'] === 'Adopté') echo '<strong>';
+    echo link_to($sous['numero'], '@amendement?loi='.$amendement->texteloi_id.'&numero='.$sous['numero']).' ';
+    if ($sous['sort'] === 'Adopté') echo '(Adopté)</strong> ';
+  } ?></p>
 <?php } ?>
 <p>Déposé le <?php echo myTools::displayDate($amendement->date); ?> par : <?php echo $amendement->getSignataires(1); ?>.</p>