[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8902] Merge 8891:8901 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8902] Merge 8891:8901 from trunk |
|
Date: |
Thu, 16 Feb 2012 13:43:51 +0000 |
Revision: 8902
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8902
Author: sigurdne
Date: 2012-02-16 13:43:50 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Merge 8891:8901 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
branches/Version-1_0-branch/controller/inc/class.socheck_list.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.uicontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_info.inc.php
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/controller/setup/default_records.inc.php
branches/Version-1_0-branch/controller/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/setup/setup.inc.php
branches/Version-1_0-branch/controller/setup/tables_current.inc.php
branches/Version-1_0-branch/controller/setup/tables_update.inc.php
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890
+
/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
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -178,7 +178,7 @@
//set local group as stored
$group->set_change_type('added');
$group->set_transferred(true);
- $so_group->update_local($group);
+ $sogroup->update_local($group);
}
else
{
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -14,8 +14,10 @@
<?php if($activity->get_group_id()){?>
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
<?php }else{?>
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
<?php }?>
if(org_id != null && org_id == 'new_org')
@@ -80,6 +82,7 @@
var div_address = document.getElementById('address_container');
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -102,6 +105,7 @@
var div_address = document.getElementById('contact2_address_container');
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -18,6 +18,7 @@
var div_select = document.getElementById('activity_select');
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
var divcontent_start = "<select name=\"activity_id\" id=\"activity_id\">";
var divcontent_end = "</select>";
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -39,6 +39,7 @@
var div_address = document.getElementById('address_container');
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -61,6 +62,7 @@
var div_address = document.getElementById('arena_address_container');
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"arena_address\" id=\"arena_address\"
size\"5\">";
var divcontent_end = "</select>";
@@ -83,6 +85,7 @@
var div_address = document.getElementById('contact2_address_container');
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -10,6 +10,7 @@
var div_address = document.getElementById('address_container');
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -10,6 +10,7 @@
var div_address = document.getElementById('address_container');
url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
Modified: branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -671,6 +671,7 @@
'num_pending_cases'
);
+
$values = array(
$this->marshal($check_list->get_control_id(), 'int'),
$check_list->get_status(),
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -147,6 +147,7 @@
$control->set_component_id($this->unmarshal($this->db->f('component_id', true),
'int'));
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
+
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type',
true), 'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
if($return_type == "return_object")
@@ -189,7 +190,7 @@
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
-
+
$controls_array[] = $control->toArray();
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -223,20 +223,6 @@
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_for_location_array,
12, "view_months" );
- foreach($controls_calendar_array as &$inst)
- {
- $curr_control = &$inst['control'];
-
- if($curr_control['repeat_type'] == 0)
- $curr_control['repeat_type'] = "Dag";
- else if($curr_control['repeat_type'] == 1)
- $curr_control['repeat_type'] = "Uke";
- else if($curr_control['repeat_type'] == 2)
- $curr_control['repeat_type'] = "Måned";
- else if($curr_control['repeat_type'] == 3)
- $curr_control['repeat_type'] = "År";
- }
-
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
@@ -290,6 +276,7 @@
}
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_calendar_array,
$control_check_list_array, 12, "view_months" );
+
//_debug_array($controls_calendar_array);
foreach($controls_calendar_array as &$inst)
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-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -211,21 +211,14 @@
$control_group_id = phpgw::get_var('control_group_id');
$order_tags = phpgw::get_var('order_tags');
- echo "Order tags : ";
- print_r($order_tags);
-
-
+
$status = true;
foreach($order_tags as $order_tag){
$control_item_id = substr($order_tag,
strpos($order_tag, ":")+1, strlen($order_tag));
$order_nr = substr($order_tag, 0,
strpos($order_tag, ":"));
$control_item_list =
$this->so_control_item_list->get_single_2($control_id, $control_item_id);
-
- echo "Order nr : " . $order_nr;
- echo "Control item list : ";
- print_r( $control_item_list );
-
+
if($order_nr !=
$control_item_list->get_order_nr() ){
$control_item_list->set_order_nr($order_nr);
Modified:
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -15,7 +15,7 @@
}
function init_calendar( $control, $num, $period_type ){
-
+
$calendar_array = array();
for($i=1;$i<=$num;$i++){
@@ -48,42 +48,49 @@
}
}
- return $calendar_array;
+ return $calendar_array;
}
public function build_calendar_array( $controls_with_check_lists_array,
$num, $period_type ){
foreach($controls_with_check_lists_array as $control){
-
- $calendar_array = $this->init_calendar( $control, $num,
$period_type );
-
if($period_type == "view_days" | ($period_type ==
"view_months" & $control->get_repeat_type() == 2 | $control->get_repeat_type()
== 3))
{
+ $calendar_array = $this->init_calendar(
$control, $num, $period_type );
+
foreach($control->get_check_lists_array() as
$check_list)
{
$check_list_status_manager = new
check_list_status_manager( $check_list );
$check_list_status_info =
$check_list_status_manager->get_status_for_check_list();
-
- $calendar_array[ date("j",
$check_list->get_deadline()) ]["status"] =
$check_list_status_info->get_status();
- $calendar_array[ date("j",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
+
+ if( $period_type == "view_months" )
+ {
+ $calendar_array[ date("n",
$check_list_status_info->get_deadline_date_ts()) ]["status"] =
$check_list_status_info->get_status();
+ $calendar_array[ date("n",
$check_list_status_info->get_deadline_date_ts()) ]["info"] =
$check_list_status_info->serialize();
+ }
+ else if( $period_type == "view_days" )
+ {
+ $calendar_array[ date("j",
$check_list->get_deadline()) ]["status"] =
$check_list_status_info->get_status();
+ $calendar_array[ date("j",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
+ }
}
$controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $calendar_array);
}
else if($period_type == "view_months" &
($control->get_repeat_type() == 0 | $control->get_repeat_type() == 1))
{
- $twelve_month_array = array();
+ $calendar_array = array();
foreach($control->get_agg_open_cases_for_month_array() as
$status_agg_month_info)
{
$status =
"controls_accomplished_with_errors";
-
-
$twelve_month_array[$status_agg_month_info->get_month_nr()]["status"] = $status;
-
$twelve_month_array[$status_agg_month_info->get_month_nr()]["info"] =
$status_agg_month_info->get_agg_open_cases();
+
+
$calendar_array[$status_agg_month_info->get_month_nr()]["status"] = $status;
+
$calendar_array[$status_agg_month_info->get_month_nr()]["info"] =
$status_agg_month_info->get_agg_open_cases();
}
- $controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $twelve_month_array);
+ $controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $calendar_array);
}
}
Modified:
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_info.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_info.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_info.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -33,7 +33,8 @@
private $check_list_id;
private $status;
private $status_text;
- private $deadline_date;
+ private $deadline_date_ts;
+ private $deadline_date_txt;
private $info_text;
private $num_open_cases;
@@ -60,13 +61,20 @@
public function get_status_text() { return $this->status_text; }
- public function set_deadline_date($deadline_date)
+ public function set_deadline_date_ts($deadline_date_ts)
{
- $this->deadline_date = $deadline_date;
+ $this->deadline_date_ts = $deadline_date_ts;
}
- public function get_deadline_date() { return
$this->deadline_date; }
+ public function get_deadline_date_ts() { return
$this->deadline_date_ts; }
+
+ public function set_deadline_date_txt($deadline_date_txt)
+ {
+ $this->deadline_date_txt = $deadline_date_txt;
+ }
+ public function get_deadline_date_txt() { return
$this->deadline_date_txt; }
+
public function set_info_text($info_text)
{
$this->info_text = $info_text;
@@ -88,7 +96,8 @@
'check_list_id' => $this->get_check_list_id(),
'status' => $this->get_status(),
'status_text' => $this->get_status_text(),
- 'deadline_date' => $this->get_deadline_date(),
+ 'deadline_date_ts' =>
$this->get_deadline_date_ts(),
+ 'deadline_date_txt' =>
$this->get_deadline_date_txt(),
'info_text' => $this->get_info_text(),
'num_open_cases' => $this->get_num_open_cases()
);
Modified:
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -75,7 +75,8 @@
}
- $check_list_status_info->set_deadline_date(
date("d/m-Y", $this->check_list->get_deadline()) );
+ $check_list_status_info->set_deadline_date_txt(
date("d/m-Y", $this->check_list->get_deadline()) );
+ $check_list_status_info->set_deadline_date_ts(
$this->check_list->get_deadline() );
$check_list_status_info->set_status($status);
return $check_list_status_info;
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-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -35,12 +35,18 @@
{
public static $so;
+ const REPEAT_TYPE_DAY = 0;
+ const REPEAT_TYPE_WEEK = 1;
+ const REPEAT_TYPE_MONTH = 2;
+ const REPEAT_TYPE_YEAR = 3;
+
protected $id;
protected $title;
protected $description;
protected $start_date;
protected $end_date;
protected $repeat_type;
+ protected $repeat_type_label;
protected $repeat_interval;
protected $procedure_id;
protected $procedure_name;
@@ -113,6 +119,30 @@
public function get_repeat_type() { return $this->repeat_type; }
+ public function set_repeat_type_label(int $repeat_type = null)
+ {
+ switch($repeat_type)
+ {
+ case controller_control::REPEAT_TYPE_DAY:
+ $this->repeat_type_label =
lang('repeat_type_day');
+ break;
+ case controller_control::REPEAT_TYPE_WEEK:
+ $this->repeat_type_label =
lang('repeat_type_week');
+ break;
+ case controller_control::REPEAT_TYPE_MONTH:
+ $this->repeat_type_label =
lang('repeat_type_month');
+ break;
+ case controller_control::REPEAT_TYPE_YEAR;
+ $this->repeat_type_label =
lang('repeat_type_year');
+ break;
+ default:
+ $this->repeat_type_label =
lang('repeat_type_none');
+ break;
+ }
+ }
+
+ public function get_repeat_type_label() { return
$this->repeat_type_label; }
+
public function set_repeat_interval($repeat_interval)
{
$this->repeat_interval = $repeat_interval;
Modified: branches/Version-1_0-branch/controller/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/default_records.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/setup/default_records.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -226,3 +226,6 @@
$oProc->query("INSERT INTO controller_procedure (title, purpose,
responsibility, description, reference, attachment, revision_no) VALUES ('P3811
Vannprøver og resultater', 'Ved jevnlig prøvetaking kan vi avklare avvik så
tidlig så mulig og dermed sikre stabil vannkvalitet', 'Byggeier representert
ved ansvarlig drifts- og vedlikeholdsingeniør BBE KF.', '<ol><li><span>Drifts-
og vedlikeholdsingeniør skal sørge for at det foretas jevnlig prøvetaking med
maks 3 måneders intervaller.
</span></li><li><span><span></span></span><span>Prøvetakingsutstyret skal være
godkjent av Næringsmiddeltilsynet og teknisk hygiene for Bergen og
Omland.</span></li><li><span>Personell som skal innhente vannprøver skal ha
nødvendig opplæring i dette. </span>Opplæring blir gitt av
Næringsmiddeltilsynet.</li><li><span><span></span></span><span>Prøvetaking skal
foregå iht. rutiner for prøvetaking som er vedlagt.
</span></li><li><span><span></span></span><span>Analyseresultater blir sendt
til BBE KF og tjenestested.</span></li><li><span><span></span></span><span>Kopi
analyseresultat settes i denne IK-perm kap.
3.</span></li><li><span><span></span></span><span>Dersom vannkvalitet ikke
tilfredsstiller kravet må DV-ingeniør konferere Næringsmiddeltilsynet for
korrigerende tiltak.</span></li><li><span><span></span></span><span>Eventuelle
avvik og korrigerende tiltak loggføres under kap. 6.</span></li><li><span>Punkt
9<br></span></li></ol></li>', '', '',1)");
$oProc->query("INSERT INTO controller_procedure (title, purpose,
responsibility, description, reference, attachment, revision_no) VALUES ('P3812
Sjekkliste/Rutiner/Logg', ' Ved bruk av sjekklister og faste
tilsynsrutiner oppnås stabil drift. Tilsyn og nødvendige kontrollpunkter skal
dokumenteres (loggføres) for at vi på en bedre måte kan vurdere anleggets
tilstand og dermed raskere oppdage avvik.', 'Driftsleder i bydel skal sørge for
at nødvendig tilsyn blir utført i tråd med fastalgte rutiner.',
'<ol><li>Drifts- og vedlikeholdsingeniør skal sørge for at denne IK-håndbok
ettterleves.</li><li>Driftsleder skal påse at ansvarlig driftspersonell foretar
rutinemessig tilsyn/ inspeksjon iht. kapittel 5.</li><li>Evt. avvik i forhold
til beskrevne rutiner skal begrunnes under kap. 6 avviksbehandling- (bruk
rapportskjema under kap. 6)</li><li>Avvik skal rapporteres til drifts- og
vedlikeholdsingeniør. Avvik kan være rutiner som ikke er fulgt, tekniske feil/
mangler, vannkvalitet som ikke tilfredsstiller gjeldende krav
o.l.</li></ol></li>', '', '',1)");
*/
+
+//insert of document type for procedures:
+$oProc->query("INSERT INTO controller_document_types (title)
values('procedures')");
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2012-02-16
13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2012-02-16
13:43:50 UTC (rev 8902)
@@ -319,4 +319,9 @@
Property name controller no Lokasjonsnavn
Address controller no Adresse
Zip code controller no Postnummer
-no category selected controller no Kategori ikke valgt
\ No newline at end of file
+no category selected controller no Kategori ikke valgt
+repeat_type_none controller no Ingen
+repeat_type_day controller no Dag
+repeat_type_week controller no Uke
+repeat_type_month controller no Måned
+repeat_type_year controller no År
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php 2012-02-16
13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php 2012-02-16
13:43:50 UTC (rev 8902)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.29';
+ $setup_info['controller']['version'] = '0.1.30';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -90,7 +90,7 @@
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
'title' => array('type' => 'varchar',
'precision' => 255, 'nullable' => False),
'purpose' => array('type' => 'text', 'nullable'
=> True),
- 'responsibility' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
+ 'responsibility' => array('type' => 'text',
'nullable' => True),
'description' => array('type' => 'text',
'nullable' => True),
'reference' => array('type' => 'text',
'nullable' => True),
'attachment' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
Modified: branches/Version-1_0-branch/controller/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -605,4 +605,20 @@
$GLOBALS['setup_info']['controller']['currentver'] = '0.1.29';
return $GLOBALS['setup_info']['controller']['currentver'];
+ }
+
+ $test[] = '0.1.29';
+ function controller_upgrade0_1_29()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('controller_procedure','responsibility',array(
+ 'type' => 'text',
+ 'nullable' => true
+ ));
+
+ $sql = "INSERT INTO controller_document_types (title)
values('procedures')";
+ $db = clone $GLOBALS['phpgw']->db;
+ $result = $db->query($sql, __LINE__, __FILE__);
+
+ $GLOBALS['setup_info']['controller']['currentver'] = '0.1.30';
+ return $GLOBALS['setup_info']['controller']['currentver'];
}
\ No newline at end of file
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-02-16 13:41:34 UTC (rev 8901)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-02-16 13:43:50 UTC (rev 8902)
@@ -123,7 +123,7 @@
</xsl:choose>
</div>
<div class="frequency">
- <xsl:value-of
select="control/repeat_type"/>
+ <xsl:value-of
select="control/repeat_type_label"/>
</div>
<div class="months">
<xsl:for-each
select="calendar_array">
@@ -184,22 +184,22 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_accomplished_with_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
-
<a class="view_check_list">
-
<xsl:attribute name="href">
-
<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:attribute>
-
<span style="display:none">
-
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</span>
-
<img height="15" src="controller/images/status_icon_red.png" />
-
</a>
-
</div>
-
</xsl:when>
+
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
+
<div id="info_box"
style="position:absolute;display:none;"></div>
+
<a class="view_check_list">
+
<xsl:attribute name="href">
+
<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:attribute>
+
<span style="display:none">
+
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</span>
+
<xsl:value-of select="info/num_open_cases"/>
+
</a>
+
</div>
+
</xsl:when>
<xsl:when test="status = 'controls_accomplished_with_errors'">
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
<a class="view_check_list">
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-02-16 13:41:34 UTC (rev 8901)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-02-16 13:43:50 UTC (rev 8902)
@@ -1346,6 +1346,10 @@
}
}
+ $config = CreateObject('phpgwapi.config','property');
+ $config->read();
+ $tax = 1+(($config->config_data['fm_tax'])/100);
+
$sql = "SELECT EXTRACT(YEAR from
to_timestamp(start_date) ) as year, sum(calculation) as calculation,
sum(budget) as budget,"
. " sum(contract_sum) as contract_sum ,paid_percent"
. " FROM fm_workorder"
@@ -1354,6 +1358,7 @@
. " GROUP BY fm_workorder.id, paid_percent,
fm_workorder.start_date ORDER BY start_date ASC";
$this->db->query($sql,__LINE__,__FILE__);
+
while ($this->db->next_record())
{
$paid_percent =
(int)$this->db->f('paid_percent');
@@ -1365,7 +1370,7 @@
}
else if($this->db->f('calculation') > 0)
{
- $_sum = $this->db->f('calculation');
+ $_sum = $this->db->f('calculation') *
$tax;
}
else if($this->db->f('budget') > 0)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8902] Merge 8891:8901 from trunk,
Sigurd Nes <=