[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10013] Merge 10008:10012 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10013] Merge 10008:10012 from trunk |
|
Date: |
Thu, 20 Sep 2012 09:16:01 +0000 |
Revision: 10013
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10013
Author: sigurdne
Date: 2012-09-20 09:16:01 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
Merge 10008:10012 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/hook_home.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/bergen_kommune/send.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,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
+
/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
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-09-20 08:17:46 UTC (rev 10012)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-09-20 09:16:01 UTC (rev 10013)
@@ -245,8 +245,10 @@
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type'),
'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
+
$control->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
+
$control->set_location_id($this->unmarshal($this->db->f('location_id'), 'int'));
- if($return_type == "return_object")
+ if($return_type == "return_object")
{
$controls_array[] = $control;
}
@@ -354,7 +356,9 @@
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type'),
'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
-
+
$control->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
+
$control->set_location_id($this->unmarshal($this->db->f('location_id'), 'int'));
+
if($return_type == "return_object")
{
$controls_array[] = $control;
@@ -388,6 +392,7 @@
}
}
+
/**
* Get controls with a control area
*
Modified: branches/Version-1_0-branch/controller/inc/hook_home.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-09-20 08:17:46 UTC (rev 10012)
+++ branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-09-20 09:16:01 UTC (rev 10013)
@@ -34,6 +34,9 @@
include_class('controller', 'date_generator', 'inc/component/');
include_class('controller', 'location_finder', 'inc/helper/');
+ $location_array = array();
+ $component_short_desc = array();
+
$so_check_list = CreateObject('controller.socheck_list');
$so_control = CreateObject('controller.socontrol');
@@ -191,7 +194,7 @@
$date_generator = new
date_generator($my_control["start_date"], $my_control["end_date"],
$from_date_ts, $to_date_ts, $my_control["repeat_type"],
$my_control["repeat_interval"]);
$deadline_dates_for_control =
$date_generator->get_dates();
-
+
$check_list_array = array();
foreach($deadline_dates_for_control as $deadline_ts)
{
@@ -207,7 +210,7 @@
$check_list =
$so_check_list->get_check_list_for_control_by_date($my_control['id'],
$deadline_ts, null, null, $component['location_id'], $component['id'],
"component" );
}
-
+
$control_id = $my_control['id'];
if($check_list == null & $control_type ==
"location")
@@ -229,7 +232,7 @@
$portalbox0 = CreateObject('phpgwapi.listbox', array
(
- 'title' => "<div class='control heading'>Tittel på
kontroll</div><div class='title heading'>Lokasjonsnavn</div><div
class='control-area heading'>Kontrollområde</div><div class='date
heading'>Fristdato</div>",
+ 'title' => "<div class='date
heading'>Fristdato</div><div class='control heading'>Tittel på
kontroll</div><div class='title heading'>Lokasjonsnavn</div><div
class='control-area heading'>Kontrollområde</div>",
'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
@@ -239,7 +242,6 @@
));
// Sorts my_undone_controls by deadline date
- //usort($my_undone_controls, "sort_cmp_2");
ksort($my_undone_controls);
foreach($my_undone_controls as $date_ts => $controls_on_date)
@@ -247,7 +249,7 @@
if(count( $controls_on_date) > 1 )
{
$portalbox0->data[] = array(
- 'text' => "<h4
class='expand_trigger' style='font-size: 12px;color:#031647;background:
#D0DEF4;padding:2px 4px;margin:0;'><img height='12'
src='controller/images/arrow_right.png' /><span
style='display:inline-block;width:805px'>Antall kontroller: " .
count($controls_on_date) . "</span><span
style='display:inline-block;width:200px;'>" . date("d/m-Y", $date_ts) .
"</span></h4><ul class='expand_list'>"
+ 'text' => "<h4
class='expand_trigger' style='font-size: 12px;color:#031647;background:
#D0DEF4;padding:2px 4px;margin:0;'><img height='12'
src='controller/images/arrow_right.png' /><span
style='display:inline-block;width:805px'>Frist: " . date($dateformat,
$date_ts) . "</span><span style='display:inline-block;width:200px;'>Antall
kontroller: " . count($controls_on_date) . "</span></h4><ul
class='expand_list'>"
);
}
@@ -278,20 +280,23 @@
if($check_list_type == "location")
{
$location_code = $my_undone_control[4];
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
- $location_name =
$location_array["loc1_name"];
+
if(!isset($location_array[$location_code]) || !$location_array[$location_code])
+ {
+ $location_array[$location_code]
= execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+ }
+ $location_name =
$location_array[$location_code]["loc1_name"];
if(count( $controls_on_date) > 1 )
{
$portalbox0->data[] = array(
- 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ 'text' => "<li><div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></li>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "location", 'control_id' =>
$my_control['id'], 'location_code' => $location_code, 'deadline_ts' =>
$deadline_ts))
);
}
else
{
$portalbox0->data[] = array(
- 'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ 'text' => "<div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "location", 'control_id' =>
$my_control['id'], 'location_code' => $location_code, 'deadline_ts' =>
$deadline_ts))
);
}
@@ -302,19 +307,27 @@
$location_id = $my_undone_control[4];
$component_id = $my_undone_control[5];
- $short_desc_arr =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
+
if(!isset($component_short_desc[$location_id][$component_id]))
+ {
+
$component_short_desc[$location_id][$component_id] =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
+ }
+
+
if($component_short_desc[$location_id][$component_id])
+ {
+ $short_desc_arr =
$component_short_desc[$location_id][$component_id];
+ }
if(count( $controls_on_date) > 1 )
{
$portalbox0->data[] = array(
- 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ 'text' => "<li><div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div></li>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "component", 'control_id'
=> $my_control['id'], 'location_id' => $location_id, 'component_id' =>
$component_id, 'deadline_ts' => $deadline_ts))
);
}
else
{
$portalbox0->data[] = array(
- 'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ 'text' => "<div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "component", 'control_id'
=> $my_control['id'], 'location_id' => $location_id, 'component_id' =>
$component_id, 'deadline_ts' => $deadline_ts))
);
}
@@ -325,20 +338,23 @@
$check_list_id = $my_undone_control[3];
$location_code = $my_undone_control[4];
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
- $location_name = $location_array["loc1_name"];
-
+ if(!isset($location_array[$location_code]) ||
!$location_array[$location_code])
+ {
+ $location_array[$location_code] =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+ }
+ $location_name =
$location_array[$location_code]["loc1_name"];
+
if(count( $controls_on_date) > 1 )
{
$portalbox0->data[] = array(
- 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ 'text' => "<li><div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></li>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id))
);
}
else
{
$portalbox0->data[] = array(
- 'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ 'text' => "<div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id))
);
}
@@ -362,6 +378,7 @@
$controls_for_location_array = array();
foreach($my_locations as $location)
{
+
$controls = array();
$controls_loc =
$so_control->get_controls_by_location($location["location_code"],
$from_date_ts, $to_date_ts, $repeat_type, "return_array", $location["role_id"]
);
$controls_comp =
$so_control->get_controls_for_components_by_location($location["location_code"],
$from_date_ts, $to_date_ts, $repeat_type, "return_array", $location["role_id"]
);
@@ -378,10 +395,11 @@
$controls_for_location_array[] =
array($location["location_code"], $controls);
}
-
+
$controls_array = array();
$control_dates = array();
- foreach($controls_for_location_array as $control_arr){
+ foreach($controls_for_location_array as $control_arr)
+ {
$current_location = $control_arr[0];
$controls_for_loc_array = $control_arr[1];
foreach($controls_for_loc_array as $control)
@@ -390,10 +408,10 @@
$controls_array[] = array($current_location, $control,
$date_generator->get_dates());
}
}
-
+
$portalbox1 = CreateObject('phpgwapi.listbox', array
(
- 'title' => "<div class='control heading'>Tittel på
kontroll</div><div class='title heading'>Lokasjonsnavn</div><div
class='control-area heading'>Kontrollområde</div><div class='date
heading'>Fristdato</div>",
+ 'title' => "<div class='date
heading'>Fristdato</div><div class='control heading'>Tittel på
kontroll</div><div class='title heading'>Lokasjonsnavn</div><div
class='control-area heading'>Kontrollområde</div>",
'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
@@ -415,14 +433,25 @@
$curr_location = $control_instance[0];
$current_control = $control_instance[1];
$check_lists =
$so_check_list->get_planned_check_lists_for_control($current_control["id"],
$curr_location, $current_control['location_id'],
$current_control['component_id']);
- $location_array = execMethod('property.bolocation.read_single',
array('location_code' => $curr_location));
- $location_name = $location_array["loc1_name"];
+
+ if(!isset($location_array[$curr_location]) ||
!$location_array[$curr_location])
+ {
+ $location_array[$curr_location] =
execMethod('property.bolocation.read_single', array('location_code' =>
$curr_location));
+ }
+ $location_name = $location_array[$curr_location]["loc1_name"];
+
if(isset($current_control['component_id']) &&
$current_control['component_id'])
{
- if($short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$current_control['location_id'], 'id' => $current_control['component_id'])))
+//_debug_array($current_control);
+
if(!isset($component_short_desc[$current_control['location_id']][$current_control['component_id']]))
{
- $location_name .= "::{$short_desc}";
+
$component_short_desc[$current_control['location_id']][$current_control['component_id']]
= execMethod('property.soentity.get_short_description', array('location_id' =>
$current_control['location_id'], 'id' => $current_control['component_id']));
}
+
+
if($component_short_desc[$current_control['location_id']][$current_control['component_id']])
+ {
+ $location_name .=
"::{$component_short_desc[$current_control['location_id']][$current_control['component_id']]}";
+ }
}
foreach($control_areas['cat_list'] as $area)
@@ -437,7 +466,8 @@
$next_date = "Planlagt: " . date($dateformat,
$check_list->get_planned_date());
$portalbox1_data[] = array(
$check_list->get_planned_date(), array(
- 'text' => "<div
class='control'>{$current_control["title"]}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div
class='date'>{$next_date}</div>",
+ // 'text' => "<div
class='control'>{$current_control["title"]}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div
class='date'>{$next_date}</div>",
+ 'text' => "<div
class='date'>{$next_date}</div><div
class='control'>{$current_control["title"]}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' =>
$check_list->get_id()))
));
}
@@ -463,7 +493,7 @@
$portalbox2 = CreateObject('phpgwapi.listbox', array
(
- 'title' => "<div class='control heading'>Tittel på
kontroll</div><div class='title heading'>Lokasjonsnavn</div><div
class='control-area heading'>Kontrollområde</div><div class='date
heading'>Fristdato</div>",
+ 'title' => "<div class='date
heading'>Fristdato</div><div class='control heading'>Tittel på
kontroll</div><div class='title heading'>Lokasjonsnavn</div><div
class='control-area heading'>Kontrollområde</div>",
'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
@@ -490,11 +520,13 @@
$level = count(explode('-', $location_code));
- if($level == 1){
+ if($level == 1)
+ {
// Fetches all controls for the components for a
location within time period
$filter = "bim_item.location_code = '$location_code' ";
$components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
- }else
+ }
+ else
{
// Fetches all controls for the components for a
location within time period
$filter = "bim_item.location_code LIKE
'$location_code%' ";
@@ -507,11 +539,11 @@
}
if( count($components_with_controls_array) > 0 )
- {
+ {
foreach($components_with_controls_array as $component)
{
- $my_controls[] = array( $location_code, 'component',
$component['controls_array'], $component );
- }
+ $my_controls[] = array( $location_code, 'component',
$component['controls_array'], $component );
+ }
}
}
@@ -541,10 +573,10 @@
// Daily, monthly yearly control: Todate in one
month
$to_date_ts = mktime(0, 0, 0, date("n")+1,
date("j"), date("Y") );
}
-
+
$date_generator = new
date_generator($my_control["start_date"], $my_control["end_date"],
$from_date_ts, $to_date_ts, $my_control["repeat_type"],
$my_control["repeat_interval"]);
$deadline_dates_for_control =
$date_generator->get_dates();
-
+
$check_list_array = array();
foreach($deadline_dates_for_control as $deadline_ts)
{
@@ -570,7 +602,7 @@
{
$component = $container_arr[3];
$my_assigned_controls[$deadline_ts][] = array("add", $deadline_ts,
$my_control, "component", $component['location_id'], $component['id'] );
- }
+ }
}
else if($check_list->get_status() ==
controller_check_list::STATUS_NOT_DONE)
{
@@ -579,15 +611,19 @@
}
}
}
-
+
// Sorts my_undone_controls by deadline date
- //usort($my_undone_controls, "sort_cmp");
+ $cats = CreateObject('phpgwapi.categories', -1, 'controller',
'.control');
+ $cats->supress_info = true;
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals'
=> true,'use_acl' => $this->_category_acl));
+
foreach($my_assigned_controls as $date_ts => $assigned_controls_on_date)
{
if(count( $assigned_controls_on_date) > 1 )
{
$portalbox2->data[] = array(
- 'text' => "<h4 class='expand_trigger'
style='font-size: 12px;color:#031647;background: #D0DEF4;padding:2px
4px;margin:0;'><img height='12' src='controller/images/arrow_right.png' /><span
style='display:inline-block;width:805px'>Antall kontroller: " .
count($assigned_controls_on_date) . "</span><span
style='display:inline-block;width:200px;'>" . date("d/m-Y", $date_ts) .
"</span></h4><ul class='expand_list'>"
+// 'text' => "<h4 class='expand_trigger'
style='font-size: 12px;color:#031647;background: #D0DEF4;padding:2px
4px;margin:0;'><img height='12' src='controller/images/arrow_right.png' /><span
style='display:inline-block;width:805px'>Antall kontroller: " .
count($assigned_controls_on_date) . "</span><span
style='display:inline-block;width:200px;'>" . date($dateformat, $date_ts) .
"</span></h4><ul class='expand_list'>"
+ 'text' => "<h4 class='expand_trigger'
style='font-size: 12px;color:#031647;background: #D0DEF4;padding:2px
4px;margin:0;'><img height='12' src='controller/images/arrow_right.png' /><span
style='display:inline-block;width:805px'>Frist: " . date($dateformat,
$date_ts) . "</span><span style='display:inline-block;width:200px;'>Antall
kontroller: " . count($controls_on_date) . "</span></h4><ul
class='expand_list'>"
);
}
@@ -597,10 +633,8 @@
$deadline_ts = $my_assigned_control[1];
$my_control = $my_assigned_control[2];
- $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
- $cats->supress_info = true;
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals'
=> true,'use_acl' => $this->_category_acl));
-
+ reset($control_areas['cat_list']);
+
foreach($control_areas['cat_list'] as $area)
{
if($area['cat_id'] ==
$my_control["control_area_id"])
@@ -618,21 +652,27 @@
if($check_list_type == "location")
{
$location_code =
$my_assigned_control[4];
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
- $location_name =
$location_array["loc1_name"];
+
+
if(!isset($location_array[$location_code]) || !$location_array[$location_code])
+ {
+ $location_array[$location_code]
= execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+ }
+ $location_name =
$location_array[$location_code]["loc1_name"];
+
-
if(count( $assigned_controls_on_date) > 1 )
{
$portalbox2->data[] = array(
- 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ // 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ 'text' => "<li><div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></li>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "location", 'control_id' =>
$my_control['id'], 'location_code' => $location_code, 'deadline_ts' =>
$deadline_ts))
);
}
else
{
$portalbox2->data[] = array(
- 'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ // 'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ 'text' => "<div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "location", 'control_id' =>
$my_control['id'], 'location_code' => $location_code, 'deadline_ts' =>
$deadline_ts))
);
}
@@ -642,19 +682,29 @@
$location_id = $my_assigned_control[4];
$component_id = $my_assigned_control[5];
- $short_desc_arr =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
-
+
if(!isset($component_short_desc[$location_id][$component_id]))
+ {
+
$component_short_desc[$location_id][$component_id] =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
+ }
+
+
if($component_short_desc[$location_id][$component_id])
+ {
+ $short_desc_arr =
$component_short_desc[$location_id][$component_id];
+ }
+
if(count( $assigned_controls_on_date) >
1 )
{
$portalbox2->data[] = array(
- 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ // 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ 'text' => "<li><div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div></li>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "component", 'control_id'
=> $my_control['id'], 'location_id' => $location_id, 'component_id' =>
$component_id, 'deadline_ts' => $deadline_ts))
);
}
else
{
$portalbox2->data[] = array(
- 'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ // 'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ 'text' => "<div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "component", 'control_id'
=> $my_control['id'], 'location_id' => $location_id, 'component_id' =>
$component_id, 'deadline_ts' => $deadline_ts))
);
}
@@ -665,20 +715,25 @@
$check_list_id = $my_assigned_control[3];
$location_code = $my_assigned_control[4];
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
- $location_name = $location_array["loc1_name"];
-
+ if(!isset($location_array[$location_code]) ||
!$location_array[$location_code])
+ {
+ $location_array[$location_code] =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+ }
+ $location_name =
$location_array[$location_code]["loc1_name"];
+
if(count( $assigned_controls_on_date ) > 1 )
{
$portalbox2->data[] = array(
- 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ // 'text' => "<li><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div></li>",
+ 'text' => "<li><div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></li>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id))
);
}
else
{
$portalbox2->data[] = array(
- 'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ //'text' => "<div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div><div class='date'>Fristdato
{$date_str}</div>",
+ 'text' => "<div
class='date'>Fristdato {$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div>",
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id))
);
}
@@ -692,30 +747,5 @@
);
}
}
-
+
echo "\n".'<!-- BEGIN checklist info -->'."\n <h2 class='heading'>Mine
tildelte kontroller</h2><div
class='home-box'>".$portalbox2->draw()."</div>\n".'<!-- END checklist info
-->'."\n";
-
-
- // ============================== FUNKSJONER
================================
-
- // Sort array on timestamp
- function sort_cmp($a, $b)
- {
- if ($a[1] == $b[1])
- {
- return 0;
- }
-
- return ($a[1] < $b[1]) ? -1 : 1;
- }
-
- // Sort array on timestamp
- function sort_cmp_2($a, $b)
- {
- if ($a[0] == $b[0])
- {
- return 0;
- }
-
- return ($a[0] < $b[0]) ? -1 : 1;
- }
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-09-20 08:17:46 UTC (rev 10012)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-09-20 09:16:01 UTC (rev 10013)
@@ -57,6 +57,8 @@
protected $responsibility_name;
protected $control_area_id;
protected $control_area_name;
+ protected $location_id;
+ protected $component_id;
// Objects
protected $check_lists_array = array();
@@ -232,7 +234,28 @@
{
$this->error_msg_array = $error_msg_array;
}
+
+ public function set_component_id($component_id)
+ {
+ $this->component_id = $component_id;
+ }
+ public function get_component_id()
+ {
+ return $this->component_id;
+ }
+
+
+ public function set_location_id($location_id)
+ {
+ $this->location_id = $location_id;
+ }
+
+ public function get_location_id()
+ {
+ return $this->location_id;
+ }
+
/**
* Get a static reference to the storage object associated with
this model object
*
@@ -288,9 +311,11 @@
'procedure_name' => $this->get_procedure_name(),
'control_area_id' =>
$this->get_control_area_id(),
'control_area_name' =>
$this->get_control_area_name(),
- 'repeat_type' => $this->get_repeat_type(),
+ 'repeat_type' => $this->get_repeat_type(),
'repeat_interval' =>
$this->get_repeat_interval(),
- 'responsibility_name' =>
$this->get_responsibility_name()
+ 'responsibility_name' =>
$this->get_responsibility_name(),
+ 'component_id' =>
$this->get_component_id(),
+ 'location_id' =>
$this->get_location_id()
);
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
2012-09-20 08:17:46 UTC (rev 10012)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
2012-09-20 09:16:01 UTC (rev 10013)
@@ -78,6 +78,7 @@
*/
$load = array
(
+ "js/jquery-1.7.2{$_type}",
"js/jquery-ui-1.8.19.custom{$_type}"
);
break;
Modified:
branches/Version-1_0-branch/sms/inc/plugin/gateway/bergen_kommune/send.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/plugin/gateway/bergen_kommune/send.php
2012-09-20 08:17:46 UTC (rev 10012)
+++ branches/Version-1_0-branch/sms/inc/plugin/gateway/bergen_kommune/send.php
2012-09-20 09:16:01 UTC (rev 10013)
@@ -29,8 +29,12 @@
$options['location'] =
$this->sms_param['service_url'];
$options['uri'] =
"http://soa01a.srv.bergenkom.no/biz/bk/sms/SmsService-v1";;
$options['trace'] = 1;
- $options['proxy_host'] =
$this->sms_param['proxy_host'];
- $options['proxy_port'] =
$this->sms_param['proxy_port'];
+
+ if(isset($this->sms_param['proxy_host']) &&
$this->sms_param['proxy_host'])
+ {
+ $options['proxy_host'] =
$this->sms_param['proxy_host'];
+ $options['proxy_port'] =
$this->sms_param['proxy_port'];
+ }
$options['encoding'] = 'iso-8859-1';//'UTF-8';
$options['login'] =
$this->sms_param['login'];
$options['password'] = $this->sms_param['password'];
@@ -90,6 +94,11 @@
function
gw_set_delivery_status($gp_code="",$uid="",$smslog_id="",$p_datetime="",$p_update="",$external_id=0)
{
+ if(!$external_id)
+ {
+ return;
+ }
+
require_once 'SmsService.php';
$options=array();
@@ -97,8 +106,13 @@
$options['location'] =
$this->sms_param['service_url'];
$options['uri'] =
"http://soa01a.srv.bergenkom.no/biz/bk/sms/SmsService-v1";;
$options['trace'] = 1;
- $options['proxy_host'] =
$this->sms_param['proxy_host'];
- $options['proxy_port'] =
$this->sms_param['proxy_port'];
+
+ if(isset($this->sms_param['proxy_host']) &&
$this->sms_param['proxy_host'])
+ {
+ $options['proxy_host'] =
$this->sms_param['proxy_host'];
+ $options['proxy_port'] =
$this->sms_param['proxy_port'];
+ }
+
$options['encoding'] = 'iso-8859-1';//'UTF-8';
$options['login'] =
$this->sms_param['login'];
$options['password'] = $this->sms_param['password'];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10013] Merge 10008:10012 from trunk,
Sigurd Nes <=