[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10005] Merge 10002:10004 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10005] Merge 10002:10004 from trunk |
|
Date: |
Tue, 18 Sep 2012 05:51:13 +0000 |
Revision: 10005
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10005
Author: sigurdne
Date: 2012-09-18 05:51:13 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Merge 10002:10004 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/controller/inc/hook_home.inc.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
+
/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
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-09-18 05:17:15 UTC (rev 10004)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-09-18 05:51:13 UTC (rev 10005)
@@ -788,7 +788,7 @@
$activity['district_name'] = $soap
? $this->get_district_name($activity['district']) :
utf8_decode($this->get_district_name($activity['district']));
$activity['category_name'] = $soap
? $this->get_category_name($activity['category']) :
utf8_decode($this->get_category_name($activity['category']));
$activity['description'] =
$this->get_activity_description($activity['organization_id'],$activity['group_id']);
- $activity['arena_info'] =
$this->get_arena_info($activity['arena']);
+ $activity['arena_info'] =
$this->get_all_arena_info($activity['arena'], $activity['internal_arena']);
$activity['internal_arena_info']=
$this->get_internal_arena_info($activity['internal_arena']);
$activity['contact_person'] =
$this->get_contact_person($activity['organization_id'],$activity['group_id'],$activity['contact_person_1']);
}
@@ -945,6 +945,34 @@
return $result;
}
+ function get_all_arena_info($arena_id, $int_arena_id)
+ {
+ $result = array();
+ if($arena_id && is_numeric($arena_id))
+ {
+ $arena_id = (int)$arena_id;
+ $this->db->query("SELECT * FROM activity_arena WHERE
id={$arena_id}", __LINE__, __FILE__);
+ $this->db->next_record();
+ $result = array
+ (
+ 'arena_name' => $this->soap ?
$this->db->f('arena_name') : utf8_decode($this->db->f('arena_name')),
+ 'address' => $this->soap ?
$this->db->f('address') : utf8_decode($this->db->f('address'))
+ );
+ }
+ else if($int_arena_id && is_numeric($int_arena_id))
+ {
+ $int_arena_id = (int)$int_arena_id;
+ $this->db->query("SELECT id, name, street FROM
bb_building WHERE id={$int_arena_id}", __LINE__, __FILE__);
+ $this->db->next_record();
+ $result = array
+ (
+ 'arena_name' => $this->soap ?
$this->db->f('name') : utf8_decode($this->db->f('name')),
+ 'address' => $this->soap ?
$this->db->f('street') : utf8_decode($this->db->f('street'))
+ );
+ }
+ return $result;
+ }
+
function get_arena_info($arena_id)
{
$result = array();
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-18 05:17:15 UTC (rev 10004)
+++ branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-09-18 05:51:13 UTC (rev 10005)
@@ -26,14 +26,14 @@
* @package property
* @subpackage controller
* @version $Id$
- */
+ */
include_class('controller', 'check_list', 'inc/model/');
include_class('controller', 'check_item', 'inc/model/');
include_class('controller', 'check_list_status_info', 'inc/component/');
include_class('controller', 'date_generator', 'inc/component/');
include_class('controller', 'location_finder', 'inc/helper/');
-
+
$so_check_list = CreateObject('controller.socheck_list');
$so_control = CreateObject('controller.socontrol');
@@ -60,11 +60,29 @@
$styling .= " .home_portal li div { display: block;float:left;cursor:
pointer;vertical-align: middle;}";
$styling .= " .home_portal_title h2 div{
display:block;float:left;cursor: pointer;vertical-align: middle;}";
$styling .= " h2.heading { font-size: 22px; font-weight:
normal;margin: 0 0 0 20px;}";
+ $styling .= " .expand_list{ display:none; }";
$styling .= "</style>";
$styling .= "\n".'<!-- END checklist info -->'."\n";
echo $styling;
-
- // Fetches my properties
+
+ echo "<script src='controller/js/controller/jquery.js'></script>";
+
+ $script = "<script>";
+ $script .= "$(document).ready(function(){";
+ $script .= " $('.expand_trigger').live('click', function() {";
+ $script .= " var liTag = $(this).closest('li'); ";
+ $script .= " var expandList = $(liTag).find('.expand_list'); ";
+ $script .= " if( !$(expandList).hasClass('active') ){
$(expandList).show(); $(expandList).addClass('active'); ";
+ $script .= " $(liTag).find('img').attr('src',
'controller/images/arrow_down.png');} ";
+ $script .= " else{ $(expandList).hide();
$(expandList).removeClass('active'); ";
+ $script .= " $(liTag).find('img').attr('src',
'controller/images/arrow_right.png');} ";
+ $script .= " return false; ";
+ $script .= " })";
+ $script .= " })";
+ $script .= "</script>";
+ echo $script;
+
+ // Fetches my properties
$criteria = array
(
'user_id' => $GLOBALS['phpgw_info']['user']['account_id'],
@@ -89,7 +107,6 @@
$my_buildings = $location_finder->get_responsibilities( $criteria );
$my_locations = array_merge($my_properties, $my_buildings);
-
@@ -98,18 +115,18 @@
$my_controls = array();
$repeat_type = null;
- // Setting from date 6 months back in time
- $from_date_ts = mktime(0, 0, 0, date("n")-6, date("j"), date("Y") );
+ // from date is set to 3 months back in time
+ $from_date_ts = mktime(0, 0, 0, date("n")-3, date("j"), date("Y") );
$to_date_ts = mktime(0, 0, 0, date("n"), date("j"), date("Y") );
- // Fetches controls current user is responsible for
+ // Fetches controls current user is responsible for 3 months back in
time
foreach($my_locations as $location)
{
$controls = array();
$components_with_controls_array = array();
$location_code = $location["location_code"];
- $controls_loc = $so_control->get_controls_by_location(
$location_code, $from_date_ts, $to_date_ts, $repeat_type, "return_array",
$location["role_id"] );
+ $controls_at_location = $so_control->get_controls_by_location(
$location_code, $from_date_ts, $to_date_ts, $repeat_type, "return_array",
$location["role_id"] );
$level = count(explode('-', $location_code));
@@ -124,15 +141,17 @@
$components_with_controls_array =
$so_control->get_controls_by_component($from_date_ts, $to_date_ts,
$repeat_type, "return_array", $location["role_id"], $filter);
}
- if( count($controls_loc) > 0 )
+ if( count($controls_at_location) > 0 )
{
- $my_controls[] = array( $location_code, 'location',
$controls_loc );
+ // Saves location code, location type and an array
containing controls at locations
+ $my_controls[] = array( $location_code, 'location',
$controls_at_location );
}
if( count($components_with_controls_array) > 0 )
{
foreach($components_with_controls_array as $component)
{
+ // Saves location code, location type, an array
containing controls at locations and component object
$my_controls[] = array( $location_code,
'component', $component['controls_array'], $component );
}
}
@@ -140,7 +159,7 @@
$my_undone_controls = array();
- // Generates an array with undone controls
+ // Generates an array containing undone controls
foreach($my_controls as $container_arr)
{
$location_code = $container_arr[0];
@@ -151,22 +170,22 @@
{
if($my_control["repeat_type"] ==
controller_control::REPEAT_TYPE_DAY)
{
- // Daily control: Fetch undone controls one
week back in time
+ // DAILY CONTROLS: Fetch undone controls one
week back in time
$from_date_ts = mktime(0, 0, 0, date("n"),
date("j")-7, date("Y") );
}
else if($my_control["repeat_type"] ==
controller_control::REPEAT_TYPE_WEEK)
{
- // Weekly control: Fetch undone controls one
month back in time
+ // WEEKLY CONTROLS: Fetch undone controls one
month back in time
$from_date_ts = mktime(0, 0, 0, date("n")-1,
date("j"), date("Y") );
}
else if($my_control["repeat_type"] ==
controller_control::REPEAT_TYPE_MONTH)
{
- // Monthly control: Fetch undone controls three
months back in time
+ // MONTHLY CONTROLS: Fetch undone controls
three months back in time
$from_date_ts = mktime(0, 0, 0, date("n")-3,
date("j"), date("Y") );
}
else if($my_control["repeat_type"] ==
controller_control::REPEAT_TYPE_YEAR)
{
- // Yearly control: Fetch undone controls one
year back in time
+ // YEARLY CONTROLS: Fetch undone controls one
year back in time
$from_date_ts = mktime(0, 0, 0, date("n"),
date("j"), date("Y")-1 );
}
@@ -189,21 +208,20 @@
$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" );
}
- if($check_list == null)
- {
- if($control_type == "location")
- {
- $my_undone_controls[] =
array("add", $deadline_ts, $my_control, "location", $location_code );
- }
- else if($control_type == "component")
- {
- $component = $container_arr[3];
- $my_undone_controls[] =
array("add", $deadline_ts, $my_control, "component", $component['location_id'],
$component['id'] );
- }
+ $control_id = $my_control['id'];
+
+ if($check_list == null & $control_type ==
"location")
+ {
+ $my_undone_controls[$deadline_ts][] =
array("add", $deadline_ts, $my_control, "location", $location_code );
}
+ else if($check_list == null & $control_type ==
"component")
+ {
+ $component = $container_arr[3];
+ $my_undone_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)
{
- $my_undone_controls[] = array("edit",
$deadline_ts, $my_control, $check_list->get_id(), $location_code );
+ $my_undone_controls[$deadline_ts][] =
array("edit", $deadline_ts, $my_control, $check_list->get_id(), $location_code
);
}
}
}
@@ -221,68 +239,117 @@
));
// Sorts my_undone_controls by deadline date
- usort($my_undone_controls, "sort_cmp");
-
- foreach($my_undone_controls as $my_undone_control)
+ //usort($my_undone_controls, "sort_cmp_2");
+ ksort($my_undone_controls);
+
+ foreach($my_undone_controls as $date_ts => $controls_on_date)
{
- $check_list_status = $my_undone_control[0];
- $deadline_ts = $my_undone_control[1];
- $my_control = $my_undone_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));
-
- foreach($control_areas['cat_list'] as $area)
- {
- if($area['cat_id'] == $my_control["control_area_id"])
+ if(count( $controls_on_date) > 1 )
{
- $control_area_name = $area['name'];
+ $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'>"
+ );
}
- }
- $date_str = date($dateformat, $deadline_ts);
-
- if($check_list_status == "add")
+ foreach($controls_on_date as $my_undone_control)
{
- $check_list_type = $my_undone_control[3];
+ $check_list_status = $my_undone_control[0];
+ $deadline_ts = $my_undone_control[1];
+ $my_control = $my_undone_control[2];
- if($check_list_type == "location")
+ $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($control_areas['cat_list'] as $area)
{
+ if($area['cat_id'] ==
$my_control["control_area_id"])
+ {
+ $control_area_name = $area['name'];
+ }
+ }
+
+ $date_str = date($dateformat, $deadline_ts);
+
+ if($check_list_status == "add")
+ {
+ $check_list_type = $my_undone_control[3];
+
+ 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(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>",
+ '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>",
+ '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 if($check_list_type == "component")
+ {
+ $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(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>",
+ '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>",
+ '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 if($check_list_status == "edit")
+ {
+ $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"];
- $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>",
- '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))
- );
+ 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>",
+ '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>",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id))
+ );
+ }
}
- else if($check_list_type == "component")
- {
- $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));
-
- $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>",
- '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 if($check_list_status == "edit")
+
+ if(count( $controls_on_date) > 1 )
{
- $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"];
-
$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>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.edit_check_list',
'check_list_id' => $check_list_id))
- );
+ 'text' => "</ul>"
+ );
}
}
@@ -448,11 +515,12 @@
}
}
- $my_undone_controls = array();
+ $my_assigned_controls = array();
$from_date_ts = mktime(0, 0, 0, date("n"), date("j"), date("Y") );
// Generates an array with undone controls
+
foreach($my_controls as $container_arr)
{
$location_code = $container_arr[0];
@@ -496,86 +564,133 @@
{
if($control_type == "location")
{
- $my_undone_controls[] =
array("add", $deadline_ts, $my_control, "location", $location_code );
+
$my_assigned_controls[$deadline_ts][] = array("add", $deadline_ts, $my_control,
"location", $location_code );
}
else if($control_type == "component")
{
$component = $container_arr[3];
- $my_undone_controls[] =
array("add", $deadline_ts, $my_control, "component", $component['location_id'],
$component['id'] );
+
$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)
{
- $my_undone_controls[] = array("edit",
$deadline_ts, $my_control, $check_list->get_id(), $location_code );
+ $my_assigned_controls[$deadline_ts][] =
array("edit", $deadline_ts, $my_control, $check_list->get_id(), $location_code
);
}
}
}
}
// Sorts my_undone_controls by deadline date
- usort($my_undone_controls, "sort_cmp");
-
- foreach($my_undone_controls as $my_undone_control)
+ //usort($my_undone_controls, "sort_cmp");
+ foreach($my_assigned_controls as $date_ts => $assigned_controls_on_date)
{
- $check_list_status = $my_undone_control[0];
- $deadline_ts = $my_undone_control[1];
- $my_control = $my_undone_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));
-
- foreach($control_areas['cat_list'] as $area)
+ if(count( $assigned_controls_on_date) > 1 )
{
- if($area['cat_id'] == $my_control["control_area_id"])
- {
- $control_area_name = $area['name'];
- }
+ $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'>"
+ );
}
- $date_str = date($dateformat, $deadline_ts);
-
- if($check_list_status == "add")
+ foreach($assigned_controls_on_date as $my_assigned_control)
{
- $check_list_type = $my_undone_control[3];
+ $check_list_status = $my_assigned_control[0];
+ $deadline_ts = $my_assigned_control[1];
+ $my_control = $my_assigned_control[2];
- if($check_list_type == "location")
+ $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($control_areas['cat_list'] as $area)
{
- $location_code = $my_undone_control[4];
+ if($area['cat_id'] ==
$my_control["control_area_id"])
+ {
+ $control_area_name = $area['name'];
+ }
+ }
+
+ $date_str = date($dateformat, $deadline_ts);
+
+ if($check_list_status == "add")
+ {
+ $check_list_type = $my_assigned_control[3];
+
+ 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(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>",
+ '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>",
+ '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 if($check_list_type == "component")
+ {
+ $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(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>",
+ '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>",
+ '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 if($check_list_status == "edit")
+ {
+ $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"];
-
- $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>",
- '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))
- );
+
+ 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>",
+ '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>",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id))
+ );
+ }
}
- else if($check_list_type == "component")
- {
- $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));
-
- $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>",
- '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))
+ }
+
+ if(count( $assigned_controls_on_date ) > 1 )
+ {
+ $portalbox2->data[] = array(
+ 'text' => "</ul>"
);
- }
}
- else if($check_list_status == "edit")
- {
- $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"];
-
- $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>",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.edit_check_list',
'check_list_id' => $check_list_id))
- );
- }
}
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";
@@ -592,4 +707,15 @@
}
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10005] Merge 10002:10004 from trunk,
Sigurd Nes <=