tutos-commits Mailing List for TUTOS (Page 23)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 765
          http://tutos.svn.sourceforge.net/tutos/?rev=765&view=rev
Author:   gokohnert
Date:     2012-08-21 11:44:40 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
prepare better history search

Modified Paths:
--------------
    trunk/php/base.pinc
    trunk/php/db/db.pinc
    trunk/php/db/table.pinc
    trunk/php/history.pinc
    trunk/php/history_show.php

Modified: trunk/php/base.pinc
===================================================================

--- trunk/php/base.pinc	2012-08-20 12:19:11 UTC (rev 764)
+++ trunk/php/base.pinc	2012-08-21 11:44:40 UTC (rev 765)
@@ -343,11 +343,11 @@
     /**
      * Return Info about history of this object
      */
-    function readHistory($adr_id,$sort,$dir,$start) {
+    function readHistory($adr_id,$sort,$dir,$start,$from = null, $to = null) {
         if ( count($this->history) > 0 ) {
             return;
         }
-        readHistory($this,$adr_id,$sort,$dir,$start);
+        readHistory($this,$adr_id,$sort,$dir,$start,$from,$to);
         return;
     }
 
@@ -1285,7 +1285,7 @@
             } else {
                 $q->addFV($i,$this->$fld,'');
             }
-#       echo $x[type] ." ". $fld ." ". $this->$fld ."<br />";
+            #       echo $x[type] ." ". $fld ." ". $this->$fld ."<br />";
         }
     }
 

Modified: trunk/php/db/db.pinc
===================================================================
--- trunk/php/db/db.pinc	2012-08-20 12:19:11 UTC (rev 764)
+++ trunk/php/db/db.pinc	2012-08-21 11:44:40 UTC (rev 765)
@@ -354,7 +354,7 @@
     function getType() {
         return 'DB';
     }
-  }
+}
 
 /**
  * Resultset base class (= template)
@@ -585,33 +585,36 @@
      *  type of cpmpare (defaults to =)
      */
     function addWC($fld,$val,$type,$cmp = " = ") {
+        $wc = '';
         $fld = $this->dbconn->colname($fld);
         if ( $type == 'STRING' ) {
-            $this->wc[$fld] = $cmp. $this->dbconn->String($val);
+            $wc = $cmp. $this->dbconn->String($val);
         } else if ( $type == 'PASSWORD' ) {
-            $this->wc[$fld] = $cmp. $this->dbconn->Password($val);
+            $wc = $cmp. $this->dbconn->Password($val);
         } else if ( $type == 'DATETIME' ) {
-            $this->wc[$fld] = $cmp. $this->dbconn->datetime($val);
+            $wc = $cmp. $this->dbconn->datetime($val);
         } else if ( $type == 'DATE' ) {
-            $this->wc[$fld] = $cmp. $this->dbconn->date($val);
+            $wc = $cmp. $this->dbconn->date($val);
         } else if ( $type == 'OBJ' ) {
             if ($cmp == 'in') {
-                $this->wc[$fld] = ' '.$cmp.'(';
+                $wc = ' '.$cmp.'(';
                 $pre = '';
                 foreach ($val as $i) {
-                    $this->wc[$fld] .= $pre.$i;
+                    $wc .= $pre.$i;
                     $pre = ',';
                 }
-                $this->wc[$fld] .= ')';
+                $wc .= ')';
             } else
-                $this->wc[$fld] = $cmp. sprintf("%d",$val->id);
+                $wc = $cmp. sprintf("%d",$val->id);
         } else if ( $type == 'INT' ) {
-            $this->wc[$fld] = $cmp. sprintf("%d",$val);
+            $wc = $cmp. sprintf("%d",$val);
         } else if ( $type == 'FLOAT' ) {
-            $this->wc[$fld] = $cmp. sprintf("%F",$val);
+            $wc = $cmp. sprintf("%F",$val);
         } else {
-            $this->wc[$fld] = $cmp. $val;
+            $wc = $cmp. $val;
         }
+
+        $this->wc[$fld][] = $wc;
     }
 
     /**
@@ -676,8 +679,10 @@
         }
         $pre = ' WHERE ';
         foreach( $this->wc as $i => $f) {
-            $q .= $pre ."(". $i . $f .")";
-            $pre = ' AND ';
+            foreach ($f as $ff) {
+                $q .= $pre ."(". $i . $ff .")";
+                $pre = ' AND ';
+            }
         }
         return $q;
     }
@@ -705,8 +710,10 @@
         $q .= ' FROM ' .  $this->table;
         $pre = ' WHERE ';
         foreach ($this->wc as $i => $f) {
-            $q .= $pre .'('. $i . $f .')';
-            $pre = ' AND ';
+            foreach ($f as $ff) {
+                $q .= $pre .'('. $i . $ff .')';
+                $pre = ' AND ';
+            }
         }
         if (! $short) {
             $q .= $this->order;

Modified: trunk/php/db/table.pinc
===================================================================
--- trunk/php/db/table.pinc	2012-08-20 12:19:11 UTC (rev 764)
+++ trunk/php/db/table.pinc	2012-08-21 11:44:40 UTC (rev 765)
@@ -675,6 +675,12 @@
     column => array('obj_id'),
     Desc  => 'history objects',
     );
+$tableidx['history2'] = array(
+    name  => 'history_idx2',
+    table => 'history',
+    column => array('adr_id'),
+    Desc  => 'history changer',
+    );
 
 $table['message'] = array(
     name => 'messages',
@@ -716,4 +722,4 @@
     Desc  => 'main TUTOS sequencer',
     );
 
-?>
+?>
\ No newline at end of file

Modified: trunk/php/history.pinc
===================================================================
--- trunk/php/history.pinc	2012-08-20 12:19:11 UTC (rev 764)
+++ trunk/php/history.pinc	2012-08-21 11:44:40 UTC (rev 765)
@@ -18,9 +18,13 @@
  * Read the history of the given object
  *
  * @param Object $obj a object
+ * @param $adr_id userid  who chnaged
+ * @param $from start time
+ * @param $to end time
  */
