tutos-commits Mailing List for TUTOS (Page 27)

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

Revision: 665
          http://tutos.svn.sourceforge.net/tutos/?rev=665&view=rev
Author:   gokohnert
Date:     2012-06-27 12:32:08 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
fix overview

Modified Paths:
--------------
    trunk/php/expense/expense.pinc
    trunk/php/expense/expense_overview.php
    trunk/php/expense/expense_select.php

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

--- trunk/php/expense/expense.pinc	2012-06-27 11:13:02 UTC (rev 664)
+++ trunk/php/expense/expense.pinc	2012-06-27 12:32:08 UTC (rev 665)
@@ -298,7 +298,7 @@
     function getRefLink($text = "") {
         global $lang;
         if ( is_object($this->ref) ) {
-            return $this->ref->getLink();
+            return $this->ref->getLink($text);
         }
         return $lang['HistoryDeleted'];
     }
@@ -309,7 +309,7 @@
     function getAdrRefLink($text = "") {
         global $lang;
         if ( is_object($this->adr_ref) ) {
-            return $this->adr_ref->getLink();
+            return $this->adr_ref->getLink($text);
         }
         return $lang['HistoryDeleted'];
     }
@@ -820,7 +820,7 @@
         case 'ExpenseInvoice':
         case 'ExpenseCreate':
             $x = resolve_history_obj($f,$this->dbconn);
-        break;
+            break;
         case 'ExpenseCategory':
             $x = resolve_history_lgarr ($f,'ExpenseCategories');
             break;
@@ -830,7 +830,7 @@
         case 'ExpenseStartTime':
         case 'ExpenseEndTime':
             $x = resolve_history_datetime($f,$this->dbconn,false);
-        break;
+            break;
         default:
             return null;
         }

Modified: trunk/php/expense/expense_overview.php
===================================================================
--- trunk/php/expense/expense_overview.php	2012-06-27 11:13:02 UTC (rev 664)
+++ trunk/php/expense/expense_overview.php	2012-06-27 12:32:08 UTC (rev 665)
@@ -154,7 +154,9 @@
             $this->flds++;
             $this->preflds++;
         }
