[Fmsystem-commits] [7469] property: request: calculate score

[Sigurd Nes]

Revision: 7469
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7469
Author:   sigurdne
Date:     2011-07-04 07:28:05 +0000 (Mon, 04 Jul 2011)
Log Message:
-----------
property: request: calculate score

Modified Paths:
--------------
    trunk/property/inc/class.borequest.inc.php
    trunk/property/inc/class.sorequest.inc.php
    trunk/property/inc/class.uirequest.inc.php

Modified: trunk/property/inc/class.borequest.inc.php
===================================================================
--- trunk/property/inc/class.borequest.inc.php  2011-07-04 07:24:57 UTC (rev 
7468)
+++ trunk/property/inc/class.borequest.inc.php  2011-07-04 07:28:05 UTC (rev 
7469)
@@ -248,6 +248,7 @@
                                foreach($condition_type_list as $condition_type)
                                {
                                        $i = $condition_type['id'];
+                                       $risk   = 
(int)$conditions[$i]['probability'] * (int)$conditions[$i]['consequence'];
                                        $values[] = array
                                        (
                                                'degree'                        
        => array('options' => 
$this->select_degree_list($conditions[$i]['degree'])),
@@ -256,8 +257,8 @@
                                                'condition_type'                
=> $condition_type_list[$i]['id'],
                                                'condition_type_name'   => 
$condition_type_list[$i]['name'],
                                                'weight'                        
        => $condition_type_list[$i]['weight'],
-                                               'risk'                          
        => (int)$condition_type_list[$i]['weight'] * 
(int)$conditions[$i]['probability'] * (int)$conditions[$i]['consequence'],
-                                               'score'                         
        => $values[$i]['risk'] * (int)$conditions[$i]['degree']
+                                               'risk'                          
        => $risk,
+                                       'score'                                 
=> $risk * (int)$condition_type_list[$i]['weight'] * 
(int)$conditions[$i]['degree']
                                        );
                                }
                        }
@@ -272,6 +273,7 @@
                                                break;
                                        }
                                }
+                               $risk   = (int)$conditions[$i]['probability'] * 
(int)$conditions[$i]['consequence'];
                                $values[] = array
                                (
                                        'condition_type_list'   => 
array('options' => $this->bocommon->select_list($i, $condition_type_list)),
@@ -281,8 +283,8 @@
                                        'condition_type'                => 
$condition_type_list[$i]['id'],
                                        'condition_type_name'   => 
$condition_type_list[$i]['name'],
                                        'weight'                                
=> $condition_type_list[$i]['weight'],
-                                       'risk'                                  
=> (int)$condition_type_list[$i]['weight'] * 
(int)$conditions[$i]['probability'] * (int)$conditions[$i]['consequence'],
-                                       'score'                                 
=> $values[$i]['risk'] * (int)$conditions[$i]['degree']
+                                       'risk'                                  
=> $risk,
+                                       'score'                                 
=> $risk * (int)$condition_type_list[$i]['weight'] * 
(int)$conditions[$i]['degree']
                                );
                        }
 

Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php  2011-07-04 07:24:57 UTC (rev 
7468)
+++ trunk/property/inc/class.sorequest.inc.php  2011-07-04 07:28:05 UTC (rev 
7469)
@@ -105,7 +105,7 @@
                                
if($GLOBALS['phpgw_info']['server']['db_type']=='pgsql' || 
$GLOBALS['phpgw_info']['server']['db_type']=='postgres')
                                {
                                        $sql = "UPDATE fm_request SET score = 
(SELECT sum(priority_key * ( degree * probability * ( consequence )))  FROM 
fm_request_condition"
-                                               . " $this->join  
fm_request_condition_type ON (fm_request_condition.condition_type = 
fm_request_condition_type.id) WHERE request_id = $id) WHERE fm_request.id = 
$id";
+                                               . " {$this->join}  
fm_request_condition_type ON (fm_request_condition.condition_type = 
fm_request_condition_type.id) WHERE request_id = {$id}) WHERE fm_request.id = 
{$id}";
 
                                        
$this->db->query($sql,__LINE__,__FILE__);
                                }

Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php  2011-07-04 07:24:57 UTC (rev 
7468)
+++ trunk/property/inc/class.uirequest.inc.php  2011-07-04 07:28:05 UTC (rev 
7469)
@@ -791,15 +791,13 @@
                        $GLOBALS['phpgw_info']['flags']['noframework'] = true;
                        $values         = phpgw::get_var('values');
 
-                       $config = CreateObject('phpgwapi.config','property');
-                       $config->read();
-                       $values['authorities_demands'] = 
$values['authorities_demands'] ? $values['authorities_demands'] : 
$config->config_data['authorities_demands'];
+                       $values['authorities_demands'] = 
$values['authorities_demands'] ? $values['authorities_demands'] : 
$this->config->config_data['authorities_demands'];
 
                        if($values['update'])
                        {
                                $receipt = 
$this->bo->update_priority_key($values);
-                               $config->config_data['authorities_demands'] = 
(int) $values['authorities_demands'];
-                               $config->save_repository();
+                               
$this->config->config_data['authorities_demands'] = (int) 
$values['authorities_demands'];
+                               $this->config->save_repository();
                        }
 
                        $function_msg   = lang('Edit priority key');