-function readHistory (tutos_base $obj,$adr_id,$sort = "m_time" ,$dir,$start) {
+function readHistory (tutos_base $obj,$adr_id,$sort = "m_time" ,$dir,$start,$from = null,$to = null) {
     global $tutos;
+
     if ( ! isset($obj->id) ) {
         return;
     }
@@ -38,13 +42,21 @@
             foreach($obj->loc as $i => $l) {
                 $x[] = $i;
             }
-            $query->addWC("obj_id",$x,"OBJ",'in');
+            $query->addWC('obj_id',$x,'OBJ','in');
         } else
-            $query->addWC("obj_id",$obj,"OBJ");
+            $query->addWC('obj_id',$obj,'OBJ');
     }
     if ( $adr_id != -1 ) {
-        $query->addWC("adr_id",$adr_id,"INT");
+        $query->addWC('adr_id',$adr_id,'INT');
     }
+
+    if (is_object($from) && !$from->notime) {
+        $query->addWC('m_time',$from,'DATE',' >= ');
+    }
+    if (is_object($to) && !$to->notime) {
+        $query->addWC('m_time',$to,'DATE',' <= ');
+    }
+
     $query->addOrder($sort,$dir);
     $query->addOrder("obj_id",$dir);
 
@@ -54,6 +66,8 @@
 
     $r = $query->runSelect();
 
+    //    echo $query->getSelect();
+
     $n = $r->numrows();
     $obj->history_size = $n;
     $a = 0;
@@ -81,7 +95,7 @@
     }
     $r->free();
     return;
-  }
+}
 /**
  * Save the history
  */

Modified: trunk/php/history_show.php
===================================================================
--- trunk/php/history_show.php	2012-08-20 12:19:11 UTC (rev 764)
+++ trunk/php/history_show.php	2012-08-21 11:44:40 UTC (rev 765)
@@ -88,7 +88,7 @@
         $r .= "</thead>\n";
 
         $line = 0;
