[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9067] Merge 9065:9066 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9067] Merge 9065:9066 from trunk |
|
Date: |
Thu, 29 Mar 2012 08:43:07 +0000 |
Revision: 9067
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9067
Author: sigurdne
Date: 2012-03-29 08:43:07 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
Merge 9065:9066 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
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,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064
+
/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,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2012-03-29 08:42:26 UTC (rev 9066)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2012-03-29 08:43:07 UTC (rev 9067)
@@ -824,9 +824,14 @@
return $this->so->bulk_update_status($start_date,
$end_date, $status_filter, $status_new, $execute, $type,
$user_id,$ids,$paid,$closed_orders);
}
- public function get_user_list()
+ public function get_user_list($selected = 0)
{
- return $this->so->get_user_list();
+ $ser_list = $this->so->get_user_list();
+ foreach($ser_list as &$user)
+ {
+ $user['selected'] = $user['id'] == $selected ?
true : false;
+ }
+ return $ser_list;
}
public function get_budget($project_id)
Modified: branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2012-03-29 08:42:26 UTC (rev 9066)
+++ branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2012-03-29 08:43:07 UTC (rev 9067)
@@ -782,8 +782,13 @@
$this->so->delete($workorder_id);
}
- public function get_user_list()
+ public function get_user_list($selected = 0)
{
- return $this->so->get_user_list();
+ $ser_list = $this->so->get_user_list();
+ foreach($ser_list as &$user)
+ {
+ $user['selected'] = $user['id'] == $selected ?
true : false;
+ }
+ return $ser_list;
}
}
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-03-29 08:42:26 UTC (rev 9066)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-03-29 08:43:07 UTC (rev 9067)
@@ -377,11 +377,6 @@
$this->uicols = $uicols;
- if($dry_run)
- {
- return array();
- }
-
$order_field = '';
if ($order)
{
@@ -610,150 +605,157 @@
$sql_end = str_replace('SELECT DISTINCT
fm_project.id',"SELECT DISTINCT fm_project.id {$order_field}", $sql_minimized)
. " GROUP BY fm_project.id {$ordermethod}";
$project_list = array();
- if(!$allrows)
+
+ if(!$dry_run)
{
-
$this->db->limit_query($sql_end,$start,__LINE__,__FILE__);
- }
- else
- {
- if($this->total_records > 200)
+ if(!$allrows)
{
- $_fetch_single = true;
+
$this->db->limit_query($sql_end,$start,__LINE__,__FILE__);
}
else
{
- $_fetch_single = false;
+ if($this->total_records > 200)
+ {
+ $_fetch_single = true;
+ }
+ else
+ {
+ $_fetch_single = false;
+ }
+
$this->db->query($sql_end,__LINE__,__FILE__, false, $_fetch_single );
+ unset($_fetch_single);
}
- $this->db->query($sql_end,__LINE__,__FILE__,
false, $_fetch_single );
- unset($_fetch_single);
- }
- $project_list = array();
+ $project_list = array();
- $count_cols_return=count($cols_return);
+ $count_cols_return=count($cols_return);
- while ($this->db->next_record())
- {
- $project_list[] = array('project_id' =>
$this->db->f('id'));
- }
-
- foreach($project_list as &$project)
- {
- $this->db->query("{$sql} WHERE fm_project.id =
'{$project['project_id']}' {$group_method}");
- $this->db->next_record();
-
- for ($i=0;$i<$count_cols_return;$i++)
+ while ($this->db->next_record())
{
- $project[$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ $project_list[] = array('project_id' =>
$this->db->f('id'));
}
- $project['grants'] =
(int)$this->grants[$this->db->f('user_id')];
- $location_code= $this->db->f('location_code');
- $location = explode('-',$location_code);
- $count_location =count($location);
-
- for ($m=0;$m<$count_location;$m++)
+ foreach($project_list as &$project)
{
- $project['loc' . ($m+1)] =
$location[$m];
- $project['query_location']['loc' .
($m+1)]=implode("-", array_slice($location, 0, ($m+1)));
- }
+ $this->db->query("{$sql} WHERE
fm_project.id = '{$project['project_id']}' {$group_method}");
+ $this->db->next_record();
- $project['combined_cost'] = 0;
- $project['actual_cost'] = 0;
- $project['billable_hours'] = 0;
+ for ($i=0;$i<$count_cols_return;$i++)
+ {
+ $project[$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ }
+ $project['grants'] =
(int)$this->grants[$this->db->f('user_id')];
- $sql_workder = 'SELECT contract_sum,
calculation, budget,'
- . ' (fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost) as actual_cost,'
- . ' billable_hours,closed'
- . " FROM fm_workorder {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
- . " WHERE project_id =
'{$project['project_id']}'";
+ $location_code=
$this->db->f('location_code');
+ $location = explode('-',$location_code);
+ $count_location =count($location);
- $this->db->query($sql_workder);
- while ($this->db->next_record())
- {
- $closed = false;
- if($this->db->f('closed'))
+ for ($m=0;$m<$count_location;$m++)
{
- $_sum = 0;
- $closed = true;
+ $project['loc' . ($m+1)] =
$location[$m];
+
$project['query_location']['loc' . ($m+1)]=implode("-", array_slice($location,
0, ($m+1)));
}
- else if($this->db->f('contract_sum') >
0)
+
+ $project['combined_cost'] = 0;
+ $project['actual_cost'] = 0;
+ $project['billable_hours'] = 0;
+
+ $sql_workder = 'SELECT contract_sum,
calculation, budget,'
+ . ' (fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost) as actual_cost,'
+ . ' billable_hours,closed'
+ . " FROM fm_workorder {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
+ . " WHERE project_id =
'{$project['project_id']}'";
+
+ $this->db->query($sql_workder);
+ while ($this->db->next_record())
{
- $_sum =
$this->db->f('contract_sum');
+ $closed = false;
+ if($this->db->f('closed'))
+ {
+ $_sum = 0;
+ $closed = true;
+ }
+ else
if($this->db->f('contract_sum') > 0)
+ {
+ $_sum =
$this->db->f('contract_sum');
+ }
+ else
if($this->db->f('calculation') > 0)
+ {
+ $_sum =
$this->db->f('calculation');
+ }
+ else if($this->db->f('budget')
> 0)
+ {
+ $_sum =
$this->db->f('budget');
+ }
+ else
+ {
+ $_sum = 0;
+ }
+
+ $_actual_cost =
(int)$this->db->f('actual_cost');
+
+ if($closed)
+ {
+ $__actual_cost = 0;
+ }
+ else
+ {
+ $__actual_cost =
$_actual_cost;
+ }
+
+ $project['combined_cost']
+= ($_sum - $__actual_cost);
+ $project['actual_cost']
+= $_actual_cost;
+ $project['billable_hours']
+= (int)$this->db->f('billable_hours');
}
- else if($this->db->f('calculation') > 0)
- {
- $_sum =
$this->db->f('calculation');
- }
- else if($this->db->f('budget') > 0)
- {
- $_sum = $this->db->f('budget');
- }
- else
- {
- $_sum = 0;
- }
- $_actual_cost =
(int)$this->db->f('actual_cost');
+ $sql_workder = 'SELECT godkjentbelop
AS actual_cost'
+ . " FROM fm_ecobilag {$this->join}
fm_workorder ON fm_ecobilag.pmwrkord_code = fm_workorder.id"
+ . " WHERE fm_workorder.project_id =
'{$project['project_id']}'";
- if($closed)
+ $this->db->query($sql_workder);
+ while ($this->db->next_record())
{
- $__actual_cost = 0;
+ $_actual_cost =
(int)$this->db->f('actual_cost');
+ $project['combined_cost']
+= ($_sum - $_actual_cost);
+ $project['actual_cost']
+= $_actual_cost;
}
- else
+
+ if($project['combined_cost'] < 0)
{
- $__actual_cost = $_actual_cost;
+ $project['combined_cost'] = 0;
}
-
- $project['combined_cost'] +=
($_sum - $__actual_cost);
- $project['actual_cost'] +=
$_actual_cost;
- $project['billable_hours'] +=
(int)$this->db->f('billable_hours');
}
+ unset($project);
- $sql_workder = 'SELECT godkjentbelop AS
actual_cost'
- . " FROM fm_ecobilag {$this->join} fm_workorder
ON fm_ecobilag.pmwrkord_code = fm_workorder.id"
- . " WHERE fm_workorder.project_id =
'{$project['project_id']}'";
-
- $this->db->query($sql_workder);
- while ($this->db->next_record())
+ $_datatype = array();
+ foreach($this->uicols['name'] as $key => $_name)
{
- $_actual_cost =
(int)$this->db->f('actual_cost');
- $project['combined_cost'] +=
($_sum - $_actual_cost);
- $project['actual_cost'] +=
$_actual_cost;
+ $_datatype[$_name] =
$this->uicols['datatype'][$key];
}
- if($project['combined_cost'] < 0)
+ $dataset = array();
+ $j=0;
+
+ foreach($project_list as $project)
{
- $project['combined_cost'] = 0;
+ foreach ($project as $field => $value)
+ {
+ $dataset[$j][$field] = array
+ (
+ 'value' =>
$value,
+ 'datatype' =>
isset($_datatype[$field]) && $_datatype[$field] ? $_datatype[$field] : false,
+ 'attrib_id' =>
isset($_attrib[$field]) && $_attrib[$field] ? $_attrib[$field] : false
+ );
+ }
+ $j++;
}
- }
- $_datatype = array();
- foreach($this->uicols['name'] as $key => $_name)
- {
- $_datatype[$_name] =
$this->uicols['datatype'][$key];
- }
+ $values =
$this->custom->translate_value($dataset, $location_id);
- $dataset = array();
- $j=0;
-
- foreach($project_list as $project)
- {
- foreach ($project as $field => $value)
- {
- $dataset[$j][$field] = array
- (
- 'value' => $value,
- 'datatype' =>
isset($_datatype[$field]) && $_datatype[$field] ? $_datatype[$field] : false,
- 'attrib_id' =>
isset($_attrib[$field]) && $_attrib[$field] ? $_attrib[$field] : false
- );
- }
- $j++;
+ return $values;
}
- $values = $this->custom->translate_value($dataset,
$location_id);
-
- return $values;
+ return array();
}
function get_meter_table()
@@ -1393,7 +1395,7 @@
'modified_date' =>
$this->db->f('modified_date')
);
}
-
+
foreach($budget as $entry)
{
$sql = "SELECT * FROM fm_project_budget
WHERE project_id = {$new_project_id} AND year = {$entry['year']}";
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-03-29 08:42:26 UTC (rev 9066)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-03-29 08:43:07 UTC (rev 9067)
@@ -267,7 +267,7 @@
$default_value = array
('id'=>'','name'=>lang('no criteria'));
array_unshift
($values_combo_box[4],$default_value);
- $values_combo_box[5] =
$this->bo->get_user_list();
+ $values_combo_box[5] =
$this->bo->get_user_list($this->filter);
array_unshift
($values_combo_box[5],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
projects')));
$default_value = array
('id'=>'','name'=>lang('no user'));
array_unshift
($values_combo_box[5],$default_value);
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2012-03-29 08:42:26 UTC (rev 9066)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2012-03-29 08:43:07 UTC (rev 9067)
@@ -274,7 +274,7 @@
$default_value = array
('id'=>'','name'=>lang('no criteria'));
array_unshift
($values_combo_box[4],$default_value);
- $values_combo_box[5] =
$this->bo->get_user_list();
+ $values_combo_box[5] =
$this->bo->get_user_list($this->filter);
array_unshift
($values_combo_box[5],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
orders')));
$default_value = array
('id'=>'','name'=>lang('no user'));
array_unshift
($values_combo_box[5],$default_value);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9067] Merge 9065:9066 from trunk,
Sigurd Nes <=