Changeset 1580
- Timestamp:
- Oct 3, 2010, 6:25:54 PM (10 years ago)
- Location:
- cpc/trunk/project
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
cpc/trunk/project/apps/frontend/modules/solr/actions/actions.class.php
r1578 r1580 73 73 $this->sort = $request->getParameter('sort'); 74 74 $date = $request->getParameter('date'); 75 $from = $request->getParameter('from');76 75 $format = $request->getParameter('format'); 77 76 … … 125 124 if ($date) { 126 125 $this->selected['date'][$date] = $date; 126 if (preg_match('/\d{8}/',$date)) { 127 $date = preg_replace('/(\d{4})(\d{2})(\d{2})/', '\1-\2-\3T00:00:00Z', $date); 128 } 127 129 $dates = explode(',', $date); 128 130 list($from, $to) = $dates; … … 243 245 foreach($results['facet_counts']['facet_dates']['date'] as $date => $nb) { 244 246 if ($period == 'DAY') { 245 $date = date ('Y-m-d', strtotime($date)+1).'T00:00:00Z'; 247 $date = date ('Ymd', strtotime($date)+1); 248 }else{ 249 $date = date ('Ymd', strtotime($date)); 246 250 } 247 251 if (preg_match('/^20/', $date)) { -
cpc/trunk/project/apps/frontend/modules/solr/templates/searchSuccess.php
r1579 r1580 22 22 23 23 function addToDate($date, $interval) { 24 $date = explode("T", $date); 25 $date = explode("-", $date[0]); 24 $date = preg_replace('/\-/', '', $date); 25 $annee = substr($date, 0, 4); 26 $mois = substr($date, 4, 2); 27 $jour = substr($date, 6, 2); 26 28 if($interval == 'mois') { 27 $date = mktime(0, 0, 0, $ date[1] + 1, $date[2], $date[0]);29 $date = mktime(0, 0, 0, $mois + 1, $jour, $annee); 28 30 #int mktime ("H","m","s","M","j","Y", -1) 29 31 } 30 else { $date = mktime(0, 0, 0, $ date[1], $date[2] - 1, $date[0]); }31 $date = date("Y -m-d", $date).'T00%3A00%3A00Z';32 else { $date = mktime(0, 0, 0, $mois, $jour - 1, $annee); } 33 $date = date("Ymd", $date); 32 34 return $date; 33 35 } … … 124 126 </div> 125 127 <?php 126 $start = explode("T", $start); 127 if($end == 'NOW') { $end = date("Y-m-d").'T00%3A00%3A00Z'; } 128 $end = explode("T", $end); 128 if($end == 'NOW') { $end = date("Ymd");; } 129 129 ?> 130 130 <h1><?php 131 131 switch ($vue) { 132 132 case "jour": 133 $periode_text = 'le '.myTools::displayShortDate($start [0]);133 $periode_text = 'le '.myTools::displayShortDate($start); 134 134 echo 'Résultats pour "<em>'.$recherche.'</em>" '.$periode_text; 135 135 $graph = 0; 136 136 break; 137 137 case "mois": 138 $periode_text = 'en '.myTools::displayMoisAnnee($start [0]);138 $periode_text = 'en '.myTools::displayMoisAnnee($start); 139 139 echo 'Résultats pour "<em>'.$recherche.'</em>" '.$periode_text; 140 140 $graph = 1; 141 141 break; 142 142 case "par_jour": 143 $periode_text = 'entre le '.myTools::displayShortDate($start [0]).' et le '.myTools::displayShortDate($end[0]);143 $periode_text = 'entre le '.myTools::displayShortDate($start).' et le '.myTools::displayShortDate($end); 144 144 echo 'Résultats pour "<em>'.$recherche.'</em>" '.$periode_text; 145 145 $graph = 1; 146 146 break; 147 147 case "par_mois": 148 $periode_text = 'entre '.myTools::displayMoisAnnee($start [0]).' et '.myTools::displayMoisAnnee($end[0]);148 $periode_text = 'entre '.myTools::displayMoisAnnee($start).' et '.myTools::displayMoisAnnee($end); 149 149 echo 'Résultats pour "<em>'.$recherche.'</em>" '.$periode_text; 150 150 $graph = 1; … … 175 175 $newargs = $selected; 176 176 177 $title_date = explode("T", $date);178 179 177 $newargs['date'] = $date.'%2C'.$date; 180 178 181 179 if(($vue == 'jour') or ($vue == 'par_jour') or ($vue == 'mois')){ 182 $title_date = myTools::displayShortDate($ title_date[0]).' : '.$nb['nb'].' résultats';180 $title_date = myTools::displayShortDate($date).' : '.$nb['nb'].' résultats'; 183 181 } 184 182 if($vue == 'par_mois') { 185 $title_date = ucfirst(myTools::displayMoisAnnee($ title_date[0])).' : '.$nb['nb'].' résultats';183 $title_date = ucfirst(myTools::displayMoisAnnee($date)).' : '.$nb['nb'].' résultats'; 186 184 } 187 185 if($vue == 'par_mois') { -
cpc/trunk/project/lib/model/doctrine/myTools.class.php
r1468 r1580 45 45 46 46 public static function displayShortDate($d) { 47 $date = substr($d,8,2)."/"; // jour 48 $date = $date.substr($d,5,2)."/"; // mois 47 $d = preg_replace ('/\-/', '', $d); 48 $date = substr($d,6,2)."/"; // jour 49 $date = $date.substr($d,4,2)."/"; // mois 49 50 $date = $date.substr($d,0,4); // année 50 51 return $date; … … 52 53 53 54 public static function displayVeryShortDate($d) { 54 $date = substr($d,8,2)."/"; // jour 55 $date = $date.substr($d,5,2)."/"; // mois 55 $d = preg_replace ('/\-/', '', $d); 56 $date = substr($d,6,2)."/"; // jour 57 $date = $date.substr($d,4,2)."/"; // mois 56 58 $date = $date.substr($d,2,2); // année 57 59 return $date; … … 59 61 60 62 public static function displayMoisAnnee($d) { 61 $date = self::$num_mois[substr($d,5,2)].' '; // mois txt 63 $d = preg_replace ('/\-/', '', $d); 64 $date = self::$num_mois[substr($d,4,2)].' '; // mois txt 62 65 $date = $date.substr($d,0,4); // année num 63 66 return $date; … … 65 68 66 69 public static function displayDateTime($d) { 70 $d = preg_replace ('/\-/', '', $d); 67 71 $date = self::displayShortDate($d)." à "; 68 72 $date = $date.substr($d,11,5); // heures et minutes
Note: See TracChangeset
for help on using the changeset viewer.