[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8984] Merge 8976:8983 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8984] Merge 8976:8983 from trunk |
|
Date: |
Thu, 15 Mar 2012 19:52:16 +0000 |
Revision: 8984
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8984
Author: sigurdne
Date: 2012-03-15 19:52:16 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Merge 8976:8983 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.customer_identifier.inc.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
branches/Version-1_0-branch/booking/js/booking/schedule.js
branches/Version-1_0-branch/booking/templates/base/css/base.css
branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
branches/Version-1_0-branch/controller/inc/class.uidocument.inc.php
branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/js/yahoo/entity.index.js
branches/Version-1_0-branch/property/js/yahoo/project.index.js
branches/Version-1_0-branch/property/js/yahoo/request.index.js
branches/Version-1_0-branch/property/js/yahoo/workorder.index.js
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
+
/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
Modified:
branches/Version-1_0-branch/booking/inc/class.customer_identifier.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.customer_identifier.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/booking/inc/class.customer_identifier.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -116,6 +116,14 @@
$identifier_field =
$this->field_prefix.$identifier_field;
$identifier_value = isset($data[$identifier_field]) ?
trim($data[$identifier_field]) : null;
+ if ($identifier_field == 'customer_organization_number'
and (strlen($identifier_value) != 5 and strlen($identifier_value) != 9)){
+ return null;
+ }
+
+ if ($identifier_field == 'customer_ssn' and
strlen($identifier_value) != 11){
+ return null;
+ }
+
return (empty($identifier_value) ? null :
$identifier_value);
}
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -224,7 +224,7 @@
}
}
- $reservations =
$this->completed_reservation_so->read(array('filters' => $filters, 'results' =>
'all', 'order' =>
'customer_type,customer_identifier_type,customer_organization_number,customer_ssn,to_',
'dir' => 'asc'));
+ $reservations =
$this->completed_reservation_so->read(array('filters' => $filters, 'results' =>
'all', 'sort' =>
'customer_type,customer_identifier_type,customer_organization_number,customer_ssn,to_',
'dir' => 'asc'));
if (count($reservations['results']) > 0) {
return $reservations['results'];
Modified: branches/Version-1_0-branch/booking/js/booking/schedule.js
===================================================================
--- branches/Version-1_0-branch/booking/js/booking/schedule.js 2012-03-15
19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/booking/js/booking/schedule.js 2012-03-15
19:52:16 UTC (rev 8984)
@@ -1,5 +1,9 @@
colors = ['color1', 'color2', 'color3', 'color4', 'color5', 'color6',
'color7', 'color8', 'color9', 'color10',
- 'color11', 'color12', 'color13', 'color14', 'color15',
'color16', 'color17', 'color18', 'color19', 'color20'];
+ 'color11', 'color12', 'color13', 'color14', 'color15',
'color16', 'color17', 'color18', 'color19', 'color20',
+ 'color21', 'color22', 'color23', 'color24', 'color25', 'color26',
'color27', 'color28', 'color29', 'color30',
+ 'color31', 'color32', 'color33', 'color34', 'color35', 'color36',
'color37', 'color38', 'color39', 'color40',
+ 'color41', 'color42', 'color43', 'color44', 'color45', 'color46',
'color47', 'color48', 'color49', 'color50',
+ 'color51', 'color52', 'color53', 'color54', 'color55', 'color56',
'color57', 'color58', 'color59', 'color60',];
colorMap = {};
YAHOO.booking.shorten = function(text, max) {
@@ -30,7 +34,7 @@
YAHOO.booking.frontendScheduleColorFormatter = function(elCell, oRecord,
oColumn, booking) {
if(booking) {
if(!colorMap[booking.name]) {
- colorMap[booking.name] = colors.length ? colors.shift()
: 'color20';
+ colorMap[booking.name] = colors.length ? colors.shift()
: 'color50';
}
var color = colorMap[booking.name];
YAHOO.util.Dom.addClass(elCell, 'info');
@@ -99,7 +103,7 @@
YAHOO.booking.backendScheduleColorFormatter = function(elCell, oRecord,
oColumn, booking) {
if(booking) {
if(!colorMap[booking.name]) {
- colorMap[booking.name] = colors.length ? colors.shift()
: 'color20';
+ colorMap[booking.name] = colors.length ? colors.shift()
: 'color50';
}
var color = colorMap[booking.name];
YAHOO.util.Dom.addClass(elCell, color);
@@ -114,7 +118,7 @@
YAHOO.booking.scheduleColorFormatter = function(elCell, oRecord, oColumn,
booking) {
if(booking) {
if(!colorMap[booking.name]) {
- colorMap[booking.name] = colors.length ? colors.shift()
: 'color20';
+ colorMap[booking.name] = colors.length ? colors.shift()
: 'color50';
}
var color = colorMap[booking.name];
YAHOO.util.Dom.addClass(elCell, color);
Modified: branches/Version-1_0-branch/booking/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/css/base.css
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/booking/templates/base/css/base.css
2012-03-15 19:52:16 UTC (rev 8984)
@@ -182,12 +182,12 @@
#schedule_container tr td { border-top: 1px solid #ccc; background: white;
white-space: nowrap; }
#schedule_container tr td:first-child { background: #eee; }
#schedule_container tr.time td { border-top: 1px solid #444;}
-#schedule_container .color1 { background-color: #ccf;}
-#schedule_container .color2 { background-color: #cfc;}
-#schedule_container .color3 { background-color: #fcc;}
-#schedule_container .color4 { background-color: #ffb;}
-#schedule_container .color5 { background-color: #bff;}
-#schedule_container .color6 { background-color: #fbf;}
+#schedule_container .color1 { background-color: #ccccff;}
+#schedule_container .color2 { background-color: #ccffcc;}
+#schedule_container .color3 { background-color: #ffcccc;}
+#schedule_container .color4 { background-color: #ffffbb;}
+#schedule_container .color5 { background-color: #bbffff;}
+#schedule_container .color6 { background-color: #ffbbff;}
#schedule_container .color7 { background-color: #de6d6d;} /* indianred */
#schedule_container .color8 { background-color: #f0f0f0;} /* gray */
#schedule_container .color9 { background-color: #6495ed;} /* cornflowerblue */
@@ -202,6 +202,46 @@
#schedule_container .color18 { background-color: #bdb76b;} /* darkkhaki */
#schedule_container .color19 { background-color: #32cd32;} /* limegreen */
#schedule_container .color20 { background-color: #ffe4b5;} /* moccasin */
+#schedule_container .color21 { background-color: #ff4040;}
+#schedule_container .color22 { background-color: #ee3b3b;}
+#schedule_container .color23 { background-color: #cd3333;}
+#schedule_container .color24 { background-color: #8b2323;}
+#schedule_container .color25 { background-color: #deb887;}
+#schedule_container .color26 { background-color: #ffd39b;}
+#schedule_container .color27 { background-color: #eec591;}
+#schedule_container .color28 { background-color: #5f9ea0;}
+#schedule_container .color29 { background-color: #98f5ff;}
+#schedule_container .color30 { background-color: #8ee5ee;}
+#schedule_container .color31 { background-color: #53868b;}
+#schedule_container .color32 { background-color: #66cd00;}
+#schedule_container .color33 { background-color: #458b00;}
+#schedule_container .color34 { background-color: #d2691e;}
+#schedule_container .color35 { background-color: #ff7f24;}
+#schedule_container .color36 { background-color: #8b4513;}
+#schedule_container .color37 { background-color: #ff7256;}
+#schedule_container .color38 { background-color: #ffb90f;}
+#schedule_container .color39 { background-color: #cd950c;}
+#schedule_container .color40 { background-color: #8fbc8f;}
+#schedule_container .color41 { background-color: #8b0000;}
+#schedule_container .color42 { background-color: #c1ffc1;}
+#schedule_container .color43 { background-color: #b4eeb4;}
+#schedule_container .color44 { background-color: #9bcd9b;}
+#schedule_container .color45 { background-color: #698b69;}
+#schedule_container .color46 { background-color: #433d8b;}
+#schedule_container .color47 { background-color: #ee1289;}
+#schedule_container .color48 { background-color: #cd1076;}
+#schedule_container .color49 { background-color: #8b0a50;}
+#schedule_container .color50 { background-color: #ccc}
+#schedule_container .color51 { background-color: #ddd;}
+#schedule_container .color52 { background-color: #eee;}
+#schedule_container .color53 { background-color: #333;}
+#schedule_container .color54 { background-color: #444;}
+#schedule_container .color55 { background-color: #555;}
+#schedule_container .color56 { background-color: #666;}
+#schedule_container .color57 { background-color: #777;}
+#schedule_container .color58 { background-color: #888;}
+#schedule_container .color59 { background-color: #999;}
+#schedule_container .color60 { background-color: #aaa;}
#boundary-table td, #boundary-table th {
padding: .1em .2em;
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -242,11 +242,15 @@
{
if(isset($control_item)) // Add new values to
the control item
{
+ $what_to_do_txt =
phpgw::get_var('what_to_do','html');
+ $what_to_do_txt = str_replace(" ",
" ", $what_to_do_txt);
+ $how_to_do_txt =
phpgw::get_var('how_to_do','html');
+ $how_to_do_txt = str_replace(" ",
" ", $how_to_do_txt);
$control_item->set_title(phpgw::get_var('title'));
$control_item->set_required(phpgw::get_var('required') == 'on' ? true : false);
$control_item->set_type(phpgw::get_var('measurement') == 'on' ?
'control_item_type_2' : 'control_item_type_1');
- $control_item->set_what_to_do(
phpgw::get_var('what_to_do','html') );
- $control_item->set_how_to_do(
phpgw::get_var('how_to_do','html') );
+ $control_item->set_what_to_do(
$what_to_do_txt );
+ $control_item->set_how_to_do(
$how_to_do_txt );
$control_item->set_control_group_id(
phpgw::get_var('control_group') );
$control_item->set_control_area_id(
phpgw::get_var('control_area') );
@@ -362,6 +366,12 @@
);
}
}
+
+ /*
+ * hack to fix display of char
+ */
+
$control_item->set_what_to_do(str_replace(" ", "
",$control_item->get_what_to_do()));
+
$control_item->set_how_to_do(str_replace(' ', ' ',
$control_item->get_how_to_do()));
$control_item_array = $control_item->toArray();
@@ -508,6 +518,12 @@
$category =
execMethod('phpgwapi.categories.return_single',
$control_item->get_control_area_id());
$control_item->set_control_area_name($category[0]['name']);
+ /*
+ * hack to fix display of char
+ */
+
$control_item->set_what_to_do(str_replace(" ", "
",$control_item->get_what_to_do()));
+
$control_item->set_how_to_do(str_replace(' ', ' ',
$control_item->get_how_to_do()));
+
$control_item_array = $control_item->toArray();
$data = array
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -251,7 +251,7 @@
$_role_criteria = array
(
'type' =>
'responsibility_role',
- 'filter' =>
array('location' => ".location.{$type_id}"),
+ 'filter' =>
array('location_level' => (int)$type_id),
'order' =>
'name'
);
@@ -484,4 +484,4 @@
return json_encode( $part_of_town_list );
}
- }
\ No newline at end of file
+ }
Modified: branches/Version-1_0-branch/controller/inc/class.uidocument.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uidocument.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/controller/inc/class.uidocument.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -220,6 +220,7 @@
$document->set_name($_FILES["file_path"]["name"]);
$document->set_type_id(phpgw::get_var('document_type'));
$desc =
phpgw::get_var('document_description','html');
+ $desc = str_replace(" ", " ", $desc);
//var_dump($desc);
$document->set_description($desc);
$document->set_procedure_id($procedure_id);
@@ -435,6 +436,10 @@
foreach($documents as $document)
{
+ /*
+ * hack to fix display of char
+ */
+
$document->set_description(str_replace(" ", "
",$document->get_description()));
$doc_array = $document->toArray();
$doc_array['link'] =
self::link(array('menuaction' => 'controller.uidocument.view', 'id' =>
$doc_array['id']));
$table_values[] = array('document' =>
$doc_array);
Modified: branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -186,11 +186,17 @@
{
if(isset($procedure)) // Edit procedure
{
+ $description_txt =
phpgw::get_var('description','html');
+ $description_txt =
str_replace(" ", " ", $description_txt);
+ $purpose_txt =
phpgw::get_var('purpose','html');
+ $purpose_txt = str_replace(" ", "
", $purpose_txt);
+ $reference_txt =
phpgw::get_var('reference','html');
+ $reference_txt = str_replace(" ",
" ", $reference_txt);
$procedure->set_title(phpgw::get_var('title'));
-
$procedure->set_purpose(phpgw::get_var('purpose','html'));
+ $procedure->set_purpose($purpose_txt);
$procedure->set_responsibility(phpgw::get_var('responsibility'));
-
$procedure->set_description(phpgw::get_var('description','html'));
-
$procedure->set_reference(phpgw::get_var('reference','html'));
+
$procedure->set_description($description_txt);
+
$procedure->set_reference($reference_txt);
$procedure->set_attachment(phpgw::get_var('attachment'));
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
@@ -249,11 +255,18 @@
{
$procedure->set_revision_no(2);
}
+
+ $description_txt =
phpgw::get_var('description','html');
+ $description_txt =
str_replace(" ", " ", $description_txt);
+ $purpose_txt =
phpgw::get_var('purpose','html');
+ $purpose_txt = str_replace(" ", "
", $purpose_txt);
+ $reference_txt =
phpgw::get_var('reference','html');
+ $reference_txt = str_replace(" ",
" ", $reference_txt);
$procedure->set_title(phpgw::get_var('title'));
-
$procedure->set_purpose(phpgw::get_var('purpose','html'));
+ $procedure->set_purpose($purpose_txt);
$procedure->set_responsibility(phpgw::get_var('responsibility'));
-
$procedure->set_description(phpgw::get_var('description','html'));
-
$procedure->set_reference(phpgw::get_var('reference','html'));
+
$procedure->set_description($description_txt);
+
$procedure->set_reference($reference_txt);
$procedure->set_attachment(phpgw::get_var('attachment'));
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
@@ -307,6 +320,7 @@
$control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$procedure->get_control_area_id(),'globals' => true,'use_acl' =>
$this->_category_acl));
array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
$control_areas_array2 = array();
+ //_debug_array($control_areas);
foreach($control_areas['cat_list'] as $cat_list)
{
if($cat_list['cat_id'] ==
$procedure->get_control_area_id())
@@ -350,6 +364,14 @@
}
}
*/
+
+ /*
+ * hack to fix display of char
+ */
+
$procedure->set_description(str_replace(" ", "
",$procedure->get_description()));
+
$procedure->set_responsibility(str_replace(' ', ' ',
$procedure->get_responsibility()));
+ $procedure->set_reference(str_replace(' ',
' ', $procedure->get_reference()));
+
$procedure_array = $procedure->toArray();
//_debug_array($procedure_array);
@@ -441,6 +463,13 @@
$category =
execMethod('phpgwapi.categories.return_single',
$procedure->get_control_area_id());
$procedure->set_control_area_name($category[0]['name']);
+ /*
+ * hack to fix display of char
+ */
+
$procedure->set_description(str_replace(" ", "
",$procedure->get_description()));
+
$procedure->set_responsibility(str_replace(' ', ' ',
$procedure->get_responsibility()));
+ $procedure->set_reference(str_replace(' ',
' ', $procedure->get_reference()));
+
$procedure_array = $procedure->toArray();
if($procedure->get_start_date() &&
$procedure->get_start_date() != null)
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -310,6 +310,39 @@
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['input_type'][] = 'hidden';
+ $uicols['name'][] =
'entity_id';
+ $uicols['descr'][] = false;
+ $uicols['statustext'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
+ $uicols['input_type'][] = 'hidden';
+ $uicols['name'][] =
'cat_id';
+ $uicols['descr'][] = false;
+ $uicols['statustext'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
+ $uicols['input_type'][] = 'hidden';
+ $uicols['name'][] =
'_type';
+ $uicols['descr'][] = false;
+ $uicols['statustext'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
if($lookup)
{
$cols .= ',num as entity_num_' .
$entity_id;
@@ -762,6 +795,26 @@
$dataset[$j]['num']['value'] =
$dataset[$j]['id']['value'];
+ $dataset[$j]['entity_id'] = array
+ (
+ 'value' => $entity_id,
+ 'datatype' => false,
+ 'attrib_id' => false
+ );
+ $dataset[$j]['cat_id'] = array
+ (
+ 'value' => $cat_id,
+ 'datatype' => false,
+ 'attrib_id' => false
+ );
+ $dataset[$j]['_type'] = array
+ (
+ 'value' => $this->type,
+ 'datatype' => false,
+ 'attrib_id' => false
+ );
+
+
if($lookup)
{
$dataset[$j]["entity_cat_name_{$entity_id}"] = array
@@ -877,7 +930,7 @@
$uicols['datatype'][] = '';
$uicols['sortable'][] = true;
$uicols['exchange'][] = false;
- $uicols['formatter'][] = '';
+ $uicols['formatter'][] =
'linktToEntity';
$uicols['classname'][] = '';
$cols_return[] = 'id';
@@ -892,6 +945,40 @@
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['input_type'][] = 'hidden';
+ $uicols['name'][] =
'entity_id';
+ $uicols['descr'][] = false;
+ $uicols['statustext'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
+ $uicols['input_type'][] = 'hidden';
+ $uicols['name'][] =
'cat_id';
+ $uicols['descr'][] = false;
+ $uicols['statustext'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
+ $uicols['input_type'][] = 'hidden';
+ $uicols['name'][] =
'_type';
+ $uicols['descr'][] = false;
+ $uicols['statustext'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['sortable'][] = false;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
+
if($lookup)
{
$cols .= ',num as entity_num_' .
$entity_id;
@@ -1304,6 +1391,25 @@
'attrib_id' =>
$uicols['cols_return_extra'][$key]['attrib_id']
);
}
+ $dataset[$j]['entity_id'] = array
+ (
+ 'value' => $entity_id,
+ 'datatype' => false,
+ 'attrib_id' => false
+ );
+ $dataset[$j]['cat_id'] = array
+ (
+ 'value' => $cat_id,
+ 'datatype' => false,
+ 'attrib_id' => false
+ );
+ $dataset[$j]['_type'] = array
+ (
+ 'value' => $this->type,
+ 'datatype' => false,
+ 'attrib_id' => false
+ );
+
if($lookup)
{
$dataset[$j]["entity_cat_name_{$entity_id}"] = array
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -136,7 +136,7 @@
$uicols['exchange'][] = false;
$uicols['align'][] = '';
$uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
+ $uicols['formatter'][] =
'linktToProject';
$uicols['classname'][] = '';
$uicols['sortable'][] = true;
Modified: branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -567,7 +567,7 @@
array_unshift($this->uicols['exchange'],'');
array_unshift($this->uicols['align'],'');
array_unshift($this->uicols['datatype'],'');
- array_unshift($this->uicols['formatter'],'');
+
array_unshift($this->uicols['formatter'],'linktToRequest');
array_unshift($this->uicols['classname'],'');
array_unshift($this->uicols['sortable'],true);
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-03-15 19:52:16 UTC (rev 8984)
@@ -158,7 +158,10 @@
$uicols['name'][] =
'project_id';
$uicols['descr'][] =
lang('Project');
$uicols['statustext'][] = lang('Project
ID');
- $uicols['formatter'][] = '';
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] =
'linktToProject';
$uicols['classname'][] = '';
$uicols['sortable'][] = true;
@@ -168,7 +171,10 @@
$uicols['name'][] =
'workorder_id';
$uicols['descr'][] =
lang('Workorder');
$uicols['statustext'][] =
lang('Workorder ID');
- $uicols['formatter'][] = '';
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] =
'linktToOrder';
$uicols['classname'][] = '';
$uicols['sortable'][] = true;
@@ -178,6 +184,9 @@
$uicols['name'][] =
'title';
$uicols['descr'][] =
lang('Title');
$uicols['statustext'][] =
lang('Workorder title');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
@@ -188,6 +197,9 @@
$uicols['name'][] =
'status';
$uicols['descr'][] =
lang('Status');
$uicols['statustext'][] =
lang('Workorder status');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
@@ -207,6 +219,9 @@
$uicols['name'][] =
'entry_date';
$uicols['descr'][] =
lang('Entry date');
$uicols['statustext'][] =
lang('Workorder entry date');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
*/
@@ -216,6 +231,9 @@
$uicols['name'][] =
'user_lid';
$uicols['descr'][] =
lang('User');
$uicols['statustext'][] =
lang('Workorder User');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
@@ -226,6 +244,9 @@
$uicols['name'][] =
'vendor_id';
$uicols['descr'][] =
lang('Vendor ID');
$uicols['statustext'][] = lang('Vendor
ID');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
@@ -237,6 +258,9 @@
$uicols['name'][] =
'loc1_name';
$uicols['descr'][] = '';
$uicols['statustext'][] = '';
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
@@ -255,6 +279,9 @@
$uicols['name'][] =
'org_name';
$uicols['descr'][] =
lang('Vendor name');
$uicols['statustext'][] = lang('Vendor
name');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = '';
@@ -265,6 +292,9 @@
$uicols['name'][] =
'combined_cost';
$uicols['descr'][] =
lang('Cost');
$uicols['statustext'][] = lang('Cost -
either budget or calculation');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
$uicols['sortable'][] = true;
@@ -275,6 +305,9 @@
$uicols['name'][] =
'actual_cost';
$uicols['descr'][] =
lang('Actual cost');
$uicols['statustext'][] = lang('Actual
cost - paid so far');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
$uicols['sortable'][] = true;
Modified: branches/Version-1_0-branch/property/js/yahoo/entity.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/entity.index.js
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/property/js/yahoo/entity.index.js
2012-03-15 19:52:16 UTC (rev 8984)
@@ -120,6 +120,15 @@
}
}
+ var oArgs_entity = {menuaction:'property.uientity.edit'};
+ var sUrl_entity = phpGWLink('index.php', oArgs_entity);
+
+ var linktToEntity = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<a
href="+sUrl_entity+"&entity_id="+oRecord.getData('entity_id')+"&cat_id="+oRecord.getData('cat_id')+"&id="+oRecord.getData('id')+"&type="+oRecord.getData('_type')+">"
+ oData + "</a>";
+ };
+
+
/****************************************************************************************/
this.myParticularRenderEvent = function()
Modified: branches/Version-1_0-branch/property/js/yahoo/project.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/project.index.js
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/property/js/yahoo/project.index.js
2012-03-15 19:52:16 UTC (rev 8984)
@@ -9,13 +9,13 @@
{order:2,
var_URL:'status_id',name:'btn_status_id',style:'districtbutton',dependiente:''},
{order:3,
var_URL:'wo_hour_cat_id',name:'btn_hour_category_id',style:'partOFTownbutton',dependiente:''},
{order:4, var_URL:'filter',
name:'btn_user_id',style:'ownerIdbutton',dependiente:''},
- {order:5, var_URL:'criteria_id',
name:'btn_criteria_id',style:'criteriabutton',dependiente:''}
+ {order:5, var_URL:'criteria_id',
name:'btn_criteria_id',style:'criteriabutton',dependiente:''}
];
// define buttons
var oNormalButton_0, oNormalButton_1, oNormalButton_2, oNormalButton_3;
var normalButtons = [
- {order:0, name:'btn_date_search', funct:"onDateSearchClick"},
+ {order:0, name:'btn_date_search', funct:"onDateSearchClick"},
{order:1, name:'btn_search', funct:"onSearchClick"},
{order:2, name:'btn_new', funct:"onNewClick"},
{order:3, name:'btn_export', funct:"onDownloadClick"}
@@ -28,7 +28,7 @@
var toolTips =
[
- {name:'loc1', title:'',
description:'',ColumnDescription:'loc1_name'},
+ {name:'loc1', title:'',
description:'',ColumnDescription:'loc1_name'},
{name:'btn_export', title:'download', description:'Download
table to your browser', ColumnDescription:''}
]
@@ -43,6 +43,15 @@
date_search : 1 //if search has link "Data search"
}
+ var oArgs_project = {menuaction:'property.uiproject.edit'};
+ var sUrl_project = phpGWLink('index.php', oArgs_project);
+
+ var linktToProject = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<a href="+sUrl_project+"&id="+oData+">" +
oData + "</a>";
+ };
+
+
/********************************************************************************/
this.myFormatNum2 = function(Data)
{
@@ -53,53 +62,53 @@
{
elCell.innerHTML = myFormatNum2(oData);
}
-
+
this.particular_setting = function()
{
if(flag_particular_setting=='init')
{
- //district
+ //district
index =
locate_in_array_options(0,"value",path_values.district_id);
- if(index)
- {
- oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
- }
-
+ if(index)
+ {
+ oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
+ }
+
//category
index =
locate_in_array_options(1,"value",path_values.cat_id);
- if(index)
- {
- oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
+ if(index)
+ {
+ oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
}
-
- //status
+
+ //status
index =
locate_in_array_options(2,"value",path_values.status_id);
- if(index)
- {
- oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
- }
-
- //wo_hour_cat_id
+ if(index)
+ {
+ oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
+ }
+
+ //wo_hour_cat_id
index =
locate_in_array_options(3,"value",path_values.wo_hour_cat_id);
- if(index)
- {
- oMenuButton_3.set("label", ("<em>" +
array_options[3][index][1] + "</em>"));
- }
-
- //user
+ if(index)
+ {
+ oMenuButton_3.set("label", ("<em>" +
array_options[3][index][1] + "</em>"));
+ }
+
+ //user
index =
locate_in_array_options(4,"value",path_values.user_id);
- if(index)
- {
- oMenuButton_4.set("label", ("<em>" +
array_options[4][index][1] + "</em>"));
- }
-
- //criteria
+ if(index)
+ {
+ oMenuButton_4.set("label", ("<em>" +
array_options[4][index][1] + "</em>"));
+ }
+
+ //criteria
index =
locate_in_array_options(5,"value",path_values.criteria_id);
- if(index)
- {
- oMenuButton_5.set("label", ("<em>" +
array_options[5][index][1] + "</em>"));
- }
-
+ if(index)
+ {
+ oMenuButton_5.set("label", ("<em>" +
array_options[5][index][1] + "</em>"));
+ }
+
//focus initial
//--focus for txt_query---
YAHOO.util.Dom.get(textImput[0].id).focus();
@@ -109,7 +118,7 @@
{
}
}
-
+
/****************************************************************************************/
this.myParticularRenderEvent = function()
@@ -118,7 +127,7 @@
}
/****************************************************************************************/
-
+
//----------------------------------------------------------
YAHOO.util.Event.addListener(window, "load", function()
{
Modified: branches/Version-1_0-branch/property/js/yahoo/request.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/request.index.js
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/property/js/yahoo/request.index.js
2012-03-15 19:52:16 UTC (rev 8984)
@@ -44,6 +44,15 @@
};
/****************************************************************************************/
+ var oArgs_request = {menuaction:'property.uirequest.edit'};
+ var sUrl_request = phpGWLink('index.php', oArgs_request);
+
+ var linktToRequest = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<a href="+sUrl_request+"&id="+oData+">" +
oData + "</a>";
+ };
+
+
var FormatterRight = function(elCell, oRecord, oColumn, oData)
{
elCell.innerHTML = "<div
align=\"right\">"+YAHOO.util.Number.format(oData, {thousandsSeparator:"
"})+"</div>";
Modified: branches/Version-1_0-branch/property/js/yahoo/workorder.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/workorder.index.js
2012-03-15 19:49:40 UTC (rev 8983)
+++ branches/Version-1_0-branch/property/js/yahoo/workorder.index.js
2012-03-15 19:52:16 UTC (rev 8984)
@@ -1,14 +1,14 @@
//--------------------------------------------------------
// Declaration of workorder.index vars
-//--------------------------------------------------------
+//--------------------------------------------------------
//define SelectButton
var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3,
oMenuButton_4, oMenuButton_5;
var selectsButtons = [
- {order:0,
var_URL:'district_id',name:'btn_district_id',style:'districtbutton',dependiente:''},
+ {order:0,
var_URL:'district_id',name:'btn_district_id',style:'districtbutton',dependiente:''},
{order:1,
var_URL:'cat_id',name:'btn_cat_id',style:'categorybutton',dependiente:''},
{order:2,
var_URL:'status_id',name:'btn_status_id',style:'districtbutton',dependiente:''},
{order:3,
var_URL:'wo_hour_cat_id',name:'btn_wo_hour_cat_id',style:'partOFTownbutton',dependiente:''},
- {order:4, var_URL:'filter',
name:'btn_user_id',style:'ownerIdbutton',dependiente:''},
+ {order:4, var_URL:'filter',
name:'btn_user_id',style:'ownerIdbutton',dependiente:''},
{order:5, var_URL:'criteria_id',
name:'btn_criteria_id',style:'criteriabutton',dependiente:''}
]
@@ -27,8 +27,8 @@
var toolTips =
[
- {name:'loc1', title:'',
description:'',ColumnDescription:'loc1_name'},
- {name:'vendor_id', title:'',
description:'',ColumnDescription:'org_name'},
+ {name:'loc1', title:'',
description:'',ColumnDescription:'loc1_name'},
+ {name:'vendor_id', title:'',
description:'',ColumnDescription:'org_name'},
{name:'btn_export', title:'Download', description:'Download
table to your browser',ColumnDescription:''}
]
@@ -42,6 +42,23 @@
date_search : 1 //if search has link "Data search"
};
+ var oArgs_project = {menuaction:'property.uiproject.edit'};
+ var sUrl_project = phpGWLink('index.php', oArgs_project);
+
+ var linktToProject = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<a href="+sUrl_project+"&id="+oData+">" +
oData + "</a>";
+ };
+
+ var oArgs_order = {menuaction:'property.uiworkorder.edit'};
+ var sUrl_order = phpGWLink('index.php', oArgs_order);
+
+ var linktToOrder = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<a href="+sUrl_order+"&id="+oData+">" +
oData + "</a>";
+ };
+
+
/********************************************************************************/
this.myFormatNum2 = function(Data)
{
@@ -52,53 +69,53 @@
{
elCell.innerHTML = myFormatNum2(oData);
}
-
+
this.particular_setting = function()
{
if(flag_particular_setting=='init')
{
- //district
+ //district
index =
locate_in_array_options(0,"value",path_values.district_id);
- if(index)
- {
- oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
- }
-
+ if(index)
+ {
+ oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
+ }
+
//category
index =
locate_in_array_options(1,"value",path_values.cat_id);
- if(index)
- {
- oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
+ if(index)
+ {
+ oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
}
-
- //status
+
+ //status
index =
locate_in_array_options(2,"value",path_values.status_id);
- if(index)
- {
- oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
- }
-
- //wo_hour_cat_id
+ if(index)
+ {
+ oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
+ }
+
+ //wo_hour_cat_id
index =
locate_in_array_options(3,"value",path_values.wo_hour_cat_id);
- if(index)
- {
- oMenuButton_3.set("label", ("<em>" +
array_options[3][index][1] + "</em>"));
- }
-
- //user
+ if(index)
+ {
+ oMenuButton_3.set("label", ("<em>" +
array_options[3][index][1] + "</em>"));
+ }
+
+ //user
index =
locate_in_array_options(4,"value",path_values.filter);
- if(index)
- {
- oMenuButton_4.set("label", ("<em>" +
array_options[4][index][1] + "</em>"));
- }
-
- //criteria
+ if(index)
+ {
+ oMenuButton_4.set("label", ("<em>" +
array_options[4][index][1] + "</em>"));
+ }
+
+ //criteria
index =
locate_in_array_options(5,"value",path_values.criteria_id);
- if(index)
- {
- oMenuButton_5.set("label", ("<em>" +
array_options[5][index][1] + "</em>"));
- }
-
+ if(index)
+ {
+ oMenuButton_5.set("label", ("<em>" +
array_options[5][index][1] + "</em>"));
+ }
+
//focus initial
//--focus for txt_query---
YAHOO.util.Dom.get(textImput[0].id).focus();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8984] Merge 8976:8983 from trunk,
Sigurd Nes <=