[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8868] Merge 8859:8867 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [8868] Merge 8859:8867 from trunk |
Date: |
Tue, 14 Feb 2012 14:18:00 +0000 |
Revision: 8868
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8868
Author: sigurdne
Date: 2012-02-14 14:17:59 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Merge 8859:8867 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
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/component/class.calendar_builder.inc.php
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/css/base.css
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
+
/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
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2012-02-14 13:40:10 UTC (rev 8867)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2012-02-14 14:17:59 UTC (rev 8868)
@@ -325,10 +325,10 @@
$this->agegroup_bo->extract_form_data($booking);
$errors = $this->bo->validate($booking);
- if (strtotime($_POST['from_']) <
($today[0]-60*60*24*7*2))
- {
- $errors['booking'] = lang('You
cant edit a booking that is older than 2 weeks');
- }
+# if (strtotime($_POST['from_']) <
($today[0]-60*60*24*7*2))
+# {
+# $errors['booking'] = lang('You
cant edit a booking that is older than 2 weeks');
+# }
if (!$errors) {
$receipt =
$this->bo->update($booking);
$this->redirect(array('menuaction' => 'bookingfrontend.uibuilding.schedule',
'id'=>$booking['building_id']));
Modified: branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
2012-02-14 13:40:10 UTC (rev 8867)
+++ branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
2012-02-14 14:17:59 UTC (rev 8868)
@@ -355,4 +355,4 @@
Cancel information2 bookingfrontend no Skal du Avbestille flere kan du
velge Ut sesong eller Slett til og velg en dato, du kan også velge intervall
(f.eks. annen hver uke).
Booking Cancel information bookingfrontend no Hvis du skal avbestille
booking på valgt dato, velg Avbestill-knappen nederst. Skal tiden bli vist som
ledig i kalenderen krysser du av for slett tildeling.
Booking Cancel information2 bookingfrontend no Skal du avbestille
flere kan du velge Ut sesong eller Avbestill til og velg en dato, du kan også
velge intervall (f.eks. annen hver uke).
-
+You cant edit a booking that is older than 2 weeks bookingfrontend no
Du kan ikke redigere en booking som er eldre en 2 uker.
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-14 13:40:10 UTC (rev 8867)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-02-14 14:17:59 UTC (rev 8868)
@@ -116,9 +116,11 @@
public function get_controls_by_location($location_code,
$from_date, $to_date, $repeat_type, $return_type = "return_object")
{
$controls_array = array();
+ $joins .= " {$this->left_join} fm_responsibility_role
ON (c.responsibility_id = fm_responsibility_role.id)";
- $sql = "SELECT distinct c.* FROM
controller_control_location_list cll ";
+ $sql = "SELECT distinct c.*,
fm_responsibility_role.name AS responsibility_name FROM
controller_control_location_list cll ";
$sql .= "LEFT JOIN controller_control c on
cll.control_id=c.id ";
+ $sql .= "LEFT JOIN fm_responsibility_role ON
fm_responsibility_role.id = c.responsibility_id ";
$sql .= "WHERE cll.location_code = '$location_code' ";
if( is_numeric($repeat_type) )
@@ -139,6 +141,7 @@
$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_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
true), 'int'));
$control->set_component_id($this->unmarshal($this->db->f('component_id', true),
'int'));
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-14 13:40:10 UTC (rev 8867)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-02-14 14:17:59 UTC (rev 8868)
@@ -108,7 +108,7 @@
$location_code =
$my_locations[0]["location_code"];
}
- $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year) ;
+ $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year);
// Fetches controls for location within specified time
period
$controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts);
@@ -121,7 +121,21 @@
$controls_calendar_array = array();
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_calendar_array,
$controls_with_check_list, $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_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$month_array = array("Januar", "Februar", "Mars",
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
@@ -129,7 +143,7 @@
for($i=1;$i<=$num_days_in_month;$i++){
$heading_array[$i] = "$i";
}
-
+
$data = array
(
'my_locations' =>
$my_locations,
@@ -170,15 +184,15 @@
$year = phpgw::get_var('year');
if(empty($year)){
- $year = date("Y");
+ $year = date("Y");
}
$year = intval($year);
-
+
$from_date_ts = strtotime("01/01/$year");
$to_year = $year + 1;
$to_date_ts = strtotime("01/01/$to_year");
-
+
$criteria = array
(
'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
@@ -196,21 +210,41 @@
$repeat_type = null;
- $controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type );
-
+ $controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
+
$this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
$controls_calendar_array = array();
// Puts aggregate values for daily controls in a twelve
month array
foreach($controls_for_location_array as $control){
- if($control->get_repeat_type() == 0 |
$control->get_repeat_type() == 1){
- $controls_calendar_array =
$this->calendar_builder->build_agg_calendar($controls_calendar_array, $control,
$location_code, $year);
+
+ if($control->get_repeat_type() == 0 |
$control->get_repeat_type() == 1)
+ {
+ $controls_calendar_array =
$this->calendar_builder->build_agg_calendar_array($controls_calendar_array,
$control, $location_code, $year);
}
+ else if($control->get_repeat_type() == 2)
+ {
+ $repeat_type = 2;
+ $control_check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date_ts,
$to_date_ts, $repeat_type );
+ //print_r($control_check_list_array);
+
+ $controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_calendar_array,
$control_check_list_array, 12, "view_months" );
+ }
+ else if($control->get_repeat_type() == 3)
+ {
+ $repeat_type = 3;
+ $control_check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date_ts,
$to_date_ts, $repeat_type );
+
+ $controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_calendar_array,
$control_check_list_array, 12, "view_months" );
+ }
}
+ /*
$repeat_type = 2;
$control_check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date_ts,
$to_date_ts, $repeat_type );
+ print_r($controls_calendar_array);
+ print_r($controls_calendar_array);
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_calendar_array,
$control_check_list_array, 12, "view_months" );
@@ -218,6 +252,20 @@
$control_check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date_ts,
$to_date_ts, $repeat_type );
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_calendar_array,
$control_check_list_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));
@@ -240,7 +288,7 @@
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
- /*
+
public function view_calendar_for_locations()
{
$control_id = phpgw::get_var('control_id');
@@ -283,6 +331,15 @@
if($curr_control["location_code"] ==
$loc1["location_code"])
$curr_control["location_name"]
= $loc1["loc1_name"];
}
+
+ 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";
}
//_debug_array($controls_calendar_array);
@@ -308,6 +365,6 @@
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
- */
+
public function query(){}
}
\ No newline at end of file
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-14 13:40:10 UTC (rev 8867)
+++
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-02-14 14:17:59 UTC (rev 8868)
@@ -19,7 +19,6 @@
$calendar_array = $this->init_calendar( $control,
$calendar_array, $num, $period_type );
- // Inserts check_list object on deadline month in
twelve_months_array
foreach($control->get_check_lists_array() as
$check_list){
$check_list_status_info = new
check_list_status_info();
@@ -76,7 +75,7 @@
return $controls_calendar_array;
}
- public function build_agg_calendar($controls_calendar_array, $control,
$location_code, $year){
+ public function build_agg_calendar_array($controls_calendar_array,
$control, $location_code, $year){
if( date("Y", $control->get_start_date()) == $year ){
$from_month = date("n", $control->get_start_date());
@@ -90,10 +89,12 @@
$to_month = 12;
}
+ /*
$todays_date_ts = mktime(0,0,0,date("m"), date("d"), date("Y"));
$twelve_month_array = array();
+
for($i=1;$i<=12;$i++){
$trail_date_ts = strtotime("$i/01/$year");
@@ -105,7 +106,8 @@
$twelve_month_array[$i-1]["status"] = $status;
}
-
+ */
+
for($from_month;$from_month<=$to_month;$from_month++){
$trail_from_date_ts = strtotime("$from_month/01/$year");
@@ -142,7 +144,7 @@
$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 on behalf of repeat type and repeat interval
+ // Inserts dates
foreach($dates_array as $date){
$todays_date = mktime(0,0,0,date("m"), date("d"),
date("Y"));
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-02-14 13:40:10 UTC (rev 8867)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-02-14 14:17:59 UTC (rev 8868)
@@ -42,9 +42,9 @@
<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 feil før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</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>
</div>
@@ -146,99 +146,13 @@
</li>
<xsl:choose>
<xsl:when
test="controls_calendar_array/child::node()">
- <xsl:for-each
select="controls_calendar_array">
- <li>
- <xsl:for-each
select="calendar_array">
- <xsl:choose>
-
<xsl:when test="status = 'control_registered'">
-
<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_yellow_ring.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_planned'">
-
<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>
-
<img height="15" src="controller/images/status_icon_yellow.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
-
<div>
+ <xsl:for-each
select="controls_calendar_array">
+ <li>
+ <xsl:for-each
select="calendar_array">
+ <xsl:choose>
+
<xsl:when test="status = 'control_registered'">
+
<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_dark_green.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></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_light_green.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_with_errors'">
-
<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 = 'control_not_accomplished_with_info'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></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>
@@ -248,23 +162,108 @@
<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" />
+
<img height="15"
src="controller/images/status_icon_yellow_ring.png" />
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_canceled'">
-
<div>
-
<img height="15" src="controller/images/status_icon_red_cross.png" />
-
</div>
-
</xsl:when>
-
<xsl:otherwise>
-
<div></div>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </li>
-
- </xsl:for-each>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_planned'">
+
<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>
+
<img height="15" src="controller/images/status_icon_yellow.png"
/>
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
+
<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_dark_green.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
+
<div style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;"></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_light_green.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_with_errors'">
+
<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 = 'control_not_accomplished_with_info'">
+
<div style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;"></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:attribute>
+
<img height="15"
src="controller/images/status_icon_red_cross.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_canceled'">
+
<div>
+
<img height="15"
src="controller/images/status_icon_red_cross.png" />
+
</div>
+
</xsl:when>
+
<xsl:otherwise>
+
<div></div>
+
</xsl:otherwise>
+
</xsl:choose>
+ </xsl:for-each>
+ </li>
+ </xsl:for-each>
</xsl:when>
<xsl:otherwise>
<div>Ingen sjekklister for bygg
i angitt periode</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-02-14 13:40:10 UTC (rev 8867)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-02-14 14:17:59 UTC (rev 8868)
@@ -53,10 +53,12 @@
</xsl:choose>
<ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroller satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroller
gjennomført uten feil</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroller
gjennomført med rapporterte feil</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroller ikke
gjennomført</span></li>
+ <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>
</div>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-02-14 13:40:10 UTC (rev 8867)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-02-14 14:17:59 UTC (rev 8868)
@@ -868,6 +868,7 @@
width: 37%;
}
ul.calendar.days li div {
+ height: 17px;
width: 24px;
}
ul.calendar.days {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8868] Merge 8859:8867 from trunk,
Sigurd Nes <=