[Fmsystem-commits] [8543]

[Torstein]

Revision: 8543
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8543
Author:   vator
Date:     2012-01-09 12:38:59 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/setup/setup.inc.php
    trunk/controller/setup/tables_current.inc.php
    trunk/controller/setup/tables_update.inc.php
    trunk/controller/templates/base/check_list/edit_check_list.xsl

Added Paths:
-----------
    trunk/controller/inc/model/class.check_item_case.inc.php

Added: trunk/controller/inc/model/class.check_item_case.inc.php
===================================================================
--- trunk/controller/inc/model/class.check_item_case.inc.php                    
        (rev 0)
+++ trunk/controller/inc/model/class.check_item_case.inc.php    2012-01-09 
12:38:59 UTC (rev 8543)
@@ -0,0 +1,138 @@
+<?php
+       /**
+       * phpGroupWare - controller: a part of a Facilities Management System.
+       *
+       * @author Erink Holm-Larsen <address@hidden>
+       * @author Torstein Vadla <address@hidden>
+       * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * This file is part of phpGroupWare.
+       *
+       * phpGroupWare is free software; you can redistribute it and/or modify
+       * it under the terms of the GNU General Public License as published by
+       * the Free Software Foundation; either version 2 of the License, or
+       * (at your option) any later version.
+       *
+       * phpGroupWare is distributed in the hope that it will be useful,
+       * but WITHOUT ANY WARRANTY; without even the implied warranty of
+       * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       * GNU General Public License for more details.
+       *
+       * You should have received a copy of the GNU General Public License
+       * along with phpGroupWare; if not, write to the Free Software
+       * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 
 USA
+       *
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @internal Development of this application was funded by 
http://www.bergen.kommune.no/
+       * @package property
+       * @subpackage controller
+       * @version $Id: class.check_item.inc.php 8478 2012-01-03 12:36:37Z 
vator $
+       */
+
+       include_class('controller', 'model', 'inc/model/');
+       
+       class controller_check_item_case extends controller_model
+       {
+               public static $so;
+
+                    'user_id' => array('type' => 'int','precision' => 
'4','nullable' => true),
+                    'entry_date' => array('type' => 'int', 'precision' => 
4,'nullable' => false),
+                    'modified_date' => array('type' => 'int', 'precision' => 
4,'nullable' => True),
+                    'modified_by' => array('type' => 'int', 'precision' => 
4,'nullable' => True),
+              ),
+               
+               
+               protected $id;
+               protected $check_item_id;
+               protected $status;
+               protected $location_id;
+               protected $location_item_id;
+               protected $descr;
+               protected $user_id;
+               protected $entry_date;
+               protected $entry_date;
+                                               
+               /**
+                * Constructor.  Takes an optional ID.  If a contract is 
created from outside
+                * the database the ID should be empty so the database can add 
one according to its logic.
+                * 
+                * @param int $id the id of this composite
+                */
+               public function __construct(int $id = null)
+               {
+                       $this->id = (int)$id;
+               }
+               
+               public function set_id($id)
+               {
+                       $this->id = $id;
+               }
+               
+               public function get_id() { return $this->id; }
+
+               public function set_control_item_id($control_item_id)
+               {
+                       $this->control_item_id = $control_item_id;
+               }
+               
+               public function get_control_item_id() { return 
$this->control_item_id; }
+                               
+               public function set_status($status)
+               {
+                       $this->status = (int)$status;
+               }
+               
+               public function get_status() { return (int)$this->status; }
+               
+               public function set_comment($comment)
+               {
+                       $this->comment = $comment;
+               }
+               
+               public function get_comment() { return $this->comment; }
+               
+               public function set_check_list_id($check_list_id)
+               {
+                       $this->check_list_id = $check_list_id;
+               }
+               
+               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; }
+               
+               public function set_measurement($measurement)
+               {
+                       $this->measurement = $measurement;
+               }
+               
+               public function get_measurement() { return $this->measurement; }
+               
+               
+               // =================  Getters and setters for objects 
=================
+               
+               public function set_control_item($control_item)
+               {
+                       $this->control_item = $control_item;
+               }
+               
+               public function get_control_item() { return 
$this->control_item; }
+                       
+                       
+               /**
+                * Get a static reference to the storage object associated with 
this model object
+                * 
+                * @return the storage object
+                */
+               public static function get_so()
+               {
+/*                     if (self::$so == null) {
+                               self::$so = 
CreateObject('controller.socontrol_item');
+                       }
+                       
+                       return self::$so;*/
+               }
+       }

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2012-01-09 12:18:12 UTC (rev 
8542)
+++ trunk/controller/setup/setup.inc.php        2012-01-09 12:38:59 UTC (rev 
8543)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.18';
+       $setup_info['controller']['version'] = '0.1.19';
        $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       2012-01-09 12:18:12 UTC 
