Changeset 4398 for trunk/include/calendar_base.class.php

Timestamp:

Nov 30, 2009, 9:41:11 PM (14 years ago)

Author:

nikrou

Message:

Feature 1255 :
sql functions for calendar (interval, year, month, ...)

File:

• trunk/include/calendar_base.class.php (modified) (2 diffs)

trunk/include/calendar_base.class.php

@@ -216 +216 @@
 $this->inner_sql.
 $this->get_date_where($level).'
-  GROUP BY period
+  GROUP BY period 
+  ORDER BY period ASC
 ;';
 
@@ -266 +267 @@
   {
     global $template, $page;
+
     $prev = $next =null;
     if ( empty($page['chronology_date']) )
       return;
-    $query = 'SELECT CONCAT_WS(\'-\'';
-    for ($i=0; $i<count($page['chronology_date']); $i++)
+    
+    $sub_query = '';
+    $nb_elements = count($page['chronology_date']);
+    for ($i=0; $i<$nb_elements; $i++)
     {
       if ( 'any' === $page['chronology_date'][$i] )
       {
-        $query .= ','.'"any"';
+        $sub_query .= '\'any\'';
       }
       else
       {
-        $query .= ','.$this->calendar_levels[$i]['sql'];
-      }
-    }
-    $current = implode('-', $page['chronology_date'] );
-
-    $query.=') as period' . $this->inner_sql .'
+        $sub_query .= pwg_db_cast_to_text($this->calendar_levels[$i]['sql']);
+      }
+      if ($i<($nb_elements-1))
+      {
+        $sub_query .= ',';
+      }
+    }
+    $query = 'SELECT '.pwg_db_concat_ws($sub_query, '-').' AS period';
+    $query .= $this->inner_sql .'
 AND ' . $this->date_field . ' IS NOT NULL
 GROUP BY period';
-
+    
+    $current = implode('-', $page['chronology_date'] );
     $upper_items = array_from_query( $query, 'period');