[Phpgroupware-cvs] CVS: property/inc functions.inc.php,1.4,1.5 class.fm_wrkorder.inc.php,1.3,1.4 class.fm_wo_activities.inc.php,1.2,1.3 hook_settings.inc.php,1.2,1.3

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv2757/inc

Modified Files:
        functions.inc.php class.fm_wrkorder.inc.php 
        class.fm_wo_activities.inc.php hook_settings.inc.php 
Log Message:
no message

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/functions.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** functions.inc.php   3 Sep 2002 22:15:38 -0000       1.4
--- functions.inc.php   6 Sep 2002 20:33:35 -0000       1.5
***************
*** 97,101 ****
  
                        $prefix = 'R-' . $year . '-';
!                       $GLOBALS['phpgw']->db->query("select max(request_id) 
from fm_request where request_id like ('$prefix%')");
                        $GLOBALS['phpgw']->db->next_record();
                        $max = 
add_leading_zero(substr($GLOBALS['phpgw']->db->f(0),7));
--- 97,101 ----
  
                        $prefix = 'R-' . $year . '-';
!                       $GLOBALS['phpgw']->db->query("select max(id) from 
fm_request where id like ('$prefix%')");
                        $GLOBALS['phpgw']->db->next_record();
                        $max = 
add_leading_zero(substr($GLOBALS['phpgw']->db->f(0),7));
***************
*** 694,697 ****
--- 694,775 ----
                return $id;
        }
+ 
+       function select_degree_list($degree_value='',$degreedefault_type='')
+       {
+               if ($degree_value)
+               {
+                       $selected=$degree_value;
+               }
+               else
+               {
+                       
$selected=$GLOBALS['phpgw_info']['user']['preferences']['property'][$degreedefault_type];
+               }
+ 
+               $degree_selected[$ticket['degree']] = ' selected';
+               $degree_comment[0]=' - '.lang('None');
+               $degree_comment[1]=' - '.lang('Minor');
+               $degree_comment[2]=' - '.lang('Medium');
+               $degree_comment[3]=' - '.lang('Serious');
+               for ($i=0; $i<=3; $i++)
+               {
+                       $degree_list .= '<option value="' . $i . '"';
+                       if ($i==$selected)
+                       $degree_list .= ' selected';
+                       $degree_list .= '>'
+                       . $i . $degree_comment[$i] . '</option>';
+               }
+ 
+               return $degree_list;
+       }
+ 
+       function select_probability_list($probability_value='')
+       {
+                       $selected=$probability_value;
+ 
+ //            $probability_selected[$ticket['probability']] = ' selected';
+               $probability_comment[1]=' - '.lang('Small');
+               $probability_comment[2]=' - '.lang('Medium');
+               $probability_comment[3]=' - '.lang('Large');
+               for ($i=1; $i<=3; $i++)
+               {
+                       $probability_list .= '<option value="' . $i . '"';
+                       if ($i==$selected)
+                       $probability_list .= ' selected';
+                       $probability_list .= '>'
+                       . $i . $probability_comment[$i] . '</option>';
+               }
+ 
+               return $probability_list;
+       }
+ 
+       function 
select_consequence_list($consequence_value='',$consequencedefault_type='')
+       {
+               if ($consequence_value)
+               {
+                       $selected=$consequence_value;
+               }
+               else
+               {
+                       
$selected=$GLOBALS['phpgw_info']['user']['preferences']['property'][$consequencedefault_type];
+               }
+ 
+               $consequence_selected[$ticket['consequence']] = ' selected';
+               $consequence_comment[0]=' - '.lang('None Consequences');
+               $consequence_comment[1]=' - '.lang('Minor Consequences');
+               $consequence_comment[2]=' - '.lang('Medium Consequences');
+               $consequence_comment[3]=' - '.lang('Serious Consequences');
+               for ($i=0; $i<=3; $i++)
+               {
+                       $consequence_list .= '<option value="' . $i . '"';
+                       if ($i==$selected)
+                       $consequence_list .= ' selected';
+                       $consequence_list .= '>'
+                       . $i . $consequence_comment[$i] . '</option>';
+               }
+ 
+               return $consequence_list;
+       }
+ 
+ 
  
  

Index: class.fm_wrkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.fm_wrkorder.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.fm_wrkorder.inc.php   4 Sep 2002 17:56:09 -0000       1.3
--- class.fm_wrkorder.inc.php   6 Sep 2002 20:33:35 -0000       1.4
***************
*** 1059,1063 ****
  
  
!                       $this->db2->query("SELECT status from fm_request WHERE 
request_id='$request_id' ");
                        $this->db2->next_record();
  
--- 1059,1063 ----
  
  
!                       $this->db2->query("SELECT status from fm_request WHERE 
id='$request_id' ");
                        $this->db2->next_record();
  

Index: class.fm_wo_activities.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.fm_wo_activities.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.fm_wo_activities.inc.php      3 Sep 2002 22:15:38 -0000       1.2
--- class.fm_wo_activities.inc.php      6 Sep 2002 20:33:35 -0000       1.3
***************
*** 606,610 ****
  
  
!                       $this->db2->query("SELECT status from fm_request WHERE 
request_id='$request_id' ");
                        $this->db2->next_record();
  
--- 606,610 ----
  
  
!                       $this->db2->query("SELECT status from fm_request WHERE 
id='$request_id' ");
                        $this->db2->next_record();
  

Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hook_settings.inc.php       4 Sep 2002 17:56:09 -0000       1.2
--- hook_settings.inc.php       6 Sep 2002 20:33:35 -0000       1.3
***************
*** 21,25 ****
                $_groups[$entry['account_id']] = $entry['account_lid'];
        }
!       create_select_box('Default group','groupdefault',$_groups);
  
        $account_list = $acc->get_list('accounts');
--- 21,25 ----
                $_groups[$entry['account_id']] = $entry['account_lid'];
        }
!       create_select_box('Default group TTS','groupdefault',$_groups);
  
        $account_list = $acc->get_list('accounts');
***************
*** 28,32 ****
                $_accounts[$entry['account_id']] = $entry['account_lid'];
        }
!       create_select_box('Default assign to','assigntodefault',$_accounts);
  
        // Choose the correct priority to display
--- 28,32 ----
                $_accounts[$entry['account_id']] = $entry['account_lid'];
        }
!       create_select_box('Default assign to TTS','assigntodefault',$_accounts);
  
        // Choose the correct priority to display
***************
*** 38,42 ****
                $priority[$i] = $i . $priority_comment[$i];
        }
