[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10637] Merge 10627:1063 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10637] Merge 10627:1063 from trunk |
|
Date: |
Wed, 02 Jan 2013 12:51:40 +0000 |
Revision: 10637
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10637
Author: sigurdne
Date: 2013-01-02 12:51:40 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Merge 10627:1063 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_group_component.inc.php
branches/Version-1_0-branch/controller/inc/hook_home.inc.php
branches/Version-1_0-branch/controller/templates/base/control_group/control_groups.xsl
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/hook_settings.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,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -533,7 +533,6 @@
'calendar/icon_color_map', 'calendar/select_my_locations',
'calendar/nav_calendar_year'), $data);
phpgwapi_jquery::load_widget('core');
-// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
@@ -618,7 +617,6 @@
'calendar/icon_color_map', 'calendar/select_my_locations',
'calendar/nav_calendar_month'), $data);
phpgwapi_jquery::load_widget('core');
-// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
Modified:
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -89,126 +89,6 @@
function index()
{
-/* if(phpgw::get_var('phpgw_return_as') == 'json') {
- return $this->query();
- }
- $building_types =
execMethod('property.soadmin_location.read',array());
-
- $type_id = 1;
-
- $category_types =
$this->bocommon->select_category_list(array(
-
'format'=>'filter',
-
'selected' =>
$this->cat_id,
-
'type'
=>'location',
-
'type_id'
=>$type_id,
-
'order'=>'descr'
-
));
-
- $district_list =
$this->bocommon->select_district_list('filter',$this->district_id);
- $default_value = array ('id'=>'','name'=>lang('no
district'));
- array_unshift($district_list,$default_value);
-
- $part_of_town_list =
$this->bocommon->select_part_of_town('filter',$this->part_of_town_id,$this->district_id);
- $default_value = array ('id'=>'','name'=>lang('no part
of town'));
- array_unshift($part_of_town_list,$default_value);
-
- $_role_criteria = array
- (
- 'type' =>
'responsibility_role',
- 'filter' =>
array('location' => ".location.{$type_id}"),
- 'order' => 'name'
- );
-
- $responsibility_roles_list =
execMethod('property.sogeneric.get_list',$_role_criteria);
- $default_value = array ('id'=>'','name'=>lang('no
role'));
- array_unshift ($responsibility_roles,$default_value);
-
- $control_areas_array =
$this->so_control_area->get_control_areas_as_array();
-
- // Fetches prosedures that are related to first control
area in list
- $control_area_id = $control_areas_array[0]['id'];
-
- $lists = array
- (
- 'building_types' =>
$building_types,
- 'category_types' =>
$category_types,
- 'district_list' =>
$district_list,
- 'part_of_town_list' =>
$part_of_town_list,
- 'responsibility_roles_list' =>
$responsibility_roles_list,
- 'control_area_list' =>
$control_areas_array,
- );
-
-
-
-
- $data = array(
- 'datatable' => array(
- 'source' =>
self::link(array('menuaction' => 'controller.uicheck_list_for_component.index',
'phpgw_return_as' => 'json')),
- 'field' => array(
- array(
- 'key' =>
'location_code',
- 'label' =>
lang('Property'),
- 'sortable' => true,
- 'formatter' =>
'YAHOO.portico.formatLink'
- ),
- array(
- 'key' =>
'loc1_name',
- 'label' =>
lang('Property name'),
- 'sotrable' =>
false
- ),
- array(
- 'key' => 'adresse1',
- 'label' =>
lang('Address'),
- 'sortable' => false
- ),
- array(
- 'key' => 'postnummer',
- 'label' => lang('Zip
code'),
- 'sortable' => false
- ),
- array(
- 'key' => 'checked',
- 'label' => 'Velg',
- 'sortable' => false,
- 'formatter' =>
'YAHOO.widget.DataTable.formatCheckbox',
- 'className' =>
'mychecks'
- ),
- array(
- 'key' => 'link',
- 'hidden' => true
- ),
- array(
- 'key' => 'actions',
- 'hidden' => true
- ),
- array(
- 'key' => 'labels',
- 'hidden' => true
- ),
- array(
- 'key' => 'ajax',
- 'hidden' => true
- ),
- array(
- 'key' => 'alert',
- 'hidden' => true
- )
- )
- ),
- 'lists' => $lists
- );
-
- //self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
- self::add_javascript('controller', 'controller',
'controller_datatable_test.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
- //self::add_javascript('controller', 'yahoo',
'component_location.js');
-
- //$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'equipmens_location', 'controller' );
-
- //self::render_template_xsl('datatable_common', $data);
- self::render_template_xsl('component', $data);
-*/
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
@@ -269,7 +149,6 @@
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
-// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control_component_tabs', 'common',
'view_component_for_control'), $data);
@@ -377,7 +256,6 @@
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
-// self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
self::render_template_xsl(array('control_component_tabs', 'common',
'add_component_to_control'), $data);
Modified: branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -379,7 +379,7 @@
}
// Fetches control groups based on selected control
area
- $contro_area =
execMethod('phpgwapi.categories.return_single',
$control->get_control_area_id());
+ $control_area =
execMethod('phpgwapi.categories.return_single',
$control->get_control_area_id());
$control_groups_as_array =
$this->so_control_group->get_control_groups_as_array($control->get_control_area_id());
$control_groups = array();
@@ -508,7 +508,6 @@
if(!$status_control_item_saved){
$control_items_for_group_array[] = array("checked" => 0, "control_item" =>
$control_item->toArray());
}
-
}
$groups_with_control_items[] =
array("control_group" => $control_group->toArray(), "group_control_items" =>
$control_items_for_group_array);
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -383,9 +383,7 @@
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- // self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
- // self::add_javascript('controller',
'controller', 'jquery-ui.custom.min.js');
self::render_template_xsl(array('control_group/control_group_tabs','control_group/control_group','control_group/control_group_items'),
$data);
}
else if(isset($_POST['save_control_group_items']))
@@ -529,9 +527,7 @@
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- // self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
- // self::add_javascript('controller',
'controller', 'jquery-ui.custom.min.js');
self::render_template_xsl(array('control_group/control_group_tabs','control_group/control_group','control_group/control_group_items'),
$data);
}
}
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_group_component.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.uicontrol_group_component.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++
branches/Version-1_0-branch/controller/inc/class.uicontrol_group_component.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -179,7 +179,6 @@
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
-// self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
self::render_template_xsl(array('control_group_component_tabs', 'common',
'add_component_to_control_group'), $data);
Modified: branches/Version-1_0-branch/controller/inc/hook_home.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++ branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -48,29 +48,40 @@
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$styling = "\n".'<!-- BEGIN checklist info -->'."\n ";
- $styling .= "<style>";
- $styling .= " .home_portal_content a { color:#0066CC;text-decoration:
none;text-transform: uppercase;} .home_portal{margin:20px 20px 0 10px;} ";
+ $styling .= "<style>";
$styling .= " .home-box { background: none repeat scroll 0 0 #EDF5FF;
border-color: #DBE5EF; border-radius: 4px; margin: 5px 20px 20px;}";
$styling .= " .home-box .home_portal { margin: 0;border: 1px solid
#DEEAF8;}";
- $styling .= " .home_portal_content { padding:5px 10px;}";
- $styling .= " .home_portal_title h2 {
overflow:hidden;clear:left;font-size: 13px;font-weight:
bold;text-transform:uppercase; background: #DEEAF8; margin: 0; padding: 2px
10px; color: #1C3C6F;}";
- $styling .= " .property_tickets .home_portal_title h2 { font-size:
20px; padding: 5px 10px;}";
- $styling .= " .home_portal_content ul li { clear: left; overflow:
hidden; padding: 3px 0;}";
+
+ $styling .= " .home_portal { margin:20px 20px 0 10px; }";
+ $styling .= " .home_portal a { color:#0066CC;text-decoration:
none;text-transform: uppercase;}";
+ $styling .= " .home_portal h2 { overflow:hidden;clear:left;font-size:
13px;font-weight: bold;text-transform:uppercase; background: #DEEAF8; margin:
0; padding: 2px 10px; color: #1C3C6F;}";
+ $styling .= " .home_portal h2 div{ display:block;float:left;cursor:
pointer;vertical-align: middle;}";
$styling .= " .home_portal .title { width:300px;margin:0 20px 0 0;}";
$styling .= " .home_portal .control-area { width:200px;}";
$styling .= " .home_portal .control { width:300px;}";
$styling .= " .home_portal .date { width:300px;}";
+ $styling .= " .home_portal li { margin: 5px;}";
$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 .= " h4.expand_trigger img {
vertical-align:middle;margin-right:3px; }";
- $styling .= " h4.expand_trigger span { vertical-align:middle; }";
- $styling .= " .expand_list{ display:none; }";
+
+ $styling .= " .home_portal_content ul li { clear: both; overflow:
hidden;}";
+ $styling .= " .home_portal_content { padding:5px 10px;}";
+ $styling .= " .property_tickets .home_portal_title h2 { font-size:
20px; padding: 5px 10px;}";
+
+ $styling .= " h2.heading { font-size: 22px; font-weight: normal;margin:
0 0 0 20px;}";
+
+ $styling .= " h4.expand_trigger { clear:both;overflow:hidden;font-size:
12px;color:#031647;background: #D0DEF4;padding:2px 4px;margin:0; }";
+ $styling .= " h4.expand_trigger img {
float:left;vertical-align:middle;margin-right:3px; }";
+ $styling .= " h4.expand_trigger span {
float:left;display:block;vertical-align:middle; }";
+ $styling .= " h4.expand_trigger span.deadline { width:805px; }";
+ $styling .= " h4.expand_trigger span.num_check_lists { width:200px; }";
+
+ $styling .= " .expand_list{ display:none; overflow:hidden; }";
+ $styling .= " .expand_list li{ clear:both;overflow:hidden; }";
+
$styling .= "</style>";
$styling .= "\n".'<!-- END checklist info -->'."\n";
echo $styling;
-// echo "<script src='controller/js/controller/jquery.js'></script>";
echo "<script
src='phpgwapi/js/jquery/js/jquery-1.7.2.min.js'></script>";
$script = "<script>";
@@ -232,28 +243,22 @@
}
}
}
-
- $portalbox0 = CreateObject('phpgwapi.listbox', array
- (
- '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'],
- 'width' => '100%',
- 'outerborderwidth' => '0',
- 'header_background_image' =>
$GLOBALS['phpgw']->common->image('phpgwapi','bg_filler', '.png', False)
- ));
+ $my_undone_controls_HTML = "<div class='home_portal'><h2><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></h2>";
+
// Sorts my_undone_controls by deadline date
ksort($my_undone_controls);
+ $my_undone_controls_HTML .= "<ul>";
+
foreach($my_undone_controls as $date_ts => $controls_on_date)
{
+ // If number of controls on a date exceeds 1 it will be put
in expand list
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'>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'>"
- );
+ $my_undone_controls_HTML .= "<li>";
+ $my_undone_controls_HTML .= "<a href='#'><h4
class='expand_trigger'><img height='12' src='controller/images/arrow_right.png'
/><span class='deadline'>Frist: " . date($dateformat, $date_ts) .
"</span><span class='num_check_lists'>Antall kontroller: " .
count($controls_on_date) . "</span></h4></a>";
+ $my_undone_controls_HTML .= "<ul
class='expand_list'>";
}
foreach($controls_on_date as $my_undone_control)
@@ -291,17 +296,17 @@
if(count( $controls_on_date) > 1 )
{
- $portalbox0->data[] = array(
- '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))
- );
+ $link = "";
+ $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));
+
+ $my_undone_controls_HTML .=
"<li><a href='{$link}'><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></a></li>";
}
else
{
- $portalbox0->data[] = array(
- '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))
- );
+ $link = "";
+ $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));
+
+ $my_undone_controls_HTML .= "<a
href='{$link}'><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></a>";
}
}
@@ -322,17 +327,17 @@
if(count( $controls_on_date) > 1 )
{
- $portalbox0->data[] = array(
- '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))
- );
+ $link = "";
+ $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));
+
+ $my_undone_controls_HTML .=
"<li><a href='{$link}'><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></a></li>";
}
else
{
- $portalbox0->data[] = array(
- '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))
- );
+ $link = "";
+ $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));
+
+ $my_undone_controls_HTML .= "<a
href='{$link}'><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></a>";
}
}
}
@@ -349,30 +354,30 @@
if(count( $controls_on_date) > 1 )
{
- $portalbox0->data[] = array(
- '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))
- );
+ $link = "";
+ $link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
+
+ $my_undone_controls_HTML .= "<li><a
href='{$link}'><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></a></li>";
}
else
{
- $portalbox0->data[] = array(
- '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))
- );
+ $link = "";
+ $link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
+
+ $my_undone_controls_HTML .= "<a
href='{$link}'><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></a>";
}
}
}
if(count( $controls_on_date) > 1 )
{
- $portalbox0->data[] = array(
- 'text' => "</ul>"
- );
+ $my_undone_controls_HTML .= "</ul>";
}
}
- echo "\n".'<!-- BEGIN checklist info -->'."\n <h2 class='heading'>Mine
glemte kontroller</h2><div
class='home-box'>".$portalbox0->draw()."</div>\n".'<!-- END checklist info
-->'."\n";
+ $my_undone_controls_HTML .= "</div>"; // home_portal
+
+ echo "\n".'<!-- BEGIN checklist info -->'."\n <h2 class='heading'>Mine
glemte kontroller</h2><div
class='home-box'>".$my_undone_controls_HTML."</div>\n".'<!-- END checklist info
-->'."\n";
/* ======================================= PLANNED CONTROLS FOR
CURRENT USER ================================= */
@@ -469,7 +474,6 @@
$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='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()))
));
@@ -491,19 +495,9 @@
-
/* ================================ CONTROLS ASSIGNED TO CURRENT USER
================================= */
- $portalbox2 = CreateObject('phpgwapi.listbox', array
- (
- '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'],
- 'width' => '100%',
- 'outerborderwidth' => '0',
- 'header_background_image' =>
$GLOBALS['phpgw']->common->image('phpgwapi','bg_filler', '.png', False)
- ));
+ $my_assigned_controls_HTML = "<div class='home_portal'><h2><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></h2>";
$my_controls = array();
$repeat_type = null;
@@ -545,7 +539,7 @@
{
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 );
}
}
}
@@ -555,7 +549,6 @@
$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];
@@ -620,16 +613,21 @@
$cats->supress_info = true;
$control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals'
=> true,'use_acl' => $this->_category_acl));
+ $my_assigned_controls_HTML .= "<ul>";
+
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($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($assigned_controls_on_date) . "</span></h4><ul
class='expand_list'>"
- );
+ $my_assigned_controls_HTML .= "<li>";
+ $my_assigned_controls_HTML .= "<a href='#'><h4
class='expand_trigger'><img height='12' src='controller/images/arrow_right.png'
/><span class='deadline'>Frist: " . date($dateformat, $date_ts) .
"</span><span class='num_controls'>Antall kontroller: " .
count($assigned_controls_on_date) . "</span></h4></a>";
}
+ if(count( $assigned_controls_on_date ) > 1 )
+ {
+ $my_assigned_controls_HTML .= "<ul
class='expand_list'>";
+ }
+
foreach($assigned_controls_on_date as $my_assigned_control)
{
$check_list_status = $my_assigned_control[0];
@@ -665,19 +663,17 @@
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='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))
- );
+ $link = "";
+ $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));
+
+ $my_assigned_controls_HTML .=
"<li><a href='$link'><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></a></li>";
}
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='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))
- );
+ $link = "";
+ $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));
+
+ $my_assigned_controls_HTML .=
"<a href='$link'><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></a>";
}
}
else if($check_list_type == "component")
@@ -697,19 +693,17 @@
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='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))
- );
+ $link = "";
+ $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));
+
+ $my_assigned_controls_HTML .=
"<li><a href='$link'><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></a></li>";
}
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='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))
- );
+ $link = "";
+ $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));
+
+ $my_assigned_controls_HTML .=
"<a href='$link'><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></a>";
}
}
}
@@ -726,29 +720,31 @@
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='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))
- );
- }
+ $link = "";
+ $link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
+
+ $my_assigned_controls_HTML .= "<li><a
href='$link'><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></a></li>";
+ }
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='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))
- );
+ $link = "";
+ $link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
+
+ $my_assigned_controls_HTML .= "<a
href='$link'><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></a>";
}
}
}
if(count( $assigned_controls_on_date ) > 1 )
+ {
+ $my_assigned_controls_HTML .= "</li>";
+ }
+
+ if(count( $assigned_controls_on_date ) > 1 )
{
- $portalbox2->data[] = array(
- 'text' => "</ul>"
- );
- }
+ $my_assigned_controls_HTML .= "</ul>";
+ }
+
}
- 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";
+ echo "\n".'<!-- BEGIN checklist info -->'."\n <h2 class='heading'>Mine
tildelte kontroller</h2><div class='home-box'>" . $my_assigned_controls_HTML .
"</div></div>\n".'<!-- END checklist info -->'."\n";
Modified:
branches/Version-1_0-branch/controller/templates/base/control_group/control_groups.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_group/control_groups.xsl
2013-01-02 12:40:46 UTC (rev 10636)
+++
branches/Version-1_0-branch/controller/templates/base/control_group/control_groups.xsl
2013-01-02 12:51:40 UTC (rev 10637)
@@ -4,7 +4,7 @@
<div class="yui-content tab_content">
<div id="control_groups">
- <h2><xsl:value-of select="control_area/title"/></h2>
+ <h2>Velg kontrollgrupper fra <xsl:value-of
select="control_area/name"/></h2>
<xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicontrol.save_control_groups')" /></xsl:variable>
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -680,12 +680,20 @@
$sql_workder_date_filter = "AND
fm_workorder.start_date >= $start_date AND fm_workorder.start_date <= $end_date
";
}
+/*
$sql_workder = 'SELECT
fm_workorder.id, budget, combined_cost, billable_hours, closed,
sum(fm_orders_paid_or_pending_view.amount) AS actual_cost'//, contract_sum,
addition, calculation, budget'
. " FROM fm_workorder"
. " {$this->join} fm_workorder_status
ON fm_workorder.status = fm_workorder_status.id"
. " {$this->left_join}
fm_orders_paid_or_pending_view ON fm_workorder.id =
fm_orders_paid_or_pending_view.order_id"
. " WHERE project_id =
'{$project['project_id']}' {$sql_workder_date_filter}"
. " GROUP BY fm_workorder.id, budget,
combined_cost, billable_hours, closed";
+
+*/
+ $sql_workder = 'SELECT
fm_workorder.id, budget, combined_cost, billable_hours, closed, actual_cost,
pending_cost'//, contract_sum, addition, calculation, budget'
+ . " FROM fm_workorder"
+ . " {$this->join} fm_workorder_status
ON fm_workorder.status = fm_workorder_status.id"
+ . " {$this->left_join}
fm_orders_pending_cost_view ON fm_workorder.id =
fm_orders_pending_cost_view.order_id"
+ . " WHERE project_id =
'{$project['project_id']}' {$sql_workder_date_filter}";
//_debug_array($sql_workder);
$this->db->query($sql_workder,__LINE__,__FILE__);
@@ -696,7 +704,7 @@
while ($this->db->next_record())
{
$_combined_cost =
$this->db->f('combined_cost');
- $_actual_cost =
$this->db->f('actual_cost');
+ $_actual_cost =
$this->db->f('actual_cost') + (float)$this->db->f('pending_cost');
if(!$this->db->f('closed'))
{
//$test[] = $this->db->f('id');
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -1987,9 +1987,11 @@
);
}
+ $project_type_id = isset($values['project_type_id']) &&
$values['project_type_id'] ? $values['project_type_id'] :
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_type'];
+
$data = array
(
- 'project_types'
=> array('options' =>
$this->bo->get_project_types($values['project_type_id'])),
+ 'project_types'
=> array('options' =>
$this->bo->get_project_types($project_type_id)),
'project_type_id'
=> $values['project_type_id'],
'inherit_location'
=> $id ? $values['inherit_location'] : 1,
'mode'
=> $mode,
Modified: branches/Version-1_0-branch/property/inc/hook_settings.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2013-01-02 12:40:46 UTC (rev 10636)
+++ branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2013-01-02 12:51:40 UTC (rev 10637)
@@ -236,6 +236,17 @@
unset($soworkorder);
unset($socommon);
+
+ $default_project_type =array
+ (
+ '1' => lang('operation'),
+ '2' => lang('investment'),
+ '3' => lang('buffer')
+ );
+
+ create_select_box('Default project
type','default_project_type',$default_project_type,'Select your default project
type');
+
+
create_select_box('Default project
status','project_status',$_status_project,'The default status for your
projects');
create_select_box('Default workorder
status','workorder_status',$_status_workorder,'The default status for your
workorders');
create_select_box('Default project
categories','project_category',$_categories_project,'The default category for
your projects and workorders');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10637] Merge 10627:1063 from trunk,
Sigurd Nes <=