[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11493] Merge 11488:11492 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11493] Merge 11488:11492 from trunk |
|
Date: |
Tue, 26 Nov 2013 19:07:30 +0000 |
Revision: 11493
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11493
Author: sigurdne
Date: 2013-11-26 19:07:30 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
Merge 11488:11492 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/property/inc/class.bocondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/property/templates/base/condition_survey_summation.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,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-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487
+
/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-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2013-11-26 19:04:56 UTC (rev 11492)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2013-11-26 19:07:30 UTC (rev 11493)
@@ -94,7 +94,7 @@
$this->so_case = CreateObject('controller.socase');
$this->location_finder = new location_finder();
- $this->acl_location = '.control';
+ $this->acl_location = '.checklist';
$this->read =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_READ, 'controller');//1
$this->add =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_ADD, 'controller');//2
Modified:
branches/Version-1_0-branch/property/inc/class.bocondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocondition_survey.inc.php
2013-11-26 19:04:56 UTC (rev 11492)
+++ branches/Version-1_0-branch/property/inc/class.bocondition_survey.inc.php
2013-11-26 19:07:30 UTC (rev 11493)
@@ -311,20 +311,34 @@
public function get_summation($id)
{
- $survey = $this->so->read_single(array('id' => $id));
+ $surveys = array();
+
+ if($id == -1)
+ {
+ $values = $this->so->read(array('allrows' =>
true ));
+ foreach ($values as $survey)
+ {
+ $surveys[$survey['id']]['multiplier'] =
$survey['multiplier'];
+ }
+ }
+ else
+ {
+ $surveys[$id] =
$this->so->read_single(array('id' => $id));
+ }
$data = $this->so->get_summation($id);
-//$total = 0;
+
+//_debug_array($surveys);
//_debug_array($data);
$values =array();
$i=0;
foreach ($data as $entry)
{
- $entry['amount'] = $entry['amount'] *
$survey['multiplier'];
- $i = $entry['building_part'] . '_' .
$entry['category'];
+ $entry['amount'] = $entry['amount'] *
$surveys[$entry['condition_survey_id']]['multiplier'];
+ $i =
"{$entry['building_part']}_{$entry['category']}";
- $values[$i]['building_part'] =
$entry['building_part'];
- $values[$i]['category'] = $entry['category'];
+
$values[$entry['condition_survey_id']][$i]['building_part'] =
$entry['building_part'];
+
$values[$entry['condition_survey_id']][$i]['category'] = $entry['category'];
$diff = $entry['year'] - date('Y');
if($diff < 0)
@@ -339,25 +353,56 @@
for ($j = 1; $j < 7 ; $j++ )
{
- $values[$i]["period_{$j}"] += 0;
- $values[$i]['sum'] += 0;
+
$values[$entry['condition_survey_id']][$i]["period_{$j}"] += 0;
+
$values[$entry['condition_survey_id']][$i]['sum'] += 0;
if($j == $period)
{
- $values[$i]["period_{$j}"] +=
$entry['amount'];
- $values[$i]['sum'] +=
$entry['amount'];
+
$values[$entry['condition_survey_id']][$i]["period_{$j}"] += $entry['amount'];
+
$values[$entry['condition_survey_id']][$i]['sum'] += $entry['amount'];
}
}
}
unset($entry);
- $ret =array();
- foreach ($values as $entry)
+ $ret = array();
+
+ $_values = array();
+ foreach ($values as $condition_survey_id => $entry)
{
+ foreach($entry as $type => $_entry)
+ {
+ $_values[$type]['building_part']
= $_entry['building_part'];
+ $_values[$type]['category']
= $_entry['category'];
+ $_values[$type]['period_1']
+= $_entry['period_1'];
+ $_values[$type]['period_2']
+= $_entry['period_2'];
+ $_values[$type]['period_3']
+= $_entry['period_3'];
+ $_values[$type]['period_4']
+= $_entry['period_4'];
+ $_values[$type]['period_5']
+= $_entry['period_5'];
+ $_values[$type]['period_6']
+= $_entry['period_6'];
+ $_values[$type]['sum']
+= $_entry['sum'];
+ }
+ }
+ unset($_entry);
+ unset($entry);
+
+ foreach($_values as $entry)
+ {
$ret[] = $entry;
}
-//_debug_array($total);
-//_debug_array($ret);
+ foreach ($ret as $key => $row)
+ {
+ $building_part[$key] = $row['building_part'];
+ $category[$key] = $row['category'];
+ }
+
+ // Sort the data with account_lastname ascending,
account_firstname ascending
+ // Add $data as the last parameter, to sort by the
common key
+ if($ret)
+ {
+ array_multisort($building_part, SORT_ASC,
$category, SORT_ASC, $ret);
+ }
+
return $ret;
}
Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2013-11-26
19:04:56 UTC (rev 11492)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2013-11-26
19:07:30 UTC (rev 11493)
@@ -833,7 +833,16 @@
(
'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uicondition_survey.index')),
'text' =>
lang('condition survey'),
- 'image'
=> array('property', 'condition_survey')
+ 'image'
=> array('property', 'condition_survey'),
+ 'children'
=> array
+ (
+
'summation' => array
+ (
+
'url' => $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uicondition_survey.summation')),
+
'text' => lang('summation'),
+
'image' => array('property', 'invoice')
+ )
+ )
),
'request' => array
(
Modified:
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2013-11-26 19:04:56 UTC (rev 11492)
+++ branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2013-11-26 19:07:30 UTC (rev 11493)
@@ -357,7 +357,7 @@
}
else
{
- throw new
Exception('property_socondition_survey::import - condition survey obsolete
status not configured');
+// throw new
Exception('property_socondition_survey::import - condition survey obsolete
status not configured');
}
$cats = CreateObject('phpgwapi.categories', -1,
'property', '.project');
@@ -410,6 +410,7 @@
$entry['amount_potential_grants'] = (int)
str_replace(array(' ', ','),array('','.'),$entry['amount_potential_grants']);
$entry['import_type']
= (int) $entry['import_type'];
$entry['condition_degree']
= (int) $entry['condition_degree'];
+ $entry['amount']
= $entry['amount_investment'] + $entry['amount_operation'] +
$entry['amount_potential_grants'];
}
@@ -421,7 +422,8 @@
$origin_id =
$GLOBALS['phpgw']->locations->get_id('property', '.project.condition_survey');
foreach ($import_data as $entry)
{
- if( $entry['condition_degree'] > 0 &&
$entry['building_part'] && $entry['import_type'] > 0)
+ //if( $entry['condition_degree'] > 0 &&
$entry['building_part'] && $entry['import_type'] > 0)
+ if( $entry['amount'] && $entry['building_part']
&& $entry['import_type'] > 0)
{
$request = array();
@@ -457,6 +459,7 @@
$request['condition_survey_id']
= $survey['id'];
+ $request['multiplier']
= $survey['multiplier'];
$request['street_name']
= $location_data['street_name'];
$request['street_number']
= $location_data['street_number'];
$request['location']
= $location;
@@ -540,13 +543,25 @@
public function get_summation($id)
{
+ $id_filter = '';
+
$condition_survey_id = (int)$id;
- $sql = "SELECT left(building_part,1) as building_part_,"
+
+ if($condition_survey_id == -1) // all
+ {
+ $id_filter = "condition_survey_id > 0";
+ }
+ else
+ {
+ $id_filter = "condition_survey_id =
{$condition_survey_id}";
+ }
+
+ $sql = "SELECT condition_survey_id,
left(building_part,1) as building_part_,"
. " sum(amount_investment) as investment
,sum(amount_operation) as operation,"
. " recommended_year as year"
." FROM fm_request {$this->_join} fm_request_status ON
fm_request.status = fm_request_status.id"
- ." WHERE condition_survey_id={$condition_survey_id} AND
fm_request_status.closed IS NULL"
- ." GROUP BY building_part_ , year ORDER BY
building_part_";
+ ." WHERE {$id_filter} AND fm_request_status.closed IS
NULL"
+ ." GROUP BY condition_survey_id, building_part_ , year
ORDER BY building_part_";
$this->_db->query($sql,__LINE__,__FILE__);
@@ -557,10 +572,11 @@
$values[] = array
(
- 'building_part' =>
$this->_db->f('building_part_'),
- 'amount_investment' =>
$this->_db->f('investment'),
- 'amount_operation' =>
$this->_db->f('operation'),
- 'year' =>
$this->_db->f('year'),
+ 'condition_survey_id' =>
$this->_db->f('condition_survey_id'),
+ 'building_part' =>
$this->_db->f('building_part_'),
+ 'amount_investment' =>
$this->_db->f('investment'),
+ 'amount_operation' =>
$this->_db->f('operation'),
+ 'year'
=> $this->_db->f('year'),
);
}
@@ -574,20 +590,22 @@
{
$return[] = array
(
- 'building_part' =>
$entry['building_part'],
- 'amount' =>
$entry['amount_investment'],
- 'year' =>
$entry['year'],
- 'category' =>
$lang_investment,
+ 'condition_survey_id' =>
$entry['condition_survey_id'],
+ 'building_part'
=> $entry['building_part'],
+ 'amount'
=> $entry['amount_investment'],
+ 'year'
=> $entry['year'],
+ 'category'
=> $lang_investment,
);
}
if ($entry['amount_operation'])
{
$return[] = array
(
- 'building_part' =>
$entry['building_part'],
- 'amount' =>
$entry['amount_operation'],
- 'year' =>
$entry['year'],
- 'category' =>
$lang_operation,
+ 'condition_survey_id' =>
$entry['condition_survey_id'],
+ 'building_part'
=> $entry['building_part'],
+ 'amount'
=> $entry['amount_operation'],
+ 'year'
=> $entry['year'],
+ 'category'
=> $lang_operation,
);
}
}
Modified: branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2013-11-26 19:04:56 UTC (rev 11492)
+++ branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2013-11-26 19:07:30 UTC (rev 11493)
@@ -1041,6 +1041,8 @@
$value_set['condition_survey_id'] =
$request['condition_survey_id'];
$value_set['responsible_unit'] =
$request['responsible_unit'];
$value_set['recommended_year'] = (int)
$request['recommended_year'];
+ $value_set['multiplier']
= $request['multiplier'] ? (float)$request['multiplier'] : 1;
+
$cols = implode(',', array_keys($value_set));
$values =
$this->_db->validate_insert(array_values($value_set));
Modified:
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2013-11-26 19:04:56 UTC (rev 11492)
+++ branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2013-11-26 19:07:30 UTC (rev 11493)
@@ -53,7 +53,8 @@
'get_summation' => true,
'view_file' => true,
'import' => true,
- 'download' => true
+ 'download' => true,
+ 'summation' => true
);
public function __construct()
@@ -713,7 +714,7 @@
'ResultSet' => array(
'totalResultsAvailable' =>
$total_records,
'startIndex' => $start,
- 'sortKey' => 'type',
+ 'sortKey' => 'building_part',
'sortDir' => "ASC",
'Result' => $out,
'pageSize' => $num_rows,
@@ -919,6 +920,28 @@
file_put_contents($cached_file,
file_get_contents($file));
phpgwapi_cache::session_set('property',
'condition_survey_import_file',$cached_file);
$step = 1;
+
+ // Add the file to documents
+ $bofiles =
CreateObject('property.bofiles');
+ $to_file =
"{$bofiles->fakebase}/condition_survey/{$id}/" . str_replace('
','_',$_FILES['import_file']['name']);
+
+ $bofiles->vfs->rm(array(
+ 'string' => $to_file,
+ 'relatives' => array(
+ RELATIVE_NONE
+ )
+ )
+ );
+
+
$bofiles->create_document_dir("condition_survey/{$id}");
+ $bofiles->vfs->override_acl = 1;
+
+ $bofiles->vfs->cp (array (
+ 'from' =>
$_FILES['import_file']['tmp_name'],
+ 'to' => $to_file,
+ 'relatives' => array
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)));
+ $bofiles->vfs->override_acl = 0;
+ unset($bofiles);
}
$tabs = array();
@@ -1319,6 +1342,89 @@
return 'Deleted';
}
+
+ /**
+ * Prepare data for summation - single survey or all
+ *
+ * @return void
+ */
+
+ public function summation()
+ {
+ $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"property::project::condition_survey::summation";
+
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uicondition_survey.index'));
+ }
+
+ $params = array
+ (
+ 'start' => 0,
+ 'sort' => 'id',
+ 'dir' => 'asc',
+ 'cat_id' => 0,
+ 'allrows' => true
+ );
+
+ $survey_list = $this->bo->read($params);
+
+ $surveys = array();
+ $surveys[] = array
+ (
+ 'id' => 0,
+ 'name' => lang('select'),
+ );
+ $surveys[] = array
+ (
+ 'id' => -1,
+ 'name' => lang('all'),
+ );
+
+ foreach($survey_list as $survey)
+ {
+ $surveys[] = array
+ (
+ 'id' =>
$survey['id'],
+ 'name' =>
$survey['title'],
+ 'description' => $survey['address'],
+ );
+
+ }
+
+ $summation_def = array
+ (
+ array('key' =>
'building_part','label'=>lang('building
part'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'category','label'=>lang('category'),'sortable'=>false,'resizeable'=>true),
+ array('key' => 'period_1','label'=>lang('year')
. ':: < 1'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+ array('key' => 'period_2','label'=>lang('year')
. ':: 1 - 5'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+ array('key' => 'period_3','label'=>lang('year')
. ':: 6 - 10'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+ array('key' => 'period_4','label'=>lang('year')
. ':: 11 - 15'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+ array('key' => 'period_5','label'=>lang('year')
. ':: 16 - 20'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+ array('key' => 'period_6','label'=>lang('year')
. ':: 21 +'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+ array('key' =>
'sum','label'=>lang('sum'),'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+ );
+
+ $datatable_def = array();
+ $datatable_def[] = array
+ (
+ 'container' =>
'datatable-container_0',
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uicondition_survey.get_summation', 'id' =>
$id,'phpgw_return_as'=>'json'))),
+ 'ColumnDefs' => $summation_def
+ );
+
+ $data = array
+ (
+ 'datatable_def'
=> $datatable_def,
+ 'surveys'
=> array('options' => $surveys),
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . '::' . lang('condition survey');
+
+
self::render_template_xsl(array('condition_survey_summation'), $data);
+ }
+
+
/*
* Overrides with incoming data from POST
*/
Copied:
branches/Version-1_0-branch/property/templates/base/condition_survey_summation.xsl
(from rev 11492, trunk/property/templates/base/condition_survey_summation.xsl)
===================================================================
---
branches/Version-1_0-branch/property/templates/base/condition_survey_summation.xsl
(rev 0)
+++
branches/Version-1_0-branch/property/templates/base/condition_survey_summation.xsl
2013-11-26 19:07:30 UTC (rev 11493)
@@ -0,0 +1,168 @@
+<!-- $Id: documents_add.xsl 11483 2013-11-24 19:54:40Z sigurdne $ -->
+
+<func:function name="phpgw:conditional">
+ <xsl:param name="test"/>
+ <xsl:param name="true"/>
+ <xsl:param name="false"/>
+
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$test">
+ <xsl:value-of select="$true"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$false"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
+</func:function>
+
+<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="yui_phpgw_i18n"/>
+
+ <div class="yui-navset" id="survey_edit_tabview">
+ <h1>
+ <xsl:value-of select="php:function('lang',
'summation')" />
+ </h1>
+ <div class="yui-content">
+
+ <dl class="proplist-col">
+
+ <dt>
+ <label
for="category"><xsl:value-of select="php:function('lang', 'category')"
/></label>
+ </dt>
+ <dd>
+ <select id="survey_id"
name="survey_id" onChange="update_summation();" >
+ <xsl:apply-templates
select="surveys/options"/>
+ </select>
+ </dd>
+
+ </dl>
+ </div>
+ <xsl:call-template name="datasource-definition" />
+ <dl class="proplist-col">
+ <dt>
+ <label><xsl:value-of
select="php:function('lang', 'summation')"/></label>
+ </dt>
+ <dd>
+ <div style="clear:both;"
id="datatable-container_0"></div>
+ </dd>
+ </dl>
+ </div>
+
+
+ <script>
+ function update_summation()
+ {
+ var survey_id = document.getElementById("survey_id").value;
+ var oArgs =
{menuaction:'property.uicondition_survey.get_summation', id:survey_id};
+ var strURL = phpGWLink('index.php', oArgs, true);
+ YAHOO.portico.updateinlineTableHelper('datatable-container_0',
strURL);
+ }
+
+
+ addFooterDatatable0 = function(paginator,datatable)
+ {
+ //call YAHOO.portico.getTotalSum(name of column) in property.js
+ tmp_sum1 =
YAHOO.portico.getTotalSum('period_1',0,paginator,datatable);
+ tmp_sum2 =
YAHOO.portico.getTotalSum('period_2',0,paginator,datatable);
+ tmp_sum3 =
YAHOO.portico.getTotalSum('period_3',0,paginator,datatable);
+ tmp_sum4 =
YAHOO.portico.getTotalSum('period_4',0,paginator,datatable);
+ tmp_sum5 =
YAHOO.portico.getTotalSum('period_5',0,paginator,datatable);
+ tmp_sum6 =
YAHOO.portico.getTotalSum('period_6',0,paginator,datatable);
+ tmp_sum7 =
YAHOO.portico.getTotalSum('sum',0,paginator,datatable);
+
+ if(typeof(tableYUI0)=='undefined')
+ {
+ tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
+ tableYUI0.setAttribute("id","tableYUI0");
+ }
+ else
+ {
+ tableYUI0.deleteTFoot();
+ }
+
+ //Create ROW
+ newTR = document.createElement('tr');
+
+ YAHOO.portico.td_empty(1);
+ YAHOO.portico.td_sum('Sum');
+ YAHOO.portico.td_sum(tmp_sum1);
+ YAHOO.portico.td_sum(tmp_sum2);
+ YAHOO.portico.td_sum(tmp_sum3);
+ YAHOO.portico.td_sum(tmp_sum4);
+ YAHOO.portico.td_sum(tmp_sum5);
+ YAHOO.portico.td_sum(tmp_sum6);
+ YAHOO.portico.td_sum(tmp_sum7);
+
+ myfoot = tableYUI0.createTFoot();
+ myfoot.setAttribute("id","myfoot");
+ myfoot.appendChild(newTR);
+ }
+
+
+ </script>
+
+
+ </xsl:template>
+
+<xsl:template name="datasource-definition">
+ <script>
+ var columnDefs = [];
+ YAHOO.util.Event.onDOMReady(function(){
+ <xsl:for-each select="datatable_def">
+ columnDefs = [
+ <xsl:for-each select="ColumnDefs">
+ {
+ resizeable: true,
+ key: "<xsl:value-of
select="key"/>",
+ <xsl:if test="label">
+ label: "<xsl:value-of
select="label"/>",
+ </xsl:if>
+ sortable: <xsl:value-of
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
+ <xsl:if test="hidden">
+ hidden: true,
+ </xsl:if>
+ <xsl:if test="formatter">
+ formatter: <xsl:value-of
select="formatter"/>,
+ </xsl:if>
+ <xsl:if test="editor">
+ editor: <xsl:value-of
select="editor"/>,
+ </xsl:if>
+ className: "<xsl:value-of
select="className"/>"
+ }<xsl:value-of
select="phpgw:conditional(not(position() = last()), ',', '')"/>
+ </xsl:for-each>
+ ];
+
+ YAHOO.portico.inlineTableHelper("<xsl:value-of
select="container"/>", <xsl:value-of select="requestUrl"/>, columnDefs);
+ </xsl:for-each>
+
+ var PaginatorName0 = 'paginator_containerdatatable-container_0';
+ var DatatableName0 = 'datatable_containerdatatable-container_0';
+
+ var myPaginator_0 = YAHOO.portico.Paginator[PaginatorName0];
+ var myDataTable_0 = YAHOO.portico.DataTable[DatatableName0];
+
+ myDataTable_0.subscribe("renderEvent", function()
+ {
+ addFooterDatatable0(myPaginator_0,myDataTable_0);
+ });
+
+ });
+ </script>
+
+</xsl:template>
+
+
+<xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected = 'selected' or selected = 1">
+ <xsl:attribute name="selected" value="selected" />
+ </xsl:if>
+ <xsl:attribute name="title">
+ <xsl:value-of disable-output-escaping="yes"
select="description"/>
+ </xsl:attribute>
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11493] Merge 11488:11492 from trunk,
Sigurd Nes <=