Changeset 451
- Timestamp:
- 11/14/08 17:00:24 (2 months ago)
- Files:
-
- trunk/apps/intranet/modules/homepage/actions/actions.class.php (modified) (7 diffs)
- trunk/apps/intranet/modules/homepage/templates/_header.php (modified) (2 diffs)
- trunk/apps/intranet/modules/homepage/templates/_searchresult.php (modified) (3 diffs)
- trunk/apps/intranet/modules/homepage/templates/indexSuccess.php (modified) (9 diffs)
- trunk/apps/intranet/modules/homepage/templates/searchresultSuccess.php (modified) (1 diff)
- trunk/lib/model/SalesPeer.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/apps/intranet/modules/homepage/actions/actions.class.php
r424 r451 28 28 $this->agencies_num = $user->getAgency()->getCompany()->doCountAgencies(); 29 29 30 / * Num avenants week */30 // num avenants week 31 31 $datedeb = date('Y-m-d',mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))); 32 32 $datefin = date('Y-m-d',mktime(0, 0, 0, date('m'), date('d')+1, date('Y'))); … … 47 47 $this->numavenants_week_ag = SalesPeer::doCount($c); 48 48 49 / * Num avenants month */49 // Num avenants month 50 50 $datedeb = date('Y-m-01'); 51 51 $datefin = date('Y-m-31'); … … 85 85 $this->numavenants_month_1_ag = SalesPeer::doCount($c); 86 86 87 // Market 88 $this->nbmarkets_week = MarketPeer::doCountNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 0); 89 $this->nbmarkets_week_upd = MarketPeer::doCountUpd(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 0); 90 91 /* Requêtes sur site internet par visiteurs */ 92 $c = new Criteria(); 93 $c->add(BasketPeer::CONTACT_BY, NULL); 94 $c->addJoin(BasketPeer::CONTACT_ID , ContactPeer::ID , Criteria::INNER_JOIN); 95 $c->add(ContactPeer::AGENCY_ID, $user->getAgencyId()); 96 $c->addDescendingOrderByColumn(BasketPeer::ID); 97 $c->addGroupByColumn(BasketPeer::CONTACT_ID); 98 $this->sales_requests = BasketPeer::doSelectJoinContact($c); 87 // market 88 $c = new Criteria(); 89 $c->add(ExchangePeer::AGENCY_ID, $this->getUser()->getSubscriber()->getAgencyId()); 90 $c->add(ExchangePeer::IS_ACTIVE, 1); 91 $c->add(ExchangePeer::PROVIDER_ID, 2); 92 $this->exchange = ExchangePeer::doSelect($c); 93 if($this->exchange): 94 $this->nbmarkets_week = MarketPeer::doCountNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 0); 95 $this->nbmarkets_week_upd = MarketPeer::doCountUpd(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 0); 96 endif; 99 97 100 98 // users … … 129 127 public function executeSearchresult() 130 128 { 131 if( $this->getRequestParameter('homesearch')):129 if(strlen($this->getRequestParameter('homesearch'))>1): 132 130 133 131 $this->limite = 5; … … 200 198 $criterion->addOr($c->getNewCriterion(ContactPeer::COMPANYNAME, '%'.$this->getRequestParameter('homesearch').'%', Criteria::LIKE)); 201 199 if((int)$this->getRequestParameter('homesearch')!=0) 202 200 $criterion->addOr($c->getNewCriterion(SalesPeer::PRICE, $this->getRequestParameter('homesearch'))); 203 201 $criterion->addOr($c->getNewCriterion(SalesPeer::ID, $this->getRequestParameter('homesearch'))); 202 $criterion->addOr($c->getNewCriterion(SalesPeer::MANDAT_NUM, $this->getRequestParameter('homesearch'))); 204 203 $c->add($criterion); 205 204 … … 216 215 $c->addDescendingOrderByColumn(SalesPeer::CREATED_AT); 217 216 $this->saless = SalesPeer::doSelect($c); 218 217 218 // market list 219 $c = new Criteria(); 220 $c->addJoin(ExchangePeer::PROVIDER_ID, Market_providerPeer::EXCHANGE_PROVIDER_ID, Criteria::INNER_JOIN); 221 $c->addJoin(Market_providerPeer::ID, MarketPeer::PROVIDER_ID, Criteria::INNER_JOIN); 222 $c->add(ExchangePeer::IS_ACTIVE, 1); 223 $c->add(ExchangePeer::AGENCY_ID, $this->getUser()->getSubscriber()->getAgencyId()); 224 $c->add(MarketPeer::ID, eregi_replace('s', '', $this->getRequestParameter('homesearch'))); 225 $this->nbmarkets = MarketPeer::doCount($c); 226 $c->addGroupByColumn(MarketPeer::ID); 227 $c->setLimit($this->limite); 228 $c->addDescendingOrderByColumn(MarketPeer::UPDATED_AT); 229 $c->addDescendingOrderByColumn(MarketPeer::CREATED_AT); 230 $this->markets = MarketPeer::doSelect($c); 231 219 232 // rents list 220 233 $c = new Criteria(); … … 224 237 $c->add(AgencyPeer::COMPANY_ID, $this->getUser()->getSubscriber()->getCompanyId()); 225 238 226 $criterion = $c->getNewCriterion(ContactPeer::COMPANYNAME, '%'.$this->getRequestParameter('homesearch' .'%', Criteria::LIKE));227 $criterion->addOr($c->getNewCriterion(ContactPeer::FIRSTNAME, '%'.$this->getRequestParameter('homesearch' .'%', Criteria::LIKE)));228 $criterion->addOr($c->getNewCriterion(ContactPeer::LASTNAME, '%'.$this->getRequestParameter('homesearch' .'%', Criteria::LIKE)));239 $criterion = $c->getNewCriterion(ContactPeer::COMPANYNAME, '%'.$this->getRequestParameter('homesearch').'%', Criteria::LIKE); 240 $criterion->addOr($c->getNewCriterion(ContactPeer::FIRSTNAME, '%'.$this->getRequestParameter('homesearch').'%', Criteria::LIKE)); 241 $criterion->addOr($c->getNewCriterion(ContactPeer::LASTNAME, '%'.$this->getRequestParameter('homesearch').'%', Criteria::LIKE)); 229 242 if((int)$this->getRequestParameter('homesearch')!=0) 230 243 $criterion->addOr($c->getNewCriterion(RentPeer::PRICE, $this->getRequestParameter('homesearch'))); 231 244 $criterion->addOr($c->getNewCriterion(RentPeer::ID, $this->getRequestParameter('homesearch'))); 232 245 $c->add($criterion); trunk/apps/intranet/modules/homepage/templates/_header.php
r413 r451 70 70 <li><?php echo link_to(ucfirst(__('settings')), 'agency/index') ?></li> 71 71 <?php endif; ?> 72 <?php if($sf_user->getSubscriber()->getProfilId()<=3): ?> 73 <li><?php echo link_to(ucfirst(__('exchange')), 'exchange/index') ?></li> 74 <?php endif; ?> 72 75 </ul> 73 76 </li> … … 78 81 <li><?php echo link_to(ucfirst(__('administration')), 'http://'.$_SERVER['HTTP_HOST'].'/admin.php/homepage/') ?></li> 79 82 <?php endif; ?> 80 <li><?php echo link_to(ucfirst(__('calendar')), '#', array('onclick' => "window.open('http://".$_SERVER['HTTP_HOST']."/app/phpicalendar/week.php?cal=http%3A%2F%2F".$sf_user->getSubscriber()->getUser().":".$sf_user->getSubscriber()->getPassword()."@".$_SERVER['HTTP_HOST']."%2Fcalendar%2Fapimo', 'calendar', 'location=no,toolbar=no,scrollbars=yes,width=900,height= 650')")) ?></li>83 <li><?php echo link_to(ucfirst(__('calendar')), '#', array('onclick' => "window.open('http://".$_SERVER['HTTP_HOST']."/app/phpicalendar/week.php?cal=http%3A%2F%2F".$sf_user->getSubscriber()->getUser().":".$sf_user->getSubscriber()->getPassword()."@".$_SERVER['HTTP_HOST']."%2Fcalendar%2Fapimo', 'calendar', 'location=no,toolbar=no,scrollbars=yes,width=900,height=700')")) ?></li> 81 84 <li><?php echo link_to(ucfirst(__('credit')), 'tools/credit') ?></li> 82 85 <li><?php echo link_to(ucfirst(__('maps')), 'maps/index') ?></li> trunk/apps/intranet/modules/homepage/templates/_searchresult.php
r413 r451 27 27 <li class="footer"><?php echo link_to('> '.__('nexts').'...','contact/list?seller=1&search='.$sf_params->get('homesearch')); ?></li> 28 28 <?php endif; ?> 29 30 <?php if($markets): ?> 31 <li class="title"><?php echo ucfirst(__('market')) ?></li> 32 <?php endif; ?> 33 <?php foreach($markets as $market): ?> 34 <li><?php echo link_to($market.' : '.$market->getPriceWithI18n(), 'market/show?id='.$market->getId()) ?></li> 35 <?php endforeach; ?> 36 29 37 <?php if($saless): ?> 30 38 <li class="title"><?php echo ucfirst(__('sales')) ?></li> … … 37 45 <li class="footer"><?php echo link_to('> '.__('nexts').'...','sales/search'); ?></li> 38 46 <?php endif; ?> 47 39 48 <?php if($rents): ?> 40 <li class="title"><?php echo ucfirst(__('rent s')) ?></li>49 <li class="title"><?php echo ucfirst(__('rentals')) ?></li> 41 50 <?php endif; ?> 42 51 <?php foreach($rents as $rent): ?> … … 47 56 <li class="footer"><?php echo link_to('> '.__('nexts').'...','rent/search'); ?></li> 48 57 <?php endif; ?> 58 49 59 </ul> trunk/apps/intranet/modules/homepage/templates/indexSuccess.php
r424 r451 7 7 <?php endif; ?> 8 8 9 < ?php //echo image_tag('tpl_02/icones/stats_80.gif') ?>10 <table >9 <h2><?php echo image_tag('tpl_02/icones/stats_56.gif') ?> actualités</h2> 10 <table class="homepage_table"> 11 11 <thead> 12 12 <tr> 13 <th width=" 150"> </th>14 <th width=" 80" style="text-align:center"><?php echo '15 '.__('days') ?></th>15 <th width=" 80" style="text-align:center"><?php echo '30 '.__('days') ?></th>16 <th width=" 80" style="text-align:center"><?php echo '45 '.__('days') ?></th>17 <th width=" 80" style="text-align:center"><?php echo '60 '.__('days') ?></th>13 <th width="200"> </th> 14 <th width="100" style="text-align:center"><?php echo '15 '.__('days') ?></th> 15 <th width="100" style="text-align:center"><?php echo '30 '.__('days') ?></th> 16 <th width="100" style="text-align:center"><?php echo '45 '.__('days') ?></th> 17 <th width="100" style="text-align:center"><?php echo '60 '.__('days') ?></th> 18 18 </tr> 19 19 </thead> … … 21 21 <tr> 22 22 <th><?php echo ucfirst('mandats sans visites') ?></th> 23 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNoVisit(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-15, date('Y'))), $user->getAgencyId(), $user->getId())), 'sales/novisit?search_in_by='.$user->getId().'&since='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-15, date('Y')))) ?></td> 24 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNoVisit(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-30, date('Y'))), $user->getAgencyId(), $user->getId())), 'sales/novisit?search_in_by='.$user->getId().'&since='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-30, date('Y')))) ?></td> 25 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNoVisit(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-45, date('Y'))), $user->getAgencyId(), $user->getId())), 'sales/novisit?search_in_by='.$user->getId().'&since='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-45, date('Y')))) ?></td> 26 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNoVisit(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-60, date('Y'))), $user->getAgencyId(), $user->getId())), 'sales/novisit?search_in_by='.$user->getId().'&since='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-60, date('Y')))) ?></td> 23 <td style="text-align:center"> 24 <?php 25 $num = count(SalesPeer::doSelectNoVisit(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-15, date('Y'))), $user->getAgencyId(), $user->getId())); 26 if($num>0) echo '<span class="highlight">'; 27 echo link_to($num, 'sales/novisit?search_in_by='.$user->getId().'&since='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-15, date('Y')))); 28 if($num>0) echo '</span>'; 29 ?></td> 30 <td style="text-align:center"> 31 <?php 32 $num = count(SalesPeer::doSelectNoVisit(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-30, date('Y'))), $user->getAgencyId(), $user->getId())); 33 if($num>0) echo '<span class="highlight">'; 34 echo link_to($num, 'sales/novisit?search_in_by='.$user->getId().'&since='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-30, date('Y')))); 35 if($num>0) echo '</span>'; 36 ?></td> 37 <td style="text-align:center"> 38 <?php 39 $num = count(SalesPeer::doSelectNoVisit(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-45, date('Y'))), $user->getAgencyId(), $user->getId())); 40 if($num>0) echo '<span class="highlight">'; 41 echo link_to($num, 'sales/novisit?search_in_by='.$user->getId().'&since='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-45, date('Y')))); 42 if($num>0) echo '</span>'; 43 ?></td> 44 <td style="text-align:center"> 45 <?php 46 $num = count(SalesPeer::doSelectNoVisit(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-60, date('Y'))), $user->getAgencyId(), $user->getId())); 47 if($num>0) echo '<span class="highlight">'; 48 echo link_to($num, 'sales/novisit?search_in_by='.$user->getId().'&since='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-60, date('Y')))); 49 if($num>0) echo '</span>'; 50 ?></td> 27 51 </tr> 28 52 <tr> … … 37 61 <hr /> 38 62 39 <table >63 <table class="homepage_table"> 40 64 <thead> 41 65 <tr> 66 <th width="200"> </th> 67 <th width="100" style="text-align:center"><?php echo ucfirst(__('personal')) ?></th> 68 <th width="100" colspan="2" style="text-align:center"><?php echo ucfirst(__('agency')) ?></th> 69 <?php if($exchange): ?> 70 <th width="100" style="text-align:center"><?php echo ucfirst(__('market')) ?></th> 71 <th width="100" style="text-align:center"><?php echo ucfirst(__('market')) ?> Mà J</th> 72 <?php endif; ?> 73 <?php if($agencies_num>1): ?> 74 <th width="100" style="text-align:center"><?php echo ucfirst(__('company')) ?></th> 75 <?php endif; ?> 76 <?php if($user->getAgency()->getBrandId()): ?> 77 <th width="100" style="text-align:center"><?php echo ucfirst(__('brand')) ?></th> 78 <?php endif; ?> 79 </tr> 80 <tr> 42 81 <th width="150"> </th> 43 <th width="80" colspan="2" style="text-align:center"><?php echo ucfirst(__('agency')) ?></th>44 <th width="80" style="text-align:center"><?php echo ucfirst(__('personal')) ?></th>45 <th width="80" style="text-align:center"><?php echo ucfirst(__('market')) ?></th>46 <th width="80" style="text-align:center"><?php echo ucfirst(__('market')) ?> Mà J</th>47 <?php if($agencies_num>1): ?>48 <th width="80" style="text-align:center"><?php echo ucfirst(__('company')) ?></th>49 <?php endif; ?>50 <?php if($user->getAgency()->getBrandId()): ?>51 <th width="80" style="text-align:center"><?php echo ucfirst(__('brand')) ?></th>52 <?php endif; ?>53 </tr>54 <tr>55 <th width="150"> </th>56 <th width="40" style="text-align:center">7 <?php echo __('days') ?></th>57 <th width="40" style="text-align:center">Total</th>58 82 <th style="text-align:center">Total</th> 83 <th width="50" style="text-align:center">7 <?php echo __('days') ?></th> 84 <th width="50" style="text-align:center">Total</th> 85 <?php if($exchange): ?> 59 86 <th style="text-align:center">72 <?php echo __('h(hours)') ?></th> 60 <th width="80" style="text-align:center">72 <?php echo __('h(hours)') ?></th> 61 <?php if($agencies_num>1): ?> 62 <th width="80" style="text-align:center">72 <?php echo __('h(hours)') ?></th> 63 <?php endif; ?> 64 <?php if($user->getAgency()->getBrandId()): ?> 65 <th width="80" style="text-align:center">72 <?php echo __('h(hours)') ?></th> 87 <th width="100" style="text-align:center">72 <?php echo __('h(hours)') ?></th> 88 <?php endif; ?> 89 <?php if($agencies_num>1): ?> 90 <th width="100" style="text-align:center">72 <?php echo __('h(hours)') ?></th> 91 <?php endif; ?> 92 <?php if($user->getAgency()->getBrandId()): ?> 93 <th width="100" style="text-align:center">72 <?php echo __('h(hours)') ?></th> 66 94 <?php endif; ?> 67 95 </tr> … … 70 98 <tr> 71 99 <th><?php echo ucfirst(__('sales')) ?></th> 72 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 1)), 'sales/list?search_start_at='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))).'&search_end_at='.date('Y-m-d').'&search_file=1&search=1&search_step_id=1') ?></td> 73 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNew('1997-01-01', date('Y-m-d'), 1)), 'sales/list?search_start_at=1997-01-01&search_end_at='.date('Y-m-d').'&search_file=1&search=1&search_step_id=1') ?></td> 74 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNew('1997-01-01', date('Y-m-d'), 0, $user->getId())), 'sales/list?search_in_by='.$user->getId().'&search_start_at=1997-01-01&search_end_at='.date('Y-m-d').'&search_file=0&search=1&search_step_id=1') ?></td> 75 <td style="text-align:center"><?php echo link_to($nbmarkets_week, 'market/list') ?></td> 76 <td style="text-align:center"><?php echo link_to($nbmarkets_week_upd, 'market/list') ?></td> 77 <?php if($agencies_num>1): ?> 78 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 0)), 'sales/list?search_start_at='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))).'&search_end_at='.date('Y-m-d').'&search_file=0&search=1&search_step_id=1') ?></td> 79 <?php endif; ?> 80 <?php if($user->getAgency()->getBrandId()): ?> 81 <td style="text-align:center"><?php echo link_to(count(SalesPeer::doSelectNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 2)), 'sales/list?search_start_at='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))).'&search_end_at='.date('Y-m-d').'&search_file=2&search=1&search_step_id=1') ?></td> 100 <td style="text-align:center"> 101 <?php 102 $num = SalesPeer::doCountNew('1997-01-01', date('Y-m-d'), 0, $user->getId()); 103 if($num>0) echo '<span class="highlight">'; 104 echo link_to($num, 'sales/list?search_in_by='.$user->getId().'&search_start_at=1997-01-01&search_end_at='.date('Y-m-d').'&search_file=0&search=1&search_step_id=1'); 105 if($num>0) echo '</span>'; 106 ?></td> 107 <td style="text-align:center"> 108 <?php 109 $num = SalesPeer::doCountNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 1); 110 if($num>0) echo '<span class="highlight">'; 111 echo link_to($num, 'sales/list?search_start_at='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))).'&search_end_at='.date('Y-m-d').'&search_file=1&search=1&search_step_id=1'); 112 if($num>0) echo '</span>'; 113 ?></td> 114 <td style="text-align:center"> 115 <?php 116 $num = SalesPeer::doCountNew('1997-01-01', date('Y-m-d'), 1); 117 if($num>0) echo '<span class="highlight">'; 118 echo link_to($num, 'sales/list?search_start_at=1997-01-01&search_end_at='.date('Y-m-d').'&search_file=1&search=1&search_step_id=1'); 119 if($num>0) echo '</span>'; 120 ?></td> 121 <?php if($exchange): ?> 122 <td style="text-align:center"> 123 <?php 124 if($nbmarkets_week>0) echo '<span class="highlight">'; 125 echo link_to($nbmarkets_week, 'market/list'); 126 if($nbmarkets_week>0) echo '</span>'; 127 ?></td> 128 <td style="text-align:center"> 129 <?php 130 if($nbmarkets_week_upd>0) echo '<span class="highlight">'; 131 echo link_to($nbmarkets_week_upd, 'market/list'); 132 if($nbmarkets_week_upd>0) echo '</span>'; 133 ?></td> 134 <?php endif; ?> 135 <?php if($agencies_num>1): ?> 136 <td style="text-align:center"> 137 <?php 138 $num = SalesPeer::doCountNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 0); 139 if($num>0) echo '<span class="highlight">'; 140 echo link_to($num, 'sales/list?search_start_at='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))).'&search_end_at='.date('Y-m-d').'&search_file=0&search=1&search_step_id=1'); 141 if($num>0) echo '</span>'; 142 ?></td> 143 <?php endif; ?> 144 <?php if($user->getAgency()->getBrandId()): ?> 145 <td style="text-align:center"> 146 <?php 147 $num = SalesPeer::doCountNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 2); 148 if($num>0) echo '<span class="highlight">'; 149 echo link_to($num, 'sales/list?search_start_at='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))).'&search_end_at='.date('Y-m-d').'&search_file=2&search=1&search_step_id=1'); 150 if($num>0) echo '</span>'; 151 ?></td> 82 152 <?php endif; ?> 83 153 </tr> … … 85 155 <tr> 86 156 <th><?php echo ucfirst(__('rentals')) ?></th> 87 <td style="text-align:center"><?php echo link_to(count(RentPeer::doSelectNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 1)), 'rent/list?search_start_at='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))).'&search_end_at='.date('Y-m-d').'&search_file=1&search=1&search_step_id=1') ?></td> 88 <td style="text-align:center"><?php echo link_to(count(RentPeer::doSelectNew('1997-01-01', date('Y-m-d'), 1)), 'rent/list?search_start_at=1997-01-01&search_end_at='.date('Y-m-d').'&search_file=1&search=1&search_step_id=1') ?></td> 89 <td style="text-align:center"><?php echo link_to(count(RentPeer::doSelectNew('1997-01-01', date('Y-m-d'), 0, $user->getId())), 'rent/list?search_in_by='.$user->getId().'&search_start_at=1997-01-01&search_end_at='.date('Y-m-d').'&search_file=0&search=1&search_step_id=1') ?></td> 90 <td style="text-align:center">-</td> 91 <td style="text-align:center">-</td> 157 <td style="text-align:center"> 158 <?php 159 $num = count(RentPeer::doSelectNew('1997-01-01', date('Y-m-d'), 0, $user->getId())); 160 if($num>0) echo '<span class="highlight">'; 161 echo link_to($num, 'rent/list?search_in_by='.$user->getId().'&search_start_at=1997-01-01&search_end_at='.date('Y-m-d').'&search_file=0&search=1&search_step_id=1'); 162 if($num>0) echo '</span>'; 163 ?> 164 </td> 165 <td style="text-align:center"> 166 <?php 167 $num = count(RentPeer::doSelectNew(date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))), date('Y-m-d'), 1)); 168 if($num>0) echo '<span class="highlight">'; 169 echo link_to($num, 'rent/list?search_start_at='.date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-7, date('Y'))).'&search_end_at='.date('Y-m-d').'&search_file=1&search=1&search_step_id=1'); 170 if($num>0) echo '</span>'; 171 ?></td> 172 <td style="text-align:center"> 173 <?php 174 $num = count(RentPeer::doSelectNew('1997-01-01', date('Y-m-d'), 1)); 175 if($num>0) echo '<span class="highlight">'; 176 echo link_to($num, 'rent/list?search_start_at=1997-01-01&search_end_at='.date('Y-m-d').'&search_file=1&search=1&search_step_id=1'); 177 if($num>0) echo '</span>'; 178 ?></td> 179 <?php if($exchange): ?> 180 <td style="text-align:center">-</td> 181 <td style="text-align:center">-</td> 182 <?php endif; ?> 92 183 <?php if($agencies_num>1): ?> 93 184 <td style="text-align:center">-</td> … … 105 196 $c->add(SearchPeer::ACTIVE, 1); 106 197 $searchs_user = SearchPeer::doCount($c); 198 if(!$searchs_user) $searchs_user = '0'; 107 199 108 200 // num searches for agency … … 111 203 $c->add(SearchPeer::ACTIVE, 1); 112 204 $searchs_agency = SearchPeer::doCount($c); 205 if(!$searchs_agency) $searchs_agency = '0'; 113 206 ?> 114 207 <tr> 115 208 <th><?php echo ucfirst(__('asks')) ?></th> 116 <td style="text-align:center">-</td> 117 <td style="text-align:center"><?php echo link_to($searchs_agency, 'search/list?search=1&active=1') ?></td> 118 <td style="text-align:center"><?php echo link_to($searchs_user, 'search/list?search=1&active=1&user_id='.$user_show_id) ?></td> 119 <td style="text-align:center">-</td> 120 <td style="text-align:center">-</td> 209 <td style="text-align:center"> 210 <?php 211 if($searchs_user>0) echo '<span class="highlight">'; 212 echo link_to($searchs_user, 'search/list?search=1&active=1&user_id='.$user_show_id); 213 if($searchs_user>0) echo '</span>'; 214 ?></td> 215 <td style="text-align:center">-</td> 216 <td style="text-align:center"> 217 <?php 218 if($searchs_agency>0) echo '<span class="highlight">'; 219 echo link_to($searchs_agency, 'search/list?search=1&active=1'); 220 if($searchs_agency>0) echo '</span>'; 221 ?> 222 </td> 223 <?php if($exchange): ?> 224 <td style="text-align:center">-</td> 225 <td style="text-align:center">-</td> 226 <?php endif; ?> 121 227 <?php if($agencies_num>1): ?> 122 228 <td style="text-align:center">-</td> … … 130 236 <th><?php echo ucfirst(__('leases')) ?></th> 131 237 <td style="text-align:center">-</td> 132 <td style="text-align:center"><?php echo link_to(count(LeasePeer::doSelectNew('1997-01-01', date('Y-m-d'), 1)), 'lease/list') ?></td> 133 <td style="text-align:center">-</td> 134 <td style="text-align:center">-</td> 135 <td style="text-align:center">-</td> 238 <td style="text-align:center">-</td> 239 <td style="text-align:center"> 240 <?php 241 $num = count(LeasePeer::doSelectNew('1997-01-01', date('Y-m-d'), 1)); 242 if($num>0) echo '<span class="highlight">'; 243 echo link_to($num, 'lease/list'); 244 if($num>0) echo '</span>'; 245 ?> 246 </td> 247 <?php if($exchange): ?> 248 <td style="text-align:center">-</td> 249 <td style="text-align:center">-</td> 250 <?php endif; ?> 136 251 <?php if($agencies_num>1): ?> 137 252 <td style="text-align:center">-</td> … … 183 298 <hr /> 184 299 185 <?php echo link_to(image_tag('tpl_02/'.$sf_user->getCulture().'/button/view.png'), '#', array('onclick' => "window.open('http://".$_SERVER['HTTP_HOST']."/app/phpicalendar/week.php?cal=http%3A%2F%2F".$sf_user->getSubscriber()->getUser().":".$sf_user->getSubscriber()->getPassword()."@".$_SERVER['HTTP_HOST']."%2Fcalendar%2Fapimo', 'calendar', 'location=no,toolbar=no,scrollbars=yes,width=900,height= 650')")) ?>300 <?php echo link_to(image_tag('tpl_02/'.$sf_user->getCulture().'/button/view.png'), '#', array('onclick' => "window.open('http://".$_SERVER['HTTP_HOST']."/app/phpicalendar/week.php?cal=http%3A%2F%2F".$sf_user->getSubscriber()->getUser().":".$sf_user->getSubscriber()->getPassword()."@".$_SERVER['HTTP_HOST']."%2Fcalendar%2Fapimo', 'calendar', 'location=no,toolbar=no,scrollbars=yes,width=900,height=700')")) ?> 186 301 <?php echo link_to(image_tag('tpl_02/'.$sf_user->getCulture().'/button/add.png'), 'calendar/create') ?> trunk/apps/intranet/modules/homepage/templates/searchresultSuccess.php
r289 r451 1 <?php include_partial('searchresult', array('limite' => $limite, 'contacts' => $contacts, 'nbcontacts' => $nbcontacts, 'buyers' => $buyers, 'nbbuyers' => $nbbuyers, 'sellers' => $sellers, 'nbsellers' => $sellers, 'saless' => $saless, 'nbsaless' => $nbsaless, 'rents' => $rents, 'nbrents' => $nbrents, ' users' => $users, 'nbusers' => $nbusers));?>1 <?php include_partial('searchresult', array('limite' => $limite, 'contacts' => $contacts, 'nbcontacts' => $nbcontacts, 'buyers' => $buyers, 'nbbuyers' => $nbbuyers, 'sellers' => $sellers, 'nbsellers' => $sellers, 'saless' => $saless, 'nbsaless' => $nbsaless, 'rents' => $rents, 'nbrents' => $nbrents, 'markets' => $markets)) ?> trunk/lib/model/SalesPeer.php
r425 r451 54 54 } 55 55 56 public static function do SelectNew($start_at = '1997-01-01', $end_at, $file = 0, $user_id = false , $agency_id = false)56 public static function doCriteriaNew($start_at = '1997-01-01', $end_at, $file = 0, $user_id = false , $agency_id = false) 57 57 { 58 58 $start_at = $start_at.' 00:00:00'; … … 81 81 if($user_id) 82 82 $c->add(SalesPeer::IN_BY, $user_id); 83 return SalesPeer::doSelect($c); 83 return $c; 84 } 85 86 public static function doSelectNew($start_at = '1997-01-01', $end_at, $file = 0, $user_id = false , $agency_id = false) 87 { 88 $c = SalesPeer::doCriteriaNew($start_at, $end_at, $file, $user_id, $agency_id); 89 return SalesPeer::doSelect($c); 90 } 91 92 public static function doCountNew($start_at = '1997-01-01', $end_at, $file = 0, $user_id = false , $agency_id = false) 93 { 94 $c = SalesPeer::doCriteriaNew($start_at, $end_at, $file, $user_id, $agency_id); 95 return SalesPeer::doCount($c); 84 96 } 85 97 … … 121 133 return SalesPeer::doCountJoinEstate($c); 122 134 } 123 public static function doCountNew($start_at , $end_at, $user_id = false , $agency_id = false)124 {125 $start_at = $start_at.' 00:00:00';126 $end_at = $end_at.' 23:59:59';127 $c = new Criteria();128 $criterion = $c->getNewCriterion(SalesPeer::CREATED_AT, $start_at, Criteria::GREATER_EQUAL);129 $criterion->addAnd($c->getNewCriterion(SalesPeer::CREATED_AT, $end_at, Criteria::LESS_EQUAL));130 $c->add($criterion);131 $c->add(SalesPeer::STEP_ID, 1);132 if($agency_id):133 // limité à l'agence134 $c->add(SalesPeer::AGENCY_ID, $agency_id , Criteria::IN);135 endif;136 //limitation user137 if($user_id)138 $c->add(SalesPeer::IN_BY, $user_id , Criteria::IN);139 return SalesPeer::doCount($c);140 }141 135 142 136 public static function doCountSold($start_at , $end_at, $user_id = false , $agency_id = false)
