[Fmsystem-commits] [11001] property: inventory

[Sigurd Nes]

Revision: 11001
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11001
Author:   sigurdne
Date:     2013-03-19 11:10:55 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
property: inventory

Modified Paths:
--------------
    trunk/property/inc/class.boentity.inc.php
    trunk/property/inc/class.soentity.inc.php
    trunk/property/inc/class.uientity.inc.php
    trunk/property/setup/tables_update.inc.php
    trunk/property/templates/base/entity.xsl

Modified: trunk/property/inc/class.boentity.inc.php
===================================================================
--- trunk/property/inc/class.boentity.inc.php   2013-03-18 14:35:55 UTC (rev 
11000)
+++ trunk/property/inc/class.boentity.inc.php   2013-03-19 11:10:55 UTC (rev 
11001)
@@ -683,7 +683,8 @@
                public function get_inventory($id = 0)
                {
                        $location_id = 
$GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type], 
".{$this->type}.{$this->entity_id}.{$this->cat_id}");
-                       return $this->so->get_inventory( array('id' => $id, 
'location_id' => $location_id) );
+                       $values = $this->so->get_inventory( array('id' => $id, 
'location_id' => $location_id) );
+                       return $values;
                }
 
                public function save_inventory($values)

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2013-03-18 14:35:55 UTC (rev 
11000)
+++ trunk/property/inc/class.soentity.inc.php   2013-03-19 11:10:55 UTC (rev 
11001)
@@ -2389,6 +2389,7 @@
                                );
                        }
 
+//_debug_array($inventory);
                        return $inventory;
 /*
   id integer NOT NULL DEFAULT nextval('seq_fm_bim_item_inventory'::regclass),
@@ -2447,18 +2448,8 @@
                                'remark'                        => 
$this->db->db_addslashes($values['remark'])
                        );
 
-
-_debug_array($p_location_id);
-_debug_array($p_id);
-_debug_array($values);
-
-
-die();
-
-                               $this->db->query("INSERT INTO {$table} (" . 
implode(',',array_keys($value_set)) . ') VALUES ('
+                       return  $this->db->query("INSERT INTO {$table} (" . 
implode(',',array_keys($value_set)) . ') VALUES ('
                                 . 
$this->db->validate_insert(array_values($value_set)) . ')',__LINE__,__FILE__);
 
-
                }
-
        }

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2013-03-18 14:35:55 UTC (rev 
11000)
+++ trunk/property/inc/class.uientity.inc.php   2013-03-19 11:10:55 UTC (rev 
11001)
@@ -2147,9 +2147,9 @@
                                        (
                                                'name'          => "3",
                                                'values'        =>      
json_encode(array(      
-                                                               array('key' => 
'url','label'=>lang('where'),'sortable'=>false,'resizeable'=>true),
+                                                               array('key' => 
'where','label'=>lang('where'),'sortable'=>false,'resizeable'=>true),
                                                                array('key' => 
'unit','label'=>lang('unit'),'sortable'=>false,'resizeable'=>true),
-                                                               array('key' => 
'count','label'=>lang('count'),'sortable'=>false,'resizeable'=>true),
+                                                               array('key' => 
'inventory','label'=>lang('count'),'sortable'=>false,'resizeable'=>true),
                                                                array('key' => 
'bookable','label'=>lang('bookable'),'sortable'=>false,'resizeable'=>true),
                                                                array('key' => 
'calendar','label'=>lang('calendar'),'sortable'=>false,'resizeable'=>true),
                                                                array('key' => 
'remark','label'=>lang('remark'),'sortable'=>false,'resizeable'=>true),
@@ -2878,7 +2878,9 @@
 
                        if (isset($values['save']) && $values['save'])
                        {
-                               $insert_record          = 
$GLOBALS['phpgw']->session->appsession('insert_record','property');
+                               $values['location_id']  = $location_id;
+                               $values['item_id']              = $item_id;
+                               $insert_record                  = 
$GLOBALS['phpgw']->session->appsession('insert_record','property');
 
                                if(is_array($insert_record_entity))
                                {

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2013-03-18 14:35:55 UTC (rev 
11000)
+++ trunk/property/setup/tables_update.inc.php  2013-03-19 11:10:55 UTC (rev 
11001)
@@ -7519,6 +7519,8 @@
        {
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
 
+               $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
                $GLOBALS['phpgw_setup']->oProc->CreateTable(
                        'fm_bim_item_inventory',  array(
                                'fd' => array(

Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl    2013-03-18 14:35:55 UTC (rev 
11000)
+++ trunk/property/templates/base/entity.xsl    2013-03-19 11:10:55 UTC (rev 
11001)
@@ -38,9 +38,9 @@
                                        <label><xsl:value-of 
select="php:function('lang', 'id')" /></label>
                                        </td>
                                        <td>
-                                               <xsl:value-of 
select="location_id"/>
+                                               <xsl:value-of select="item_id"/>
                                                <input type="hidden" 
name="location_id" value="{location_id}"/>
-                                               <input type="hidden" 
name="item_id" value="{item_id}"/>
+                                               <input type="hidden" name="id" 
value="{item_id}"/>
                                        </td>
                                </tr>