[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10032] Merge 10013:10031 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10032] Merge 10013:10031 from trunk |
|
Date: |
Tue, 25 Sep 2012 09:13:56 +0000 |
Revision: 10032
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10032
Author: sigurdne
Date: 2012-09-25 09:13:55 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
Merge 10013:10031 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.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/class.uicontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
branches/Version-1_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
branches/Version-1_0-branch/controller/inc/helper/class.date_helper.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/controller/templates/base/calendar/calendar_filters.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_manager.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/add_case.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/case_row.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/cases_tab_menu.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_cases_for_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_details.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_info.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_items.xsl
branches/Version-1_0-branch/controller/templates/base/control/control.xsl
branches/Version-1_0-branch/controller/templates/base/control/control_details.xsl
branches/Version-1_0-branch/controller/templates/base/control_group/control_groups.xsl
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
branches/Version-1_0-branch/controller/templates/base/control_item/control_item.xsl
branches/Version-1_0-branch/controller/templates/base/control_item/control_item_option.xsl
branches/Version-1_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_documents.xsl
branches/Version-1_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-1_0-branch/preferences/inc/hook_settings.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/logistic/
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
+
/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
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-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -749,7 +749,7 @@
$whereclause_date = "AND last_change_date >
{$from_date}";
}
$activities = array();
- $sql = "SELECT * FROM activity_activity where state in (3,5)
{$whereclause_date}";
+ $sql = "SELECT * FROM activity_activity where state in (2,3,5)
{$whereclause_date}";
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
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-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -202,7 +202,7 @@
* @return array with controls as objects or arrays
*/
- public function
get_controls_for_components_by_location($location_code, $from_date, $to_date,
$repeat_type, $return_type = "return_object", $role_id = 0)
+ public function
get_controls_for_components_by_location($location_code, $from_date, $to_date,
$repeat_type, $role_id = 0)
{
$controls_array = array();
@@ -231,31 +231,25 @@
while($this->db->next_record())
{
- $control = new
controller_control($this->unmarshal($this->db->f('id'), 'int'));
-
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-
$control->set_description($this->unmarshal($this->db->f('description', true),
'string'));
-
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
-
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
'int'));
-
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
-
$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;
- }
- else
- {
- $controls_array[] = $control->toArray();
- }
+
+ $controls_array[] = array
+ (
+ 'id'
=> $this->db->f('id'),
+ 'title'
=> $this->db->f('title', true),
+ 'description' =>
$this->db->f('description', true),
+ 'start_date' =>
$this->db->f('start_date'),
+ 'end_date'
=> $this->db->f('end_date'),
+ 'procedure_id' =>
$this->db->f('procedure_id'),
+ 'requirement_id' =>
$this->db->f('requirement_id'),
+ 'costresponsibility_id' =>
$this->db->f('costresponsibility_id'),
+ 'responsibility_id' =>
$this->db->f('responsibility_id'),
+ 'responsibility_name' =>
$this->db->f('responsibility_name', true),
+ 'control_area_id' =>
$this->db->f('control_area_id'),
+ 'repeat_type' =>
$this->db->f('repeat_type'),
+ 'repeat_interval' =>
$this->db->f('repeat_interval'),
+ 'component_id' =>
$this->db->f('component_id'),
+ 'location_id' =>
$this->db->f('location_id')
+ );
}
return $controls_array;
@@ -356,8 +350,6 @@
$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")
{
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -28,7 +28,12 @@
* @version $Id$
*/
- phpgw::import_class('phpgwapi.uicommon');
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
+ phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('controller.socheck_list');
include_class('controller', 'check_list', 'inc/model/');
@@ -212,10 +217,10 @@
'current_repeat_type' =>
$repeat_type
);
- self::add_javascript('controller', 'controller',
'jquery.js');
+
+ phpgwapi_jquery::load_widget('autocomplete');
+
self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
self::add_stylesheet('controller/templates/base/css/jquery-ui.custom.css');
self::render_template_xsl(array('calendar/view_calendar_month',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations',
@@ -401,10 +406,9 @@
'calendar/select_buildings_on_property', 'calendar/nav_calendar_year',
'calendar/calendar_filters'), $data);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('autocomplete');
+
self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
self::add_stylesheet('controller/templates/base/css/jquery-ui.custom.css');
}
public function view_calendar_year_for_locations()
@@ -448,7 +452,7 @@
$agg_open_cases_pr_month_array =
$this->build_agg_open_cases_pr_month_array($cl_criteria, $year, $from_month,
$to_month);
$year_calendar_agg = new
year_calendar_agg($control, $year, $curr_location_code,
"VIEW_LOCATIONS_FOR_CONTROL");
- $calendar_array =
$year_calendar->build_calendar($agg_open_cases_pr_month_array);
+ $calendar_array =
$year_calendar_agg->build_calendar($agg_open_cases_pr_month_array);
$locations_with_calendar_array[] =
array( "location" => $location, "calendar_array" => $calendar_array );
}
@@ -531,7 +535,8 @@
self::render_template_xsl(
array('calendar/view_calendar_year_for_locations',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations',
'calendar/nav_calendar_year'), $data);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
@@ -570,13 +575,14 @@
$location_with_check_lists =
$this->so->get_check_lists_for_control_and_location($control_id,
$curr_location_code, $from_date_ts, $to_date_ts, $control->get_repeat_type());
$check_lists_array =
$location_with_check_lists["check_lists_array"];
-
- $month_calendar = new month_calendar($control,
$year, $month, null, $location_code, "location");
+
+
+ $month_calendar = new month_calendar($control,
$year, $month, null, $curr_location_code, "location");
$calendar_array =
$month_calendar->build_calendar( $check_lists_array );
$locations_with_calendar_array[] =
array("location" => $location, "calendar_array" => $calendar_array);
}
-
+
foreach( $components_for_control_array as $component )
{
$short_desc_arr =
execMethod('property.soentity.get_short_description', array('location_id' =>
$component->get_location_id(), 'id' => $component->get_id()));
@@ -615,7 +621,8 @@
self::render_template_xsl(
array('calendar/view_calendar_month_for_locations',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations',
'calendar/nav_calendar_month'), $data);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
@@ -852,4 +859,4 @@
}
public function query(){}
- }
\ No newline at end of file
+ }
Modified: branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -28,6 +28,11 @@
* @version $Id: class.uicheck_list.inc.php 8419 2011-12-23 09:54:15Z
vator $
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('controller.socase');
@@ -215,32 +220,54 @@
$data = array
(
- 'categories'
=> $categories,
- 'check_list'
=> $check_list->toArray(),
- 'control'
=> $control->toArray(),
+ 'categories' =>
$categories,
+ 'check_list' =>
$check_list->toArray(),
+ 'control'
=> $control->toArray(),
'check_items_and_cases' =>
$check_items_and_cases,
- 'date_format'
=> $date_format,
- 'location_array'
=> $location_array,
- 'component_array'
=> $component_array,
+ 'date_format' =>
$date_format,
+ 'location_array' =>
$location_array,
+ 'component_array' =>
$component_array,
'building_location_code' =>
$building_location_code,
- 'current_year'
=> $year,
- 'current_month_nr'
=> $month,
- 'type'
=> $type,
- 'location_level'
=> $level
+ // 'current_year' =>
$year,
+ // 'current_month_nr' =>
$month,
+ 'type'
=> $type,
+ 'location_level' =>
$level,
+ 'dateformat' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
+ 'action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicase.send_case_message')),
+ 'url_calendar_for_year' =>
$GLOBALS['phpgw']->link('/index.php', array
+
(
+
'menuaction' => 'controller.uicalendar.view_calendar_for_year',
+
'year' => $year,
+
'location_code' => $type == 'component' ? $building_location_code :
$location_array['location_code']
+
)
+
),
+ 'url_calendar_for_month' =>
$GLOBALS['phpgw']->link('/index.php', array
+
(
+
'menuaction' => 'controller.uicalendar.view_calendar_for_month',
+
'year' => $year,
+
'month' => $month,
+
'location_code' => $type == 'component' ? $building_location_code :
$location_array['location_code']
+
)
+
),
);
- if(count( $buildings_array ) > 0){
+ if(count( $buildings_array ) > 0)
+ {
$data['buildings_array'] = $buildings_array;
- }else{
+ }
+ else
+ {
$data['building_array'] = $building_array;
}
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ phpgwapi_jquery::load_widget('core');
+
+// self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
self::render_template_xsl(array('check_list/check_list_tab_menu',
'case/create_case_message'), $data);
}
@@ -340,7 +367,8 @@
$this->redirect(array('menuaction' =>
'controller.uicase.view_case_message', 'check_list_id'=>$check_list_id,
'message_ticket_id'=>$message_ticket_id));
}
- function view_case_message(){
+ function view_case_message()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$message_ticket_id =
phpgw::get_var('message_ticket_id');
@@ -389,29 +417,60 @@
$data = array
(
- 'control'
=> $control->toArray(),
- 'message_ticket_id'
=> $message_ticket_id,
- 'message_ticket'
=> $message_ticket,
- 'category'
=> $category[0]['name'],
- 'location_array'
=> $location_array,
- 'component_array'
=> $component_array,
- 'control_array'
=> $control->toArray(),
- 'check_list'
=> $check_list->toArray(),
- 'check_items_and_cases' =>
$check_items_and_cases,
- 'current_year'
=> $year,
- 'current_month_nr'
=> $month,
- 'date_format'
=> $date_format,
- 'type'
=> $type,
- 'building_location_code' =>
$building_location_code,
- 'location_level'
=> $level
+ 'control'
=> $control->toArray(),
+ // 'message_ticket_id'
=> $message_ticket_id,
+ 'message_ticket'
=> $message_ticket,
+ 'category'
=> $category[0]['name'],
+ 'location_array'
=> $location_array,
+ 'component_array'
=> $component_array,
+ 'control_array'
=> $control->toArray(),
+ 'check_list'
=> $check_list->toArray(),
+ 'check_items_and_cases' =>
$check_items_and_cases,
+ // 'current_year'
=> $year,
+ // 'current_month_nr'
=> $month,
+ 'date_format'
=> $date_format,
+ 'type'
=> $type,
+ 'building_location_code' =>
$building_location_code,
+ 'location_level'
=> $level,
+ 'dateformat'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
+ 'url_calendar_for_year' =>
$GLOBALS['phpgw']->link('/index.php', array
+
(
+
'menuaction' => 'controller.uicalendar.view_calendar_for_year',
+
'year' => $year,
+
'location_code' => $type == 'component' ? $building_location_code :
$location_array['location_code']
+
)
+
),
+ 'url_calendar_for_month' =>
$GLOBALS['phpgw']->link('/index.php', array
+
(
+
'menuaction' => 'controller.uicalendar.view_calendar_for_month',
+
'year' => $year,
+
'month' => $month,
+
'location_code' => $type == 'component' ? $building_location_code :
$location_array['location_code']
+
)
+
),
+ 'url_ticket_view'
=> $GLOBALS['phpgw']->link('/index.php', array
+
(
+
'menuaction' => 'property.uitts.view',
+
'id' => $message_ticket_id
+
)
+
),
+
+ 'url_ticket_new'
=> $GLOBALS['phpgw']->link('/index.php', array
+
(
+
'menuaction' => 'controller.uicase.create_case_message',
+
'check_list_id' => $check_list->get_id()
+
)
+
),
);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ phpgwapi_jquery::load_widget('core');
+
+// self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
self::render_template_xsl(array('check_list/check_list_tab_menu',
'case/view_case_message'), $data);
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -28,6 +28,14 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
+ /**
+ * Import the yui class
+ */
phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('controller.socheck_list');
@@ -264,12 +272,12 @@
'location_level' =>
$level
);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ // phpgwapi_jquery::load_widget('core');
+ $GLOBALS['phpgw']->jqcal->add_listener('planned_date');
+
$GLOBALS['phpgw']->jqcal->add_listener('completed_date');
+
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
self::add_stylesheet('controller/templates/base/css/jquery-ui.custom.css');
-
self::render_template_xsl('check_list/add_check_list',
$data);
}
@@ -337,13 +345,13 @@
'location_level'
=> $level
);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ $GLOBALS['phpgw']->jqcal->add_listener('planned_date');
+
$GLOBALS['phpgw']->jqcal->add_listener('completed_date');
+ $GLOBALS['phpgw']->jqcal->add_listener('deadline_date');
+
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
$data);
}
@@ -364,18 +372,26 @@
$completed_date = phpgw::get_var('completed_date',
'string');
$comment = phpgw::get_var('comment', 'string');
- $deadline_date_ts =
date_helper::get_timestamp_from_date( $deadline_date, "d/m-Y" );
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
+ $deadline_date_ts =
date_helper::get_timestamp_from_date( $deadline_date, $dateformat );
- if($planned_date != ''){
- $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
- }else{
+ if($planned_date != '')
+ {
+ $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, $dateformat );
+ }
+ else
+ {
$planned_date_ts = 0;
}
- if($completed_date != ''){
- $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
+ if($completed_date != '')
+ {
+ $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, $dateformat );
$status = controller_check_list::STATUS_DONE;
- }else{
+ }
+ else
+ {
$completed_date_ts = 0;
}
@@ -485,12 +501,13 @@
'current_month_nr'
=> $month
);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
}
@@ -543,7 +560,7 @@
$component = new controller_component();
$component->set_location_code(
$component_arr['location_code'] );
- $component->set_xml_short_desc( $short_desc );
+ $component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
$type = 'component';
@@ -562,20 +579,21 @@
$data = array
(
- 'control'
=> $control->toArray(),
- 'check_list'
=> $check_list->toArray(),
- 'location_array'
=> $location_array,
- 'component_array'
=> $component_array,
- 'date_format'
=> $date_format,
- 'type'
=> $type,
- 'current_year'
=> $year,
- 'current_month_nr'
=> $month,
+ 'control'
=> $control->toArray(),
+ 'check_list' =>
$check_list->toArray(),
+ 'location_array' =>
$location_array,
+ 'component_array' =>
$component_array,
+ // 'date_format' =>
$date_format,
+ 'type'
=> $type,
+ 'current_year' =>
$year,
+ 'current_month_nr' =>
$month,
'building_location_code' =>
$building_location_code,
- 'location_level'
=> $level
+ 'location_level' =>
$level
);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ phpgwapi_jquery::load_widget('core');
+// self::add_javascript('controller', 'controller',
'jquery.js');
+// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
}
@@ -702,7 +720,9 @@
'current_month_nr'
=> $month
);
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+
+// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.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
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -28,6 +28,10 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon');
@@ -262,9 +266,10 @@
);
phpgwapi_yui::load_widget('paginator');
+ 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',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control_component_tabs', 'common',
'view_component_for_control'), $data);
@@ -369,9 +374,10 @@
phpgwapi_yui::load_widget('paginator');
+ 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', '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
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -28,6 +28,11 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('property.boevent');
phpgw::import_class('controller.socontrol');
@@ -280,28 +285,26 @@
$data = array
(
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
- 'view'
=> "control_details",
- 'editable'
=> true,
- 'control'
=> ($control != null) ? $control->toArray() : null,
+ 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
+ 'view'
=> "control_details",
+ 'editable'
=> true,
+ 'control'
=> ($control != null) ? $control->toArray() : null,
'control_areas_array' =>
$control_areas_array,
'procedures_array' =>
$procedures_array,
- 'role_array'
=> $role_array,
- 'repeat_type_array' =>
$repeat_type_array
+ 'role_array' =>
$role_array,
+ 'repeat_type_array' =>
$repeat_type_array,
+ 'dateformat' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
+ 'action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.save_control_details'))
);
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');
- //$GLOBALS['phpgw']->jqcal->add_listener('start_date');
- //$GLOBALS['phpgw']->jqcal->add_listener('end_date');
-
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
+
+ $this->use_yui_editor(array('description'));
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date');
+
self::render_template_xsl(array('control/control_tabs',
'control/control'), $data);
-
- $this->use_yui_editor(array('description'));
}
/**
@@ -407,8 +410,9 @@
'control_groups' => $control_groups,
);
+ 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',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control/control_tabs',
'control_group/control_groups'), $data);
}
@@ -523,8 +527,10 @@
'groups_with_control_items' =>
$groups_with_control_items
);
+ 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',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control/control_tabs',
'control_item/choose_control_items'), $data);
@@ -600,8 +606,10 @@
'saved_groups_with_items_array' =>
$saved_groups_with_items_array
);
+ 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',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'yui_min_3_4_3.js');
self::add_javascript('controller', 'controller',
'custom_drag_drop.js');
@@ -612,11 +620,12 @@
public function get_control_details()
{
$control_id = phpgw::get_var('control_id');
- $control = $this->so->get_single($control_id);
-
- $data = array
+ $control = $this->so->get_single($control_id);
+
+ $data = array
(
- 'control'
=> $control->toArray()
+ 'control'
=> $control->toArray(),
+ 'dateformat'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
);
self::render_template_xsl('control/control_details',
$data);
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
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -28,6 +28,11 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('property.boevent');
phpgw::import_class('controller.socontrol');
@@ -375,10 +380,12 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Control_group');
+ 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', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
- self::add_javascript('controller',
'controller', 'jquery-ui.custom.min.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']))
@@ -520,10 +527,12 @@
// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'controller.item', 'controller' );
+ 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', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
- self::add_javascript('controller',
'controller', 'jquery-ui.custom.min.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
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/inc/class.uicontrol_group_component.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -28,6 +28,10 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon');
@@ -172,9 +176,10 @@
);
phpgwapi_yui::load_widget('paginator');
+ 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', '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/class.uicontrol_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -28,6 +28,11 @@
* @version $Id$
*/
+ /**
+ * Import the jQuery class
+ */
+ phpgw::import_class('phpgwapi.jquery');
+
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('property.boevent');
phpgw::import_class('controller.socontrol');
@@ -235,9 +240,10 @@
$this->use_yui_editor(array('what_to_do','how_to_do'));
- self::add_javascript('controller', 'controller',
'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+// 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::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::render_template_xsl('control_item/control_item',
$data);
}
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -254,7 +254,9 @@
phpgwapi_yui::load_widget('paginator');
- self::add_javascript('controller',
'controller', 'jquery.js');
+ phpgwapi_jquery::load_widget('core');
+
+// self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
self::add_javascript('controller', 'yahoo',
'register_control_to_location.js');
Modified:
branches/Version-1_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -86,8 +86,9 @@
$check_list_status_info->set_check_list_id(
$this->check_list->get_id() );
}
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$check_list_status_info->set_control_id(
$this->check_list->get_control_id() );
- $check_list_status_info->set_deadline_date_txt(
date("d/m-Y", $this->check_list->get_deadline()) );
+ $check_list_status_info->set_deadline_date_txt(
date($dateformat, $this->check_list->get_deadline()) );
$check_list_status_info->set_deadline_date_ts(
$this->check_list->get_deadline() );
$check_list_status_info->set_type( $this->type );
Modified:
branches/Version-1_0-branch/controller/inc/helper/class.date_helper.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/helper/class.date_helper.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/helper/class.date_helper.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,24 +1,29 @@
<?php
- class date_helper {
+ class date_helper
+ {
- public function __construct(){}
+ public function __construct(){}
- public static function get_timestamp_from_date( $date_string, $format
){
-
- if( $format == "d/m-Y" ){
- $pos_day = strpos($date_string, "/");
- $day = date_helper::substring($date_string, 0,
$pos_day);
+ public static function get_timestamp_from_date( $date_string,
$format )
+ {
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
+ if( $format == $dateformat )
+ {
+ $pos_day = strpos($date_string, "/");
+ $day = date_helper::substring($date_string, 0,
$pos_day);
- $pos_month = strpos($date_string, "-");
- $month = date_helper::substring($date_string,
$pos_day+1, $pos_month);
+ $pos_month = strpos($date_string, "-");
+ $month = date_helper::substring($date_string,
$pos_day+1, $pos_month);
- $year = date_helper::substring($date_string,
$pos_month+1, strlen($date_string));
+ $year = date_helper::substring($date_string,
$pos_month+1, strlen($date_string));
- return mktime(0, 0, 0, $month, $day, $year);
+ return mktime(0, 0, 0, $month, $day, $year);
+ }
}
- }
- public function substring($string, $from, $to){
- return substr($string, $from, $to - $from);
+ public function substring($string, $from, $to)
+ {
+ return substr($string, $from, $to - $from);
+ }
}
-}
\ No newline at end of file
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-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -381,7 +381,7 @@
$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"]
);
+ $controls_comp =
$so_control->get_controls_for_components_by_location($location["location_code"],
$from_date_ts, $to_date_ts, $repeat_type, $location["role_id"] );
foreach($controls_loc as $cl)
{
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-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -57,8 +57,6 @@
protected $responsibility_name;
protected $control_area_id;
protected $control_area_name;
- protected $location_id;
- protected $component_id;
// Objects
protected $check_lists_array = array();
@@ -235,27 +233,6 @@
$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
*
@@ -273,19 +250,21 @@
public function populate()
{
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
$this->set_title(phpgw::get_var('title','string'));
$this->set_description(phpgw::get_var('description','html'));
if(phpgw::get_var('start_date','string') != '')
{
- $start_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('start_date','string'),
"d/m-Y" );
+ $start_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('start_date','string'),
$dateformat );
$this->set_start_date($start_date_ts);
}else
$this->set_start_date(0);
if( phpgw::get_var('end_date','string') != '')
{
- $end_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('end_date','string'),
"d/m-Y" );
+ $end_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('end_date','string'),
$dateformat );
$this->set_end_date( $end_date_ts );
}else
{
@@ -313,9 +292,7 @@
'control_area_name' =>
$this->get_control_area_name(),
'repeat_type' => $this->get_repeat_type(),
'repeat_interval' =>
$this->get_repeat_interval(),
- 'responsibility_name' =>
$this->get_responsibility_name(),
- 'component_id' =>
$this->get_component_id(),
- 'location_id' =>
$this->get_location_id()
+ 'responsibility_name' =>
$this->get_responsibility_name()
);
}
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/calendar_filters.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/calendar_filters.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/calendar_filters.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -2,14 +2,21 @@
<xsl:template name="calendar_filters" xmlns:php="http://php.net/xsl";>
<xsl:param name="view_period" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<form id="cal-filters" class="select-box" method="post">
<xsl:choose>
<xsl:when test="$view_period = 'month'">
- <xsl:attribute
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:attribute>
+ <xsl:attribute name="action">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
</xsl:when>
<xsl:otherwise>
- <xsl:attribute
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:attribute>
+ <xsl:attribute name="action">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
</xsl:otherwise>
</xsl:choose>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_manager.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_manager.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_manager.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,7 +1,8 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="check_list_status_manager" xmlns:php="http://php.net/xsl";>
-
+
<xsl:param name="location_code" />
+ <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<xsl:choose>
<xsl:when test="status = 'CONTROL_REGISTERED'">
@@ -26,6 +27,7 @@
<xsl:value-of select="info/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_yellow_ring.png" />
</a>
@@ -36,6 +38,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_yellow.png" />
</a>
@@ -62,6 +65,7 @@
<xsl:value-of select="info/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_red_cross.png" />
</a>
@@ -72,6 +76,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_red_cross.png" />
</a>
@@ -82,6 +87,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_red_cross.png" />
</a>
@@ -92,6 +98,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<span class="ext_info">
<xsl:value-of select="info/id"/>
@@ -107,6 +114,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<span class="ext_info">
<xsl:value-of select="info/id"/>
@@ -123,6 +131,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<span class="ext_info">
<xsl:text>&check_list_id=</xsl:text>
@@ -157,6 +166,7 @@
<xsl:value-of select="//current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:number />
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<span class="ext_info">
<xsl:text>&check_list_id=</xsl:text>
@@ -186,6 +196,7 @@
<xsl:value-of select="//current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:number />
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_red_cross.png" />
</a>
@@ -209,6 +220,7 @@
<xsl:value-of select="info/month"/>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="info/year"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_yellow_ring.png" />
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,8 +1,8 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="nav_calendar_month" xmlns:php="http://php.net/xsl";>
-
<xsl:param name="view" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="calNav">
<xsl:choose>
<xsl:when test="current_month_nr > 1">
@@ -24,6 +24,7 @@
<xsl:value-of select="current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:value-of select="current_month_nr
- 1"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:variable name="month_str">month
<xsl:value-of select="current_month_nr - 1"/> capitalized</xsl:variable>
@@ -48,6 +49,7 @@
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year -
1"/>
<xsl:text>&month=12</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:variable name="month_str">month 12
capitalized</xsl:variable>
@@ -80,6 +82,7 @@
<xsl:value-of select="current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:value-of select="current_month_nr
+ 1"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable name="month_str">month
<xsl:value-of select="current_month_nr + 1"/> capitalized</xsl:variable>
<xsl:value-of select="php:function('lang',
$month_str)" />
@@ -104,6 +107,7 @@
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year +
1"/>
<xsl:text>&month=1</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable name="month_str">month 1
capitalized</xsl:variable>
<xsl:value-of select="php:function('lang',
$month_str)" />
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,8 +1,7 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="nav_calendar_year" xmlns:php="http://php.net/xsl";>
-
<xsl:param name="view" />
-
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="calNav">
<a class="showPrev">
<xsl:attribute name="href">
@@ -20,6 +19,7 @@
</xsl:choose>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year - 1"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:value-of select="current_year - 1"/>
@@ -43,6 +43,7 @@
</xsl:choose>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year + 1"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:value-of select="current_year + 1"/>
<img height="17"
src="controller/images/right_arrow_simple_light_blue.png" />
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,7 +1,9 @@
<!-- $Id$ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<script>
<xsl:text>
@@ -145,6 +147,7 @@
<xsl:value-of select="current_year"/>
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/location_code"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="20"
src="controller/images/left_arrow_simple_light_blue.png" />Årsoversikt
</a>
@@ -159,6 +162,7 @@
<xsl:value-of
select="current_year"/>
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/loc1"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Vis kontrollplan for eiendom
</a>
@@ -213,6 +217,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:value-of select="control/title"/>
</a>
@@ -288,6 +293,7 @@
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:value-of select="control/title"/>
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,7 +1,8 @@
<!-- $Id: view_calendar_year.xsl 9206 2012-04-23 06:21:38Z vator $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content">
<div id="control_plan">
@@ -22,6 +23,7 @@
<xsl:value-of
select="current_year"/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control/id"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Årsoversikt
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<script>
<xsl:text>
@@ -110,6 +111,7 @@
<xsl:value-of
select="current_year"/>
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/loc1"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Vis kontrollplan for eiendom
</a>
@@ -152,6 +154,7 @@
<xsl:value-of select="//current_location/location_code"/>
<xsl:text>&month=</xsl:text>
<xsl:number/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable
name="month_str">short_month <xsl:number/> capitalized</xsl:variable>
@@ -181,6 +184,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:value-of select="control/title"/>
</a>
@@ -246,6 +250,7 @@
<xsl:value-of select="//current_location/location_code"/>
<xsl:text>&month=</xsl:text>
<xsl:number/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable name="month_str">short_month <xsl:number/>
capitalized</xsl:variable>
@@ -274,6 +279,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:value-of select="control/title"/>
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,7 @@
<!-- $Id: view_calendar_year.xsl 9206 2012-04-23 06:21:38Z vator $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content">
@@ -41,6 +42,7 @@
<xsl:number/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="//control/id"/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable
name="month_str">short_month <xsl:value-of select="."/>
capitalized</xsl:variable>
@@ -106,6 +108,7 @@
<xsl:number/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="//control/id"/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable
name="month_str">short_month <xsl:value-of select="."/>
capitalized</xsl:variable>
Modified:
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,6 @@
<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="dateformat"/></xsl:variable>
<div id="main_content" class="medium">
@@ -24,40 +24,10 @@
</xsl:choose>
</div>
<div class="box-2 select-box">
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of
select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
+ <a href="{url_calendar_for_year}">
Kontrolplan for bygg/eiendom (år)
</a>
- <a class="last">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of
select="current_month_nr"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of
select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
+ <a class="last" href="{url_calendar_for_month}">
Kontrolplan for bygg/eiendom (måned)
</a>
</div>
@@ -72,7 +42,7 @@
<xsl:choose>
<xsl:when
test="check_items_and_cases/child::node()">
- <form ENCTYPE="multipart/form-data"
id="frmRegCaseMessage"
action="index.php?menuaction=controller.uicase.send_case_message" method="post">
+ <form ENCTYPE="multipart/form-data"
id="frmRegCaseMessage" action="{action}" method="post">
<input>
<xsl:attribute
name="name">check_list_id</xsl:attribute>
<xsl:attribute
name="type">hidden</xsl:attribute>
Modified:
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,6 @@
<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="dateformat"/></xsl:variable>
<div id="main_content" class="medium">
@@ -24,40 +24,10 @@
</xsl:choose>
</div>
<div class="box-2 select-box">
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of
select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
+ <a href="{url_calendar_for_year}">
Kontrolplan for bygg/eiendom (år)
</a>
- <a class="last">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of
select="current_month_nr"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of
select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
+ <a class="last" href="{url_calendar_for_month}">
Kontrolplan for bygg/eiendom (måned)
</a>
</div>
@@ -70,15 +40,9 @@
<h3 class="box_header ext">Melding registrert</h3>
<div id="caseMessage" class="box ext">
- <a id="showMessage" target="_blank">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
- <xsl:text>&id=</xsl:text>
- <xsl:value-of
select="message_ticket_id"/>
- </xsl:attribute>
+ <a id="showMessage" target="_blank"
href="{url_ticket_view}">
Vis melding
</a>
-
<!-- === TITLE === -->
<div class="row">
<label>Tittel på
melding:</label><span><xsl:value-of select="message_ticket/subject"/></span>
@@ -113,12 +77,7 @@
</xsl:choose>
</xsl:for-each>
</ul>
- <a class="btn">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
+ <a class="btn" href="{url_ticket_new}">
Registrer ny melding
</a>
</div>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/add_case.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/add_case.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/add_case.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -2,6 +2,8 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div id="main_content" class="medium">
<div id="check-list-heading">
@@ -38,6 +40,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (år)
</a>
@@ -57,6 +60,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
@@ -75,6 +79,8 @@
<div class="expand_menu"><div class="expand_all">Vis
alle</div><div class="collapse_all focus">Skjul alle</div></div>
+ <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', 'index.php',
'menuaction:controller.uicase.add_case,phpgw_return_as:json')" /></xsl:variable>
+
<ul class="control_groups">
<xsl:for-each select="control_groups_with_items_array">
<xsl:choose>
@@ -87,7 +93,7 @@
<h4><img src="controller/images/arrow_right.png" /><span><xsl:value-of
select="title"/></span></h4>
<xsl:choose>
<xsl:when test="type = 'control_item_type_1'">
-
<form class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.add_case&phpgw_return_as=json"
method="post">
+
<form class="frm_register_case expand_item"
action="{$action_url}" method="post">
<xsl:variable name="control_item_id"><xsl:value-of
select="id"/></xsl:variable>
<input type="hidden" name="control_item_id"
value="{$control_item_id}" />
<input name="check_list_id"
type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
@@ -104,7 +110,7 @@
</form>
</xsl:when>
<xsl:when test="type = 'control_item_type_2'">
-
<form class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.add_case&phpgw_return_as=json"
method="post">
+
<form class="frm_register_case expand_item" action="{$action_url}"
method="post">
<xsl:variable name="control_item_id"><xsl:value-of
select="id"/></xsl:variable>
<input type="hidden" name="control_item_id"
value="{$control_item_id}" />
<input name="check_list_id"
type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
@@ -139,7 +145,7 @@
</form>
</xsl:when>
<xsl:when test="type = 'control_item_type_3'">
-
<form class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.add_case&phpgw_return_as=json"
method="post">
+
<form class="frm_register_case expand_item"
action="{$action_url}" method="post">
<xsl:variable name="control_item_id"><xsl:value-of
select="id"/></xsl:variable>
<input type="hidden" name="control_item_id"
value="{$control_item_id}" />
<input name="check_list_id"
type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
@@ -175,7 +181,7 @@
</form>
</xsl:when>
<xsl:when test="type = 'control_item_type_4'">
-
<form class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.add_case&phpgw_return_as=json"
method="post">
+
<form class="frm_register_case expand_item"
action="{$action_url}" method="post">
<xsl:variable name="control_item_id"><xsl:value-of
select="id"/></xsl:variable>
<input type="hidden" name="control_item_id"
value="{$control_item_id}" />
<input name="check_list_id"
type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,27 +1,8 @@
<!-- $Id$ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-<script>
- $(function() {
- $( "#planned_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy',
- changeMonth: true,
- changeYear: true
- });
- $( "#completed_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy',
- changeMonth: true,
- changeYear: true
- });
- });
-</script>
-
<!-- ================== ADD CHECKLIST ========================= -->
<div id="main_content" class="medium">
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/case_row.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/case_row.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/case_row.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -3,7 +3,7 @@
<xsl:template name="case_row" xmlns:php="http://php.net/xsl";>
<xsl:param name="control_item_type" />
-
+ <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<li class="check_item_case">
<xsl:choose>
<xsl:when test="cases_array/child::node()">
@@ -75,6 +75,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
lukk
</a>
@@ -88,6 +89,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
slett
</a>
@@ -107,6 +109,7 @@
<xsl:text>&control_item_type=</xsl:text>
<xsl:value-of select="//control_item/type" />
<xsl:text>&phpgw_return_as=json</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<input type="hidden" name="control_item_type">
<xsl:attribute name="value"><xsl:value-of
select="//control_item/type" /></xsl:attribute>
@@ -200,6 +203,7 @@
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
<xsl:text>&id=</xsl:text>
<xsl:value-of select="location_item_id"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Vis melding
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/cases_tab_menu.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/cases_tab_menu.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/cases_tab_menu.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -2,6 +2,8 @@
<xsl:param name="active_tab" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div class="tab_menu">
<a id="view_open_cases">
<xsl:if test="$active_tab = 'view_open_cases'">
@@ -12,6 +14,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Åpne saker
</a>
@@ -24,6 +27,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Lukkede saker
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -2,6 +2,7 @@
<xsl:param name="active_tab" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="check_list_menu">
<!-- ================== LOADS VIEW CHECKLIST DETAILS
===================== -->
<div class="left_btns">
@@ -13,6 +14,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Vis detaljer for sjekkliste
</a>
@@ -25,6 +27,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Vis saker
</a>
@@ -37,6 +40,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Vis info om kontroll
</a>
@@ -49,6 +53,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.add_case</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Registrer sak
</a>
@@ -58,6 +63,7 @@
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Registrer melding
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,37 +1,10 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
- <!-- ======================= CALENDAR
================================== -->
- <script>
- $(function() {
- $( "#planned_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy',
- changeMonth: true,
- changeYear: true
- });
- $( "#completed_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy',
- changeMonth: true,
- changeYear: true
- });
- $( "#deadline_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy',
- changeMonth: true,
- changeYear: true
- });
-
- });
- </script>
-
<!-- ================== EDIT CHECKLIST ========================= -->
<div id="check-list-heading">
@@ -68,6 +41,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (år)
</a>
@@ -87,6 +61,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
@@ -101,7 +76,8 @@
<!-- ================== CHECKLIST DETAILS ===================== -->
<div id="check_list_details">
<h3 class="box_header">Sjekklistedetaljer</h3>
- <form id="frm_update_check_list"
action="index.php?menuaction=controller.uicheck_list.save_check_list"
method="post">
+ <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', 'index.php',
'menuaction:controller.uicheck_list.save_check_list')" /></xsl:variable>
+ <form id="frm_update_check_list" action="{$action_url}"
method="post">
<xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
<input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,7 @@
<!-- $Id: edit_check_list.xsl 8513 2012-01-07 10:38:09Z vator $ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -94,6 +95,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (år)
</a>
@@ -113,6 +115,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
@@ -130,6 +133,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -57,6 +58,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<div>Registrer sjekkliste</div>
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_lists.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_lists.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_lists.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_lists"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -54,6 +55,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="id"/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:if
test="deadline != ''">
<xsl:value-of select="php:function('date', $date_format, number(deadline))"/>
@@ -84,6 +86,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.control_calendar_status_overview</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control_as_array/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<div>
Se kalenderoversikt for kontroll
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,7 +1,9 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-<xsl:template match="data">
-
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div id="view_cases">
<xsl:call-template name="cases_tab_menu">
@@ -44,6 +46,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
åpne
</a>
@@ -57,6 +60,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of
select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:value-of
select="$session_url"/>
</xsl:attribute>
slett
</a>
@@ -74,6 +78,7 @@
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
<xsl:text>&id=</xsl:text>
<xsl:value-of
select="location_item_id"/>
+
<xsl:value-of
select="$session_url"/>
</xsl:attribute>
Vis melding
</a>
@@ -100,4 +105,4 @@
</xsl:choose>
</div>
</div>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_details.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_details.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_details.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,8 +1,6 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<h2>Kontrolldetaljer</h2>
<fieldset id="control_details">
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_info.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_info.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_info.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,7 @@
<!-- $Id: edit_check_list.xsl 8478 2012-01-03 12:36:37Z vator $ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -101,6 +102,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (år)
</a>
@@ -120,6 +122,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
@@ -138,6 +141,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolldetaljer
</a>
@@ -147,6 +151,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrollpunkter
</a>
@@ -158,6 +163,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="location_array/location_code"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Prosedyrer
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_items.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_items.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_items.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,7 +1,9 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-<xsl:template match="data">
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div id="control-items">
<h2>Kontrollpunkter</h2>
@@ -56,6 +58,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Skriv ut
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/control/control.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control/control.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/controller/templates/base/control/control.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -6,29 +6,11 @@
<xsl:variable name="control_procedure_id"><xsl:value-of
select="control/procedure_id"/></xsl:variable>
<xsl:variable name="control_repeat_type"><xsl:value-of
select="control/repeat_type"/></xsl:variable>
<xsl:variable name="control_role"><xsl:value-of
select="control/responsibility_id"/></xsl:variable>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="dateformat"/></xsl:variable>
-<script>
- $(function() {
- $( "#start_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'd/m-yy',
- changeMonth: true,
- changeYear: true
- });
- $( "#end_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'd/m-yy',
- changeMonth: true,
- changeYear: true
- });
- });
- </script>
<div class="yui-content">
<div id="control_details">
- <form id="frm_save_control_details"
action="index.php?menuaction=controller.uicontrol.save_control_details"
method="post">
+ <form id="frm_save_control_details" action="{action}"
method="post">
<input type="hidden" name="control_id"
value="{$control_id}" />
<input type="hidden" name="saved_control_area_id"
value="{$control_area_id}" />
@@ -257,4 +239,4 @@
</form>
</div>
</div>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
Modified:
branches/Version-1_0-branch/controller/templates/base/control/control_details.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control/control_details.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/control/control_details.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,7 +1,6 @@
<!-- $Id: control.xsl 9951 2012-08-31 10:14:12Z vator $ -->
<xsl:template match="data" name="control_details"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
+<xsl:variable name="date_format"><xsl:value-of
select="dateformat"/></xsl:variable>
<div id="show-control-details-box">
<h3>Detaljer for kontroll</h3>
@@ -39,4 +38,4 @@
</li>
</ul>
</div>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
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
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/control_group/control_groups.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -6,7 +6,9 @@
<h2><xsl:value-of select="control_area/title"/></h2>
- <form id="frm_save_control_groups"
action="index.php?menuaction=controller.uicontrol.save_control_groups"
method="post">
+ <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', 'index.php',
'menuaction:controller.uicontrol.save_control_groups')" /></xsl:variable>
+
+ <form id="frm_save_control_groups" action="{$action_url}"
method="post">
<xsl:variable name="control_area_id"><xsl:value-of
select="control_area/id"/></xsl:variable>
<input type="hidden" name="control_area_id"
value="{$control_area_id}" />
Modified:
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -9,7 +9,8 @@
<!-- ==== CHOOSE NONE/ALL ===== -->
<div class="expand_menu"><div class="expand_all">Vis
alle</div><div class="collapse_all focus">Skjul alle</div></div>
- <form id="frm_control_items"
action="index.php?menuaction=controller.uicontrol.save_control_items"
method="post">
+ <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', 'index.php',
'menuaction:controller.uicontrol.save_control_items')" /></xsl:variable>
+ <form id="frm_control_items" action="{$action_url}"
method="post">
<xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
<input type="hidden" name="control_id"
value="{$control_id}" />
Modified:
branches/Version-1_0-branch/controller/templates/base/control_item/control_item.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_item/control_item.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/control_item.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -2,7 +2,7 @@
<!-- item -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<xsl:call-template name="yui_phpgw_i18n"/>
<div id="main_content">
@@ -17,7 +17,8 @@
</xsl:choose>
<div id="control_item_details">
- <form
action="index.php?menuaction=controller.uicontrol_item.save" method="post">
+ <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', 'index.php',
'menuaction:controller.uicontrol_item.save')" /></xsl:variable>
+ <form action="{$action_url}" method="post">
<input type="hidden" name="id"
value="{control_item/id}" />
<dl class="proplist">
<dt>
@@ -323,6 +324,7 @@
<xsl:>index.php?menuaction=controller.uicontrol_item.edit</xsl:>
<xsl:>&id=</xsl:>
<xsl:value-of
select="control_item/id"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
<xsl:value-of
select="php:function('lang', 'edit')" />
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_item/control_item_option.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_item/control_item_option.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/control_item_option.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -13,7 +13,8 @@
<div class="yui-content">
<div id="details">
- <form id="frm_add_control_item_option"
action="index.php?menuaction=controller.uicontrol_item_option.save"
method="post">
+ <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', 'index.php',
'menuaction:controller.uicontrol_item_option.save')" /></xsl:variable>
+ <form id="frm_add_control_item_option" action="{$action_url}"
method="post">
<input type="hidden" name="control_item_id">
<xsl:attribute name="value"><xsl:value-of
select="control_item/id"/></xsl:attribute>
</input>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,6 +1,6 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content">
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
@@ -53,7 +53,8 @@
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
<xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="control_as_array/id"/>
+ <xsl:value-of
select="control_as_array/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Lag sjekkliste for kontroll
</a>
Modified:
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_documents.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_documents.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_documents.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -7,7 +7,8 @@
<div class="yui-content">
<div id="details">
- <form enctype="multipart/form-data"
action="?menuaction=controller.uidocument.add" method="POST">
+ <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', 'index.php',
'menuaction:controller.uidocument.add')" /></xsl:variable>
+ <form enctype="multipart/form-data"
action="{$action_url}" method="POST">
<xsl:variable name="lang_upload"><xsl:value-of
select="php:function('lang', 'upload')" /></xsl:variable>
<input type="hidden" name="procedure_id" value
= "{procedure_id}" />
<input type="hidden" name="document_type"
value="1" />
@@ -63,4 +64,4 @@
</xsl:for-each>
</tr>
</xsl:for-each>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
Modified:
branches/Version-1_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-09-25 08:49:29 UTC (rev 10031)
+++
branches/Version-1_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1,10 +1,10 @@
<!-- $Id: procedure_item.xsl 8485 2012-01-05 08:21:03Z erikhl $ -->
-<xsl:template match="data">
-
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div id="view-procedures">
<h2>Prosedyrer</h2>
-
<div class="box">
<h3>Prosedyre for kontroll</h3>
<h4><xsl:value-of select="control_procedure/title"/>
@@ -18,6 +18,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="location/location_code"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Skriv ut
</a>
@@ -54,6 +55,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="//location/location_code"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Skriv ut
</a>
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-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -81,6 +81,9 @@
"js/jquery-1.7.2{$_type}",
"js/jquery-ui-1.8.19.custom{$_type}"
);
+
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.8.19.custom.css');
+
break;
default:
Modified: branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2012-09-25
08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2012-09-25
09:13:55 UTC (rev 10032)
@@ -89,7 +89,61 @@
}
+
/**
+ * Get global phpgw_info from XSLT templates
+ * @param string $key on the format 'user|preferences|common|dateformat'
+ * @return array or string depending on if param is representing a node
+ */
+
+ function get_phpgw_info($key)
+ {
+ $_keys = explode('|',$key);
+
+ $ret = $GLOBALS['phpgw_info'];
+ foreach ($_keys as $_var)
+ {
+ $ret = $ret[$_var];
+ }
+ return $ret;
+ }
+
+
+ /**
+ * Get global phpgw_link from XSLT templates
+ * @param string $path on the format 'index.php'
+ * @param string $params on the format 'param1:value1,param2:value2'
+ * @return string containing url
+ */
+ function get_phpgw_link($path, $params)
+ {
+ $link_data = array();
+
+ $_param_sets = explode(',',$params);
+ foreach ($_param_sets as $_param_set)
+ {
+ $__param_set = explode(':',$_param_set);
+ if(isset($__param_set[1]) && $__param_set[1])
+ {
+ $link_data[trim($__param_set[0])] =
trim($__param_set[1]);
+ }
+ }
+ $ret = $GLOBALS['phpgw']->link($path, $link_data, true);
+ return $ret;
+ }
+
+ /**
+ * Fix global phpgw_link from XSLT templates by adding session id and
click_history
+ * @return string containing parts of url
+ */
+ function get_phpgw_session_url()
+ {
+ $base_url = $GLOBALS['phpgw']->link('/', array(), true);
+ $url_parts = parse_url($base_url);
+ return $url_parts['query'];
+ }
+
+ /**
* cleans up a backtrace array and converts it to a string
*
* @internal this is such an ugly piece of code due to a reference to
the error context
Modified: branches/Version-1_0-branch/preferences/inc/hook_settings.inc.php
===================================================================
--- branches/Version-1_0-branch/preferences/inc/hook_settings.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/preferences/inc/hook_settings.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -73,6 +73,7 @@
'Y/m/d' => 'Y/m/d',
'Y-m-d' => 'Y-m-d',
'Y.m.d' => 'Y.m.d',
+ 'd/m-Y' => 'd/m-Y',
'd/m/Y' => 'd/m/Y',
'd-m-Y' => 'd-m-Y',
'd.m.Y' => 'd.m.Y',
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-09-25 08:49:29 UTC (rev 10031)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-09-25 09:13:55 UTC (rev 10032)
@@ -1635,18 +1635,27 @@
while ($this->db->next_record())
{
$periode = $this->db->f('periode');
+
$year = substr( $periode, 0, 4 );
// $month = substr( $periode, 4, 2 );
-
+
$_found = false;
- for ($i=0;$i<13;$i++)
+ if(isset($project_budget[$periode]))
{
- $_period = $year .
sprintf("%02s", $i);
-
if(isset($project_budget[$_period]))
+
$orders[$periode][$this->db->f('order')]['actual_cost'] +=
$this->db->f('actual_cost');
+ $_found = true;
+ }
+ else
+ {
+ for ($i=0;$i<13;$i++)
{
-
$orders[$_period][$this->db->f('order')]['actual_cost'] +=
$this->db->f('actual_cost');
- $_found = true;
- break;
+ $_period = $year .
sprintf("%02s", $i);
+
if(isset($project_budget[$_period]))
+ {
+
$orders[$_period][$this->db->f('order')]['actual_cost'] +=
$this->db->f('actual_cost');
+ $_found = true;
+ break;
+ }
}
}
@@ -1655,7 +1664,7 @@
$orders[$periode][$this->db->f('order')]['actual_cost'] +=
$this->db->f('actual_cost');
}
}
-
+//_debug_array($orders);die();
$sql = "SELECT sum(godkjentbelop) AS
actual_cost, pmwrkord_code AS order, periode FROM fm_ecobilag WHERE
pmwrkord_code IN ({$_order_filter}) GROUP BY pmwrkord_code, periode ORDER BY
pmwrkord_code, periode ASC ";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
@@ -1670,14 +1679,22 @@
}
$_found = false;
- for ($i=0;$i<13;$i++)
+ if(isset($project_budget[$periode]))
{
- $_period = $year .
sprintf("%02s", $i);
-
if(isset($project_budget[$_period]))
+
$orders[$periode][$this->db->f('order')]['actual_cost'] +=
$this->db->f('actual_cost');
+ $_found = true;
+ }
+ else
+ {
+ for ($i=0;$i<13;$i++)
{
-
$orders[$_period][$this->db->f('order')]['actual_cost'] +=
$this->db->f('actual_cost');
- $_found = true;
- break;
+ $_period = $year .
sprintf("%02s", $i);
+
if(isset($project_budget[$_period]))
+ {
+
$orders[$_period][$this->db->f('order')]['actual_cost'] +=
$this->db->f('actual_cost');
+ $_found = true;
+ break;
+ }
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10032] Merge 10013:10031 from trunk,
Sigurd Nes <=