[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8026]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8026] |
|
Date: |
Fri, 04 Nov 2011 21:52:37 +0000 |
Revision: 8026
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8026
Author: vator
Date: 2011-11-04 21:52:36 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/model/class.check_item.inc.php
trunk/controller/templates/base/control_check_lists.xsl
trunk/controller/templates/base/control_item.xsl
trunk/controller/templates/base/view_check_list.xsl
trunk/controller/templates/base/view_check_lists.xsl
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2011-11-04 20:55:45 UTC
(rev 8025)
+++ trunk/controller/inc/class.socheck_list.inc.php 2011-11-04 21:52:36 UTC
(rev 8026)
@@ -20,6 +20,79 @@
return self::$so;
}
+ public function get_single($check_list_id){
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id FROM
controller_check_list cl, controller_check_item ci WHERE cl.id = $check_list_id
AND cl.id = ci.check_list_id;";
+ $this->db->query($sql);
+
+ $counter = 0;
+ $check_list = null;
+ while ($this->db->next_record()) {
+
+ if($counter == 0){
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'bool'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+ }
+
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'bool'));
+
$check_item->set_comment($this->unmarshal($this->db->f('ci_comment', true),
'string'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+
+ $check_items_array[] = $check_item->toArray();
+
+ $counter++;
+ }
+
+ if($check_list != null){
+ $check_list->set_check_item_array($check_items_array);
+ return $check_list->toArray();
+ }else {
+ return null;
+ }
+ }
+
+ public function get_single_with_control_item($check_list_id){
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id, coi.title as
control_item_title FROM controller_check_list cl, controller_check_item ci,
controller_control_item as coi WHERE cl.id = $check_list_id AND cl.id =
ci.check_list_id AND ci.control_item_id=coi.id;";
+ $this->db->query($sql);
+
+ $counter = 0;
+ $check_list = null;
+ while ($this->db->next_record()) {
+
+ if($counter == 0){
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'bool'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+ }
+
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'bool'));
+
$check_item->set_comment($this->unmarshal($this->db->f('ci_comment', true),
'string'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('control_item_id', true),
'int'));
+
$control_item->set_title($this->db->f('control_item_title', true), 'string');
+
+ $check_item->set_control_item($control_item->toArray());
+
+ $check_items_array[] = $check_item->toArray();
+
+ $counter++;
+ }
+
+ if($check_list != null){
+ $check_list->set_check_item_array($check_items_array);
+ return $check_list->toArray();
+ }else {
+ return null;
+ }
+ }
+
public function get_check_list(){
$current_time = time();
@@ -60,7 +133,7 @@
return $results;
}
- function get_check_list_for_control($control_id){
+ function get_check_lists_for_control($control_id){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id FROM
controller_check_list cl, controller_check_item ci WHERE cl.control_id =
$control_id AND cl.id = ci.check_list_id ORDER BY cl.id;";
$this->db->query($sql);
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2011-11-04 20:55:45 UTC
(rev 8025)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2011-11-04 21:52:36 UTC
(rev 8026)
@@ -18,8 +18,9 @@
public $public_functions = array
(
'index' => true,
- 'view_check_list_for_control' => true,
- 'save_check_list' => true
+ 'view_check_lists_for_control' => true,
+ 'save_check_list' => true,
+ 'view_check_list' => true
);
public function __construct()
@@ -49,13 +50,28 @@
self::render_template_xsl('control_check_lists', $data);
}
- public function view_check_list_for_control()
+ public function view_check_list()
{
+ $check_list_id = phpgw::get_var('check_list_id');
+ $check_list =
$this->so_check_list->get_single_with_control_item($check_list_id);
+
+ $data = array
+ (
+ 'check_list' => $check_list
+ );
+
+ //print_r($check_list);
+
+ self::render_template_xsl('view_check_list', $data);
+ }
+
+ public function view_check_lists_for_control()
+ {
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
- $check_list_array =
$this->so->get_check_list_for_control( $control_id );
+ $check_list_array =
$this->so->get_check_lists_for_control( $control_id );
$data = array
(
@@ -63,7 +79,7 @@
'check_list_array' =>
$check_list_array
);
- self::render_template_xsl('view_check_list', $data);
+ self::render_template_xsl('view_check_lists', $data);
}
public function view_control_items_for_control()
Modified: trunk/controller/inc/model/class.check_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.check_item.inc.php 2011-11-04 20:55:45 UTC
(rev 8025)
+++ trunk/controller/inc/model/class.check_item.inc.php 2011-11-04 21:52:36 UTC
(rev 8026)
@@ -10,6 +10,7 @@
protected $status;
protected $comment;
protected $check_list_id;
+ protected $control_item;
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
@@ -56,6 +57,13 @@
}
public function get_check_list_id() { return
$this->check_list_id; }
+
+ public function set_control_item($control_item)
+ {
+ $this->control_item = $control_item;
+ }
+
+ public function get_control_item() { return
$this->control_item; }
/**
Modified: trunk/controller/templates/base/control_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/control_check_lists.xsl 2011-11-04
20:55:45 UTC (rev 8025)
+++ trunk/controller/templates/base/control_check_lists.xsl 2011-11-04
21:52:36 UTC (rev 8026)
@@ -16,7 +16,7 @@
<li>
<a>
<xsl:attribute
name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list_for_control</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_lists_for_control</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="id"/>
</xsl:attribute>
Modified: trunk/controller/templates/base/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item.xsl 2011-11-04 20:55:45 UTC
(rev 8025)
+++ trunk/controller/templates/base/control_item.xsl 2011-11-04 21:52:36 UTC
(rev 8026)
@@ -12,13 +12,12 @@
<ul class="check_list">
<xsl:for-each select="check_list_array">
<li>
-
<span>Tittel:</span><xsl:value-of
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
</li>
</xsl:for-each>
</ul>
-<div class="yui-content">
+ <div class="yui-content">
<div id="details">
<form action="#" method="post">
<input type="hidden" name="id" value =
"{value_id}">
Modified: trunk/controller/templates/base/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/view_check_list.xsl 2011-11-04 20:55:45 UTC
(rev 8025)
+++ trunk/controller/templates/base/view_check_list.xsl 2011-11-04 21:52:36 UTC
(rev 8026)
@@ -3,30 +3,25 @@
<div id="main_content">
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
- <h1>Detaljer for kontroll</h1>
+ <h1>Sjekkliste</h1>
<fieldset class="control_details">
- <label>Tittel</label><xsl:value-of
select="control_as_array/title"/><br/>
- <label>Startdato</label><xsl:value-of
select="control_as_array/start_date"/><br/>
- <label>Sluttdato</label><xsl:value-of
select="control_as_array/end_date"/><br/>
- <label>Syklustype</label><xsl:value-of
select="control_as_array/repeat_type"/><br/>
- <label>Syklusfrekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
+ <label>Tittel</label><xsl:value-of
select="check_list/status"/><br/>
+ <label>Startdato</label><xsl:value-of
select="check_list/comment"/><br/>
+ <label>Sluttdato</label><xsl:value-of
select="check_list/deadline"/><br/>
</fieldset>
-
- <h2>Sjekklister</h2>
+
+ <h2>Sjekkpunkter</h2>
<ul class="check_list">
<li class="heading">
<div class="status">Status</div>
- <div>Skal utføres innen dato</div>
- <div>Planlagt utført dato</div>
- <div>Ble utført dato</div>
+ <div class="title">Tittel for
kontrollpunkt</div>
<div>Kommentar</div>
</li>
+
<xsl:choose>
- <xsl:when test="check_list_array/child::node()">
- <xsl:for-each select="check_list_array">
+ <xsl:when
test="check_list/check_item_array/child::node()">
+ <xsl:for-each
select="check_list/check_item_array">
<li>
<div
class="order_nr"><xsl:number/>.</div>
<div class="status">
@@ -35,23 +30,9 @@
<xsl:when
test="status = 1">
<img
height="15" src="controller/images/status_icon_light_green.png" />
</xsl:when>
- <xsl:otherwise>
- Ingen
sjekklister for denne kontrollen
- </xsl:otherwise>
</xsl:choose>
</div>
- <div>
- <a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<xsl:value-of select="deadline"/>
- </a>
- </div>
- <div><xsl:value-of
select="planned_date"/></div>
- <div><xsl:value-of
select="completed_date"/></div>
+ <div class="title"><xsl:value-of
select="control_item/title"/></div>
<div><xsl:value-of
select="comment"/></div>
</li>
</xsl:for-each>
Modified: trunk/controller/templates/base/view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/view_check_lists.xsl 2011-11-04
20:55:45 UTC (rev 8025)
+++ trunk/controller/templates/base/view_check_lists.xsl 2011-11-04
21:52:36 UTC (rev 8026)
@@ -6,7 +6,7 @@
<xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
<input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
- <h1>Detaljer for kontroll</h1>
+ <h1>Sjekklister for kontroll</h1>
<fieldset class="control_details">
<label>Tittel</label><xsl:value-of
select="control_as_array/title"/><br/>
<label>Startdato</label><xsl:value-of
select="control_as_array/start_date"/><br/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8026],
Torstein <=