(rev 8542)
+++ trunk/controller/setup/tables_current.inc.php       2012-01-09 12:38:59 UTC 
(rev 8543)
@@ -194,12 +194,12 @@
                                'check_item_id'         => array('type' => 
'int', 'precision' => '4', 'nullable' => false),
                                'status' => array('type' => 'int', 'precision' 
=> '4', 'nullable' => false),
                                'location_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => true), // representer meldingsfregisteret
-                    'location_item_id' => array('type' => 'int', 'precision' 
=> '8', 'nullable' => true), //meldings id
-                    'descr' => array('type' => 'text','nullable' => true),
-                    'user_id' => array('type' => 'int','precision' => 
'4','nullable' => true),
-                    'entry_date' => array('type' => 'int', 'precision' => 
4,'nullable' => false),
-                    'modified_date' => array('type' => 'int', 'precision' => 
4,'nullable' => True),
-                    'modified_by' => array('type' => 'int', 'precision' => 
4,'nullable' => True),
+                'location_item_id' => array('type' => 'int', 'precision' => 
'8', 'nullable' => true), //meldings id
+                'descr' => array('type' => 'text','nullable' => true),
+                'user_id' => array('type' => 'int','precision' => 
'4','nullable' => true),
+                'entry_date' => array('type' => 'int', 'precision' => 
8,'nullable' => false),
+                'modified_date' => array('type' => 'int', 'precision' => 
8,'nullable' => True),
+                'modified_by' => array('type' => 'int', 'precision' => 
4,'nullable' => True),
               ),
                 'pk' => array('id'),
                 'fk' => array('controller_check_item' => array('check_item_id' 
=> 'id')),

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2012-01-09 12:18:12 UTC 
(rev 8542)
+++ trunk/controller/setup/tables_update.inc.php        2012-01-09 12:38:59 UTC 
(rev 8543)
@@ -396,4 +396,23 @@
 
                $GLOBALS['setup_info']['controller']['currentver'] = '0.1.18';
                return $GLOBALS['setup_info']['controller']['currentver'];
+       }
+       
+       $test[] = '0.1.18';
+       function controller_upgrade0_1_18()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('controller_check_item_case','entry_date',array(
+                       'type' => 'int', 
+                       'precision' => 8,
+                       'nullable' => false
+               ));
+               
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('controller_check_item_case','modified_date',array(
+                       'type' => 'int', 
+                       'precision' => 8,
+                       'nullable' => true
+               ));
+               
+               $GLOBALS['setup_info']['controller']['currentver'] = '0.1.19';
+               return $GLOBALS['setup_info']['controller']['currentver'];
        }
\ No newline at end of file

Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-01-09 12:18:12 UTC (rev 8542)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-01-09 12:38:59 UTC (rev 8543)
@@ -63,8 +63,7 @@
                        </a>
                </div>
                
-               <div class="tab_menu"><a 
class="active">Sjekklistedetaljer</a></div>
-               
+               <h3 class="box_header">Sjekklistedetaljer</h3>
                <fieldset class="check_list_details">
                        <form id="frm_update_check_list" 
action="index.php?menuaction=controller.uicheck_list.update_check_list" 
method="post">