[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9404]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9404] |
|
Date: |
Tue, 15 May 2012 11:47:15 +0000 |
Revision: 9404
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9404
Author: vator
Date: 2012-05-15 11:47:15 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol.inc.php
trunk/controller/inc/model/class.control.inc.php
trunk/controller/inc/model/class.control_item.inc.php
trunk/controller/templates/base/calendar/check_list_status_checker.xsl
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2012-05-15 07:17:03 UTC
(rev 9403)
+++ trunk/controller/inc/class.socontrol.inc.php 2012-05-15 11:47:15 UTC
(rev 9404)
@@ -145,7 +145,7 @@
$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'));
-
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+ //
$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'));
@@ -187,7 +187,7 @@
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
$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'));
-
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+ //
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
@@ -383,7 +383,7 @@
//
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_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'));
-
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+
//$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
}
@@ -427,7 +427,7 @@
$control->set_control_area_name($category[0]['name']);
$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'));
-
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+ //
$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($control->get_repeat_type());
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
Modified: trunk/controller/inc/model/class.control.inc.php
===================================================================
--- trunk/controller/inc/model/class.control.inc.php 2012-05-15 07:17:03 UTC
(rev 9403)
+++ trunk/controller/inc/model/class.control.inc.php 2012-05-15 11:47:15 UTC
(rev 9404)
@@ -57,7 +57,7 @@
protected $responsibility_name;
protected $component_id;
protected $component_type_id;
- protected $location_code;
+ //protected $location_code;
protected $control_area_id;
protected $control_area_name;
@@ -212,14 +212,14 @@
}
public function get_component_type_id() { return
$this->component_type_id; }
-
+ /*
public function set_location_code($location_code)
{
$this->location_code = $location_code;
}
public function get_location_code() { return
$this->location_code; }
-
+ */
public function set_control_area_id($control_area_id)
{
$this->control_area_id = $control_area_id;
Modified: trunk/controller/inc/model/class.control_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_item.inc.php 2012-05-15
07:17:03 UTC (rev 9403)
+++ trunk/controller/inc/model/class.control_item.inc.php 2012-05-15
11:47:15 UTC (rev 9404)
@@ -33,10 +33,17 @@
class controller_control_item extends controller_model
{
public static $so;
+
/*
+ const "CONTROL_ITEM_TYPE_MAALING" = "control_item_type_1";
const CONTROL_ITEM_TYPE_MAALING = "control_item_type_1";
- const CONTROL_ITEM_TYPE_MAALING = "control_item_type_1";
- */
+ */
+
+ public static $type_array = array("CONTROL_ITEM_TYPE_1" =>
"Vanlig",
+
"CONTROL_ITEM_TYPE_2" => "Måling",
+
"CONTROL_ITEM_TYPE_3" => "Nedtrekksliste",
+
"CONTROL_ITEM_TYPE_4" => "Radioknapper");
+
protected $id;
protected $title;
protected $required;
Modified: trunk/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-15 07:17:03 UTC (rev 9403)
+++ trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-15 11:47:15 UTC (rev 9404)
@@ -1,12 +1,39 @@
<!-- $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>
+ <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>&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>
+ </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>
@@ -17,52 +44,39 @@
<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" />
+ <img height="15"
src="controller/images/status_icon_red_cross.png" />
</a>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_PLANNED'">
- <td>
+ </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>
- <img height="15"
src="controller/images/status_icon_yellow.png" />
+ <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>
- </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>&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>
- </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>
+ </td>
</xsl:when>
- <xsl:when test="status =
'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
- <td>
+ <xsl:when test="status =
'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
+ <td>
+ <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>
@@ -70,79 +84,62 @@
<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" />
+ <img height="15"
src="controller/images/status_icon_light_green.png" />
</a>
- </td>
- </xsl:when>
- <xsl:when test="status =
'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
- <td>
- <div style="position:relative;">
-
- <div id="info_box"></div>
- <a>
- <xsl:attribute name="href">
+ </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
style="display:none"><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
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>
- </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="//control/id"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="//current_location/location_code"/>
-
<xsl:text>&year=</xsl:text>
- <xsl:value-of
select="//current_year"/>
-
<xsl:text>&month=</xsl:text>
- <xsl:number />
- </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/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>
-
+ <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>
+ </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="//control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="//current_location/location_code"/>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="//current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:number />
+ </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/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>
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-15 07:17:03 UTC (rev 9403)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-15 11:47:15 UTC (rev 9404)
@@ -174,7 +174,7 @@
<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:with-param
name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
</xsl:call-template>
</xsl:for-each>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-15 07:17:03 UTC (rev 9403)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-15 11:47:15 UTC (rev 9404)
@@ -114,7 +114,7 @@
</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:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
</xsl:call-template>
</xsl:for-each>
</tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9404],
Torstein <=