[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11361] Merge 11357:11359 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11361] Merge 11357:11359 from trunk |
Date: |
Wed, 09 Oct 2013 14:00:23 +0000 |
Revision: 11361
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11361
Author: sigurdne
Date: 2013-10-09 14:00:23 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
Merge 11357:11359 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.boentity.inc.php
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.bos_agreement.inc.php
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
branches/Version-1_0-branch/property/js/yahoo/entity.edit.js
branches/Version-1_0-branch/property/js/yahoo/location.edit.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/location.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
+
/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-11359
Modified: branches/Version-1_0-branch/property/inc/class.boentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2013-10-09 14:00:23 UTC (rev 11361)
@@ -64,7 +64,7 @@
var $type_app = array();
var $type;
- function property_boentity($session=false, $type = '',
$entity_id = 0, $cat_id = 0)
+ function __construct($session=false, $type = '', $entity_id =
0, $cat_id = 0)
{
$this->solocation =
CreateObject('property.solocation');
$this->bocommon =
CreateObject('property.bocommon');
Modified: branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2013-10-09 14:00:23 UTC (rev 11361)
@@ -201,9 +201,9 @@
return $this->bocommon->select_list($selected,$list);
}
- function read_entity_to_link($location_code)
+ function read_entity_to_link($location_code, $exact = false)
{
- return $this->so->read_entity_to_link($location_code);
+ return $this->so->read_entity_to_link($location_code,
$exact);
}
function get_owner_list($format='',$selected='')
Modified: branches/Version-1_0-branch/property/inc/class.bos_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bos_agreement.inc.php
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/inc/class.bos_agreement.inc.php
2013-10-09 14:00:23 UTC (rev 11361)
@@ -43,6 +43,7 @@
var $role;
var $member_id;
var $uicols = array();
+ var $location_code;
/**
* @var object $custom reference to custom fields object
@@ -82,7 +83,8 @@
$allrows =
phpgw::get_var('allrows', 'bool');
$role =
phpgw::get_var('role');
$member_id =
phpgw::get_var('member_id', 'int');
- $status_id = phpgw::get_var('status_id', 'int');
+ $status_id =
phpgw::get_var('status_id', 'int');
+ $this->location_code= phpgw::get_var('location_code');
$this->p_num = phpgw::get_var('p_num');
@@ -176,7 +178,7 @@
{
$s_agreements = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,'member_id'=>$this->member_id,
- 'vendor_id'=>$this->vendor_id, 'p_num' =>
$this->p_num, 'status_id'=>$this->status_id));
+ 'vendor_id'=>$this->vendor_id, 'p_num' =>
$this->p_num, 'status_id'=>$this->status_id, 'location_code' =>
$this->location_code));
$this->total_records = $this->so->total_records;
$this->uicols = $this->so->uicols;
Modified: branches/Version-1_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2013-10-09 14:00:23 UTC (rev 11361)
@@ -61,8 +61,10 @@
$this->like = & $this->db->like;
}
- function read_entity_to_link($location_code)
+ function read_entity_to_link($location_code, $exact = false)
{
+ $condition = $exact ? "= '{$location_code}'" :
"{$this->like} '{$location_code}%'";
+
$entity = array();
$type_app =
execMethod('property.soentity.get_type_app');
@@ -99,11 +101,11 @@
$this->db->query("SELECT id as
bim_type FROM fm_bim_type WHERE location_id =
{$location_id}",__LINE__,__FILE__);
$this->db->next_record();
$bim_type =
(int)$this->db->f('bim_type');
- $sql = "SELECT count(*) as hits
FROM fm_bim_item WHERE location_code {$this->like} '$location_code%' AND type =
{$bim_type}";
+ $sql = "SELECT count(*) as hits
FROM fm_bim_item WHERE location_code {$condition} AND type = {$bim_type}";
}
else
{
- $sql = "SELECT count(*) as hits
FROM fm_{$type}_{$entry['entity_id']}_{$entry['cat_id']} WHERE location_code
{$this->like} '$location_code%'";
+ $sql = "SELECT count(*) as hits
FROM fm_{$type}_{$entry['entity_id']}_{$entry['cat_id']} WHERE location_code
{$condition}";
}
$this->db->query($sql,__LINE__,__FILE__);
@@ -128,7 +130,7 @@
}
}
- $sql = "SELECT count(*) as hits FROM fm_tts_tickets
WHERE location_code $this->like '$location_code%'";
+ $sql = "SELECT count(*) as hits FROM fm_tts_tickets
WHERE location_code {$condition}";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
if($this->db->f('hits'))
@@ -142,7 +144,7 @@
);
}
- $sql = "SELECT count(*) as hits FROM fm_request WHERE
location_code $this->like '$location_code%'";
+ $sql = "SELECT count(*) as hits FROM fm_request WHERE
location_code {$condition}";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
if($this->db->f('hits'))
@@ -156,7 +158,7 @@
);
}
- $sql = "SELECT count(*) as hits FROM fm_project WHERE
location_code $this->like '$location_code%'";
+ $sql = "SELECT count(*) as hits FROM fm_project WHERE
location_code {$condition}";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
if($this->db->f('hits'))
@@ -170,7 +172,7 @@
);
}
- $sql = "SELECT count(*) as hits FROM fm_gab_location
WHERE location_code $this->like '$location_code%'";
+ $sql = "SELECT count(*) as hits FROM fm_gab_location
WHERE location_code {$condition}";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
if($this->db->f('hits'))
@@ -185,16 +187,19 @@
}
- $sql = "SELECT count(*) as hits FROM fm_s_agreement
{$this->join} fm_s_agreement_detail ON fm_s_agreement.id =
fm_s_agreement_detail.agreement_id WHERE location_code {$this->like}
'$location_code%'";
+ $sql = "SELECT DISTINCT fm_s_agreement.id FROM
fm_s_agreement"
+ . " {$this->join} fm_s_agreement_detail ON
fm_s_agreement.id = fm_s_agreement_detail.agreement_id"
+ . " WHERE location_code {$condition}"
+ . " GROUP BY fm_s_agreement.id";
$this->db->query($sql,__LINE__,__FILE__);
- $this->db->next_record();
- if($this->db->f('hits'))
+ $hits = $this->db->num_rows();
+
+ if( $hits )
{
- $hits = $this->db->f('hits');
$entity['related'][] = array
(
'entity_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uis_agreement.index',
-
'query'=> $location_code)),
+
'location_code'=>
$location_code)),
'name' =>
lang('service agreement') . " [{$hits}]",
'descr' =>
lang('service agreement')
);
Modified: branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
2013-10-09 14:00:23 UTC (rev 11361)
@@ -83,6 +83,7 @@
$detail =
isset($data['detail'])?$data['detail']:'';
$p_num = isset($data['p_num'])
? $data['p_num'] : '';
$status_id =
isset($data['status_id']) && $data['status_id'] ? (int)$data['status_id']:0;
+ $location_code =
isset($data['location_code'])?$data['location_code']:'';
}
$choice_table = 'phpgw_cust_choice';
@@ -157,7 +158,7 @@
$attribute_filter = " location_id =
{$location_id}";
$paranthesis .='(';
- $joinmethod .= " $this->join
fm_s_agreement_pricing ON ( $entity_table.agreement_id
=fm_s_agreement_pricing.agreement_id AND $entity_table.id
=fm_s_agreement_pricing.item_id))";
+ $joinmethod .= " {$this->join}
fm_s_agreement_pricing ON ( $entity_table.agreement_id
=fm_s_agreement_pricing.agreement_id AND {$entity_table}.id
=fm_s_agreement_pricing.item_id))";
$cols = "$entity_table.*,
fm_s_agreement_pricing.cost,fm_s_agreement_pricing.id as
index_count,fm_s_agreement_pricing.index_date,fm_s_agreement_pricing.item_id,fm_s_agreement_pricing.this_index";
@@ -347,6 +348,12 @@
$where= 'AND';
}
+ if ($location_code)
+ {
+ $filtermethod .= " $where location_code
{$this->like} '{$location_code}%'";
+ $where= 'AND';
+ }
+
if ($cat_id && !$detail)
{
$filtermethod .= " $where
$entity_table.category='$cat_id' ";
Modified: branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2013-10-09 14:00:23 UTC (rev 11361)
@@ -2227,9 +2227,19 @@
}
//_debug_array($roles);die();
+ $location_arr = explode('-', $location_code);
+//_debug_array($location_arr);die();
- $related =
$this->bo->read_entity_to_link($location_code);
- $related_link = array();
+ $related = array();
+ $_location_level_arr = array();
+ foreach($location_arr as $_location_level)
+ {
+ $_exact = $location_code ==
$_location_level ? false : true;
+ $_location_level_arr[] =
$_location_level;
+ $location_level = implode('-',
$_location_level_arr);
+ $related[$location_level] =
$this->bo->read_entity_to_link($location_level, $_exact);
+ }
+//_debug_array($related);die();
$location_type_info =
$this->soadmin_location->read_single($type_id);
$documents = array();
@@ -2272,42 +2282,72 @@
$file_tree = json_encode($file_tree);
}
- if(isset($related['related']))
+ $_related = array();
+ foreach($related as $_location_level =>
$related_info)
{
- $tabs['related'] = array('label'
=> lang('related'), 'link' => '#related');
- }
-
- foreach($related as $related_key =>
$related_data)
- {
- if( $related_key == 'gab')
+ if(isset($related_info['related']))
{
- foreach($related_data as $entry)
+ foreach($related_info as
$related_key => $related_data)
{
- $entities_link[] = array
- (
-
'entity_link' => $entry['entity_link'],
-
'lang_entity_statustext' => $entry['descr'],
-
'text_entity' => $entry['name'],
- );
+ if( $related_key ==
'gab')
+ {
+
foreach($related_data as $entry)
+ {
+
$entities_link[] = array
+
(
+
'entity_link' => $entry['entity_link'],
+
'lang_entity_statustext' => $entry['descr'],
+
'text_entity' => $entry['name'],
+
);
+ }
+ }
+ else
+ {
+
foreach($related_data as $entry)
+ {
+
$_related[] = array
+ (
+
'where' => $_location_level,
+
'url' => "<a href=\"{$entry['entity_link']}\" > {$entry['name']}</a>",
+ );
+ }
+ }
}
}
+ }
+
+ $related_link = $_related ? true : false;
- if( $related_key == 'related')
- {
- foreach($related_data as $entry)
- {
- $related_link[] = array
- (
-
'entity_link' => $entry['entity_link'],
-
'lang_entity_statustext' => $entry['descr'],
-
'text_entity' => $entry['name'],
- );
-
- }
- }
+ if($_related)
+ {
+ $tabs['related'] = array('label'
=> lang('related'), 'link' => '#related');
}
+ $datavalues = array();
+ $myColumnDefs = array();
+ $datavalues[0] = array
+ (
+ 'name'
=> "0",
+ 'values'
=> json_encode($_related),
+ 'total_records' =>
count($_related),
+ 'edit_action' => "''",
+ 'is_paginator' => 0,
+ 'footer'
=> 0
+ );
+
+ $myColumnDefs[0] = array
+ (
+ 'name' => "0",
+ 'values' =>
json_encode(array(
+ array('key' =>
'where','label'=>lang('where'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'url','label'=>lang('what'),'sortable'=>false,'resizeable'=>true),
+ )
+ )
+ );
+
+
+
// ---- START INTEGRATION -------------------------
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
@@ -2486,8 +2526,20 @@
unset($values['attributes']);
+ $property_js = "/property/js/yahoo/property2.js";
+
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+
$data = array
(
+ 'property_js'
=> json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] .
$property_js),
+ 'datatable'
=> $datavalues,
+ 'myColumnDefs'
=> $myColumnDefs,
'integration'
=> $integration,
'roles'
=> $roles,
'edit'
=> $view ? '' : true,
@@ -2562,7 +2614,23 @@
);
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/examples/treeview/assets/css/folders/tree.css');
+
+ phpgwapi_yui::load_widget('dragdrop');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('menu');
+ phpgwapi_yui::load_widget('connection');
+ phpgwapi_yui::load_widget('loader');
+ phpgwapi_yui::load_widget('tabview');
+ phpgwapi_yui::load_widget('paginator');
+ phpgwapi_yui::load_widget('animation');
+
+
phpgwapi_yui::load_widget('treeview');
+
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
+
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'location.edit', 'property' );
$appname = lang('location');
Modified: branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
2013-10-09 14:00:23 UTC (rev 11361)
@@ -93,6 +93,7 @@
$this->member_id =
$this->bo->member_id;
$this->p_num =
$this->bo->p_num;
$this->status_id =
$this->bo->status_id;
+ $this->location_code =
$this->bo->location_code;
}
function save_sessiondata()
@@ -189,15 +190,16 @@
$datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
(
'menuaction' =>
'property.uis_agreement.index',
- 'sort' =>$this->sort,
- 'order' =>$this->order,
- 'cat_id' =>$this->cat_id,
- 'filter' =>$this->filter,
- 'query' =>$this->query,
- 'role' => $this->role,
- 'member_id' =>
$this->member_id,
- 'p_num' => $this->p_num,
- 'status_id' =>
$this->status_id
+ 'sort'
=>$this->sort,
+ 'order'
=>$this->order,
+ 'cat_id'
=>$this->cat_id,
+ 'filter'
=>$this->filter,
+ 'query'
=>$this->query,
+ 'role' =>
$this->role,
+ 'member_id' =>
$this->member_id,
+ 'p_num' =>
$this->p_num,
+ 'status_id' =>
$this->status_id,
+ 'location_code' =>
$this->location_code
));
$datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index',"
@@ -210,6 +212,7 @@
."query:'{$this->query}',"
."p_num: '{$this->p_num}',"
."role:'{$this->role}',"
+
."location_code:'{$this->location_code}',"
."member_id:'{$this->member_id}'";
$datatable['config']['allow_allrows'] = true;
@@ -252,14 +255,15 @@
array
(
'menuaction'
=> 'property.uis_agreement.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'role'
=> $this->role,
- 'member_id'
=> $this->member_id,
- 'status_id'
=> $this->status_id
+ 'sort'
=> $this->sort,
+ 'order'
=> $this->order,
+ 'cat_id'
=> $this->cat_id,
+ 'filter'
=> $this->filter,
+ 'query'
=> $this->query,
+ 'role'
=> $this->role,
+ 'member_id'
=> $this->member_id,
+ 'status_id'
=> $this->status_id,
+ 'location_code'
=> $this->location_code
)
),
'fields' => array
Modified: branches/Version-1_0-branch/property/js/yahoo/entity.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/entity.edit.js
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/js/yahoo/entity.edit.js
2013-10-09 14:00:23 UTC (rev 11361)
@@ -1,5 +1,5 @@
var myDataSource, myDataTable, myContextMenu;
-var myPaginator_0, myDataTable_0
+var myPaginator_0, myDataTable_0;
var myPaginator_1, myDataTable_1;
var myPaginator_2, myDataTable_2;
var myPaginator_3, myDataTable_3;
Modified: branches/Version-1_0-branch/property/js/yahoo/location.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/location.edit.js
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/js/yahoo/location.edit.js
2013-10-09 14:00:23 UTC (rev 11361)
@@ -1,3 +1,19 @@
+
+var myPaginator_0, myDataTable_0;
+
+YAHOO.util.Event.addListener(window, "load", function()
+ {
+ var loader = new YAHOO.util.YUILoader();
+ loader.addModule({
+ name: "anyone",
+ type: "js",
+ fullpath: property_js
+ });
+
+ loader.require("anyone");
+ loader.insert();
+ });
+
//an anonymous function wraps our code to keep our variables
//in function scope rather than in the global namespace:
(function() {
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2013-10-09
13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2013-10-09
14:00:23 UTC (rev 11361)
@@ -2012,3 +2012,4 @@
cost operation property no Andel driftskonstnad i kr.
cost investment property no Andel investering i kr.
grant category property no Tilskuddskategori
+what property no Hva
Modified: branches/Version-1_0-branch/property/templates/base/location.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location.xsl
2013-10-09 13:58:30 UTC (rev 11360)
+++ branches/Version-1_0-branch/property/templates/base/location.xsl
2013-10-09 14:00:23 UTC (rev 11361)
@@ -272,6 +272,35 @@
self.name="first_Window";
<xsl:value-of select="lookup_functions"/>
</script>
+
+ <script type="text/javascript">
+ function set_tab(active_tab)
+ {
+ document.form.active_tab.value = active_tab;
+ }
+
+ var property_js = <xsl:value-of select="property_js"/>;
+ // var base_java_url = <xsl:value-of
select="base_java_url"/>;
+ var datatable = new Array();
+ var myColumnDefs = new Array();
+
+ <xsl:for-each select="datatable">
+ datatable[<xsl:value-of select="name"/>] = [
+ {
+ values:<xsl:value-of
select="values"/>,
+ total_records: <xsl:value-of
select="total_records"/>,
+ edit_action: <xsl:value-of
select="edit_action"/>,
+ is_paginator: <xsl:value-of
select="is_paginator"/>,
+ footer:<xsl:value-of
select="footer"/>
+ }
+ ]
+ </xsl:for-each>
+
+ <xsl:for-each select="myColumnDefs">
+ myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
+ </xsl:for-each>
+ </script>
+
<div class="yui-navset" id="location_edit_tabview">
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
@@ -560,15 +589,15 @@
<table
cellpadding="2" cellspacing="2" width="80%" align="center">
<tr>
<td>
-
<table width="100%" cellpadding="2" cellspacing="2" align="center">
-
<xsl:apply-templates select="related_link"/>
-
</table>
+
<div id="datatable-container_0"/>
</td>
</tr>
</table>
+
</div>
</xsl:when>
</xsl:choose>
+
<xsl:for-each select="integration">
<div id="{section}">
<iframe
id="{section}_content" width="100%" height="{height}">
@@ -762,22 +791,6 @@
</tr>
</xsl:template>
- <!-- New template-->
- <xsl:template match="related_link">
- <xsl:variable name="lang_entity_statustext">
- <xsl:value-of select="lang_entity_statustext"/>
- </xsl:variable>
- <xsl:variable name="entity_link">
- <xsl:value-of select="entity_link"/>
- </xsl:variable>
- <tr>
- <td class="small_text" align="left">
- <a href="{$entity_link}"
onMouseover="window.status='{$lang_entity_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="text_entity"/>
- </a>
- </td>
- </tr>
- </xsl:template>
<!-- New template-->
<xsl:template match="summary">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11361] Merge 11357:11359 from trunk,
Sigurd Nes <=