!       create_select_box('Default Priority','prioritydefault',$priority);
  
        create_input_box('Refresh TTS every (seconds)','refreshinterval');
--- 38,61 ----
                $priority[$i] = $i . $priority_comment[$i];
        }
! 
! 
!       // Choose the correct degree to display
!               $degree_comment[0]=' - '.lang('None');
!               $degree_comment[1]=' - '.lang('Minor');
!               $degree_comment[2]=' - '.lang('Medium');
!               $degree_comment[3]=' - '.lang('Serious');
!       for ($i=0; $i<=3; $i++)
!       {
!               $degree[$i] = $i . $degree_comment[$i];
!       }
!       create_select_box('Default Priority TTS','prioritydefault',$priority);
! 
!       create_select_box('Default Degree Request 
safety','default_safety',$degree);
!       create_select_box('Default Degree Request 
aesthetics','default_aesthetics',$degree);
!       create_select_box('Default Degree Request indoor 
climate','default_climate',$degree);
!       create_select_box('Default Degree Request consequential 
damage','default_consequential_damage',$degree);
!       create_select_box('Default Degree Request user 
gratification','default_gratification',$degree);
!       create_select_box('Default Degree Request residential 
environment','default_environment',$degree);
! 
  
        create_input_box('Refresh TTS every (seconds)','refreshinterval');