-        $r .= $this->orderHeader('',$lang['ExpenseAddress'],$this->link2);
+        if ($this->head['adr_id']) {
+            $r .= $this->orderHeader('',$lang['ExpenseAddress'],$this->link2);
+        }
         if ($this->head['category']) {
             $r .= $this->orderHeader('category',$lang['ExpenseCategory'],$this->link2);
             $this->flds++;
@@ -198,17 +200,28 @@
             $x = $this->mark_filter(myentities($b->getFullName()),'name');
             $r .= ' <td class="over_l">'. $b->getLink($x,'ss='.$ss) ."</td>\n";
             if ($this->head['link_id']) {
-                $r .= ' <td class="over_l">'. $b->getRefLink() ."</td>\n";
+                $x = '';
+                if ( is_object($b->ref) ) {
+                    $x = $this->mark_filter(myentities($b->ref->getFullName()),'nsrn');
+                }
+                $r .= ' <td class="over_l">'. $b->getRefLink($x) ."</td>\n";
             }
 
             if ($this->head['supplier']) {
+                $x = '';
                 if (is_object($b->supplier)) {
-                    $x = $this->mark_filter(myentities($b->supplier->getFullName()),'supfn');
+                    $x = $this->mark_filter(myentities($b->supplier->getFullName()),'supplier');
                 }
                 $r .= ' <td class="over_l">'. (is_object($b->supplier) ? $b->supplier->getLink($x):'&nbsp;') ."</td>\n";
             }
 
-            $r .= ' <td class="over_l">'. $b->getAdrRefLink() ."</td>\n";
+            if ($this->head['adr_id']) {
+                $x = '';
+                if ( is_object($b->adr_ref) ) {
+                    $x = $this->mark_filter(myentities($b->adr_ref->getFullName()),'adr_id');
+                }
+                $r .= ' <td class="over_l">'. $b->getAdrRefLink($x) ."</td>\n";
+            }
 
             if ($this->head['category']) {
                 $r .= ' <td class="over_l">'. $b->getCategory() ."</td>\n";
@@ -326,7 +339,7 @@
      * prepare
      */
     Function prepare() {
-        global $msg,$lang;
+        global $msg,$lang,$table;
 
         $this->layout_id = useexpenses;
         $this->name = $lang['ExpensesOverview'];
@@ -340,12 +353,13 @@
         $this->link1 = 'expense/expense_overview.php';
         $this->filter = array();
 
-        $this->head['link_id'] = true;
-        $this->head['custom'] = true;
-        $this->head['mods'] = true;
+        $this->head['link_id']  = true;
+        $this->head['custom']   = true;
+        $this->head['mods']     = true;
         $this->head['supplier'] = true;
         $this->head['category'] = true;
         $this->head['quantity'] = true;
+        $this->head['adr_id']   = true;
 
         if (isset($this->hide['category']) && $this->hide['category'] )  {
             $this->head['category'] = false;
@@ -361,26 +375,40 @@
         }
         $this->link1 = addHiddenFields($this->link1);
 
-        $reftype = "";
-        $name = "";
-        $nsrn = "";
-        $nscr = "";
+        if (isset($_GET['ext'])) {
+            $this->ext = $_GET['ext'];
+            $this->link1 = addUrlParameter($this->link1,"ext=".$this->ext);
+        } else {
+            $this->ext = 2; // call from somewhere else
+        }
 
-        if ( isset($_GET['reftype']) ) {
-            $reftype = $_GET['reftype'];
-        }
+        $reftype = '';
+        $name    = '';
+        $nsrn    = '';
+        $nscr    = '';
+
         if ( isset($_GET['name']) ) {
             $name = $_GET['name'];
         }
-        if ( isset($_GET['nsrn']) ) {
-            $nsrn = $_GET['nsrn'];
+        if ($this->ext != 0) {
+            if ( isset($_GET['reftype']) ) {
+                $reftype = $_GET['reftype'];
+                $this->link1 = addUrlParameter($this->link1,"reftype=". $reftype);
+                $this->filter['reftype'] = $reftype;
+            }
+            if ( isset($_GET['nsrn']) ) {
+                $nsrn = $_GET['nsrn'];
+                $this->link1 = addUrlParameter($this->link1,"nsrn=". $nsrn);
+                $this->filter['nsrn'] = $nsrn;
+            }
+            if ( isset($_GET['nscr']) ) {
+                $nscr = $_GET['nscr'];
+                $this->link1 = addUrlParameter($this->link1,"nscr=".UrlEncode($nscr));
+                $this->filter['nscr'] = $nscr;
+            }
         }
-        if ( isset($_GET['nscr']) ) {
-            $nscr = $_GET['nscr'];
-        }
 
-
-        $j = "SELECT DISTINCT e.* FROM ". $this->dbconn->prefix ."expenses e ";   // select + join
+        $j = "SELECT DISTINCT e.* FROM ". $this->dbconn->prefix .$table['expense'][name].' e ';   // select + join
         $q = "";
         $pre = " WHERE ";
 
@@ -416,7 +444,7 @@
                 $nsrn = "";
             }
             if ( ($reftype == 1) || ($reftype == -1) ) {
-                $j .= ", ". $this->dbconn->prefix ."companies c ";
+                $j .= ", ". $this->dbconn->prefix .$table['company'][name].' c ';
                 $q .= " ". $pre . "(e.link_id=c.id ";
                 if ( $nsrn != "" ) {
                     $q .= " AND ". $this->dbconn->Like("c.name",$nsrn);
@@ -425,7 +453,7 @@
                 $pre = " OR ";
             }
             if ( ($reftype == 2) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."departments d ";
+                $j .= ",". $this->dbconn->prefix .$table['department'][name].' d ';
                 $q .= " ". $pre . "(e.link_id=d.id ";
                 if ( $nsrn != "" ) {
                     $q .= " AND ". $this->dbconn->Like("d.name",$nsrn);
@@ -434,7 +462,7 @@
                 $pre = " OR ";
             }
             if ( ($reftype == 3) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."addresses a ";
+                $j .= ",". $this->dbconn->prefix .$table['address'][name].' a ';
                 $q .= $pre ."( (";
                 $q .= $this->dbconn->Like("a.f_name",$nsrn) ." OR ";
                 $q .= $this->dbconn->Like("a.m_name",$nsrn) ." OR ";
@@ -443,7 +471,7 @@
                 $pre = " OR ";
             }
             if ( ($reftype == 4) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."bugs b";
+                $j .= ",". $this->dbconn->prefix .$table['bugtracking'][name].' b';
                 $q .= " ". $pre . "(e.link_id=b.id ";
                 if ( $nsrn != "" ) {
                     $q .= " AND ". $this->dbconn->Like("b.short",$nsrn);
@@ -452,7 +480,7 @@
                 $pre = " OR ";
             }
             if ( ($reftype == 5) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."products p";
+                $j .= ",". $this->dbconn->prefix .$table['product'][name].' p';
                 $q .= $pre ."( e.link_id=p.id ";
                 if ( $nsrn != "" ) {
                     $q .= " AND (";
@@ -463,19 +491,19 @@
                 $pre = " OR ";
             }
             if ( ($reftype == 6) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."teams t";
+                $j .= ",". $this->dbconn->prefix .$table['team'][name].' t';
                 $q .= $pre . "(e.link_id=t.id AND ". $this->dbconn->Like("t.name",$nsrn) .")";
                 $pre = " OR ";
             }
             if ( ($reftype == 7) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."tasks k";
+                $j .= ",". $this->dbconn->prefix .$table['task'][name].' k';
                 $q .= $pre . "(e.link_id=k.id AND ". $this->dbconn->Like("k.name",$nsrn) .")";
                 $pre = " OR ";
             }
             if ( ($reftype == 8) || ($reftype == -1) ) {
-                $j .= ",". $this->dbconn->prefix ."installations i";
-                if ( ! stristr($j, "products") ) {
-                    $j .= ",". $this->dbconn->prefix ."products p";
+                $j .= ",". $this->dbconn->prefix.$table['installation'][name].' i';
+                if ( ! stristr($j, $table['product'][name]) ) {
+                    $j .= ",".$this->dbconn->prefix.$table['product'][name].' p';
                 }
                 $q .= $pre ."( e.link_id=i.id AND i.product_id=p.id AND (";
                 $q .= $this->dbconn->Like("p.name",$nsrn) ." OR ";
@@ -484,25 +512,10 @@
             }
             $pre = "AND ";
 
-            $this->link1 = addUrlParameter($this->link1,"reftype=". $reftype);
-            $this->link1 = addUrlParameter($this->link1,"nsrn=". $nsrn);
-            // remember this
-            $_SESSION['expensesearchreftype'] = $reftype;
-            $this->filter['reftype'] = $reftype;
         }
-        if ( ($nscr != "*") && ($nscr != "") ) {
-            $j .= ", addresses ";
-            $q .= $pre ."( (";
-            $q .= $this->dbconn->Like("addresses.f_name",$nscr) ." OR ";
-            $q .= $this->dbconn->Like("addresses.m_name",$nscr) ." OR ";
-            $q .= $this->dbconn->Like("addresses.l_name",$nscr) .")";
-            $q .= " AND e.creator=addresses.id )";
-            $pre = "AND ";
-            $this->link1 = addUrlParameter($this->link1,"nscr=".UrlEncode($nscr));
-            $this->filter['nscr'] = $nscr;
-        }
+        // remember this
+        $_SESSION['expensesearchreftype'] = $reftype;
 
-
         $this->q = $j.$q;
         $this->qpre = $pre;
 
@@ -518,6 +531,14 @@
         overview_arg($this,'supfn',OVERVIEW_ARG_FN,'expense',array('supplier'),'ExpenseSupplier','e.','cd');
         overview_arg($this,'supid',OVERVIEW_ARG_OBJID,'expense',array('supplier'),'ExpenseSupplier','e.');
 
+        // adr
+        overview_arg($this,'adrfn',OVERVIEW_ARG_FN,'expense',array('adr_id'),'ExpenseAddress','e.','at');
+        overview_arg($this,'adrid',OVERVIEW_ARG_OBJID,'expense',array('adr_id'),'ExpenseAddress','e.');
+
+        // creator
+        overview_arg($this,'crfn',OVERVIEW_ARG_FN,'expense',array('creator'),'ExpenseCreator','e.','a');
+        overview_arg($this,'crid',OVERVIEW_ARG_OBJID,'expense',array('creator'),'ExpenseCreator','e.');
+
         // category
         overview_arg($this,'cat',OVERVIEW_ARG_INT,'expense',array('category'),array('ExpenseCategory','ExpenseCategories'),'e.');
 
@@ -535,7 +556,7 @@
         foreach ($custom[1] as $s) {
             $this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
         }
-        #        $msg .= $this->q;
+        //        $msg = addLine($this->q,$msg);
 
         check_dbacl($this->dbconn,$this->q, $this->user->id);
 

Modified: trunk/php/expense/expense_select.php
===================================================================
--- trunk/php/expense/expense_select.php	2012-06-27 11:13:02 UTC (rev 664)
+++ trunk/php/expense/expense_select.php	2012-06-27 12:32:08 UTC (rev 665)
@@ -36,10 +36,8 @@
         $this->width = 3;
         $r = '';
         $r .= "<form id=\"expensesearch\" name=\"expensesearch\" method=\"get\" action=\"expense_overview.php\">\n";
-        if ( $this->ext == false ) {
-            $this->addHidden("reftype",0);
-        }
         $r .= $this->SelectTableStart();
+        $this->addHidden('ext',$this->ext);
         $r .= $this->headline($lang['SearchForExpense']);
 
         $r .= $this->ContentRowStart();
@@ -70,7 +68,7 @@
         }
 
         $r .= $this->ContentRowStart('ext');
-        $r .= $this->showfieldc($lang['ExpenseRefType']);
+        $r .= $this->showfieldc($lang['ExpenseRefType'],0,'reftype');
         $r .= $this->showdata($this->ExpenseAskRefType($this->nsrt,1),2);
         $r .= $this->ContentRowEnd();
 
@@ -85,13 +83,18 @@
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
+        $r .= $this->showfieldc($lang['ExpenseAddress'],0,'adr');
+        $r .= $this->showdata(select_from_array_or_input($this->obj,"adr",null,1,'at'),2);
+        $r .= $this->ContentRowEnd();
+
+        $r .= $this->ContentRowStart('ext');
         $r .= $this->showfieldc($lang['ExpenseCategory'],0,'cat');
         $r .= $this->showdata(SelectLangArray('cat','ExpenseCategories',-1,true),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
-        $r .= $this->showfieldc($lang['ExpenseCreator'],0,'nscr');
-        $r .= $this->showdata('<input type="text" value="" name="nscr" id="nscr" />',2);
+        $r .= $this->showfieldc($lang['ExpenseCreator'],0,'cr');
+        $r .= $this->showdata(select_from_array_or_input($this->obj,"cr",null,1,'a'),2);
         $r .= $this->ContentRowEnd();
 
         $r .= $this->ContentRowStart('ext');
@@ -127,7 +130,7 @@
     function ExpenseAskRefType ($default,$any) {
         global $lang;
 
-        $r = '<select name="reftype">';
+        $r = '<select id="reftype" name="reftype">';
         foreach ($lang['ExpenseReferences'] as $i => $f ) {
             $r .= "<option value=\"". $i ."\" ";
             if ( $i == $default ) {

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 27)

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

tutos-commits — SVN commits