[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9805]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9805] |
|
Date: |
Mon, 16 Jul 2012 13:39:22 +0000 |
Revision: 9805
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9805
Author: vator
Date: 2012-07-16 13:39:22 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/component/class.date_generator.inc.php
trunk/controller/inc/component/class.month_calendar.inc.php
trunk/controller/inc/component/class.year_calendar.inc.php
trunk/controller/inc/model/class.control.inc.php
trunk/controller/inc/model/class.control_area.inc.php
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
Added Paths:
-----------
trunk/controller/inc/component/class.status_agg_month_info.inc.php
trunk/controller/inc/component/class.year_calendar_agg.inc.php
trunk/controller/templates/base/calendar/check_list_status_manager.xsl
Removed Paths:
-------------
trunk/controller/inc/helper/class.status_agg_month_info.inc.php
trunk/controller/templates/base/calendar/check_list_status_checker.xsl
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-07-16 13:38:59 UTC
(rev 9804)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-07-16 13:39:22 UTC
(rev 9805)
@@ -34,10 +34,11 @@
include_class('controller', 'check_list', 'inc/model/');
include_class('controller', 'check_item', 'inc/model/');
include_class('controller', 'component', 'inc/model/');
- include_class('controller', 'check_list_status_info', 'inc/helper/');
- include_class('controller', 'status_agg_month_info', 'inc/helper/');
+ include_class('controller', 'check_list_status_info', 'inc/component/');
+ include_class('controller', 'status_agg_month_info', 'inc/component/');
include_class('controller', 'location_finder', 'inc/helper/');
include_class('controller', 'year_calendar', 'inc/component/');
+ include_class('controller', 'year_calendar_agg', 'inc/component/');
include_class('controller', 'month_calendar', 'inc/component/');
class controller_uicalendar extends phpgwapi_uicommon
@@ -156,7 +157,7 @@
// Loops through all controls for
location and populates controls with check lists
$controls_for_component_array =
$this->populate_controls_with_check_lists($controls_for_component_array,
$control_id_with_check_list_array);
-
+
$month_calendar = new month_calendar(
$control, $year, $month, $component, null, "component" );
$calendar_array =
$month_calendar->build_calendar( $control->get_check_lists_array() );
@@ -166,8 +167,6 @@
$components_calendar_array[] = array("component" =>
$component->toArray(), "controls_calendar" =>
$controls_components_calendar_array);
}
- print_r( $components_calendar_array );
-
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$property_array =
execMethod('property.solocation.read', array('type_id' => 1, 'allrows' =>
true));
@@ -210,7 +209,7 @@
self::add_javascript('controller', 'controller',
'jquery-ui-1.8.20.custom.min.js');
self::add_stylesheet('controller/templates/base/css/jquery-ui-1.8.20.custom.css');
-
self::render_template_xsl(array('calendar/view_calendar_month',
'calendar/check_list_status_checker',
+
self::render_template_xsl(array('calendar/view_calendar_month',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations',
'calendar/select_buildings_on_property', 'calendar/nav_calendar_month',
'calendar/calendar_filters'), $data);
@@ -222,7 +221,7 @@
$year = phpgw::get_var('year');
$role = phpgw::get_var('role');
$repeat_type = phpgw::get_var('repeat_type');
-
+
// Validates year. If year is not set, current year is
chosen
$year = $this->validate_year($year);
@@ -273,8 +272,8 @@
// Loops through controls and populates
aggregate open cases pr month array.
$agg_open_cases_pr_month_array =
$this->build_agg_open_cases_pr_month_array($cl_criteria, $year, $from_month,
$to_month);
- $year_calendar = new
year_calendar($control, $year, null, $location_code, "location");
- $calendar_array =
$year_calendar->build_agg_month_calendar($agg_open_cases_pr_month_array);
+ $year_calendar_agg = new
year_calendar_agg($control, $year, $location_code);
+ $calendar_array =
$year_calendar_agg->build_calendar($agg_open_cases_pr_month_array);
$controls_calendar_array[] =
array("control" => $control->toArray(), "calendar_array" => $calendar_array);
}
@@ -309,7 +308,8 @@
$controls_for_component_array =
$component->get_controls_array();
$controls_components_calendar_array = array();
-
+
+ // AGGREGATED VALUES PR MONTH: Puts aggregated
number of open cases for days and weeks in calendar array
foreach($controls_for_component_array as $control)
{
if($control->get_repeat_type() ==
controller_control::REPEAT_TYPE_DAY | $control->get_repeat_type() ==
controller_control::REPEAT_TYPE_WEEK)
@@ -324,8 +324,8 @@
$agg_open_cases_pr_month_array =
$this->build_agg_open_cases_pr_month_array($cl_criteria, $year, $from_month,
$to_month);
- $year_calendar = new year_calendar(
$control, $year, $component, null, "component" );
- $calendar_array =
$year_calendar->build_agg_month_calendar($agg_open_cases_pr_month_array);
+ $year_calendar_agg = new
year_calendar_agg( $control, $year, $location_code);
+ $calendar_array =
$year_calendar_agg->build_calendar($agg_open_cases_pr_month_array);
$controls_components_calendar_array[]
= array("control" => $control->toArray(), "calendar_array" => $calendar_array);
}
@@ -380,7 +380,7 @@
'current_repeat_type' =>
$repeat_type
);
-
self::render_template_xsl(array('calendar/view_calendar_year',
'calendar/check_list_status_checker',
+
self::render_template_xsl(array('calendar/view_calendar_year',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations',
'calendar/select_buildings_on_property', 'calendar/nav_calendar_year',
'calendar/calendar_filters'), $data);
@@ -511,7 +511,7 @@
'current_year'
=> $year,
);
- self::render_template_xsl(
array('calendar/view_calendar_year_for_locations',
'calendar/check_list_status_checker',
+ self::render_template_xsl(
array('calendar/view_calendar_year_for_locations',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations'), $data);
self::add_javascript('controller', 'controller',
'jquery.js');
@@ -595,7 +595,7 @@
'current_year'
=> $year,
);
- self::render_template_xsl(
array('calendar/view_calendar_month_for_locations',
'calendar/check_list_status_checker',
+ self::render_template_xsl(
array('calendar/view_calendar_month_for_locations',
'calendar/check_list_status_manager',
'calendar/icon_color_map', 'calendar/select_my_locations'), $data);
self::add_javascript('controller', 'controller',
'jquery.js');
Modified: trunk/controller/inc/component/class.date_generator.inc.php
===================================================================
--- trunk/controller/inc/component/class.date_generator.inc.php 2012-07-16
13:38:59 UTC (rev 9804)
+++ trunk/controller/inc/component/class.date_generator.inc.php 2012-07-16
13:39:22 UTC (rev 9805)
@@ -17,19 +17,19 @@
public function __construct($start_date, $end_date, $period_start_date,
$period_end_date, $repeat_type, $repeat_interval){
$this->start_date = $start_date;
- $this->end_date = $end_date;
- $this->period_start_date = $period_start_date;
- $this->period_end_date = $period_end_date;
- $this->repeat_type = $repeat_type;
- $this->repeat_interval = $repeat_interval;
-
- $this->generate_calendar();
- }
+ $this->end_date = $end_date;
+ $this->period_start_date = $period_start_date;
+ $this->period_end_date = $period_end_date;
+ $this->repeat_type = $repeat_type;
+ $this->repeat_interval = $repeat_interval;
+
+ $this->generate_calendar();
+ }
function generate_calendar(){
-
$control_start_date = $this->find_control_start_date();
$control_end_date = $this->end_date;
+
if($control_end_date == null)
{
$control_end_date = $this->period_end_date;
@@ -39,8 +39,8 @@
$interval_date = $period_start_date;
- while(($interval_date < $this->period_end_date) &&
($interval_date <= $control_end_date)){
-
+ while(($interval_date < $this->period_end_date) &&
($interval_date <= $control_end_date))
+ {
$this->calendar_array[] = $interval_date;
if($this->repeat_type == 0)
@@ -68,14 +68,16 @@
$interval_date = mktime(0,0,0, date("m",
$interval_date), date("d", $interval_date), date("Y",
$interval_date)+$this->repeat_interval);
}
}
- }
+ }
- public function find_control_start_date(){
+ public function find_control_start_date(){
- if( $this->repeat_type == 0 ){
+ if( $this->repeat_type == 0 )
+ {
$control_start_date = $this->start_date;
}
- else if( $this->repeat_type == 1 ){
+ else if( $this->repeat_type == 1 )
+ {
$control_start_date = $this->start_date;
while(date("l", $control_start_date) != "Sunday")
@@ -96,23 +98,23 @@
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
date("m", $this->start_date), date("y", $this->start_date));
$control_start_date = mktime(0,0,0, date("m",
$this->start_date), $num_days_in_month, date("y", $this->start_date));
}
- else if( $this->repeat_type == 3 ){
+ else if( $this->repeat_type == 3 ){
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
12, date("y", $this->start_date));
$control_start_date = mktime(0,0,0, 12,
$num_days_in_month, date("y", $this->start_date));
}
return $control_start_date;
- }
+ }
- public function find_start_date_for_period( $trail_period_start_date ){
-
- while( $trail_period_start_date < $this->period_start_date ){
-
+ public function find_start_date_for_period( $trail_period_start_date )
+ {
+ while( $trail_period_start_date < $this->period_start_date )
+ {
if($this->repeat_type == 0)
{
$trail_period_start_date = mktime(0,0,0,
date("m", $trail_period_start_date), date("d", $trail_period_start_date) +
$this->repeat_interval, date("Y", $trail_period_start_date));
}
- else if($this->repeat_type == 1)
+ else if($this->repeat_type == 1)
{
$trail_period_start_date = mktime(0,0,0,
date("m", $trail_period_start_date), date("d", $trail_period_start_date) +
($this->repeat_interval * 7), date("Y", $trail_period_start_date));
}
@@ -136,8 +138,7 @@
}
return $trail_period_start_date;
- }
-
+ }
public function get_dates(){
return $this->calendar_array;
Modified: trunk/controller/inc/component/class.month_calendar.inc.php
===================================================================
--- trunk/controller/inc/component/class.month_calendar.inc.php 2012-07-16
13:38:59 UTC (rev 9804)
+++ trunk/controller/inc/component/class.month_calendar.inc.php 2012-07-16
13:39:22 UTC (rev 9805)
@@ -1,8 +1,8 @@
<?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/');
+include_class('controller', 'check_list_status_info', 'inc/component/');
+include_class('controller', 'check_list_status_manager', 'inc/component/');
/* This class transforms controls with checklists or controls with aggregated
number of open cases,
* and puts these values in a calendar array for each control
@@ -18,16 +18,19 @@
private $calendar_array = array();
public function __construct($control, $year, $month, $component,
$location_code, $type){
- $this->year = $year;
- $this->month = $month;
$this->control = $control;
+ $this->year = $year;
+ $this->month = $month;
$this->component = $component;
$this->location_code = $location_code;
$this->type = $type;
-
+
$this->init_calendar();
}
+ /* Initializes calendar by setting status for each month in calendar array.
+ * - CONTROL_NOT_DONE if month date is in the past
+ * - CONTROL_REGISTERED if month date is in the future */
function init_calendar(){
$ctr_start_date_ts = $this->control->get_start_date();
$ctr_end_date_ts = $this->control->get_end_date();
@@ -42,11 +45,11 @@
{
$this->calendar_array[$i] = null;
}
-
+
$date_generator = new date_generator($ctr_start_date_ts,
$ctr_end_date_ts, $period_start_date_ts, $period_end_date_ts, $repeat_type,
$repeat_interval);
$dates_array = $date_generator->get_dates();
-
- // Inserts dates
+
+ // Set status for control on each date to NOT DONE or REGISTERED
foreach($dates_array as $date_ts)
{
$check_list = new controller_check_list();
@@ -69,22 +72,6 @@
$this->calendar_array[ date("j", $date_ts) ]["status"] =
$check_list_status_info->get_status();
$this->calendar_array[ date("j", $date_ts) ]["info"] =
$check_list_status_info->serialize();
-
- /*
- $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("j", $date) ]["status"] =
$status;
- $this->calendar_array[ date("j", $date) ]["info"] =
array("date" => $date, "control_id" => $this->control->get_id());
- */
}
}
Copied: trunk/controller/inc/component/class.status_agg_month_info.inc.php
(from rev 9520, trunk/controller/inc/helper/class.status_agg_month_info.inc.php)
===================================================================
--- trunk/controller/inc/component/class.status_agg_month_info.inc.php
(rev 0)
+++ trunk/controller/inc/component/class.status_agg_month_info.inc.php
2012-07-16 13:39:22 UTC (rev 9805)
@@ -0,0 +1,59 @@
+<?php
+ /**
+ * phpGroupWare - controller: a part of a Facilities Management System.
+ *
+ * @author Erink Holm-Larsen <address@hidden>
+ * @author Torstein Vadla <address@hidden>
+ * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/
+ * @package property
+ * @subpackage controller
+ * @version $Id: class.check_list_status_info.inc.php 8571 2012-01-15
13:46:27Z vator $
+ */
+
+ class status_agg_month_info
+ {
+ private $month_nr;
+ private $agg_open_cases;
+
+ public function __construct(){}
+
+ public function set_month_nr($month_nr)
+ {
+ $this->month_nr = $month_nr;
+ }
+
+ public function get_month_nr() { return $this->month_nr; }
+
+ public function set_agg_open_cases($agg_open_cases)
+ {
+ $this->agg_open_cases = $agg_open_cases;
+ }
+
+ public function get_agg_open_cases() { return
$this->agg_open_cases; }
+
+ public function serialize()
+ {
+ return array(
+ 'agg_open_cases' => $this->get_agg_open_cases(),
+ 'month_nr' => $this->get_month_nr()
+ );
+ }
+ }
Modified: trunk/controller/inc/component/class.year_calendar.inc.php
===================================================================
--- trunk/controller/inc/component/class.year_calendar.inc.php 2012-07-16
13:38:59 UTC (rev 9804)
+++ trunk/controller/inc/component/class.year_calendar.inc.php 2012-07-16
13:39:22 UTC (rev 9805)
@@ -2,8 +2,8 @@
phpgw::import_class('controller.socheck_list');
include_class('controller', 'date_generator', 'inc/component/');
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/');
+include_class('controller', 'check_list_status_info', 'inc/component/');
+include_class('controller', 'check_list_status_manager', 'inc/component/');
include_class('controller', 'check_list', 'inc/model/');
@@ -31,6 +31,7 @@
* - CONTROL_REGISTERED if month date is in the future */
function init_calendar()
{
+ // Sets null values for twelve months in calendar array
for($i = 1;$i <= 12;$i++)
{
$this->calendar_array[$i] = null;
@@ -43,10 +44,11 @@
$repeat_type = $this->control->get_repeat_type();
$repeat_interval = $this->control->get_repeat_interval();
+ // Generates dates for time period with specified interval
$date_generator = new date_generator($ctr_start_date_ts, $ctr_end_date_ts,
$period_start_date_ts, $period_end_date_ts, $repeat_type, $repeat_interval);
$dates_array = $date_generator->get_dates();
- // Inserts dates
+ // Set status for control on each date to NOT DONE or REGISTERED
foreach($dates_array as $date_ts)
{
$check_list = new controller_check_list();
Added: trunk/controller/inc/component/class.year_calendar_agg.inc.php
===================================================================
--- trunk/controller/inc/component/class.year_calendar_agg.inc.php
(rev 0)
+++ trunk/controller/inc/component/class.year_calendar_agg.inc.php
2012-07-16 13:39:22 UTC (rev 9805)
@@ -0,0 +1,108 @@
+<?php
+phpgw::import_class('controller.socheck_list');
+include_class('controller', 'date_generator', 'inc/component/');
+include_class('controller', 'check_list_status_info', 'inc/component/');
+include_class('controller', 'check_list_status_manager', 'inc/component/');
+include_class('controller', 'check_list', 'inc/model/');
+
+
+class year_calendar_agg {
+ private $year;
+ private $control;
+ private $location_code;
+ private $calendar_array = array();
+
+ public function __construct($control, $year, $location_code)
+ {
+ $this->year = $year;
+ $this->control = $control;
+ $this->location_code = $location_code;
+
+ $this->init_calendar();
+ }
+
+ function init_calendar()
+ {
+ $start_month_nr = $this->get_start_month_for_control(
$this->control, $this->year );
+ $end_month_nr = $this->get_end_month_for_control(
$this->control, $this->year );
+
+ for($month_nr = 1;$month_nr <= 12;$month_nr++)
+ {
+ if( ($month_nr < $start_month_nr) || ($month_nr > $end_month_nr))
+ {
+ $this->calendar_array[ $month_nr ] = null;
+ }
+ else if( $month_nr < date("m") )
+ {
+ $this->calendar_array[ $month_nr ]["status"] =
"CONTROLS_NOT_DONE";
+ $this->calendar_array[ $month_nr ]["info"] =
array("location_code" => $this->location_code, "year" => $this->year, "month"
=> $month_nr);
+ }
+ else
+ {
+ $this->calendar_array[ $month_nr ]["status"] =
"CONTROLS_REGISTERED";
+ $this->calendar_array[ $month_nr ]["info"] =
array("location_code" => $this->location_code, "year" => $this->year, "month"
=> $month_nr);
+ }
+ }
+ }
+
+ public function build_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"]["agg_open_errors"]
= $status_agg_month_info->get_agg_open_cases();
+ }
+
+ return $this->calendar_array;
+ }
+
+ public static function get_heading_array(){
+
+ $heading_array = array();
+
+ for($i=1;$i<=12;$i++){
+ $heading_array[$i] = "$i";
+ }
+
+ return $heading_array;
+ }
+
+ function get_start_month_for_control($control, $year)
+ {
+ // Checks if control starts in the year that is displayed
+ if( date("Y", $control->get_start_date()) == $year )
+ {
+ $from_month = date("n",
$control->get_start_date());
+ }
+ else
+ {
+ $from_month = 1;
+ }
+
+ return $from_month;
+ }
+
+ function get_end_month_for_control($control, $year)
+ {
+ // Checks if control ends in the year that is displayed
+ if( date("Y", $control->get_end_date()) == $year )
+ {
+ $to_month = date("n", $control->get_end_date());
+ }
+ else
+ {
+ $to_month = 12;
+ }
+
+ return $to_month;
+ }
+
+ public static function get_start_date_year_ts($year){
+ $start_date_year_ts = strtotime("01/01/$year");
+
+ return $start_date_year_ts;
+ }
+}
\ No newline at end of file
Deleted: trunk/controller/inc/helper/class.status_agg_month_info.inc.php
===================================================================
--- trunk/controller/inc/helper/class.status_agg_month_info.inc.php
2012-07-16 13:38:59 UTC (rev 9804)
+++ trunk/controller/inc/helper/class.status_agg_month_info.inc.php
2012-07-16 13:39:22 UTC (rev 9805)
@@ -1,59 +0,0 @@
-<?php
- /**
- * phpGroupWare - controller: a part of a Facilities Management System.
- *
- * @author Erink Holm-Larsen <address@hidden>
- * @author Torstein Vadla <address@hidden>
- * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/
- * @package property
- * @subpackage controller
- * @version $Id: class.check_list_status_info.inc.php 8571 2012-01-15
13:46:27Z vator $
- */
-
- class status_agg_month_info
- {
- private $month_nr;
- private $agg_open_cases;
-
- public function __construct(){}
-
- public function set_month_nr($month_nr)
- {
- $this->month_nr = $month_nr;
- }
-
- public function get_month_nr() { return $this->month_nr; }
-
- public function set_agg_open_cases($agg_open_cases)
- {
- $this->agg_open_cases = $agg_open_cases;
- }
-
- public function get_agg_open_cases() { return
$this->agg_open_cases; }
-
- public function serialize()
- {
- return array(
- 'agg_open_cases' => $this->get_agg_open_cases(),
- 'month_nr' => $this->get_month_nr()
- );
- }
- }
Modified: trunk/controller/inc/model/class.control.inc.php
===================================================================
--- trunk/controller/inc/model/class.control.inc.php 2012-07-16 13:38:59 UTC
(rev 9804)
+++ trunk/controller/inc/model/class.control.inc.php 2012-07-16 13:39:22 UTC
(rev 9805)
@@ -341,7 +341,7 @@
}
// Validate REPEAT INTERVAL
- if( $this->repeat_interval == "" )
+ if( ($this->repeat_interval == "") ||
(intval($this->repeat_interval) < 1) )
{
$status = false;
$this->error_msg_array['repeat_interval'] =
"error_msg_1";
Modified: trunk/controller/inc/model/class.control_area.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_area.inc.php 2012-07-16
13:38:59 UTC (rev 9804)
+++ trunk/controller/inc/model/class.control_area.inc.php 2012-07-16
13:39:22 UTC (rev 9805)
@@ -29,7 +29,7 @@
*/
include_class('controller', 'model', 'inc/model/');
-
+ /*
class controller_control_area extends controller_model
{
public static $so;
@@ -37,12 +37,7 @@
protected $id;
protected $title;
- /**
- * Constructor. Takes an optional ID. If a contract is
created from outside
- * the database the ID should be empty so the database can add
one according to its logic.
- *
- * @param int $id the id of this composite
- */
+
public function __construct(int $id = null)
{
$this->id = (int)$id;
@@ -70,11 +65,7 @@
);
}
- /**
- * Get a static reference to the storage object associated with
this model object
- *
- * @return the storage object
- */
+
public static function get_so()
{
if (self::$so == null) {
@@ -83,4 +74,5 @@
return self::$so;
}
+ */
}
Deleted: trunk/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-07-16 13:38:59 UTC (rev 9804)
+++ trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-07-16 13:39:22 UTC (rev 9805)
@@ -1,181 +0,0 @@
-<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
-<xsl:template name="check_list_status_checker" xmlns:php="http://php.net/xsl";>
-
- <xsl:param name="location_code" />
-
- <xsl:choose>
- <xsl:when test="status = 'CONTROL_REGISTERED'">
- <td>
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
- <xsl:text>&deadline_ts=</xsl:text>
- <xsl:value-of
select="info/deadline_date_ts"/>
- <xsl:text>&control_id=</xsl:text>
- <xsl:value-of select="info/control_id"/>
- <xsl:text>&type=</xsl:text>
- <xsl:value-of select="info/type"/>
- <xsl:choose>
- <xsl:when test="info/type =
'component'">
-
<xsl:text>&location_id=</xsl:text>
- <xsl:value-of
select="info/location_id"/>
-
<xsl:text>&component_id=</xsl:text>
- <xsl:value-of
select="info/component_id"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_yellow_ring.png" />
- </a>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_PLANNED'">
- <td>
- <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>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_NOT_DONE'">
- <td>
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-
<xsl:text>&deadline_ts=</xsl:text>
- <xsl:value-of
select="info/deadline_date_ts"/>
-
<xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="info/control_id"/>
- <xsl:text>&type=</xsl:text>
- <xsl:value-of
select="info/type"/>
- <xsl:choose>
- <xsl:when test="info/type =
'component'">
-
<xsl:text>&location_id=</xsl:text>
- <xsl:value-of
select="info/location_id"/>
-
<xsl:text>&component_id=</xsl:text>
- <xsl:value-of
select="info/component_id"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </a>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_CHECKLIST'">
- <td>
- <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_red_cross.png" />
- </a>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
- <td>
- <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_red_cross.png" />
- </a>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
- <td>
- <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 class="ext_info"><xsl:value-of
select="info/id"/></span>
- <img height="15"
src="controller/images/status_icon_dark_green.png" />
- </a>
- </td>
- </xsl:when>
- <xsl:when test="status =
'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
- <td>
- <div class="info_box_wrp">
- <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
class="ext_info"><xsl:value-of select="info/id"/></span>
- <img height="15"
src="controller/images/status_icon_light_green.png" />
- </a>
- </div>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_DONE_WITH_ERRORS'">
- <td>
- <div class="info_box_wrp">
- <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>
- <span class="ext_info">
-
<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>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
- <td>
- <div class="info_box_wrp">
- <div id="info_box"></div>
- <a class="view_info_box">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="info/control_id"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
-
<xsl:text>&year=</xsl:text>
- <xsl:value-of
select="//current_year"/>
-
<xsl:text>&month=</xsl:text>
- <xsl:number />
- </xsl:attribute>
- <span class="ext_info">
-
<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/agg_open_errors"/>
- </a>
- </div>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_CANCELED'">
- <td>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td></td>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
Copied: trunk/controller/templates/base/calendar/check_list_status_manager.xsl
(from rev 9641,
trunk/controller/templates/base/calendar/check_list_status_checker.xsl)
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_manager.xsl
(rev 0)
+++ trunk/controller/templates/base/calendar/check_list_status_manager.xsl
2012-07-16 13:39:22 UTC (rev 9805)
@@ -0,0 +1,197 @@
+<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
+<xsl:template name="check_list_status_manager" xmlns:php="http://php.net/xsl";>
+
+ <xsl:param name="location_code" />
+
+ <xsl:choose>
+ <xsl:when test="status = 'CONTROL_REGISTERED'">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+ <xsl:text>&deadline_ts=</xsl:text>
+ <xsl:value-of
select="info/deadline_date_ts"/>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="info/control_id"/>
+ <xsl:text>&type=</xsl:text>
+ <xsl:value-of select="info/type"/>
+ <xsl:choose>
+ <xsl:when test="info/type =
'component'">
+
<xsl:text>&location_id=</xsl:text>
+ <xsl:value-of
select="info/location_id"/>
+
<xsl:text>&component_id=</xsl:text>
+ <xsl:value-of
select="info/component_id"/>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="info/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <img height="15"
src="controller/images/status_icon_yellow_ring.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_PLANNED'">
+ <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>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE'">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+
<xsl:text>&deadline_ts=</xsl:text>
+ <xsl:value-of
select="info/deadline_date_ts"/>
+
<xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="info/control_id"/>
+ <xsl:text>&type=</xsl:text>
+ <xsl:value-of
select="info/type"/>
+ <xsl:choose>
+ <xsl:when test="info/type =
'component'">
+
<xsl:text>&location_id=</xsl:text>
+ <xsl:value-of
select="info/location_id"/>
+
<xsl:text>&component_id=</xsl:text>
+ <xsl:value-of
select="info/component_id"/>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="info/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <img height="15"
src="controller/images/status_icon_red_cross.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_CHECKLIST'">
+ <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_red_cross.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
+ <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_red_cross.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
+ <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 class="ext_info"><xsl:value-of
select="info/id"/></span>
+ <img height="15"
src="controller/images/status_icon_dark_green.png" />
+ </a>
+ </xsl:when>
+ <xsl:when test="status =
'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
+ <div class="info_box_wrp">
+ <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
class="ext_info"><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_DONE_WITH_ERRORS'">
+ <div class="info_box_wrp">
+ <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>
+ <span class="ext_info">
+
<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_CANCELED'">
+ <img height="15"
src="controller/images/status_icon_red_cross.png" />
+ </xsl:when>
+ <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
+ <div class="info_box_wrp">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="info/control_id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="info/location_code"/>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="//current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:number />
+ </xsl:attribute>
+ <span class="ext_info">
+
<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/agg_open_errors"/>
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROLS_NOT_DONE'">
+ <div class="info_box_wrp">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="info/control_id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="info/location_code"/>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="//current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:number />
+ </xsl:attribute>
+ <span class="ext_info">
+
<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/agg_open_errors"/>
+ </a>
+ </div>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROLS_REGISTERED'">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="info/location_code"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="info/month"/>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="info/year"/>
+ </xsl:attribute>
+ <img height="15"
src="controller/images/status_icon_yellow_ring.png" />
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/calendar/check_list_status_manager.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-07-16 13:38:59 UTC (rev 9804)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-07-16 13:39:22 UTC (rev 9805)
@@ -233,9 +233,11 @@
</td>
<xsl:for-each
select="calendar_array">
-
<xsl:call-template name="check_list_status_checker" >
-
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
-
</xsl:call-template>
+ <td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
+
</xsl:call-template>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
@@ -302,9 +304,11 @@
</span>
</td>
<xsl:for-each
select="calendar_array">
-
<xsl:call-template name="check_list_status_checker" >
-
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
-
</xsl:call-template>
+ <td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
+
</xsl:call-template>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
Modified:
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-07-16 13:38:59 UTC (rev 9804)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-07-16 13:39:22 UTC (rev 9805)
@@ -88,9 +88,11 @@
</td>
<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>
+ <td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
+
</xsl:call-template>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
@@ -139,9 +141,11 @@
</td>
<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>
+ <td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
+
</xsl:call-template>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-07-16 13:38:59 UTC (rev 9804)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-07-16 13:39:22 UTC (rev 9805)
@@ -200,9 +200,11 @@
</span>
</td>
<xsl:for-each
select="calendar_array">
-
<xsl:call-template name="check_list_status_checker" >
-
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
-
</xsl:call-template>
+ <td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
+
</xsl:call-template>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
@@ -283,9 +285,11 @@
</span>
</td>
<xsl:for-each
select="calendar_array">
-
<xsl:call-template name="check_list_status_checker" >
-
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
-
</xsl:call-template>
+ <td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
+
</xsl:call-template>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
Modified:
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-07-16 13:38:59 UTC (rev 9804)
+++
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-07-16 13:39:22 UTC (rev 9805)
@@ -68,9 +68,11 @@
</td>
<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>
+ <td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
+
</xsl:call-template>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
@@ -133,9 +135,11 @@
</td>
<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>
+ <td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
+
</xsl:call-template>
+ </td>
</xsl:for-each>
</tr>
</xsl:for-each>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9805],
Torstein <=