|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [11279] Merge 11268:11278 from trunk |
| Date: | Fri, 06 Sep 2013 09:29:21 +0000 |
Revision: 11279
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11279
Author: sigurdne
Date: 2013-09-06 09:29:20 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Merge 11268:11278 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
branches/Version-1_0-branch/property/inc/class.interlink.inc.php
branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
branches/Version-1_0-branch/property/templates/base/request.xsl
branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
Added Paths:
-----------
branches/Version-1_0-branch/logistic/js/logistic/assign_job.js
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.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
+
/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
Modified: branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
2013-09-06 09:29:20 UTC (rev 11279)
@@ -234,6 +234,24 @@
return $ret;
}
+
+ public function get_single(int $id)
+ {
+ $objects = parent::get(null, null, null, null, null,
null, array($this->get_id_field_name() => $id));
+ if(count($objects) > 0)
+ {
+ $keys = array_keys($objects);
+ return $objects[$keys[0]];
+ }
+ return null;
+ }
+
+ public function get_count(string $search_for, string
$search_type, array $filters)
+ {
+ return $this->total_records;
+ }
+
+
/**
* used for retrive the path for a particular node from a
hierarchy
*
Modified: branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2013-09-06 09:29:20 UTC (rev 11279)
@@ -314,13 +314,15 @@
switch ($query_type)
{
case 'children':
- $num_of_objects = null;//get them all
$activity_id =
phpgw::get_var('activity_id');
$filters = array('id' => $activity_id);
$result_objects =
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending,
$search_for, $search_type, $filters);
- $object_count =
$this->so->get_count($search_for, $search_type, $filters);
-
+ $object_count = $this->so->get_count();
array_shift($result_objects);
+ if($result_objects)
+ {
+ $object_count --;
+ }
break;
case 'activity_id':
$activity_id =
phpgw::get_var('activity_id');
@@ -389,7 +391,6 @@
}
}
-
// ... add result data
$result_data = array('results' => $rows);
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-09-06 09:29:20 UTC (rev 11279)
@@ -70,7 +70,8 @@
'view_requirement_values' => true,
'save_requirement_values' => true,
'get_custom_attributes' => true,
- 'assign_job' => true
+ 'assign_job' => true,
+ 'send_job_ticket' => true,
);
public function __construct()
@@ -905,26 +906,265 @@
public function assign_job()
{
- $assign_requirement = json_decode(str_replace('"',
'"', phpgw::get_var('assign_requirement')));
+ $assign_requirement_json = str_replace('"', '"',
phpgw::get_var('assign_requirement'));
+
$assign_requirement=json_decode($assign_requirement_json);
+//_debug_array($assign_requirement);die();
if(!$assign_requirement ||
!is_array($assign_requirement))
{
echo 'Nothing to do';
return;
}
+ $allocations = array();
foreach ($assign_requirement as $assign_entry)
{
$assign_arr = explode('_', $assign_entry);
- $allocation_id = $assign_arr[0];
- $location_id = $assign_arr[1];
- $item_id = $assign_arr[2];
- $inventory_id = (int)$assign_arr[3];
+ $requirement_id = $assign_arr[0];
+ $allocation_id = $assign_arr[1];
+ $location_id = $assign_arr[2];
+ $item_id = $assign_arr[3];
+ $inventory_id = (int)$assign_arr[4];
+
+ $allocations[] =
$this->so_resource_allocation->get_single($allocation_id);
+
}
- echo 'logistic_uirequirement::assign_job()';
+
+ $requirement = $this->so->get_single($requirement_id);
+
+ $custom =
createObject('phpgwapi.custom_fields');
+
+//--
+ $_filters = array('requirement_id' =>
$requirement_id);
+ $requirement_values_array =
$this->so_requirement_value->get(0, false, $sort_field, $sort_ascending,
$search_for, $search_type, $_filters);
+
+ $location_id = $requirement->get_location_id();
+ $criterias = array();
+ if( count( $requirement_values_array ) > 0 )
+ {
+ foreach($requirement_values_array as
$requirement_value)
+ {
+ $loc_arr =
$GLOBALS['phpgw']->locations->get_name($location_id);
+
+ $cust_attribute_id =
$requirement_value->get_cust_attribute_id();
+
+ $attrib_data =
$custom->get('property', $loc_arr['location'], $cust_attribute_id);
+
+ $_criterie =
$attrib_data['input_text'];
+
+
if(isset($attrib_data['choice']))
+ {
+ foreach
($attrib_data['choice'] as $_choice)
+ {
+
if($_choice['id'] == $requirement_value->get_value())
+ {
+
$_criterie .= "::{$_choice['value']}";
+ break;
+ }
+ }
+ }
+ else
if($requirement_value->get_value())
+ {
+ $_criterie .=
"::{$requirement_value->get_value()}";
+ }
+
+ $criterias[] = $_criterie;
+
+// $operator =
$requirement_value->get_operator();
+ }
+ }
+ $requirement_descr = $loc_arr['descr'] . '::' .
implode(',',$criterias);
+ $message = 'Hva: ' . $requirement_descr .
"\n\n";
+
+ #FIXME timezone..
+
//$GLOBALS['phpgw']->common->show_date($requirement->get_start_date())
+ //$message .= 'Frist:' .
$GLOBALS['phpgw']->common->show_date($requirement->get_start_date()) . "\n\n";
+
+ $datetime_format =
"{$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']} H:i";
+
+ $when = date($datetime_format,
$requirement->get_start_date());
+ $message .= 'Frist: ' . $when . "\n\n";
+
+ foreach ($allocations as $allocation)
+ {
+ $message .= 'Antall: ';
+ $message .=
$allocation->get_allocated_amount();
+ $message .= ' Fra: ';
+
+
+ if($allocation->get_inventory_id())
+ {
+ $inventory =
execMethod('property.soentity.get_inventory',array('inventory_id' =>
$allocation->get_inventory_id()));
+
+ $system_location =
$GLOBALS['phpgw']->locations->get_name($inventory[0]['p_location_id']);
+
+ $name = 'N∕A';
+ if( preg_match('/.location./i',
$system_location['location']) )
+ {
+ $location_code =
execMethod('property.solocation.get_location_code', $inventory[0]['p_id']);
+ $location =
execMethod('property.solocation.read_single', $location_code);
+ $location_arr =
explode('-', $location_code);
+ $i=1;
+ $name_arr = array();
+ foreach($location_arr
as $_dummy)
+ {
+ $name_arr[] =
$location["loc{$i}_name"];
+ $i++;
+ }
+
+ $name = implode('::',
$name_arr);
+ }
+ else if(
preg_match('/.entity./i', $system_location['location']) )
+ {
+ $name =
execMethod('property.soentity.get_short_description',
+
array('location_id' => $inventory[0]['p_location_id'], 'id' =>
$inventory[0]['p_id']));
+ }
+
+ }
+
+ $message .= "$name ($location_code)\n";
+
+ }
+
+// --------
+
+
+ $catsObj = CreateObject('phpgwapi.categories', -1,
'property', '.ticket');
+ $catsObj->supress_info = true;
+
+ $categories =
$catsObj->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $this->cat_id, 'use_acl' =>
$this->_category_acl));
+
+
+ $path =
$this->so_activity->get_path($requirement->get_activity_id());
+
+ $breadcrumb_array = array();
+ foreach($path as $menu_item)
+ {
+ $breadcrumb_array[] = $menu_item['name'];
+ }
+
+ $title = implode(' -> ',$breadcrumb_array);
+
+ $data = array
+ (
+ 'title'
=> $title,
+ 'title_size' =>
strlen($title) > 20 ? strlen($title) : 20,
+ 'categories' =>
$categories,
+ 'assign_requirement_json' =>
$assign_requirement_json,
+ 'requirement_descr' =>
$requirement_descr,
+ 'message'
=> $message
+ );
+
+ if(count( $buildings_array ) > 0)
+ {
+ $data['buildings_array'] = $buildings_array;
+ }
+ else
+ {
+ $data['building_array'] = $building_array;
+ }
+
+ phpgwapi_jquery::load_widget('core');
+
+ self::add_javascript('logistic', 'logistic',
'assign_job.js');
+
+
self::render_template_xsl(array('allocation/assign_job'), $data);
+//------
+
}
+
+ function send_job_ticket()
+ {
+ if(!$this->add && !$this->edit)
+ {
+ phpgwapi_cache::message_set('No access',
'error');
+ }
+
+ $assign_requirement_json = str_replace('"', '"',
phpgw::get_var('assign_requirement'));
+
+
$assign_requirement=json_decode($assign_requirement_json);
+
+ if(!$assign_requirement ||
!is_array($assign_requirement))
+ {
+ echo 'Nothing to do';
+ return;
+ }
+
+ $allocations = array();
+ foreach ($assign_requirement as $assign_entry)
+ {
+ $assign_arr = explode('_', $assign_entry);
+ $requirement_id = $assign_arr[0];
+ $allocation_id = $assign_arr[1];
+ $location_id = $assign_arr[2];
+ $item_id = $assign_arr[3];
+ $inventory_id = (int)$assign_arr[4];
+
+ $allocations[] =
$this->so_resource_allocation->get_single($allocation_id);
+
+ }
+
+ $requirement = $this->so->get_single($requirement_id);
+
+ // This value represents the type
+ $location_id =
$GLOBALS['phpgw']->locations->get_id("logistic", ".activity");
+
+ $ticket = array
+ (
+ 'origin_id' => $location_id,
+ 'origin_item_id' =>
$requirement->get_activity_id(),
+ 'location_code' => $location_code,
+ 'cat_id' =>
phpgw::get_var('message_cat_id', 'int'),
+ 'priority' =>
3,//$priority, //valgfri (1-3)
+ 'title' =>
phpgw::get_var('message_title', 'string'),
+ 'details' =>
phpgw::get_var('message', 'string'),
+ 'file_input_name' => 'file' // navn på
felt som inneholder fil
+ );
+
+ $botts = CreateObject('property.botts',true);
+ $message_ticket_id = $botts->add_ticket($ticket);
+ $location_id_ticket =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
+
+
+//---Sigurd: start register component to ticket
+
+ $user_id = $GLOBALS['phpgw_info']['user']['id'];
+
+ foreach ($assign_requirement as $assign_entry)
+ {
+ $assign_arr = explode('_', $assign_entry);
+ $requirement_id = $assign_arr[0];
+ $allocation_id = $assign_arr[1];
+ $location_id = $assign_arr[2];
+ $item_id = $assign_arr[3];
+ $inventory_id = (int)$assign_arr[4];
+
+ $interlink_data = array
+ (
+ 'location1_id' => $location_id,
+ 'location1_item_id' => $item_id,
+ 'location2_id' =>
$location_id_ticket,
+ 'location2_item_id' =>
$message_ticket_id,
+ 'account_id' => $user_id
+ );
+
+ execMethod('property.interlink.add',
$interlink_data);
+
+ $allocation =
$this->so_resource_allocation->get_single($allocation_id);
+
$allocation->set_ext_location_id($location_id_ticket);
+
$allocation->set_ext_location_item_id($message_ticket_id);
+
$this->so_resource_allocation->store($allocation);
+ }
+
+//---End register component to ticket
+
+ }
+
+
+
+
private function make_tab_menu($requirement_id)
{
$tabs = array();
Modified:
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2013-09-06 09:26:02 UTC (rev 11278)
+++
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2013-09-06 09:29:20 UTC (rev 11279)
@@ -294,7 +294,7 @@
$assign_href =
"javascript:load_assign_task(document.assign_task, {$requirement['id']});";
- $requirement['assign_job'] = "<input
name='assign_requirement' type='checkbox'
value='{$requirement['id']}_{$requirement['location_id']}_{$requirement['resource_id']}_{$requirement['inventory_id']}'
/>"
+ $requirement['assign_job'] = "<input
name='assign_requirement' type='checkbox'
value='{$requirement_id}_{$requirement['id']}_{$requirement['location_id']}_{$requirement['resource_id']}_{$requirement['inventory_id']}'
/>"
. "<a class=\"btn-sm assign\"
href=\"{$assign_href}\">{$lang_assign}</a>";
$rows[] = $requirement;
Copied: branches/Version-1_0-branch/logistic/js/logistic/assign_job.js (from
rev 11278, trunk/logistic/js/logistic/assign_job.js)
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/assign_job.js
(rev 0)
+++ branches/Version-1_0-branch/logistic/js/logistic/assign_job.js
2013-09-06 09:29:20 UTC (rev 11279)
@@ -0,0 +1,58 @@
+$(document).ready(function(){
+
+ //============================= MESSAGE ===========================
+
+ // REGISTER MESSAGE
+ $("#frmRegCaseMessage").submit(function(e){
+
+ var thisForm = $(this);
+
+ var $required_input_fields = $(this).find(".required");
+ var status = true;
+
+ // Checking that required fields (fields with class required)
is not null
+ $required_input_fields.each(function() {
+
+ // User has selected a value from select list
+ if( $(this).is("select") & $(this).val() == 0 )
+ {
+ var nextElem = $(this).next();
+
+ if( !$(nextElem).hasClass("input_error_msg") )
+ {
+ $(this).after("<div
class='input_error_msg'>Vennligst velg fra listen</div>");
+ }
+
+ status = false;
+ }
+ // Input field is not empty
+ else if( $(this).is("input") & $(this).val() == '' )
+ {
+ var nextElem = $(this).next();
+
+ if( !$(nextElem).hasClass("input_error_msg") )
+ {
+ $(this).after("<div
class='input_error_msg'>Vennligst fyll ut dette feltet</div>");
+ }
+
+ status = false;
+ }
+ else
+ {
+ var nextElem = $(this).next();
+
+ if( $(nextElem).hasClass("input_error_msg") )
+ {
+ $(nextElem).remove();
+ }
+ }
+ });
+
+ if( !status )
+ {
+ e.preventDefault();
+ }
+
+ });
+
+});
Modified:
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
2013-09-06 09:26:02 UTC (rev 11278)
+++
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
2013-09-06 09:29:20 UTC (rev 11279)
@@ -86,19 +86,18 @@
var oArgs = {
menuaction:'logistic.uiactivity.index',
activity_id: '<xsl:value-of
select='activity/id'/>',
- type: 'children',
- phpgw_return_as: 'json'
+ type: 'children'
};
var requestUrl = phpGWLink('index.php', oArgs, true);
var myColumnDefs = [
- {key:"id", label:'Id', sortable:true},
- {key:"name", label:'Aktivitetsnavn', sortable:true},
- {key:"start_date", label:'Startdato', sortable:true},
- {key:"end_date", label:'Sluttdato', sortable:true},
- {key:"responsible_user_name", label:'Ansvarlig',
sortable:true},
- {key:"status", label:'Status', sortable:true}
+ {key:"id", label:'Id', sortable:false},
+ {key:"name", label:'Aktivitetsnavn', sortable:false},
+ {key:"start_date", label:'Startdato', sortable:false},
+ {key:"end_date", label:'Sluttdato', sortable:false},
+ {key:"responsible_user_name", label:'Ansvarlig',
sortable:false},
+ {key:"status", label:'Status', sortable:false}
];
YAHOO.portico.inlineTableHelper("sub-activities-container",
requestUrl, myColumnDefs);
Copied:
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
(from rev 11278, trunk/logistic/templates/base/allocation/assign_job.xsl)
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
(rev 0)
+++
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
2013-09-06 09:29:20 UTC (rev 11279)
@@ -0,0 +1,104 @@
+<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
+<xsl:template match="data" name="assign_job" xmlns:php="http://php.net/xsl";>
+
+<div id="main_content" class="medium">
+
+ <div id="check-list-heading">
+ <div class="box">
+ <h1>
+ <xsl:value-of select="php:function('lang',
'assign ticket')" />
+ </h1>
+ <h2>
+ <xsl:value-of select="requirement_descr"/>
+ </h2>
+
+ </div>
+
+ </div>
+
+ <!-- ======================= INFO ABOUT MESSAGE
========================= -->
+ <div id="caseMessage" class="box ext">
+ <xsl:choose>
+ <xsl:when test="assign_requirement_json !=''">
+
+ <xsl:variable name="action_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uirequirement.send_job_ticket')" />
+ </xsl:variable>
+
+ <form ENCTYPE="multipart/form-data"
id="frmRegCaseMessage" action="{$action_url}" method="post">
+
+ <input name="assign_requirement"
type="text" value="{assign_requirement_json}" />
+
+ <!-- === TITLE === -->
+
+ <table>
+ <tr>
+ <td>
+ <div class="row">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'title')" />
+ </label>
+ <input name="message_title"
type="text" class="required" value = '{title}' size= '{title_size}'/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+
+ <!-- === CATEGORY === -->
+ <div class="row">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'category')" />
+ </label>
+ <select name="message_cat_id"
class="required">
+ <option
value="0"><xsl:value-of select="php:function('lang', 'select')" /></option>
+ <xsl:for-each
select="categories/cat_list">
+ <xsl:variable
name="cat_id"><xsl:value-of select="./cat_id"/></xsl:variable>
+ <option
value="{$cat_id}">
+
<xsl:value-of select="./name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div class="row">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'message')" />
+ </label>
+ <textarea name="message"
cols="60" rows="10">
+ <xsl:value-of
select="message"/>
+ </textarea>
+ </div>
+ <!-- === UPLOAD FILE === -->
+ </td>
+ </tr>
+ <tr>
+ <td>
+
+ <div class="row">
+ <label>Filvedlegg:</label>
+ <input type="file" id="file"
name="file" >
+ <xsl:attribute
name="accept">image/*</xsl:attribute>
+ <xsl:attribute
name="capture">camera</xsl:attribute>
+ </input>
+ </div>
+ </td>
+ </tr>
+ </table>
+ <div class="form-buttons">
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
+ <input class="btn"
type="submit" name="save_control" value="Send melding" title="{$lang_save}" />
+ </div>
+ </form>
+ </xsl:when>
+ <xsl:otherwise>
+ nothing..
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+</div>
+</xsl:template>
Modified: branches/Version-1_0-branch/property/inc/class.interlink.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.interlink.inc.php
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/property/inc/class.interlink.inc.php
2013-09-06 09:29:20 UTC (rev 11279)
@@ -325,6 +325,10 @@
{
$link = array('menuaction' =>
'controller.uicheck_list.view_control_info', 'check_list_id' => $id);
}
+ else if($type == '.activity')
+ {
+ $link = array('menuaction' =>
'logistic.uiactivity.view_resource_allocation', 'activity_id' => $id);
+ }
else if( substr($type, 1, 8) == 'location' )
{
$type = explode('.',$type);
Modified: branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2013-09-06 09:29:20 UTC (rev 11279)
@@ -954,6 +954,7 @@
function delete_entity($id)
{
+ $this->db->transaction_begin();
$id = (int) $id;
$category_list=$this->read_category(array('allrows'=>true, 'entity_id'=>$id));
$locations = array();
@@ -978,7 +979,7 @@
$this->oProc->DropTable("fm_{$this->type}_{$id}_{$entry['id']}");
}
}
-
+ $this->db->transaction_commit();
}
function delete_category($entity_id, $id)
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2013-09-06 09:29:20 UTC (rev 11279)
@@ -453,18 +453,18 @@
}
$sql = "SELECT DISTINCT {$return_fields} FROM
fm_tts_tickets"
- . " {$this->join} fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
- . " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
- . " {$this->join} fm_district ON fm_district.id
= fm_part_of_town.district_id"
+ . " {$this->left_join} fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
+ . " {$this->left_join} fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
+ . " {$this->left_join} fm_district ON
fm_district.id = fm_part_of_town.district_id"
. " {$order_join}"
. " LEFT OUTER JOIN fm_tts_views ON
(fm_tts_tickets.id = fm_tts_views.id AND
fm_tts_views.account_id='{$this->account}')"
. " {$filtermethod} {$querymethod}";
$sql_cnt = "SELECT DISTINCT fm_tts_tickets.budget
,fm_tts_tickets.actual_cost, fm_tts_tickets.id FROM fm_tts_tickets"
- . " $this->join fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
- . " $this->join fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
- . " $this->join fm_district ON fm_district.id =
fm_part_of_town.district_id"
+ . " {$this->left_join} fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
+ . " {$this->left_join} fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
+ . " {$this->left_join} fm_district ON
fm_district.id = fm_part_of_town.district_id"
. " $order_join"
. " LEFT OUTER JOIN fm_tts_views ON
(fm_tts_tickets.id = fm_tts_views.id AND
fm_tts_views.account_id='{$this->account}')"
. " $filtermethod $querymethod";
Modified: branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
2013-09-06 09:29:20 UTC (rev 11279)
@@ -307,7 +307,7 @@
$uicols['name'][7]['name'] = 'name';
$uicols['name'][7]['value'] = 'name';
- $uicols['name'][8]['name'] = 'time created';
+ $uicols['name'][8]['name'] = 'entry date';
$uicols['name'][8]['value'] = 'entry_date';
$uicols['name'][9]['name'] = 'user';
@@ -850,6 +850,7 @@
'workorder_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.view')),
'lang_start_date'
=> lang('Project start date'),
'value_start_date'
=> $project_values['start_date'],
+ 'value_entry_date'
=> $values['entry_date'] ?
$GLOBALS['phpgw']->common->show_date($values['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
: '',
'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
'base_java_url'
=> json_encode(array(menuaction =>
"property.uitenant_claim.edit",claim_id=>$claim_id)),
@@ -1214,8 +1215,7 @@
'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uitenant_claim.index')),
'lang_done'
=> lang('done'),
- 'value_date'
=>
$GLOBALS['phpgw']->common->show_date($tenant_claim['entry_date'])
-
+ 'value_entry_date'
=> $values['entry_date'] ?
$GLOBALS['phpgw']->common->show_date($values['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
: '',
);
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Tenant claim') . '::' . lang('view claim');
Modified: branches/Version-1_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/request.xsl
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/property/templates/base/request.xsl
2013-09-06 09:29:20 UTC (rev 11279)
@@ -193,16 +193,17 @@
<div id="general" class="content-wrp
requirement">
<div
class="requirement-responsibility-left">
<h2><xsl:value-of
select="php:function('lang', 'request')"/></h2>
-<!-- <span class="messages">
+ <span class="messages">
<xsl:choose>
<xsl:when test="value_request_id!=''">
<label>
-
<xsl:value-of select="lang_request_id"/>
+
<xsl:value-of select="php:function('lang', 'id')"/>
</label>
<xsl:value-of select="value_request_id"/>
+
<br/>
</xsl:when>
</xsl:choose>
- </span> -->
+ </span>
<span class="messages">
<xsl:choose>
<xsl:when test="value_request_id!=''">
@@ -254,108 +255,134 @@
<div
class="clearBoth"> </div>
<hr/>
<div>
- <div
class="requirement-responsibility-left">
- <div
class="requirement-responsibility-left-sub">
- <label>
-
<xsl:value-of select="php:function('lang', 'responsible unit')"/>
- </label>
- <br/>
- <select
name="values[responsible_unit]" class="forms" style="width:300px;">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Set responsible unit')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'select')"/>
-
</option>
-
<xsl:apply-templates select="responsible_unit_list/options"/>
-
</select>
- </div>
- <div
class="requirement-responsibility-right">
- <label>
-
<xsl:value-of select="php:function('lang', 'request status')"/>
- </label>
- <br/>
- <select
name="values[status]" class="forms" style="width:200px;">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Set the status of the
request')"/>
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'no status')"/>
-
</option>
-
<xsl:apply-templates select="status_list/options"/>
-
</select>
- </div>
- <div
class="coordinator_select">
- <dt>
-
<label>
-
<xsl:value-of select="lang_coordinator"/>
-
</label>
- </dt>
- <dd>
-
<xsl:call-template name="user_id_select"/>
- </dd>
- </div>
- </div>
- <div
class="requirement-responsibility-right">
- <!--<legend>
-
<xsl:value-of select="php:function('lang', 'location')"/>
-
</legend> -->
- <dl
class="proplist-col">
- <input
type="hidden" name="values[origin]" value="{value_origin_type}"/>
- <input
type="hidden" name="values[origin_id]" value="{value_origin_id}"/>
-
<xsl:for-each select="value_target">
-
<dt>
-
<label>
-
<xsl:value-of select="descr"/>
-
</label>
-
</dt>
-
<dd>
-
<xsl:for-each select="data">
-
<a href="{link}" title="{statustext}">
-
<xsl:value-of select="id"/>
-
</a>
-
<xsl:text> </xsl:text>
-
</xsl:for-each>
-
</dd>
-
</xsl:for-each>
-
<xsl:choose>
-
<xsl:when test="mode ='edit'">
-
<xsl:call-template name="location_form2"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:call-template name="location_view2"/>
-
<xsl:choose>
-
<xsl:when test="contact_phone !=''">
+ <table>
+ <tr>
+ <td
valign = 'top'>
+
<div class="requirement-responsibility-left">
+
<table>
+
<tr>
+
<td>
+
<div class="requirement-responsibility-left-sub">
+
<label>
+
<xsl:value-of
select="php:function('lang', 'responsible unit')"/>
+
</label>
+
<br/>
+
<select name="values[responsible_unit]"
class="forms" style="width:300px;">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'Set responsible unit')"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of
select="php:function('lang', 'select')"/>
+
</option>
+
<xsl:apply-templates
select="responsible_unit_list/options"/>
+
</select>
+
</div>
+
</td>
+
<td>
+
<div class="requirement-responsibility-right">
+
<label>
+
<xsl:value-of select="php:function('lang',
'request status')"/>
+
</label>
+
<br/>
+
<select name="values[status]" class="forms"
style="width:200px;">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'Set the status of the request')"/>
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of
select="php:function('lang', 'no status')"/>
+
</option>
+
<xsl:apply-templates
select="status_list/options"/>
+
</select>
+
</div>
+
</td>
+
</tr>
+
<tr>
+
<td>
+
<div class="coordinator_select">
<dt>
<label>
-
<xsl:value-of
select="lang_contact_phone"/>
+
<xsl:value-of
select="lang_coordinator"/>
</label>
</dt>
<dd>
-
<xsl:value-of select="contact_phone"/>
+
<xsl:call-template name="user_id_select"/>
</dd>
-
</xsl:when>
-
</xsl:choose>
-
</xsl:otherwise>
-
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="suppressmeter =''">
-
<dt>
-
<label>
-
<xsl:value-of select="lang_power_meter"/>
-
</label>
-
</dt>
-
<dd>
-
<input type="text" name="values[power_meter]"
value="{value_power_meter}" size="12">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="lang_power_meter_statustext"/>
-
</xsl:attribute>
-
</input>
-
</dd>
-
</xsl:when>
-
</xsl:choose>
- </dl>
- </div>
+
</div>
+
</td>
+
</tr>
+ </table>
+ </div>
+ </td>
+ <td>
+ <table>
+ <tr>
+
<td>
+
<div class="requirement-responsibility-right">
+
<!--<legend>
+
<xsl:value-of select="php:function('lang',
'location')"/>
+
</legend> -->
+
<dl class="proplist-col">
+
<input type="hidden" name="values[origin]"
value="{value_origin_type}"/>
+
<input type="hidden" name="values[origin_id]"
value="{value_origin_id}"/>
+
<xsl:for-each select="value_target">
+
<dt>
+
<label>
+
<xsl:value-of select="descr"/>
+
</label>
+
</dt>
+
<dd>
+
<xsl:for-each select="data">
+
<a href="{link}"
title="{statustext}">
+
<xsl:value-of
select="id"/>
+
</a>
+
<xsl:text> </xsl:text>
+
</xsl:for-each>
+
</dd>
+
</xsl:for-each>
+
<xsl:choose>
+
<xsl:when test="mode ='edit'">
+
<xsl:call-template
name="location_form2"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:call-template
name="location_view2"/>
+
<xsl:choose>
+
<xsl:when test="contact_phone
!=''">
+
<dt>
+
<label>
+
<xsl:value-of select="lang_contact_phone"/>
+
</label>
+
</dt>
+
<dd>
+
<xsl:value-of
select="contact_phone"/>
+
</dd>
+
</xsl:when>
+
</xsl:choose>
+
</xsl:otherwise>
+
</xsl:choose>
+
<xsl:choose>
+
<xsl:when test="suppressmeter =''">
+
<dt>
+
<label>
+
<xsl:value-of
select="lang_power_meter"/>
+
</label>
+
</dt>
+
<dd>
+
<input type="text"
name="values[power_meter]" value="{value_power_meter}" size="12">
+
<xsl:attribute
name="title">
+
<xsl:value-of
select="lang_power_meter_statustext"/>
+
</xsl:attribute>
+
</input>
+
</dd>
+
</xsl:when>
+
</xsl:choose>
+
</dl>
+
</div>
+
</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
</div>
<div
class="clearBoth"> </div>
<hr/>
@@ -415,11 +442,6 @@
</table>
</td>
</tr>
- <tr>
-
<td>
-
<br/>
-
</td>
- </tr>
<xsl:choose>
<xsl:when test="authorities_demands/options!=''">
<tr>
@@ -440,18 +462,8 @@
</select>
</td>
</tr>
-
<tr>
-
<td>
-
<br/>
-
</td>
-
</tr>
</xsl:when>
</xsl:choose>
- <tr>
-
<td>
-
<br/>
-
</td>
- </tr>
</table>
</dl>
</div>
@@ -548,7 +560,7 @@
</div>
<div>
<label class="requirement-action-label-wide">
-
<xsl:value-of select="php:function('lang', 'grant category')"/>
+
<xsl:value-of select="php:function('lang', 'category')"/>
</label>
<xsl:call-template name="categories"/>
</div>
Modified: branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
2013-09-06 09:26:02 UTC (rev 11278)
+++ branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
2013-09-06 09:29:20 UTC (rev 11279)
@@ -201,6 +201,14 @@
</tr>
<tr>
<td valign="top">
+ <xsl:value-of
select="php:function('lang', 'entry date')" />
+ </td>
+ <td>
+ <xsl:value-of
select="value_entry_date"/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
<xsl:value-of
select="lang_start_date"/>
</td>
<td>
@@ -376,7 +384,7 @@
<!-- New template-->
<!-- view -->
- <xsl:template match="view">
+ <xsl:template match="view" xmlns:php="http://php.net/xsl";>
<div align="left">
<table cellpadding="2" cellspacing="2" width="79%"
align="left">
<tr>
@@ -556,6 +564,15 @@
</tr>
<tr>
<td valign="top">
+ <xsl:value-of
select="php:function('lang', 'entry date')" />
+ </td>
+ <td>
+ <xsl:value-of
select="value_entry_date"/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top">
<xsl:value-of
select="lang_start_date"/>
</td>
<td>
| [Prev in Thread] | Current Thread | [Next in Thread] |