[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8168] Merge 8163:8167 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8168] Merge 8163:8167 from trunk |
|
Date: |
Wed, 23 Nov 2011 07:25:57 +0000 |
Revision: 8168
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8168
Author: sigurdne
Date: 2011-11-23 07:25:57 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Merge 8163:8167 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/controller/templates/base/control.xsl
branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
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,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162
+
/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,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2011-11-23 07:21:53 UTC (rev 8167)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2011-11-23 07:25:57 UTC (rev 8168)
@@ -68,7 +68,8 @@
'control_area_id = ' .
$this->marshal($control->get_control_area_id()),
'repeat_type = ' .
$this->marshal($control->get_repeat_type(), 'string'),
'repeat_interval = ' .
$this->marshal($control->get_repeat_interval(), 'string'),
- 'procedure_id = ' .
$this->marshal($control->get_procedure_id(), 'int')
+ 'procedure_id = ' .
$this->marshal($control->get_procedure_id(), 'int'),
+ 'responsibility_id = ' .
$this->marshal($control->get_responsibility_id(), 'int')
);
$result = $this->db->query('UPDATE controller_control SET ' .
join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
@@ -138,6 +139,10 @@
{
$filter_clauses[] = "controller_control.control_area_id
= {$this->marshal($filters['control_areas'],'int')}";
}
+ if(isset($filters['responsibilities']))
+ {
+ $filter_clauses[] =
"controller_control.responsibility_id =
{$this->marshal($filters['responsibilities'],'int')}";
+ }
if(count($filter_clauses))
{
@@ -151,6 +156,7 @@
//$joins = " {$this->left_join} rental_document_types ON
(rental_document.type_id = rental_document_types.id)";
$joins = " {$this->left_join} controller_control_area ON
(controller_control.control_area_id = controller_control_area.id)";
$joins .= " {$this->left_join} controller_procedure ON
(controller_control.procedure_id = controller_procedure.id)";
+ $joins .= " {$this->left_join} fm_responsibility_role ON
(controller_control.responsibility_id = fm_responsibility_role.id)";
if($return_count)
{
@@ -158,7 +164,7 @@
}
else
{
- $cols = 'controller_control.id,
controller_control.title, controller_control.description,
controller_control.start_date, controller_control.end_date,
controller_control.procedure_id, controller_control.control_area_id,
controller_control.requirement_id, controller_control.costresponsibility_id,
controller_control.responsibility_id, controller_control.equipment_type_id,
controller_control.equipment_id, controller_control.location_code,
controller_control.repeat_type, controller_control.repeat_interval,
controller_control.enabled, controller_control_area.title AS control_area_name,
controller_procedure.title AS procedure_name ';
+ $cols = 'controller_control.id,
controller_control.title, controller_control.description,
controller_control.start_date, controller_control.end_date,
controller_control.procedure_id, controller_control.control_area_id,
controller_control.requirement_id, controller_control.costresponsibility_id,
controller_control.responsibility_id, controller_control.equipment_type_id,
controller_control.equipment_id, controller_control.location_code,
controller_control.repeat_type, controller_control.repeat_interval,
controller_control.enabled, controller_control_area.title AS control_area_name,
controller_procedure.title AS procedure_name, fm_responsibility_role.name AS
responsibility_name ';
}
$dir = $ascending ? 'ASC' : 'DESC';
@@ -190,6 +196,7 @@
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
//
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
@@ -215,8 +222,9 @@
$joins = " {$this->left_join} controller_control_area ON
(c.control_area_id = controller_control_area.id)";
$joins .= " {$this->left_join} controller_procedure ON
(c.procedure_id = controller_procedure.id)";
+ $joins .= " {$this->left_join} fm_responsibility_role ON
(c.responsibility_id = fm_responsibility_role.id)";
- $sql = "SELECT c.*, controller_control_area.title AS
control_area_name, controller_procedure.title AS procedure_name FROM
controller_control c {$joins} WHERE c.id = " . $id;
+ $sql = "SELECT c.*, controller_control_area.title AS
control_area_name, controller_procedure.title AS procedure_name,
fm_responsibility_role.name AS responsibility_name FROM controller_control c
{$joins} WHERE c.id = " . $id;
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
@@ -231,6 +239,7 @@
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
//
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
@@ -242,8 +251,20 @@
return $control;
}
-
-
-
+ function get_roles()
+ {
+ $ret_array = array();
+ $ret_array[0] = array('id' => 0,'name' => lang('Not
selected'));
+ $sql = "select * from fm_responsibility_role ORDER BY name";
+ $this->db->query($sql, __LINE__, __FILE__);
+ $i = 1;
+ while($this->db->next_record())
+ {
+ $ret_array[$i]['id'] = $this->db->f('id');
+ $ret_array[$i]['name'] = $this->db->f('name');
+ $i++;
+ }
+ return $ret_array;
+ }
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2011-11-23 07:21:53 UTC (rev 8167)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2011-11-23 07:25:57 UTC (rev 8168)
@@ -105,6 +105,11 @@
'text' => lang('Control_area'),
'list' =>
$this->so_control_area->get_control_area_select_array(),
),
+ array('type' =>
'filter',
+ 'name' =>
'responsibilities',
+ 'text' => lang('Responsibility'),
+ 'list' => $this->so->get_roles(),
+ ),
array('type' => 'text',
'text' => lang('searchfield'),
'name' =>
'query'
@@ -153,6 +158,11 @@
'sortable' => false
),
array(
+ 'key' =>
'responsibility_name',
+ 'label' =>
lang('Responsibility'),
+ 'sortable' => false
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
@@ -178,6 +188,7 @@
// Fetches prosedures that are related to first control
area in list
$control_area_id = $control_areas_array[0]['id'];
$procedures_array =
$this->so_procedure->get_procedures_by_control_area_id($control_area_id);
+ $role_array = $this->so->get_roles();
$tabs = array( array(
'label' => "1: " .
lang('Details')
@@ -197,6 +208,7 @@
'control'
=> (isset($control)) ? $control->toArray(): null,
'control_areas_array' =>
$control_areas_array,
'procedures_array' =>
$procedures_array,
+ 'role_array' =>
$role_array,
'start_date' =>
$GLOBALS['phpgw']->yuical->add_listener('start_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
time())),
'end_date'
=>
$GLOBALS['phpgw']->yuical->add_listener('end_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
''))
);
@@ -616,6 +628,11 @@
{
$filters['control_areas'] = $ctrl_area;
}
+ $responsibility = phpgw::get_var('responsibilities');
+ if(isset($responsibility) && $responsibility > 0)
+ {
+ $filters['responsibilities'] = $responsibility;
+ }
$search_for = phpgw::get_var('query');
Modified: branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2011-11-23 07:21:53 UTC (rev 8167)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2011-11-23 07:25:57 UTC (rev 8168)
@@ -18,6 +18,7 @@
protected $requirement_id;
protected $costresponsibility_id;
protected $responsibility_id;
+ protected $responsibility_name;
protected $equipment_id;
protected $equipment_type_id;
protected $location_code;
@@ -129,6 +130,13 @@
public function get_responsibility_id() { return
$this->responsibility_id; }
+ public function set_responsibility_name($responsibility_name)
+ {
+ $this->responsibility_name = $responsibility_name;
+ }
+
+ public function get_responsibility_name() { return
$this->responsibility_name; }
+
public function set_equipment_id($equipment_id)
{
$this->equipment_id = $equipment_id;
@@ -195,6 +203,7 @@
$this->set_control_area_id(phpgw::get_var('control_area_id','int'));
$this->set_repeat_type(phpgw::get_var('repeat_type','int'));
$this->set_repeat_interval(phpgw::get_var('repeat_interval','int'));
+
$this->set_responsibility_id(phpgw::get_var('responsibility_id','int'));
}
public function serialize()
@@ -211,6 +220,7 @@
'control_area_name' =>
$this->get_control_area_name(),
'repeat_type' => $this->get_repeat_type(),
'repeat_interval' =>
$this->get_repeat_interval(),
+ 'responsibility_name' =>
$this->get_responsibility_name(),
);
}
Modified: branches/Version-1_0-branch/controller/templates/base/control.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control.xsl
2011-11-23 07:21:53 UTC (rev 8167)
+++ branches/Version-1_0-branch/controller/templates/base/control.xsl
2011-11-23 07:25:57 UTC (rev 8168)
@@ -117,6 +117,25 @@
</xsl:choose>
</dd>
<dt>
+ <label>Rolle</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="responsibility_id"
name="responsibility_id">
+ <xsl:for-each
select="role_array">
+ <option
value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/role_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
<label
for="description">Beskrivelse</label>
</dt>
<dd>
Modified: branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2011-11-23 07:21:53 UTC (rev 8167)
+++ branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2011-11-23 07:25:57 UTC (rev 8168)
@@ -215,7 +215,7 @@
continue;
}
- $insert_value =
trim($var_result[$field]);
+ $insert_value =
html_entity_decode(trim($var_result[$field]));
switch ( $field_info->type )
{
case 'string':
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-11-23 07:21:53 UTC (rev 8167)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-11-23 07:25:57 UTC (rev 8168)
@@ -670,8 +670,8 @@
'APPROVER.FULLNAME' =>
$GLOBALS['phpgw_info']['user']['fullname'], //Batch 04 - 14
'DIMENSION.D1.CODE' =>
$line['dimb'], // 1111
'DIMENSION.D2.CODE' =>
'',//$line['dima'], // 62000
- 'DIMENSION.D3.CODE' =>
$line['project_id'], // dummy
- 'DIMENSION.D4.CODE' =>
$dim4, // dummy
+ 'DIMENSION.D3.CODE' => '',
+ 'DIMENSION.D4.CODE' =>
$line['project_id'], // dummy
'DIMENSION.D5.CODE' =>
$dim5, // dummy
'DIMENSION.D6.CODE' =>
$dim6, // dummy
'DIMENSION.D7.CODE' =>
$dim7, // dummy
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8168] Merge 8163:8167 from trunk,
Sigurd Nes <=