[Phpgroupware-cvs] property/inc class.sotts.inc.php class.botts.in...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/08/24 13:59:23

Modified files:
        inc            : class.sotts.inc.php class.botts.inc.php 

Log message:
        update

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.36&r2=1.37

Patches:
Index: class.sotts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.sotts.inc.php 24 Aug 2007 12:44:53 -0000      1.25
+++ class.sotts.inc.php 24 Aug 2007 13:59:23 -0000      1.26
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage helpdesk
-       * @version $Id: class.sotts.inc.php,v 1.25 2007/08/24 12:44:53 sigurdne 
Exp $
+       * @version $Id: class.sotts.inc.php,v 1.26 2007/08/24 13:59:23 sigurdne 
Exp $
        */
 
        /**
@@ -125,7 +125,7 @@
                        }
                        elseif($filter == 'progress'):
                        {
-                               $filtermethod .= " $where 
fm_tts_tickets.status='P'";
+                               $filtermethod .= " $where 
fm_tts_tickets.status='I'";
                                $where = 'AND';
                        }
                        endif;

Index: class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- class.botts.inc.php 24 Aug 2007 12:44:53 -0000      1.36
+++ class.botts.inc.php 24 Aug 2007 13:59:23 -0000      1.37
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage helpdesk
-       * @version $Id: class.botts.inc.php,v 1.36 2007/08/24 12:44:53 sigurdne 
Exp $
+       * @version $Id: class.botts.inc.php,v 1.37 2007/08/24 13:59:23 sigurdne 
Exp $
        */
 
        /**
@@ -214,7 +214,7 @@
                        $filters[0]['name']=lang('Closed');
                        $filters[1]['id']='O';
                        $filters[1]['name']=lang('Open');
-                       $filters[2]['id']='P';
+                       $filters[2]['id']='I';
                        $filters[2]['name']=lang('In progress');
 
                        return $this->bocommon->select_list($selected,$filters);
@@ -394,7 +394,8 @@
                                'S' => 'Subject changed',
                                'B' => 'Billing rate',
                                'H' => 'Billing hours',
-                               'F' => 'finnish date'
+                               'F' => 'finnish date',
+                               'I' => 'In progress'
                        );
 
                        $ticket['status_name'] = 
lang($status_text[$ticket['status']]);
@@ -470,12 +471,17 @@
                                        case 'B': $type = lang('Billable rate 
changed'); break;
                                        case 'F': $type = lang('finnish date 
changed'); break;
                                        case 'IF': $type = lang('Initial 
finnish date'); break;
+                                       case 'I': $type = lang('Status 
changed'); break;
                                        default: break;
                                }
 
-                               
if($value['new_value']=='O'){$value['new_value']=lang('Opened');}
-                               
if($value['new_value']=='X'){$value['new_value']=lang('Closed');}
-
+                               switch ($value['status'])
+                               {
+                                       case 'O': 
$value['new_value']=lang('Opened'); break;
+                                       case 'X': 
$value['new_value']=lang('Closed'); break;
+                                       case 'I': $value['new_value']=lang('In 
Progress'); break; //initiated           
+                                       default: break;
+                               }
 
                                $record_history[$i]['value_action']     = 
$type?$type:'';
                                unset($type);
@@ -510,7 +516,6 @@
 
                                $i++;
                        }
-
                        return (isset($record_history)?$record_history:'');
                }
 
@@ -614,7 +619,8 @@
                                'S' => 'Subject changed',
                                'B' => 'Billing rate',
                                'H' => 'Billing hours',
-                               'F' => 'finnish date changed'
+                               'F' => 'finnish date changed',
+                               'I'=> 'Status changed'
                        );