[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8896]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8896] |
|
Date: |
Thu, 16 Feb 2012 12:44:44 +0000 |
Revision: 8896
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8896
Author: vator
Date: 2012-02-16 12:44:43 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/component/class.calendar_builder.inc.php
trunk/controller/inc/helper/class.check_list_status_info.inc.php
trunk/controller/inc/helper/class.check_list_status_manager.inc.php
trunk/controller/templates/base/calendar/view_calendar_year.xsl
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-02-16 11:06:18 UTC
(rev 8895)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-02-16 12:44:43 UTC
(rev 8896)
@@ -671,6 +671,7 @@
'num_pending_cases'
);
+
$values = array(
$this->marshal($check_list->get_control_id(), 'int'),
$check_list->get_status(),
Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php
2012-02-16 11:06:18 UTC (rev 8895)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php
2012-02-16 12:44:43 UTC (rev 8896)
@@ -15,7 +15,7 @@
}
function init_calendar( $control, $num, $period_type ){
-
+
$calendar_array = array();
for($i=1;$i<=$num;$i++){
@@ -48,42 +48,49 @@
}
}
- return $calendar_array;
+ return $calendar_array;
}
public function build_calendar_array( $controls_with_check_lists_array,
$num, $period_type ){
foreach($controls_with_check_lists_array as $control){
-
- $calendar_array = $this->init_calendar( $control, $num,
$period_type );
-
if($period_type == "view_days" | ($period_type ==
"view_months" & $control->get_repeat_type() == 2 | $control->get_repeat_type()
== 3))
{
+ $calendar_array = $this->init_calendar(
$control, $num, $period_type );
+
foreach($control->get_check_lists_array() as
$check_list)
{
$check_list_status_manager = new
check_list_status_manager( $check_list );
$check_list_status_info =
$check_list_status_manager->get_status_for_check_list();
-
- $calendar_array[ date("j",
$check_list->get_deadline()) ]["status"] =
$check_list_status_info->get_status();
- $calendar_array[ date("j",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
+
+ if( $period_type == "view_months" )
+ {
+ $calendar_array[ date("n",
$check_list_status_info->get_deadline_date_ts()) ]["status"] =
$check_list_status_info->get_status();
+ $calendar_array[ date("n",
$check_list_status_info->get_deadline_date_ts()) ]["info"] =
$check_list_status_info->serialize();
+ }
+ else if( $period_type == "view_days" )
+ {
+ $calendar_array[ date("j",
$check_list->get_deadline()) ]["status"] =
$check_list_status_info->get_status();
+ $calendar_array[ date("j",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
+ }
}
$controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $calendar_array);
}
else if($period_type == "view_months" &
($control->get_repeat_type() == 0 | $control->get_repeat_type() == 1))
{
- $twelve_month_array = array();
+ $calendar_array = array();
foreach($control->get_agg_open_cases_for_month_array() as
$status_agg_month_info)
{
$status =
"controls_accomplished_with_errors";
-
-
$twelve_month_array[$status_agg_month_info->get_month_nr()]["status"] = $status;
-
$twelve_month_array[$status_agg_month_info->get_month_nr()]["info"] =
$status_agg_month_info->get_agg_open_cases();
+
+
$calendar_array[$status_agg_month_info->get_month_nr()]["status"] = $status;
+
$calendar_array[$status_agg_month_info->get_month_nr()]["info"] =
$status_agg_month_info->get_agg_open_cases();
}
- $controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $twelve_month_array);
+ $controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $calendar_array);
}
}
Modified: trunk/controller/inc/helper/class.check_list_status_info.inc.php
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_info.inc.php
2012-02-16 11:06:18 UTC (rev 8895)
+++ trunk/controller/inc/helper/class.check_list_status_info.inc.php
2012-02-16 12:44:43 UTC (rev 8896)
@@ -33,7 +33,8 @@
private $check_list_id;
private $status;
private $status_text;
- private $deadline_date;
+ private $deadline_date_ts;
+ private $deadline_date_txt;
private $info_text;
private $num_open_cases;
@@ -60,13 +61,20 @@
public function get_status_text() { return $this->status_text; }
- public function set_deadline_date($deadline_date)
+ public function set_deadline_date_ts($deadline_date_ts)
{
- $this->deadline_date = $deadline_date;
+ $this->deadline_date_ts = $deadline_date_ts;
}
- public function get_deadline_date() { return
$this->deadline_date; }
+ public function get_deadline_date_ts() { return
$this->deadline_date_ts; }
+
+ public function set_deadline_date_txt($deadline_date_txt)
+ {
+ $this->deadline_date_txt = $deadline_date_txt;
+ }
+ public function get_deadline_date_txt() { return
$this->deadline_date_txt; }
+
public function set_info_text($info_text)
{
$this->info_text = $info_text;
@@ -88,7 +96,8 @@
'check_list_id' => $this->get_check_list_id(),
'status' => $this->get_status(),
'status_text' => $this->get_status_text(),
- 'deadline_date' => $this->get_deadline_date(),
+ 'deadline_date_ts' =>
$this->get_deadline_date_ts(),
+ 'deadline_date_txt' =>
$this->get_deadline_date_txt(),
'info_text' => $this->get_info_text(),
'num_open_cases' => $this->get_num_open_cases()
);
Modified: trunk/controller/inc/helper/class.check_list_status_manager.inc.php
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_manager.inc.php
2012-02-16 11:06:18 UTC (rev 8895)
+++ trunk/controller/inc/helper/class.check_list_status_manager.inc.php
2012-02-16 12:44:43 UTC (rev 8896)
@@ -75,7 +75,8 @@
}
- $check_list_status_info->set_deadline_date(
date("d/m-Y", $this->check_list->get_deadline()) );
+ $check_list_status_info->set_deadline_date_txt(
date("d/m-Y", $this->check_list->get_deadline()) );
+ $check_list_status_info->set_deadline_date_ts(
$this->check_list->get_deadline() );
$check_list_status_info->set_status($status);
return $check_list_status_info;
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-02-16 11:06:18 UTC (rev 8895)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-02-16 12:44:43 UTC (rev 8896)
@@ -184,22 +184,22 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_accomplished_with_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
-
<a class="view_check_list">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<span style="display:none">
-
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</span>
-
<img height="15" src="controller/images/status_icon_red.png" />
-
</a>
-
</div>
-
</xsl:when>
+
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
+
<div id="info_box"
style="position:absolute;display:none;"></div>
+
<a class="view_check_list">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<span style="display:none">
+
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</span>
+
<xsl:value-of select="info/num_open_cases"/>
+
</a>
+
</div>
+
</xsl:when>
<xsl:when test="status = 'controls_accomplished_with_errors'">
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
<a class="view_check_list">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8896],
Torstein <=