[Fmsystem-commits] [10079] added description-field on activity

[Erik Holm-Larsen]

Revision: 10079
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10079
Author:   erikhl
Date:     2012-10-02 06:47:39 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
added description-field on activity

Modified Paths:
--------------
    trunk/logistic/inc/class.soactivity.inc.php
    trunk/logistic/inc/model/class.activity.inc.php
    trunk/logistic/setup/setup.inc.php
    trunk/logistic/setup/tables_current.inc.php

Added Paths:
-----------
    trunk/logistic/setup/tables_update.inc.php

Modified: trunk/logistic/inc/class.soactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.soactivity.inc.php 2012-10-02 06:29:07 UTC (rev 
10078)
+++ trunk/logistic/inc/class.soactivity.inc.php 2012-10-02 06:47:39 UTC (rev 
10079)
@@ -53,6 +53,7 @@
                        $cols = array(
                                'parent_activity_id',
                                'name',
+                               'description',
                                'project_id',
                                'start_date',
                                'end_date',
@@ -74,6 +75,7 @@
                        $values = array(
                                $this->marshal($activity->get_parent_id(), 
'int'),
                                $this->marshal($activity->get_name(), 'string'),
+                               $this->marshal($activity->get_description(), 
'string'),
                                $this->marshal($activity->get_project_id(), 
'int'),
                                $this->marshal($activity->get_start_date(), 
'int'),
                                $this->marshal($activity->get_end_date(), 
'int'),
@@ -102,6 +104,7 @@
 
                        $values = array(
                                'name=' . $this->marshal($activity->get_name(), 
'string'),
+                               'description=' . 
$this->marshal($activity->get_description(), 'string'),
                                'parent_activity_id=' . 
$this->marshal($activity->get_parent_id(), 'int'),
                                'project_id=' . 
$this->marshal($activity->get_project_id(), 'int'),
                                'start_date=' . 
$this->marshal($activity->get_start_date(), 'int'),
@@ -211,6 +214,7 @@
                                $activity = new logistic_activity((int) 
$activity_id);
 
                                
$activity->set_name($this->unmarshal($this->db->f('name'), 'string'));
+                               
$activity->set_description($this->unmarshal($this->db->f('description'), 
'string'));
                                
$activity->set_parent_id($this->unmarshal($this->db->f('parent_id'), 'int'));
                                
$activity->set_project_id($this->unmarshal($this->db->f('project_id'), 'int'));
                                
$activity->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));

Modified: trunk/logistic/inc/model/class.activity.inc.php
===================================================================
--- trunk/logistic/inc/model/class.activity.inc.php     2012-10-02 06:29:07 UTC 
(rev 10078)
+++ trunk/logistic/inc/model/class.activity.inc.php     2012-10-02 06:47:39 UTC 
(rev 10079)
@@ -35,6 +35,7 @@
 
                                protected static $id;
                                protected static $name;
+                               protected static $description;
                                protected static $parent_id;
                                protected static $project_id;
                                protected static $start_date;
@@ -75,6 +76,16 @@
                                        return $this->name;
                                }
 
+                               public function set_description($description)
+                               {
+                                       $this->description = $description;
+                               }
+
+                               public function get_description()
+                               {
+                                       return $this->description;
+                               }
+
                                public function set_parent_id($parent_id)
                                {
                                        $this->parent_id = $parent_id;
@@ -169,6 +180,7 @@
                                                'id' => $this->get_id(),
                                                'parent_id' => 
$this->get_parent_id(),
                                                'name' => $this->get_name(),
+                                               'description' => 
$this->get_description(),
                                                'project_id' => 
$this->get_project_id(),
                                                'project_name' => $project_name,
                                                'start_date' => 
$this->get_start_date() ? date($date_format, $this->get_start_date()): '',

Modified: trunk/logistic/setup/setup.inc.php
===================================================================
--- trunk/logistic/setup/setup.inc.php  2012-10-02 06:29:07 UTC (rev 10078)
+++ trunk/logistic/setup/setup.inc.php  2012-10-02 06:47:39 UTC (rev 10079)
@@ -1,11 +1,11 @@
 <?php
        $setup_info['logistic']['name'] = 'logistic';
-       $setup_info['logistic']['version'] = '0.0.1';
+       $setup_info['logistic']['version'] = '0.0.2';
        $setup_info['logistic']['app_order'] = 70;
        $setup_info['logistic']['enable'] = 1;
        $setup_info['logistic']['app_group']    = 'office';
-       
-       $setup_info['logistic']['tables'] = array 
+
+       $setup_info['logistic']['tables'] = array
        (
                        'lg_project',
                        'lg_project_type',

Modified: trunk/logistic/setup/tables_current.inc.php
===================================================================
--- trunk/logistic/setup/tables_current.inc.php 2012-10-02 06:29:07 UTC (rev 
10078)
+++ trunk/logistic/setup/tables_current.inc.php 2012-10-02 06:47:39 UTC (rev 
10079)
@@ -28,6 +28,7 @@
                                                'id' => array('type' => 'auto', 
'precision' => 4, 'nullable' => false),
                                                'parent_activity_id' => 
array('type' => 'int', 'precision' => 4, 'nullable' => true),
                                                'name' => array('type' => 
'varchar', 'precision' => '255', 'nullable' => false),
+                                               'description' => array('type' 
=> 'text', 'nullable' => false),
                                                'project_id' => array('type' => 
'int', 'precision' => 4, 'nullable' => false),
                                                'start_date' => array('type' => 
'int', 'precision' => 4, 'nullable' => true),
                                                'end_date' => array('type' => 
'int', 'precision' => 4, 'nullable' => true),

Added: trunk/logistic/setup/tables_update.inc.php
===================================================================
--- trunk/logistic/setup/tables_update.inc.php                          (rev 0)
+++ trunk/logistic/setup/tables_update.inc.php  2012-10-02 06:47:39 UTC (rev 
10079)
@@ -0,0 +1,16 @@
+<?php
+        /* Update Logistic from v 0.0.1 to 0.0.2
+         * Add column 'description' to table activity
+         */
+
+       $test[] = '0.0.1';
+       function logistic_upgrade0_0_1()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_activity','description',array(
+                       'type' => 'text',
+                       'nullable' => True
+               ));
+
+               $GLOBALS['setup_info']['logistic']['currentver'] = '0.0.2';
+               return $GLOBALS['setup_info']['logistic']['currentver'];
+       }