Changeset 479

Show
Ignore:
Timestamp:
11/28/08 18:29:10 (1 month ago)
Author:
arnaud
Message:

Bourse : affichage de la liste à partir de l'accueil sur les dates création et modification provenant de la bourse

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/apps/intranet/modules/market/actions/actions.class.php

    r474 r479  
    4444    if($this->getUser()->getAttribute('search_start_at') || $this->getUser()->getAttribute('search_end_at')): 
    4545      if($this->getRequestParameter('search')): 
    46         $criterion = $c->getNewCriterion(MarketPeer::CREATED_AT, $this->getUser()->getAttribute('search_start_at', '1997-01-01').' 00:00:00', Criteria::GREATER_EQUAL); 
    47         $criterion->addAnd($c->getNewCriterion(MarketPeer::CREATED_AT, $this->getUser()->getAttribute('search_end_at', date('Y-m-d')).' 23:59:59', Criteria::LESS_EQUAL)); 
     46        $criterion = $c->getNewCriterion(MarketPeer::MARKET_CREATED_AT, $this->getUser()->getAttribute('search_start_at', '1997-01-01').' 00:00:00', Criteria::GREATER_EQUAL); 
     47        $criterion->addAnd($c->getNewCriterion(MarketPeer::MARKET_CREATED_AT, $this->getUser()->getAttribute('search_end_at', date('Y-m-d')).' 23:59:59', Criteria::LESS_EQUAL)); 
    4848        $c->add($criterion); 
    4949      elseif($this->getRequestParameter('searchupd')): 
    50         $criterion = $c->getNewCriterion(MarketPeer::UPDATED_AT, $this->getUser()->getAttribute('search_start_at', '1997-01-01').' 00:00:00', Criteria::GREATER_EQUAL); 
    51         $criterion->addAnd($c->getNewCriterion(MarketPeer::UPDATED_AT, $this->getUser()->getAttribute('search_end_at', date('Y-m-d')).' 23:59:59', Criteria::LESS_EQUAL)); 
     50        $criterion = $c->getNewCriterion(MarketPeer::MARKET_UPDATED_AT, $this->getUser()->getAttribute('search_start_at', '1997-01-01').' 00:00:00', Criteria::GREATER_EQUAL); 
     51        $criterion->addAnd($c->getNewCriterion(MarketPeer::MARKET_UPDATED_AT, $this->getUser()->getAttribute('search_end_at', date('Y-m-d')).' 23:59:59', Criteria::LESS_EQUAL)); 
    5252        $c->add($criterion); 
    5353      endif; 

  • trunk/apps/intranet/modules/market/templates/_list.php

    r467 r479  
    2727  <td><?php if($market->getTerraceSurface()>0) echo round($market->getTerraceSurface()).' m&sup2;' ?></td> 
    2828  <td><?php echo $market->getLevel() ?></td> 
    29   <td><?php if(strlen($market->getAgency())>15) echo substr($market->getAgency(), 0, 15).'.'; else echo $market->getAgency() ?></td> 
    30   <td><?php if(strlen($market->getAddress1().' '.$market->getAddress2())>30) echo trim(substr($market->getAddress1().' '.$market->getAddress2(), 0, 30)).'...'; else echo $market->getAddress1().' '.$market->getAddress2() ?></td>  
    31   <td><?php if(strlen($market->getCity())>7) echo substr($market->getCity(), 0, 7).'...'; else echo $market->getCity() ?></td> 
    32   <td><?php if(strlen($market->getSector())>7) echo substr($market->getSector(), 0, 7).'...'; else echo $market->getSector() ?></td> 
     29  <td><?php if(mb_strlen($market->getAgency())>15) echo mb_substr($market->getAgency(), 0, 15).'.'; else echo $market->getAgency() ?></td> 
     30  <td><?php if(mb_strlen($market->getAddress1().' '.$market->getAddress2())>30) echo trim(mb_substr($market->getAddress1().' '.$market->getAddress2(), 0, 30)).'...'; else echo $market->getAddress1().' '.$market->getAddress2() ?></td>  
     31  <td><?php if(mb_strlen($market->getCity())>7) echo mb_substr($market->getCity(), 0, 7).'...'; else echo $market->getCity() ?></td> 
     32  <td><?php if(mb_strlen($market->getSector())>7) echo mb_substr($market->getSector(), 0, 7).'...'; else echo $market->getSector() ?></td> 
    3333</tr> 
    3434<?php $i = !$i ?>