[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9311] Merge 9300:9310 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9311] Merge 9300:9310 from trunk |
|
Date: |
Tue, 08 May 2012 09:14:45 +0000 |
Revision: 9311
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9311
Author: sigurdne
Date: 2012-05-08 09:14:45 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Merge 9300:9310 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.uiprocedure.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/js/controller/ajax.js
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.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_year.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_item.xsl
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/js/yahoo/tts.index.js
Added Paths:
-----------
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
branches/Version-1_0-branch/controller/templates/base/calendar/icon_color_map.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
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
+
/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
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2012-05-08 09:14:45 UTC (rev 9311)
@@ -432,4 +432,5 @@
update_org activitycalendar no Oppdater organisasjonsregister
edit_contact_info activitycalendar no For å redigere
kontaktopplysninger:
edit_contact_info_org activitycalendar no Gå til
organisasjonsopplysninger
-edit_contact_info_group activitycalendar no Gå til
gruppeopplysninger
\ No newline at end of file
+edit_contact_info_group activitycalendar no Gå til
gruppeopplysninger
+arena_helptext activitycalendar no I feltet Navn skal det stå navn
på arena, som det heter på folkemunne.<br/>Når du redigerer feltet
besøksadresse, gjøres det automatisk oppslag i gatetabellen, dette for å sikre
at adresser skrives riktig, og kan kobles mot kart.<br/>Når du har funnet rett
gateadresse , gå til feltet Husnummer og legg inn husnummer.<br/>Trykk lagre.
\ No newline at end of file
Modified: branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -41,6 +41,11 @@
<form action="#" method="post">
<input type="hidden" name="id" value="<?php
if($arena->get_id()){ echo $arena->get_id(); } else { echo '0'; } ?>"/>
<dl class="proplist-col">
+ <dt><?php if($editable){
+ echo lang('arena_helptext');
+ }
+ ?>
+ </dt>
<dt>
<?php if($arena->get_arena_name() ||
$editable) { ?>
<label for="name"><?php echo
lang('name') ?></label>
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-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -162,48 +162,7 @@
return null;
}
}
- /*
- public function get_check_list(){
-
- $current_time = time();
- $buffer_in_days = 3600*24*7*5;
-
- $buffer_time = $current_time - $buffer_in_days;
-
- $sql = "SELECT p.* FROM controller_control p WHERE
$current_time >= p.start_date AND p.start_date > $buffer_time";
- $this->db->query($sql);
-
- while ($this->db->next_record()) {
- $start_date = date("d.m.Y",
$this->db->f('start_date'));
- $end_date = date("d.m.Y", $this->db->f('end_date'));
-
- $control = new
controller_control($this->unmarshal($this->db->f('id', true), 'int'));
-
-
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
-
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
- $control->set_start_date($start_date);
- $control->set_end_date($end_date);
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
-
$control->set_procedure_name($this->unmarshal($this->db->f('procedure_name',
true), 'string'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
-
$control->set_equipment_type_id($this->unmarshal($this->db->f('equipment_type_id',
true), 'int'));
-
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_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'));
-
- $results[] = $control->toArray();
- }
-
- return $results;
- }
- */
function get_check_lists_for_control($control_id){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
$sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
@@ -318,7 +277,7 @@
$sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
$sql .= "GROUP BY c.id, title, start_date, end_date, cl.id,
cl.deadline, c.repeat_type, c.repeat_interval ";
$sql .= "ORDER BY c.id";
-//var_dump($sql);
+
$this->db->query($sql);
$control_id = 0;
@@ -384,6 +343,7 @@
return $control_array;
}
+ // Fetches all controls as objects with check lists
function get_check_lists_for_location( $location_code, $from_date_ts,
$to_date_ts, $repeat_type = null, $control_id = 0 ){
$use_location_inparam = false;
$sql = "SELECT c.id as c_id, title, description, start_date,
end_date, control_area_id, c.location_code as c_location_code, repeat_type,
repeat_interval, ";
@@ -403,7 +363,7 @@
}
$sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
$sql .= "ORDER BY c.id;";
-//var_dump($sql);
+
$this->db->query($sql);
$control_id = 0;
@@ -463,6 +423,7 @@
return $controls_array;
}
+ // Fetches control id and check lists for period and location
function get_check_lists_for_location_2( $location_code, $from_date_ts,
$to_date_ts, $repeat_type ){
$sql = "SELECT c.id as c_id, ";
$sql .= "cl.id as cl_id, cl.status as cl_status, cl.comment as
cl_comment, deadline, planned_date, completed_date, ";
@@ -520,6 +481,40 @@
return $controls_array;
}
+ // Fetches check lists for location and control id
+ function get_check_lists_for_control_and_location( $control_id,
$location_code, $from_date_ts, $to_date_ts, $repeat_type = null ){
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, completed_date, ";
+ $sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases, num_pending_cases ";
+ $sql .= "FROM controller_check_list cl ";
+ $sql .= "LEFT JOIN controller_control c on cl.control_id = c.id
";
+ $sql .= "WHERE cl.control_id = {$control_id} ";
+ $sql .= "AND cl.location_code = '{$location_code}' ";
+
+ if( $repeat_type != null )
+ $sql .= "AND c.repeat_type = $repeat_type ";
+
+ $sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
+
+ $this->db->query($sql);
+
+ while ($this->db->next_record()) {
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id',
true), 'int'));
+
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
+ $check_lists_array[] = $check_list;
+ }
+
+ return array( "location_code" => $location_code,
"check_lists_array" => $check_lists_array);
+ }
+
function get_check_list_for_date($control_id, $current_date){
$sql = "SELECT c.id as c_id, title, description, start_date,
end_date, control_area_id, c.location_code as c_location_code, repeat_type,
repeat_interval, ";
$sql .= "cl.id as cl_id, cl.status as cl_status, cl.comment as
cl_comment, deadline, planned_date, completed_date, ";
Modified: branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -412,7 +412,7 @@
$like_clauses = array();
switch($search_type){
default:
- $like_clauses[] =
"controller_procedure.title $this->like $like_pattern";
+ $like_clauses[] =
"procedure.title $this->like $like_pattern";
break;
}
if(count($like_clauses))
@@ -422,7 +422,7 @@
}
$filter_clauses = array();
- $filter_clauses[] = "controller_procedure.end_date IS
NULL";
+ $filter_clauses[] = "procedure.end_date IS NULL";
/*
switch($filters['is_active']){
case "non_active":
@@ -436,11 +436,11 @@
if(isset($filters[$this->get_id_field_name()]))
{
- $filter_clauses[] = "controller_procedure.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
+ $filter_clauses[] = "procedure.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
}
if(isset($filters['control_areas']))
{
- $filter_clauses[] =
"controller_procedure.control_area_id =
{$this->marshal($filters['control_areas'], 'int')}";
+ $filter_clauses[] = "procedure.control_area_id
= {$this->marshal($filters['control_areas'], 'int')}";
}
if(count($filter_clauses))
@@ -452,16 +452,17 @@
//$joins = " {$this->left_join} controller_control_area
ON (controller_procedure.control_area_id = controller_control_area.id)";
- $tables = "controller_procedure";
+ $tables = "controller_procedure procedure";
if($return_count) // We should only return a count
{
- $cols =
'COUNT(DISTINCT(controller_procedure.id)) AS count';
+ $cols = 'COUNT(DISTINCT(procedure.id)) AS
count';
}
else
{
- $cols .= "controller_procedure.id,
controller_procedure.title, controller_procedure.purpose,
controller_procedure.responsibility, controller_procedure.description,
controller_procedure.reference, controller_procedure.attachment,
controller_procedure.start_date, controller_procedure.end_date,
controller_procedure.procedure_id, controller_procedure.revision_no,
controller_procedure.revision_date, controller_procedure.control_area_id ";
+ $cols .= "procedure.id, procedure.title,
procedure.purpose, procedure.responsibility, procedure.description,
procedure.reference, procedure.attachment, procedure.start_date,
procedure.end_date, procedure.procedure_id, procedure.revision_no,
procedure.revision_date, procedure.control_area_id ";
}
+ //var_dump($sort_field);
$dir = $ascending ? 'ASC' : 'DESC';
$order = $sort_field ? "ORDER BY
{$this->marshal($sort_field, 'field')} $dir ": '';
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -37,6 +37,7 @@
include_class('controller', 'status_agg_month_info', 'inc/helper/');
include_class('controller', 'calendar_builder', 'inc/component/');
include_class('controller', 'location_finder', 'inc/helper/');
+ include_class('controller', 'year_calendar', 'inc/component/');
class controller_uicalendar extends controller_uicommon
{
@@ -114,7 +115,7 @@
$my_locations = $location_finder->get_responsibilities(
$criteria );
if(empty($location_code)){
- $location_code =
$my_locations[0]["location_code"];
+ $location_code =
$my_locations[0]["location_code"];
}
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year);
@@ -130,27 +131,10 @@
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $control_with_check_list_array,
$num_days_in_month, "view_days" );
- 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_list =
$this->bo->read(array('type_id'=>$type_id,'lookup_tenant'=>$lookup_tenant,'lookup'=>$lookup,'allrows'=>$this->allrows,'dry_run'
=>$dry_run));
-
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
- //lookup=1&type_id=1&lookup_name=0
+
$property_array =
execMethod('property.solocation.read', array('type_id' => 1, 'allrows' =>
true));
- //$property_array =
execMethod('property.bolocation.read', array('type_id' => 1, 'lookup_name' =>
0, 'lookup' => 1));
- //print_r( $property_array );
+
$month_array = array("Januar", "Februar", "Mars",
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
@@ -176,7 +160,7 @@
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
self::render_template_xsl(array('calendar/view_calendar_month',
'calendar/check_list_status_checker'), $data);
+
self::render_template_xsl(array('calendar/view_calendar_month',
'calendar/check_list_status_checker', 'calendar/icon_color_map'), $data);
}
public function view_calendar_for_year()
@@ -196,6 +180,7 @@
$from_date_ts = strtotime("01/01/$year");
$to_year = $year + 1;
$to_date_ts = strtotime("01/01/$to_year");
+
$manage=false;
if($manage)
@@ -215,8 +200,6 @@
$my_locations =
$location_finder->get_responsibilities( $criteria );
}
-
- //print_r($my_locations);
if(empty($location_code)){
$location_code =
$my_locations[0]["location_code"];
}
@@ -227,7 +210,7 @@
// Creates a calendar object for time period
$this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
- // Loops through controls with repeat type: day or week
in controls_for_location_array
+ // Loops through controls with repeat type day or week
in controls_for_location_array
// and populates array that contains aggregate open
cases pr month.
foreach($controls_for_location_array as $control){
if($control->get_repeat_type() == 0 |
$control->get_repeat_type() == 1){
@@ -271,7 +254,7 @@
'year' =>
$year
);
- self::render_template_xsl(
array('calendar/view_calendar_year', 'calendar/check_list_status_checker'),
$data);
+ self::render_template_xsl(
array('calendar/view_calendar_year', 'calendar/check_list_status_checker',
'calendar/icon_color_map'), $data);
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
@@ -280,82 +263,94 @@
{
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
+ $year = phpgw::get_var('year');
if(is_numeric($control_id) & $control_id > 0)
{
$locations_for_control_array =
$this->so_control->get_locations_for_control($control_id);
}
- $year = intval( date("Y") );
-
+ if(empty($year)){
+ $year = intval( date("Y") );
+ }
+
$from_date_ts = strtotime("01/01/$year");
$to_year = $year + 1;
$to_date_ts = strtotime("01/01/$to_year");
-
- $this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
- $controls_with_check_lists_array = array();
+ //$this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
- if( $control->get_repeat_type() == 0 |
$control->get_repeat_type() == 1 )
- {
- foreach($locations_for_control_array as
$location)
- {
- $location_code =
$location["location_code"];
+ //$controls_with_check_lists_array = array();
+ $locations_with_calendar_array = array();
+
+ if($control->get_repeat_type() <= 1 ){
+ foreach($locations_for_control_array as
$location){
+ $curr_location_code =
$location['location_code'];
- $agg_open_cases_pr_month_array =
$this->build_agg_open_cases_pr_month_array($control, $location_code, $year);
- $curr_control = clone $control;
-
$curr_control->set_agg_open_cases_pr_month_array(
$agg_open_cases_pr_month_array );
-
$curr_control->set_location_code($location_code);
-
- $controls_with_check_lists_array[] =
$curr_control;
- }
- }
- else if($control->get_repeat_type() == 2 |
$control->get_repeat_type() == 3)
- {
- foreach($locations_for_control_array as
$location)
- {
- $location_code =
$location["location_code"];
- $curr_control = clone $control;
- $control_check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date_ts,
$to_date_ts, $control->get_repeat_type(), $control->get_id() );
-
$curr_control->set_location_code($location_code);
+ // Loops through controls in
controls_for_location_array and populates aggregate open cases pr month array.
+ $agg_open_cases_pr_month_array =
$this->build_agg_open_cases_pr_month_array($control, $curr_location_code,
$year);
- $controls_with_check_lists_array[] =
$curr_control;
+ $year_calendar = new
year_calendar($control, $year);
+ $calendar_array =
$year_calendar->build_agg_calendar($agg_open_cases_pr_month_array);
+ $locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
}
- }
-
- $controls_calendar_array =
$this->calendar_builder->build_calendar_array($controls_with_check_lists_array,
12, "view_months" );
+ }else if($control->get_repeat_type() == 2){
+ foreach($locations_for_control_array as
$location){
+ $curr_location_code =
$location['location_code'];
+
+ $repeat_type = 2;
+ $location_with_check_lists =
$this->so->get_check_lists_for_control_and_location($control_id,
$curr_location_code, $from_date_ts, $to_date_ts, $repeat_type);
+
+ $check_lists_array =
$location_with_check_lists["check_lists_array"];
+
+ $year_calendar = new
year_calendar($control, $year);
+ $calendar_array =
$year_calendar->build_calendar( $check_lists_array );
- foreach($controls_calendar_array as &$inst)
- {
- $curr_control = &$inst['control'];
- //var_dump($control['location_code']);
- foreach($locations_for_control_array as $loc1)
- {
- if($curr_control["location_code"] ==
$loc1["location_code"])
- $curr_control["location_name"]
= $loc1["loc1_name"];
+ $locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
}
- }
+ }else if($control->get_repeat_type() == 3){
+ foreach($locations_for_control_array as
$location){
+ $curr_location_code =
$location['location_code'];
+
+ $repeat_type = 3;
+ $location_with_check_lists =
$this->so->get_check_lists_for_control_and_location($control_id,
$curr_location_code, $from_date_ts, $to_date_ts, $repeat_type);
+
+ $year_calendar = new
year_calendar($control, $year);
+
+ $check_lists_array =
$location_with_check_lists["check_lists_array"];
+
+ $calendar_array =
$year_calendar->build_calendar( $check_lists_array );
+
+ $locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
+ }
+ }
- //_debug_array($controls_calendar_array);
+ $criteria = array
+ (
+ 'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'], //
+ 'type_id' => 1, // Nivå i bygningsregisteret
1:eiendom
+ 'role_id' => 0, // For å begrense til en
bestemt rolle - ellers listes alle roller for brukeren
+ 'allrows' => false
+ );
+
+ $location_finder = new location_finder();
+ $my_locations = $location_finder->get_responsibilities(
$criteria );
+ //$controls_calendar_array =
$this->calendar_builder->build_calendar_array($controls_with_check_lists_array,
12, "view_months" );
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
-
+
$data = array
(
- 'my_locations' =>
$locations_for_control_array,
- 'view_location_code' => null,
- 'location_array' =>
$locations_for_control_array,
- 'heading_array' =>
$heading_array,
- 'controls_calendar_array' =>
$controls_calendar_array,
- 'date_format' =>
$date_format,
- 'period' =>
$year,
- 'year' =>
$year,
- 'show_location' => 'yes',
- 'control_name' =>
$control->get_title()
+ 'my_locations'
=> $my_locations,
+ 'control'
=> $control->toArray(),
+ 'heading_array'
=> $heading_array,
+ 'locations_with_calendar_array' =>
$locations_with_calendar_array,
+ 'date_format'
=> $date_format,
+ 'period'
=> $year,
+ 'year'
=> $year,
);
-
self::render_template_xsl('calendar/view_calendar_year', $data);
-
+ self::render_template_xsl(
array('calendar/view_calendar_year_for_locations',
'calendar/check_list_status_checker', 'calendar/icon_color_map'), $data);
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -650,9 +650,6 @@
$closed_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id,
"control_item_type_1", 'closed', null, 'return_array');
$closed_check_items_and_measurements =
$this->so_check_item->get_check_items_with_cases($check_list_id,
"control_item_type_2", 'closed', null, 'return_array');
- //echo "SKRIVER UT LUKKEDE SAKER";
- //print_r($closed_check_items_and_cases);
-
$data = array
(
'closed_check_items_and_cases'
=> $closed_check_items_and_cases,
Modified: branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -140,7 +140,7 @@
array(
'key' => 'title',
'label' =>
lang('Procedure title'),
- 'sortable' => false
+ 'sortable' => true
),
array(
'key' => 'purpose',
@@ -466,10 +466,15 @@
/*
* hack to fix display of char
*/
+
$procedure->set_description(str_replace(" ", "
",$procedure->get_description()));
$procedure->set_responsibility(str_replace(' ', ' ',
$procedure->get_responsibility()));
$procedure->set_reference(str_replace(' ',
' ', $procedure->get_reference()));
-
+/*
+
$procedure->set_description(htmlspecialchars_decode($procedure->get_description()));
+
$procedure->set_responsibility(htmlspecialchars_decode($procedure->get_responsibility()));
+
$procedure->set_reference(htmlspecialchars_decode($procedure->get_reference()));
+*/
$procedure_array = $procedure->toArray();
if($procedure->get_start_date() &&
$procedure->get_start_date() != null)
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-05-08 09:13:31 UTC (rev 9310)
+++
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -29,13 +29,13 @@
$date_generator = new
date_generator($control->get_start_date(), $control->get_end_date(),
$this->period_start_date, $this->period_end_date, $control->get_repeat_type(),
$control->get_repeat_interval());
$dates_array = $date_generator->get_dates();
- // Inserts dates
+ // Inserts dates
foreach($dates_array as $date){
$todays_date = mktime(0,0,0,date("m"), date("d"),
date("Y"));
if($date < $todays_date){
- $status = "control_not_accomplished";
+ $status = "CONTROL_NOT_DONE";
}else{
$status = "CONTROL_REGISTERED";
}
@@ -63,6 +63,8 @@
// ======================== DISPLAY STATUS FOR A MONTH
OR DAYS IN A MONTH ==========================
if($period_type == "view_days" | ($period_type ==
"view_months" & $control->get_repeat_type() == 2 | $control->get_repeat_type()
== 3))
{
+ $check_list_array =
$control->get_check_lists_array();
+
$calendar_array = $this->init_calendar(
$control, $num, $period_type );
foreach($control->get_check_lists_array() as
$check_list)
Copied:
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
(from rev 9310, trunk/controller/inc/component/class.year_calendar.inc.php)
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
(rev 0)
+++
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -0,0 +1,79 @@
+<?php
+phpgw::import_class('controller.socheck_list');
+include_class('controller', 'date_generator', 'inc/component/');
+include_class('controller', 'check_list_status_info', 'inc/helper/');
+include_class('controller', 'check_list_status_manager', 'inc/helper/');
+
+
+class year_calendar {
+
+ private $period_start_date_ts;
+ private $period_end_date_ts;
+ private $year;
+ private $control;
+ private $calendar_array = array();
+
+ public function __construct($control, $year){
+ $this->year = $year;
+ $this->control = $control;
+
+ $this->period_start_date_ts = strtotime("01/01/$year");
+ $to_year = $year + 1;
+ $this->period_end_date_ts = strtotime("01/01/$to_year");
+
+ $this->init_calendar();
+ }
+
+ function init_calendar(){
+
+ for($i = 1;$i <= 12;$i++){
+ $this->calendar_array[$i] = null;
+ }
+
+ $date_generator = new
date_generator($this->control->get_start_date(),
$this->control->get_end_date(), $this->period_start_date_ts,
$this->period_end_date_ts, $this->control->get_repeat_type(),
$this->control->get_repeat_interval());
+ $dates_array = $date_generator->get_dates();
+
+ // Inserts dates
+ foreach($dates_array as $date){
+
+ $todays_date = mktime(0,0,0,date("m"), date("d"),
date("Y"));
+
+ if($date < $todays_date){
+ $status = "CONTROL_NOT_DONE";
+ }else{
+ $status = "CONTROL_REGISTERED";
+ }
+
+ $this->calendar_array[ date("n", $date) ]["status"] =
$status;
+ $this->calendar_array[ date("n", $date) ]["info"] =
array("date" => $date, "control_id" => $this->control->get_id());
+ }
+ }
+
+ public function build_calendar( $check_lists_array ){
+
+ foreach($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();
+
+ $this->calendar_array[ date("n",
$check_list_status_info->get_deadline_date_ts()) ]["status"] =
$check_list_status_info->get_status();
+ $this->calendar_array[ date("n",
$check_list_status_info->get_deadline_date_ts()) ]["info"] =
$check_list_status_info->serialize();
+ }
+
+ return $this->calendar_array;
+ }
+
+ public function build_agg_calendar( $agg_open_cases_pr_month_array ){
+
+ foreach($agg_open_cases_pr_month_array as
$status_agg_month_info)
+ {
+ $status = "CONTROLS_DONE_WITH_ERRORS";
+
+
$this->calendar_array[$status_agg_month_info->get_month_nr()]["status"] =
$status;
+
$this->calendar_array[$status_agg_month_info->get_month_nr()]["info"] =
$status_agg_month_info->get_agg_open_cases();
+ }
+
+ return $this->calendar_array;
+ }
+
+}
\ No newline at end of file
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-05-08 09:13:31 UTC (rev 9310)
+++
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_info.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -36,6 +36,7 @@
private $deadline_date_ts;
private $deadline_date_txt;
private $info_text;
+ private $location_code;
private $num_open_cases;
public function __construct(){}
@@ -82,6 +83,13 @@
public function get_info_text() { return $this->info_text; }
+ public function set_location_code($location_code)
+ {
+ $this->location_code = $location_code;
+ }
+
+ public function get_location_code() { return
$this->location_code; }
+
public function set_num_open_cases($num_open_cases)
{
$this->num_open_cases = $num_open_cases;
@@ -99,6 +107,7 @@
'deadline_date_ts' =>
$this->get_deadline_date_ts(),
'deadline_date_txt' =>
$this->get_deadline_date_txt(),
'info_text' => $this->get_info_text(),
+ 'location_code' => $this->get_location_code(),
'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-05-08 09:13:31 UTC (rev 9310)
+++
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -56,7 +56,7 @@
}
else if( $this->check_list->get_status() ==
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_deadline() <
$todays_date_ts )
{
- $status = "control_not_accomplished";
+ $status = "CONTROL_NOT_DONE";
}
else if( $this->check_list->get_status() ==
controller_check_list::STATUS_DONE & $this->check_list->get_completed_date() >
$this->check_list->get_deadline() & $this->check_list->get_num_open_cases() ==
0)
{
@@ -67,17 +67,18 @@
$status = "CONTROL_DONE_IN_TIME_WITHOUT_ERRORS";
}
else if( $this->check_list->get_status() ==
controller_check_list::STATUS_DONE & $this->check_list->get_num_open_cases() >
0){
- $status = "control_accomplished_with_errors";
+ $status = "CONTROL_DONE_WITH_ERRORS";
$check_list_status_info->set_num_open_cases($this->check_list->get_num_open_cases());
}
else if( $this->check_list->get_status() ==
controller_check_list::STATUS_CANCELED)
{
- $status = "control_canceled";
+ $status = "CONTROL_CANCELED";
}
$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_location_code(
$this->check_list->get_location_code() );
$check_list_status_info->set_status($status);
return $check_list_status_info;
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-05-08 09:14:45 UTC (rev 9311)
@@ -581,6 +581,8 @@
$(submitBnt).removeClass("not_active");
});
+
+
//============================= MESSAGE ===========================
// REGISTER MESSAGE
@@ -637,7 +639,7 @@
- //============================= CASE ===========================
+ //======================================= CASE
======================================
// REGISTER CASE
$(".frm_register_case").live("submit", function(e){
@@ -664,12 +666,15 @@
// Changes text on save button back
to original
window.setTimeout(function() {
if( type ==
"control_item_type_2")
-
$(submitBnt).val('Registrer måling');
+
$(submitBnt).val('Lagre måling');
else
-
$(submitBnt).val('Registrer sak');
+
$(submitBnt).val('Lagre sak');
$(submitBnt).addClass("not_active");
}, 1000);
+
+ $(thisForm).delay(1500).slideUp(500);
+
$(thisForm).parents("ul.expand_list").find("h4 img").delay(1500).attr("src",
"controller/images/arrow_right.png");
}
}
}
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-08 09:13:31 UTC (rev 9310)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-08 09:14:45 UTC (rev 9311)
@@ -33,6 +33,22 @@
</a>
</div>
</xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE'">
+ <div>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+
<xsl:text>&date=</xsl:text>
+ <xsl:value-of
select="info/date"/>
+
<xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="info/control_id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="$location_code"/>
+ </xsl:attribute>
+ <img height="15"
src="controller/images/status_icon_red_cross.png" />
+ </a>
+ </div>
+ </xsl:when>
<xsl:when test="status =
'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
<div>
<a>
@@ -72,7 +88,7 @@
</a>
</div>
</xsl:when>
- <xsl:when test="status =
'control_accomplished_with_errors'">
+ <xsl:when test="status = 'CONTROL_DONE_WITH_ERRORS'">
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
<div id="info_box"></div>
<a class="view_info_box">
@@ -89,37 +105,24 @@
</a>
</div>
</xsl:when>
- <xsl:when test="status =
'control_not_accomplished_with_info'">
- <div style="position:relative;">
- <div id="info_box"></div>
- <a>
- <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:value-of select="info/id"/></span>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </a>
- </div>
- </xsl:when>
- <xsl:when test="status = 'control_not_accomplished'">
- <div>
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-
<xsl:text>&date=</xsl:text>
- <xsl:value-of
select="info/date"/>
-
<xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="info/control_id"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="$location_code"/>
+ <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
+ <div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <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>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
+ <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"/>
</a>
</div>
</xsl:when>
- <xsl:when test="status = 'control_canceled'">
+ <xsl:when test="status = 'CONTROL_CANCELED'">
<div>
<img height="15"
src="controller/images/status_icon_red_cross.png" />
</div>
Copied:
branches/Version-1_0-branch/controller/templates/base/calendar/icon_color_map.xsl
(from rev 9310, trunk/controller/templates/base/calendar/icon_color_map.xsl)
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/icon_color_map.xsl
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/icon_color_map.xsl
2012-05-08 09:14:45 UTC (rev 9311)
@@ -0,0 +1,13 @@
+<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
+<xsl:template name="icon_color_map" xmlns:php="http://php.net/xsl";>
+
+ <ul id="icon_color_map">
+ <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="15" src="controller/images/status_icon_yellow.png"
/><span>Kontroll har planlagt dato</span></li>
+ <li><img height="15" src="controller/images/status_icon_dark_green.png"
/><span>Kontroll gjennomført uten åpne saker før frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten åpne saker etter frist</span></li>
+ <li><img height="15" src="controller/images/status_icon_red_empty.png"
/><span>Kontroll gjennomført med åpne saker</span></li>
+ <li><img height="15" src="controller/images/status_icon_red_cross.png"
/><span>Kontroll ikke gjennomført</span></li>
+</ul>
+
+</xsl:template>
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-05-08 09:13:31 UTC (rev 9310)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-08 09:14:45 UTC (rev 9311)
@@ -8,7 +8,7 @@
<div id="control_plan">
<div class="top">
<h1><xsl:value-of
select="location_array/loc1_name"/></h1>
- <h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/><span style="margin-left:5px;"><xsl:value-of
select="year"/></span></h3>
+ <h3>Kalenderoversikt for <xsl:value-of
select="period"/><span class="year"><xsl:value-of select="year"/></span></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -39,15 +39,9 @@
</div>
<div class="middle">
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten åpne saker før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten åpne saker etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med åpne saker</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
+ <xsl:call-template name="icon_color_map" />
+
<a style="display:block;font-weight: bold;font-size:
14px;float:left;">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
@@ -81,7 +75,6 @@
<div id="cal_wrp">
-
<ul class="calendar month">
<li class="heading">
<div class="control_details_wrp">
@@ -117,7 +110,7 @@
<xsl:value-of
select="control/responsibility_name"/>
</div>
<div class="frequency">
- <xsl:value-of
select="control/repeat_type"/>
+ <xsl:value-of
select="control/repeat_type_label"/>
<xsl:value-of
select="control/repeat_interval"/>
</div>
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-05-08 09:13:31 UTC (rev 9310)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-08 09:14:45 UTC (rev 9311)
@@ -3,68 +3,47 @@
<xsl:variable name="date_format">d/m-Y</xsl:variable>
<xsl:variable name="year"><xsl:value-of select="year"/></xsl:variable>
<xsl:variable name="view_location_code"><xsl:value-of
select="view_location_code"/></xsl:variable>
-
+
<div id="main_content">
<div id="control_plan">
<div class="top">
- <xsl:choose>
- <xsl:when test="show_location">
- <h1><xsl:value-of
select="control_name"/></h1>
- </xsl:when>
- <xsl:otherwise>
- <h1><xsl:value-of
select="location_array/loc1_name"/></h1>
- </xsl:otherwise>
- </xsl:choose>
- <h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
- <xsl:choose>
- <xsl:when test="show_location"> </xsl:when>
- <xsl:otherwise>
- <form action="#">
- <input type="hidden"
name="period_type" value="view_year" />
- <input type="hidden"
name="year">
- <xsl:attribute name="value">
- <xsl:value-of select="year"/>
- </xsl:attribute>
- </input>
-
- <select id="choose_my_location">
- <xsl:for-each
select="my_locations">
- <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
- <xsl:choose>
-
<xsl:when test="location_code = $view_location_code">
-
<option value="{$loc_code}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{$loc_code}">
-
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
-
</option>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- </form>
- </xsl:otherwise>
- </xsl:choose>
- </div>
+ <h1>Kontrollplan for <xsl:value-of
select="location_array/loc1_name"/></h1>
+ <h3 style="margin:0;font-size:19px;">Periode:
<xsl:value-of select="period"/></h3>
+
+ <form action="#">
+ <input type="hidden" name="period_type"
value="view_year" />
+ <input type="hidden" name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of select="year"/>
+ </xsl:attribute>
+ </input>
+ <select id="choose_my_location">
+ <xsl:for-each select="my_locations">
+ <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="location_code = $view_location_code">
+ <option
value="{$loc_code}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="{$loc_code}">
+
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </form>
+ </div>
<div class="middle">
-
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten åpne saker før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten åpne saker etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med åpne saker</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
+ <xsl:call-template name="icon_color_map" />
-
-
</div>
+
<div id="cal_wrp">
<ul class="calendar">
<li class="heading">
@@ -103,41 +82,37 @@
<xsl:variable
name="control_id"><xsl:value-of select="control/id"/></xsl:variable>
<li>
- <xsl:choose>
- <xsl:when test="(position() mod 2) !=
1">
- <xsl:attribute
name="class">odd</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute
name="class">even</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="(position() mod
2) != 1">
+ <xsl:attribute
name="class">odd</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">even</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
- <div class="control_details_wrp">
- <xsl:if test="//show_location">
- <div class="location">
- <xsl:value-of
select="control/location_name"/>
+ <div class="control_details_wrp">
+ <xsl:if
test="//show_location">
+ <div
class="location">
+
<xsl:value-of select="control/location_name"/>
+ </div>
+ </xsl:if>
+ <div class="title">
+ <xsl:value-of
select="control/title"/>
</div>
- </xsl:if>
- <div class="title">
- <xsl:value-of
select="control/title"/>
- </div>
- <div class="assigned">
- <xsl:value-of
select="control/responsibility_name"/>
- </div>
-
- <div class="frequency">
- <xsl:value-of
select="control/repeat_type_label"/>
- </div>
+ <div class="assigned">
+ <xsl:value-of
select="control/responsibility_name"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_type_label"/>
+ </div>
</div>
<div class="months_wrp">
-
- <xsl:for-each
select="calendar_array">
-
-
- <xsl:call-template
name="check_list_status_checker" >
- <xsl:with-param
name="location_code"><xsl:value-of
select="$view_location_code"/></xsl:with-param>
- </xsl:call-template>
- </xsl:for-each>
+ <xsl:for-each
select="calendar_array">
+
<xsl:call-template name="check_list_status_checker" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="$view_location_code"/></xsl:with-param>
+
</xsl:call-template>
+ </xsl:for-each>
</div>
</li>
</xsl:for-each>
Copied:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
(from rev 9310,
trunk/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
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-08 09:14:45 UTC (rev 9311)
@@ -0,0 +1,95 @@
+<!-- $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="year"><xsl:value-of select="year"/></xsl:variable>
+
+<div id="main_content">
+
+ <div id="control_plan">
+ <div class="top">
+ <h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
+ <h3>Periode: <xsl:value-of select="period"/></h3>
+
+ <form action="#">
+ <input type="hidden" name="period_type"
value="view_year" />
+ <input type="hidden" name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of select="year"/>
+ </xsl:attribute>
+ </input>
+
+ <select id="choose_my_location">
+ <xsl:for-each select="my_locations">
+ <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
+ <option value="{$loc_code}">
+ <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </form>
+ </div>
+ <div class="middle">
+ <xsl:call-template name="icon_color_map" />
+ </div>
+ <div id="cal_wrp">
+ <ul class="calendar">
+ <li class="heading">
+ <div class="control_details_wrp">
+ <div
class="location">Lokasjon</div>
+ </div>
+ <div class="months_wrp">
+ <xsl:for-each
select="heading_array">
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+
<xsl:text>&year=</xsl:text>
+
<xsl:value-of select="$year"/>
+
<xsl:text>&month=</xsl:text>
+
<xsl:number/>
+
</xsl:attribute>
+
<xsl:value-of select="."/>
+ </a>
+ </div>
+ </xsl:for-each>
+ </div>
+ </li>
+
+ <xsl:choose>
+ <xsl:when
test="locations_with_calendar_array/child::node()">
+
+ <xsl:for-each
select="locations_with_calendar_array">
+ <li>
+ <xsl:choose>
+ <xsl:when test="(position() mod
2) != 1">
+ <xsl:attribute
name="class">odd</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">even</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <div class="control_details_wrp">
+ <div class="location">
+ <xsl:value-of
select="location"/>
+ </div>
+ </div>
+ <div class="months_wrp">
+ <xsl:for-each
select="calendar_array">
+
<xsl:call-template name="check_list_status_checker" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
+
</xsl:call-template>
+ </xsl:for-each>
+ </div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <div class="cal_info_msg">Ingen sjekklister for
bygg i angitt periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+ </div>
+</div>
+</div>
+</xsl:template>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
2012-05-08 09:13:31 UTC (rev 9310)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
2012-05-08 09:14:45 UTC (rev 9311)
@@ -41,7 +41,7 @@
<xsl:value-of select="comment"/>
</textarea>
</div>
-
<input type="submit" class="btn not_active"
name="save_control" value="Registrer sak" />
+
<input type="submit" class="btn not_active"
name="save_control" value="Lagre sak" />
</form>
</xsl:when>
<xsl:when test="type = 'control_item_type_2'">
@@ -76,7 +76,7 @@
</textarea>
</div>
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
-
<input type="submit" name="save_control" value="Registrer
måling" class="not_active" title="{$lang_save}" />
+
<input type="submit" name="save_control" value="Lagre
måling" class="not_active" title="{$lang_save}" />
</form>
</xsl:when>
</xsl:choose>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-08 09:14:45 UTC (rev 9311)
@@ -908,13 +908,18 @@
}
/* ====================== CALENDAR ========================== */
-#control_plan .top {
- overflow: hidden;
+
+#control_plan .top h1{
+
}
-
#control_plan .top h3{
- float:left;
+ margin:0;
+ font-size:19px;
+ overflow: hidden;
}
+#control_plan .top h3 .year{
+ margin-left:5px;
+}
#control_plan .top form{
float:right;
}
@@ -972,7 +977,7 @@
float: left;
height: 30px;
text-align: center;
- width: 52px;
+ width: 40px;
}
ul.calendar li {
height: 30px;
@@ -1001,8 +1006,8 @@
width: 200px;
}
ul.calendar div.location {
- width: 150px;
- text-align: left;
+ text-align: left;
+ width: 600px;
}
.control_details_wrp div.assigned {
text-align: left;
@@ -1012,17 +1017,16 @@
width: 130x;
}
-ul.calendar div.title{
+ul.calendar div.title {
text-align: left;
}
-ul.calendar .heading div.title{
+ul.calendar .heading div.title {
text-align: center;
}
ul.calendar div.frequency {
margin-right: 10px;
width: 65px;
}
-
.cal_info_msg{
font-size: 16px;
padding: 40px 20px;
@@ -1035,7 +1039,7 @@
display: block;
font-size: 10px;
font-weight: bold;
- left: 23px;
+ left: 18px;
position: absolute;
text-decoration: none;
top: 8px;
Modified:
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_item.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_item.xsl
2012-05-08 09:13:31 UTC (rev 9310)
+++
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_item.xsl
2012-05-08 09:14:45 UTC (rev 9311)
@@ -213,7 +213,7 @@
<xsl:template match="options">
<option value="{id}">
- <xsl:if test="selected != 0">
+ <xsl:if test="selected">
<xsl:attribute name="selected" value="selected"
/>
</xsl:if>
<xsl:value-of disable-output-escaping="yes"
select="name"/>
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-05-08 09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-05-08 09:14:45 UTC (rev 9311)
@@ -421,18 +421,6 @@
$this->status_id =
$default_status;
}
-/*
- $bgcolor_array[1] = '#dadada';
- $bgcolor_array[2] = '#dad0d0';
- $bgcolor_array[3] = '#dacaca';
- $bgcolor_array[4] = '#dac0c0';
- $bgcolor_array[5] = '#dababa';
- $bgcolor_array[6] = '#dab0b0';
- $bgcolor_array[7] = '#daaaaa';
- $bgcolor_array[8] = '#da9090';
- $bgcolor_array[9] = '#da8a8a';
- $bgcolor_array[10] = '#da7a7a';
- */
$bgcolor_array[1] = '#da7a7a';
$bgcolor_array[2] = '#dababa';
$bgcolor_array[3] = '#dadada';
@@ -1249,15 +1237,16 @@
//values for Pagination
$json = array
(
- 'recordsReturned' =>
$datatable['pagination']['records_returned'],
- 'totalRecords' =>
(int)$datatable['pagination']['records_total'],
- 'startIndex' =>
$datatable['pagination']['records_start'],
- 'sort' =>
$datatable['sorting']['order'],
- 'dir' =>
$datatable['sorting']['sort'],
- 'records' =>
array(),
- 'show_sum' =>
$this->acl->check('.ticket.order', PHPGW_ACL_READ, 'property'),
- 'sum_budget' =>
$this->bo->sum_budget,
- 'sum_actual_cost' =>
$this->bo->sum_actual_cost
+ 'recordsReturned' =>
$datatable['pagination']['records_returned'],
+ 'totalRecords' =>
(int)$datatable['pagination']['records_total'],
+ 'startIndex' =>
$datatable['pagination']['records_start'],
+ 'sort'
=> $datatable['sorting']['order'],
+ 'dir'
=> $datatable['sorting']['sort'],
+ 'records'
=> array(),
+ 'show_sum_estimate' =>
in_array('estimate', $custom_cols),//$this->acl->check('.ticket.order',
PHPGW_ACL_READ, 'property'),
+ 'show_sum_actual_cost' =>
in_array('actual_cost', $custom_cols),
+ 'sum_budget' =>
$this->bo->sum_budget,
+ 'sum_actual_cost' =>
$this->bo->sum_actual_cost
);
// values for datatable
Modified: branches/Version-1_0-branch/property/js/yahoo/tts.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/tts.index.js 2012-05-08
09:13:31 UTC (rev 9310)
+++ branches/Version-1_0-branch/property/js/yahoo/tts.index.js 2012-05-08
09:14:45 UTC (rev 9311)
@@ -116,7 +116,7 @@
this.myParticularRenderEvent = function()
{
- if(values_ds.show_sum)
+ if(values_ds.show_sum_estimate ||
values_ds.show_sum_actual_cost)
{
tableYUI.deleteTFoot();
addFooterDatatable();
@@ -128,23 +128,48 @@
tmp_sum_budget = YAHOO.util.Number.format(values_ds.sum_budget,
{decimalPlaces:0, decimalSeparator:",", thousandsSeparator:" "});
tmp_sum_actual_cost =
YAHOO.util.Number.format(values_ds.sum_actual_cost, {decimalPlaces:2,
decimalSeparator:",", thousandsSeparator:" "});
+ var show_estimate = false;
+ var show_actual_cost = false;
count_empty = 0;
for(i=0;i<myColumnDefs.length;i++)
{
if (myColumnDefs[i].key == 'estimate')
{
+ show_estimate = true;
count_empty = i;
break;
}
}
+ count_empty_cost = 0;
+ for(i=0;i<myColumnDefs.length;i++)
+ {
+ if (myColumnDefs[i].key == 'actual_cost')
+ {
+ count_empty_cost = i;
+ show_actual_cost = true;
+ break;
+ }
+ }
+
+ if(!count_empty)
+ {
+ count_empty = count_empty_cost;
+ }
+
count_empty_end = myColumnDefs.length - count_empty - 2;
//Create ROW
newTR = document.createElement('tr');
td_empty(count_empty);
- td_sum(tmp_sum_budget);
- td_sum(tmp_sum_actual_cost);
+ if(show_estimate)
+ {
+ td_sum(tmp_sum_budget);
+ }
+ if(show_actual_cost)
+ {
+ td_sum(tmp_sum_actual_cost);
+ }
td_empty(count_empty_end);
//Add to Table
myfoot = tableYUI.createTFoot();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9311] Merge 9300:9310 from trunk,
Sigurd Nes <=