[Fmsystem-commits] [8450]

[Torstein]

Revision: 8450
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8450
Author:   vator
Date:     2011-12-27 13:33:53 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socheck_item.inc.php
    trunk/controller/inc/class.uierror_report_message.inc.php
    trunk/controller/inc/model/class.check_item.inc.php
    trunk/controller/setup/setup.inc.php
    trunk/controller/setup/tables_current.inc.php
    trunk/controller/setup/tables_update.inc.php

Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php     2011-12-27 13:33:40 UTC 
(rev 8449)
+++ trunk/controller/inc/class.socheck_item.inc.php     2011-12-27 13:33:53 UTC 
(rev 8450)
@@ -59,14 +59,16 @@
                                        'control_item_id',
                                        'status',
                                        'comment',
-                                       'check_list_id'
+                                       'check_list_id',
+                                       'message-ticket_id'
                        );
 
                        $values = array(
                                
$this->marshal($check_item->get_control_item_id(), 'int'),
-                               $this->marshal($check_item->get_status(), 
'bool'),
+                               $this->marshal($check_item->get_status(), 
'int'),
                                $this->marshal($check_item->get_comment(), 
'string'),
-                               
$this->marshal($check_item->get_check_list_id(), 'int')
+                               
$this->marshal($check_item->get_check_list_id(), 'int'),
+                               
$this->marshal($check_item->get_message_ticket_id(), 'int')
                        );
 
                        $result = $this->db->query('INSERT INTO 
controller_check_item (' . join(',', $cols) . ') VALUES (' . join(',', $values) 
. ')', __LINE__,__FILE__);
@@ -80,9 +82,10 @@
 
                        $values = array(
                                'control_item_id = ' . 
$this->marshal($check_item->get_control_item_id(), 'int'),
-                               'status = ' . 
$this->marshal($check_item->get_status(), 'bool'),
+                               'status = ' . 
$this->marshal($check_item->get_status(), 'int'),
                                'comment = ' . 
$this->marshal($check_item->get_comment(), 'string'),
-                               'check_list_id = ' . 
$this->marshal($check_item->get_check_list_id(), 'int')
+                               'check_list_id = ' . 
$this->marshal($check_item->get_check_list_id(), 'int'),
+                               'message_ticket_id = ' . 
$this->marshal($check_item->get_message_ticket_id(), 'int')
                        );
 
                        $result = $this->db->query('UPDATE 
controller_check_item SET ' . join(',', $values) . " WHERE id=$id", 
__LINE__,__FILE__);

Modified: trunk/controller/inc/class.uierror_report_message.inc.php
===================================================================
--- trunk/controller/inc/class.uierror_report_message.inc.php   2011-12-27 
13:33:40 UTC (rev 8449)
+++ trunk/controller/inc/class.uierror_report_message.inc.php   2011-12-27 
13:33:53 UTC (rev 8450)
@@ -116,8 +116,8 @@
                        
                        foreach($check_item_ids as $check_item_id){
                                $check_item = 
$this->so_check_item->get_single($check_item_id);
-                               
-                               $details .= $check_item->get_comment(); 
+                               $details .= "Gjøremål: ";
+                               $details .=  $check_item->get_comment() . 
"<br>";
                        }
                        
                        $ticket = array
@@ -133,10 +133,14 @@
                        );
                        
                        $botts = CreateObject('property.botts',true);
-                       $ticket_id = $botts->add_ticket($ticket);
+                       $message_ticket_id = $botts->add_ticket($ticket);
 
+                       foreach($check_item_ids as $check_item_id){
+                               $check_item = 
$this->so_check_item->get_single($check_item_id);
+                               $check_item->set_message_ticket_id( 
$message_ticket_id );
+                               $this->so_check_item->update($check_item);
+                       }                       
                        
-                       
                        $data = array
                        (
                                'location_array'                => 
$location_array,

Modified: trunk/controller/inc/model/class.check_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.check_item.inc.php 2011-12-27 13:33:40 UTC 
(rev 8449)
+++ trunk/controller/inc/model/class.check_item.inc.php 2011-12-27 13:33:53 UTC 
(rev 8450)
@@ -39,6 +39,9 @@
                protected $status;
                protected $comment;
                protected $check_list_id;
+               protected $message_ticket_id;
+               
+               // Objects
                protected $control_item;
                
                /**
@@ -87,6 +90,16 @@
                
                public function get_check_list_id() { return 
$this->check_list_id; }
                
+               public function set_message_ticket_id($message_ticket_id)
+               {
+                       $this->message_ticket_id = $message_ticket_id;
+               }
+               
+               public function get_message_ticket_id() { return 
$this->message_ticket_id; }
+               
+               
+               // =================  Getters and setters for objects 
=================
+               
                public function set_control_item($control_item)
                {
                        $this->control_item = $control_item;

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2011-12-27 13:33:40 UTC (rev 
8449)
+++ trunk/controller/setup/setup.inc.php        2011-12-27 13:33:53 UTC (rev 
8450)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.13';
+       $setup_info['controller']['version'] = '0.1.14';
        $setup_info['controller']['app_order'] = 100;
        $setup_info['controller']['enable'] = 1;
        $setup_info['controller']['app_group']  = 'office';

Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php       2011-12-27 13:33:40 UTC 
(rev 8449)
+++ trunk/controller/setup/tables_current.inc.php       2011-12-27 13:33:53 UTC 
(rev 8450)
@@ -56,8 +56,9 @@
                                'id' => array('type' => 'auto','precision' => 
4,'nullable' => False),
                                'control_item_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
                                'status' => array('type' => 'bool','nullable' 
=> true,'default' => 'false'),
-                               'comment' => array('type' => 
'varchar','precision' => '255','nullable' => false),
-                               'check_list_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True)
+                               'comment' => array('type' => 
'varchar','precision' => '255','nullable' => False),
+                               'check_list_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
+                               'message_ticket_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True)
                        ),
                        'pk' => array('id'),
                        'fk' => array(),

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2011-12-27 13:33:40 UTC 
(rev 8449)
+++ trunk/controller/setup/tables_update.inc.php        2011-12-27 13:33:53 UTC 
(rev 8450)
@@ -282,3 +282,17 @@
                $GLOBALS['setup_info']['controller']['currentver'] = '0.1.13';
                return $GLOBALS['setup_info']['controller']['currentver'];
        }
+       
+       $test[] = '0.1.13';
+       function controller_upgrade0_1_13()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_item', 
'message_ticket_id',array(
+                       'type' => 'int',
+                       'precision' => 4,
+                       'nullable' => true,
+                       'default' => 0
+               ));
+
+               $GLOBALS['setup_info']['controller']['currentver'] = '0.1.14';
+               return $GLOBALS['setup_info']['controller']['currentver'];
+       }