[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7522] Merge 7518:7521 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7522] Merge 7518:7521 from trunk |
|
Date: |
Tue, 23 Aug 2011 10:21:08 +0000 |
Revision: 7522
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7522
Author: sigurdne
Date: 2011-08-23 10:21:08 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
Merge 7518:7521 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
branches/Version-1_0-branch/property/templates/base/request.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-08-23 10:18:41 UTC (rev 7521)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-08-23 10:21:08 UTC (rev 7522)
@@ -427,6 +427,7 @@
$_querymethod = array();
$__querymethod = array();
$_joinmethod_datatype = array();
+ $_joinmethod_datatype_custom = array();
if($query)
{
$query = $this->db->db_addslashes($query);
@@ -475,9 +476,10 @@
case 'LB':
if(!$criteria_id)
{
-
$_joinmethod_datatype[] = "{$this->join} phpgw_cust_choice ON
({$entity_table}." . $this->db->f('column_name') . " = phpgw_cust_choice.id"
-
." AND phpgw_cust_choice.location_id =" . (int)$this->db->f('location_id')
-
." AND phpgw_cust_choice.attrib_id =" . (int)$this->db->f('id') .')';
+
if(!$_joinmethod_datatype_custom)//only join once
+ {
+
$_joinmethod_datatype_custom[] = "{$this->join} phpgw_cust_choice ON
phpgw_cust_choice.location_id =" . (int)$this->db->f('location_id');
+ }
$_querymethod[]= "(phpgw_cust_choice.location_id =" .
(int)$this->db->f('location_id')
." AND phpgw_cust_choice.attrib_id =" . (int)$this->db->f('id')
@@ -525,6 +527,7 @@
}
}
+ $_joinmethod_datatype =
array_merge($_joinmethod_datatype, $_joinmethod_datatype_custom);
foreach($_joinmethod_datatype as $_joinmethod)
{
$sql .= $_joinmethod;
@@ -541,7 +544,7 @@
$sql .= " $filtermethod $querymethod";
-//_debug_array($sql);
+_debug_array($sql);
$this->db->query('SELECT count(*) as cnt ' .
substr($sql,strripos($sql,'from')),__LINE__,__FILE__);
$this->db->next_record();
$this->total_records = $this->db->f('cnt');
Modified: branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2011-08-23 10:18:41 UTC (rev 7521)
+++ branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2011-08-23 10:21:08 UTC (rev 7522)
@@ -50,13 +50,16 @@
function read_priority_key()
{
- $this->db->query("SELECT * FROM
fm_request_condition_type",__LINE__,__FILE__);
+ $this->db->query("SELECT * FROM
fm_request_condition_type ORDER BY priority_key DESC, id
ASC",__LINE__,__FILE__);
+ $priority_key = array();
while ($this->db->next_record())
{
- $priority_key[] = array(
- 'id' => $this->db->f('id'),
- 'descr' =>
$this->db->f('descr'),
+ $priority_key[] = array
+ (
+ 'id' =>
$this->db->f('id'),
+ 'name' =>
$this->db->f('name',true),
+ 'descr' =>
$this->db->f('descr',true),
'priority_key' =>
$this->db->f('priority_key')
);
}
@@ -120,9 +123,8 @@
$score = $this->db->f('score');
$this->db->query("UPDATE fm_request SET
score = $score WHERE id = $id",__LINE__,__FILE__);
}
-
- $this->db->query("UPDATE fm_request SET score =
score + {$authorities_demands} WHERE id = $id AND authorities_demands =
1",__LINE__,__FILE__);
}
+ $this->db->query("UPDATE fm_request SET score = score +
{$authorities_demands} WHERE authorities_demands = 1",__LINE__,__FILE__);
}
function select_status_list()
@@ -202,6 +204,9 @@
$dry_run = isset($data['dry_run']) ?
$data['dry_run'] : '';
$p_num = isset($data['p_num']) ?
$data['p_num'] : '';
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.project.request');
+ $attribute_table = 'phpgw_cust_attribute';
+ $attribute_filter = " location_id = {$location_id}";
$entity_table = 'fm_request';
@@ -325,6 +330,25 @@
$uicols['sortable'][] = true;
+ $this->db->query("SELECT * FROM $attribute_table WHERE
list=1 AND $attribute_filter");
+ while ($this->db->next_record())
+ {
+ $cols .= ",{$entity_table}." .
$this->db->f('column_name');
+
+ $cols_return[] =
$this->db->f('column_name');
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] =
$this->db->f('column_name');
+ $uicols['descr'][] =
$this->db->f('input_text',true);
+ $uicols['statustext'][] =
$this->db->f('statustext',true);
+ $uicols['exchange'][] = '';
+ $uicols['align'][] = '';
+ $uicols['datatype'][] =
$this->db->f('datatype');
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = false;
+
+ }
+
$paranthesis = '(';
$joinmethod = "{$this->left_join} fm_request_status ON
{$entity_table}.status = fm_request_status.id)";
@@ -678,7 +702,7 @@
(
'location1_id' =>
$GLOBALS['phpgw']->locations->get_id('property',
$request['origin'][0]['location']),
'location1_item_id' =>
$request['origin'][0]['data'][0]['id'],
- 'location2_id' =>
$GLOBALS['phpgw']->locations->get_id('property', '.project.request'),
+ 'location2_id' =>
$GLOBALS['phpgw']->locations->get_id('property', '.project.request'),
'location2_item_id' => $id,
'account_id' =>
$this->account
);
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2011-08-23 10:18:41 UTC (rev 7521)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2011-08-23 10:21:08 UTC (rev 7522)
@@ -391,11 +391,13 @@
for ($i=$start; $i<$rows; $i++ ) //First data entry on
row 2
{
- foreach($data->sheets[0]['cells'][$i] as
&$value)
+ $_result = array();
+ foreach($data->sheets[0]['cells'][$i] as $key
=> $value)
{
- $value = utf8_encode(trim($value));
+ $_key = $key - 1;
+ $_result[$_key] =
utf8_encode(trim($value));
}
- $result[] =
array_values($data->sheets[0]['cells'][$i]);
+ $result[] = $_result;
}
$this->messages[] = "Read '{$path}' file in " . (time()
- $start_time) . " seconds";
Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-08-23 10:18:41 UTC (rev 7521)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2011-08-23 10:21:08 UTC (rev 7522)
@@ -344,8 +344,7 @@
( // TEXT IMPUT
'name'
=> 'query',
'id'
=> 'txt_query',
-
//'value' => '',//$query,
- 'value'
=> phpgw::get_var('query'),
+ 'value'
=> $this->query,
'type'
=> 'text',
'size'
=> 28,
'onkeypress' => 'return pulsar(event)',
@@ -419,7 +418,7 @@
}
$request_list = array();
- $request_list = $this->bo->read(array('project_id' =>
1,'allrows'=>$this->allrows, 'dry_run' => $dry_run));
+ $request_list = $this->bo->read(array('project_id' =>
$project_id,'allrows'=>$this->allrows, 'dry_run' => $dry_run));
$uicols = $this->bo->uicols;
$j=0;
@@ -801,9 +800,7 @@
}
$function_msg = lang('Edit priority key');
- $link_data = array
- (
- 'menuaction' =>
'property.uirequest.priority_key');
+ $link_data = array('menuaction' =>
'property.uirequest.priority_key');
$priority_key = $this->bo->read_priority_key();
Modified:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
2011-08-23 10:18:41 UTC (rev 7521)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
2011-08-23 10:21:08 UTC (rev 7522)
@@ -65,11 +65,11 @@
if($data[7])
{
- $entry_date_info = explode('/',$data[4]);
+ $entry_date_info = explode('/',$data[7]);
}
else if($data[8])
{
- $entry_date_info = explode('/',$data[5]);
+ $entry_date_info = explode('/',$data[8]);
}
//YYYY/MM/DD
@@ -83,12 +83,10 @@
$entry_date = time();
}
-//$authorities_demands
-//$building_part
-//$coordinator
-_debug_array($entry_date_info);
-_debug_array($entry_date);
+//_debug_array($entry_date_info);
+//_debug_array($entry_date);
+
$status = 'registrert';
if($data[3])//historikk
@@ -140,10 +138,10 @@
}
$value_set['id']
= $id;
- $value_set['title']
= $this->db->db_addslashes("{$data[0]}::{$data[6]}::{$data[20]}");
+ $value_set['title']
= substr($this->db->db_addslashes("{$data[0]}::{$data[6]}::{$data[20]}"), 0 ,
100);
$value_set['owner']
= $this->account;
$value_set['category'] =
$category;
- $value_set['descr']
= $this->db->db_addslashes("{$data[0]}\n{$data[6]}\n{$data[20]}");
+ $value_set['descr']
= $this->db->db_addslashes("{$data[6]}\n{$data[20]}");
$value_set['location_code'] =
$location_code;
$value_set['address'] =
$address;
$value_set['entry_date'] =
$entry_date;
@@ -161,7 +159,7 @@
{
foreach($attrib['choice'] as $choice)
{
-
if(preg_match("/{$choice['value']}/i", $data[11]))
+ if(strpos($choice['value'],
$data[11]) !== false)
{
$value_set['lovhjemmel'] = $choice['id'];
break 2;
@@ -177,7 +175,7 @@
{
foreach($attrib['choice'] as $choice)
{
-
if(preg_match("/{$choice['value']}/i", $data[12]))
+ if(strpos($choice['value'],
$data[12]) !== false)
{
$value_set['forskriftshjemmel'] = $choice['id'];
break 2;
@@ -208,18 +206,15 @@
$condition = array();
$condition_type = (int) substr($data[14], 0, 1);
+//_debug_array($data);
+ $condition[$condition_type] = array
+ (
+ 'degree' => $data[13] ?
(int)$data[13] : 1,
+ 'probability' => $data[16] ?
(int)$data[16] : 1,
+ 'consequence' => $data[15] ?
(int)$data[15] : 1,
+ );
- if($data[13] || $data[15])
- {
- $condition[$condition_type] = array
- (
- 'degree' =>
(int)$data[13],
- 'probability' => $data[16] ?
(int)$data[16] : 1,
- 'consequence' => (int)$data[15]
- );
- }
-
-
+//_debug_array($condition);
foreach ($condition as $condition_type => $value_type)
{
$sql = "INSERT INTO fm_request_condition
(request_id,condition_type,degree,probability,consequence,user_id,entry_date) "
Modified: branches/Version-1_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/request.xsl
2011-08-23 10:18:41 UTC (rev 7521)
+++ branches/Version-1_0-branch/property/templates/base/request.xsl
2011-08-23 10:21:08 UTC (rev 7522)
@@ -77,6 +77,8 @@
</xsl:choose>
</xsl:attribute>
<td class="small_text" align="left">
+ <xsl:value-of select="name"/>
+ <xsl:text>::</xsl:text>
<xsl:value-of select="descr"/>
</td>
<td class="small_text" align="left">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7522] Merge 7518:7521 from trunk,
Sigurd Nes <=