Changeset 17760

Timestamp:

Sep 5, 2012, 5:15:35 PM (12 years ago)

Author:

grum

Message:

version 0.1.0b

. fix bug on period tab (empty period is managed)
. fix bug on date/time filter (+set time as mandatory value)

Location:

extensions/EStat

Files:

• estat_ajax.php (modified) (3 diffs)
• lib/statDB.class.inc.php (modified) (5 diffs)
• lib/statDBMonth.class.inc.php (modified) (1 diff)

extensions/EStat/estat_ajax.php

@@ -1151 +1151 @@
 
           $tmp=$statFile->getStatPeriod(0, 0, $fields['total'], $filter, $sort);
-          $returned['total']=array('', $tmp[0]['T'], $tmp[0]['C'], $tmp[0]['I'], $tmp[0]['A']);
+          if(isset($tmp[0]))
+          {
+            $returned['total']=array('', $tmp[0]['T'], $tmp[0]['C'], $tmp[0]['I'], $tmp[0]['A']);
+          }
+          else
+          {
+            $returned['total']=array('', '0', '0', '0', '0');
+          }
           break;
         case 'y':
@@ -1170 +1177 @@
 
           $tmp=$statFile->getStatPeriod(0, 0, $fields['total'], $filter, $sort);
-          $returned['total']=array('', $tmp[0][0]['T'], $tmp[0][0]['C'], $tmp[0][0]['I'], $tmp[0][0]['A']);
+          if(isset($tmp[0]))
+          {
+            $returned['total']=array('', $tmp[0][0]['T'], $tmp[0][0]['C'], $tmp[0][0]['I'], $tmp[0][0]['A']);
+          }
+          else
+          {
+            $returned['total']=array('', '0', '0', '0', '0');
+          }
           break;
         default:
@@ -1189 +1203 @@
           }
           $tmp=$statFile->getStatPeriod(0, 0, $fields['total'], $filter, $sort);
-          $returned['total']=array('', $tmp[0][0]['T'], $tmp[0][0]['C'], $tmp[0][0]['I'], $tmp[0][0]['A']);
+          if(isset($tmp[0]))
+          {
+            $returned['total']=array('', $tmp[0][0]['T'], $tmp[0][0]['C'], $tmp[0][0]['I'], $tmp[0][0]['A']);
+          }
+          else
+          {
+            $returned['total']=array('', '0', '0', '0', '0');
+          }
           break;
       }

extensions/EStat/lib/statDB.class.inc.php

@@ -865 +865 @@
 
 
+
+  /**
+   * to be used with Date filter: replace the given operator with 'between' or 'not between'
+   *
+   * @param Array $value
+   * @return Array
+   */
+  protected function checkDateFilter($value)
+  {
+    if(is_array($value))
+    {
+      if(isset($value['operator']))
+      {
+        if($value['operator']=='=' or
+           $value['operator']=='like')
+        {
+          $value['operator']='between';
+          $value['minValue']=$value['value'];
+          $value['maxValue']=$value['value'];
+          $value['value']=null;
+        }
+        elseif($value['operator']=='!=' or
+               $value['operator']=='not like')
+        {
+          $value['operator']='not between';
+          $value['minValue']=$value['value'];
+          $value['maxValue']=$value['value'];
+          $value['value']=null;
+        }
+      }
+    }
+    return($value);
+  } // checkDateFilter
+
+
+
+
   /**
    * check if value is a valid operator array
@@ -902 +939 @@
               {
                 case 'date':
-                  $value['value']=$this->checkValueDate($value['value']);
+                  switch($value['operator'])
+                  {
+                    case '>':
+                    case '<=':
+                      $value['value']=$this->checkValueDate($value['value'], 'E');
+                      break;
+                    case '<':
+                    case '>=':
+                    default:
+                      $value['value']=$this->checkValueDate($value['value'], 'B');
+                      break;
+                  }
                   if($value['value']==null) return(null);
                   $value['value']=$value['value'];
@@ -958 +1006 @@
               {
                 case 'date':
-                  $value['minValue']=$this->checkValueDate($value['minValue']);
+                  $value['minValue']=$this->checkValueDate($value['minValue'], 'B');
                   if($value['minValue']==null) return(null);
-                  $value['maxValue']=$this->checkValueDate($value['maxValue']);
+                  $value['maxValue']=$this->checkValueDate($value['maxValue'], 'E');
                   if($value['maxValue']==null) return(null);
                   break;
@@ -993 +1041 @@
   /**
    * check if date is Ok
-   * return the date completed (YYYY-MM-DD => YYYY-MM-DD 00:00:00) or null if not valid
+   * return the date completed
+   *      (YYYY-MM-DD => YYYY-MM-DD 00:00:00) if $mode='B'
+   *  or  (YYYY-MM-DD => YYYY-MM-DD 23:59:59) if $mode='E'
+   *  or  null if not valid
    *
    * @param String $value
+   * @param String $mode: 'B' for begin or 'E' for end
    * @return String
    */
-  protected function checkValueDate($value)
+  protected function checkValueDate($value, $mode='B')
   {
     $returned=null;
     $result=array();
-    if(preg_match('/^(\d{4}-\d{2}-\d{2})(?:(\s{1}\d{2}:\d{2})(:\d{2})?)?$/', $value, $result)>0)
+    if(preg_match('/^(\d{4}-\d{2}-\d{2})(?:(\s{1}\d{2}:\d{2})(:\d{2})?)?$/', trim($value), $result)>0)
     {
       $returned=$result[1];
@@ -1012 +1064 @@
           $returned.=$result[3];
         }
-        else $returned.=':00';
-      }
-      else $returned.=' 00:00:00';
+        else
+        {
+          $returned.=($mode=='B')?':00':':59';
+        }
+      }
+      else
+      {
+        $returned.=($mode=='B')?' 00:00:00':' 23:59:59';
+      }
     }
     return(strtotime($returned));

extensions/EStat/lib/statDBMonth.class.inc.php

@@ -257 +257 @@
     if(!isset($filter['uaType'])) $filter['uaType']=null;
 
+    $filter['date']=$this->checkDateFilter($filter['date']);
     $filter['IPadress']=$this->checkIPFilter($filter['IPadress']);
     // check filter values - getOperator check and 'clean' the filter