-        $this->xobj->readHistory($this->adr_id,$this->xf,$this->xo,$this->start);
+        $this->xobj->readHistory($this->adr_id,$this->order_fld,$this->order_dir,$this->start,$this->from,$this->to);
         $n = $this->xobj->history_size;
         if ( $n == 0 ) {
             $r .= $this->error ( $lang['Err0048'] );
@@ -237,10 +237,12 @@
         global $tutos,$msg,$lang;
 
         $this->link1 = "history_show.php";
-        $this->obj = -1;
-        $this->adr = -1;
-        $this->id = -1;
+        $this->obj    = -1;
+        $this->adr    = -1;
+        $this->id     = -1;
         $this->adr_id = -1;
+        $this->from   = null;
+        $this->to     = null;
 
         $name =  $lang['AppEverything'];
 
@@ -284,40 +286,58 @@
         if ($arg == 0) {
             $this->id = -1;
             if ( ! $this->user->isadmin() && ($tutos[demo] != 1) ) {
-                $msg .= "Missing Filter";
+                $msg = addLine($msg,"Missing Filter");
                 $this->stop = true;
             }
         }
 
         $this->name = sprintf($lang['HistoryDetail'],"\"". $name ."\"");
 
+        if ( isset($_GET['maxshow']) && ($_GET['maxshow'] != "") ) {
+            $tutos['maxshow'] = $_GET['maxshow'];
+            $this->addHidden("maxshow",$_GET['maxshow']);
+            $this->link1 = addUrlParameter($this->link1,"maxshow=".$_GET['maxshow']);
+        }
+
+        $this->from = new TUTOS_Date_Time(0);
+        if ( isset($_GET['fd']) ) {
+            $this->from->setDateTime($_GET['fd']);
+        } else {
+            $this->from->setDateTimeF('f');
+        }
+        if (!$this->from->notime)
+            $this->link1 = addUrlParameter($this->link1,"fd=".$this->from->getYYYYMMDD());
+
+        $this->to = new TUTOS_Date_Time(0);
+        if ( isset($_GET['td']) ) {
+            $this->to->setDateTime($_GET['td']);
+        } else {
+            $this->to->setDateTimeF('t');
+        }
+        if (!$this->to->notime)
+            $this->link1 = addUrlParameter($this->link1,"td=".$this->to->getYYYYMMDD());
+
+
         $this->link2 = $this->link1;
+
         if ( ! isset($_GET['start']) ) {
             $this->start = 0;
         } else {
             $this->start = $_GET['start'];
         }
         if ( ! isset($_GET['xf']) ) {
-            $this->xf = "m_time";
-            $_GET['xf'] = $this->xf;
+            $this->order_fld = "m_time";
         } else {
-            $this->xf = $_GET['xf'];
-            $this->link1 = addUrlParameter($this->link1,"xf=".$this->xf);
+            $this->order_fld = $_GET['xf'];
+            $this->link1 = addUrlParameter($this->link1,"xf=".$this->order_fld);
         }
         if ( ! isset($_GET['xo']) ) {
-            $this->xo = 2;
-            $_GET['xo'] = $this->xo;
+            $this->order_dir = 2;
         } else {
-            $this->xo = $_GET['xo'];
-            $this->link1 = addUrlParameter($this->link1,"xo=".$this->xo);
+            $this->order_dir = $_GET['xo'];
+            $this->link1 = addUrlParameter($this->link1,"xo=".$this->order_dir);
         }
-        if ( isset($_GET['maxshow']) && ($_GET['maxshow'] != "") ) {
-            $tutos['maxshow'] = $_GET['maxshow'];
-            $this->addHidden("maxshow",$_GET['maxshow']);
-            $this->link1 = addUrlParameter($this->link1,"maxshow=".$_GET['maxshow']);
-        }
 
-
         if ( ! $this->user->feature_ok(usehistory,PERM_SEE) ) {
             $msg .= sprintf($lang['Err0022'],$this->name);
             $this->stop = true;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2001	Jan	Feb	Mar	Apr	May	Jun	Jul (13)	Aug (214)	Sep (144)	Oct (22)	Nov (22)	Dec (93)
2002	Jan (25)	Feb (31)	Mar (92)	Apr (70)	May (103)	Jun (130)	Jul (265)	Aug (325)	Sep (233)	Oct (244)	Nov (261)	Dec (157)
2003	Jan (101)	Feb (135)	Mar (148)	Apr (164)	May (53)	Jun (116)	Jul (149)	Aug (126)	Sep (45)	Oct (109)	Nov (36)	Dec (61)
2004	Jan (131)	Feb (236)	Mar (278)	Apr (259)	May (92)	Jun (110)	Jul (150)	Aug (64)	Sep (141)	Oct (141)	Nov (146)	Dec (65)
2005	Jan (70)	Feb (77)	Mar (129)	Apr (153)	May (161)	Jun (63)	Jul (42)	Aug (16)	Sep (30)	Oct (3)	Nov (8)	Dec (40)
2006	Jan (114)	Feb (16)	Mar (12)	Apr (15)	May (4)	Jun (9)	Jul (69)	Aug (27)	Sep (12)	Oct (80)	Nov (62)	Dec (41)
2007	Jan (34)	Feb (2)	Mar (38)	Apr (82)	May (61)	Jun (37)	Jul (16)	Aug (64)	Sep (7)	Oct (52)	Nov (18)	Dec (28)
2008	Jan (168)	Feb (26)	Mar (27)	Apr (19)	May (10)	Jun (58)	Jul (58)	Aug (91)	Sep (14)	Oct (23)	Nov (56)	Dec (38)
2009	Jan (58)	Feb (90)	Mar (204)	Apr (90)	May (27)	Jun (177)	Jul (116)	Aug (53)	Sep (42)	Oct (120)	Nov (51)	Dec (58)
2010	Jan (117)	Feb (231)	Mar (163)	Apr (90)	May (40)	Jun (139)	Jul (49)	Aug (118)	Sep (25)	Oct (80)	Nov (102)	Dec (99)
2011	Jan (176)	Feb (42)	Mar (60)	Apr (52)	May (30)	Jun (29)	Jul (27)	Aug (16)	Sep (51)	Oct (70)	Nov (63)	Dec (58)
2012	Jan (28)	Feb (26)	Mar (7)	Apr (12)	May (41)	Jun (61)	Jul (59)	Aug (38)	Sep (30)	Oct (28)	Nov (14)	Dec (31)
2013	Jan (24)	Feb (54)	Mar (45)	Apr (22)	May (35)	Jun (8)	Jul (18)	Aug (38)	Sep (11)	Oct (8)	Nov (19)	Dec (20)
2014	Jan (20)	Feb (22)	Mar (4)	Apr (6)	May (13)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb (1)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (1)
2016	Jan (4)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (8)	Aug (13)	Sep (12)	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2021	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

tutos-commits Mailing List for TUTOS (Page 23)

Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory

tutos-commits — SVN commits