[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16957] controller: FDV-195
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16957] controller: FDV-195 |
|
Date: |
Tue, 8 Aug 2017 09:35:18 -0400 (EDT) |
Revision: 16957
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16957
Author: sigurdne
Date: 2017-08-08 09:35:18 -0400 (Tue, 08 Aug 2017)
Log Message:
-----------
controller: FDV-195
Modified Paths:
--------------
trunk/controller/inc/class.soprocedure.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/templates/base/check_list/view_control_info.xsl
trunk/controller/templates/base/procedure/procedure_item.xsl
Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php 2017-08-07 16:16:37 UTC
(rev 16956)
+++ trunk/controller/inc/class.soprocedure.inc.php 2017-08-08 13:35:18 UTC
(rev 16957)
@@ -190,15 +190,71 @@
return $procedure;
}
- function get_single_with_documents( $id, $return_type =
"return_object" )
+ function get_procedure_version( $procedure_id,
$valid_version_date)
{
- $id = (int)$id;
+ $sql = "SELECT id, procedure_id, start_date, end_date
FROM controller_procedure"
+ . " WHERE id = {$procedure_id}";
+ $this->db->query($sql, __LINE__, __FILE__);
+ $this->db->next_record();
+ $new_version_id = (int)$this->db->f('procedure_id');
+ $start_date = (int)$this->db->f('start_date');
+ $end_date = (int)$this->db->f('end_date');
+
+ if( $valid_version_date > $start_date &&
($valid_version_date < $end_date || !$end_date))
+ {
+ $ret = $procedure_id;
+ }
+ else if($new_version_id && $valid_version_date >
$end_date)
+ {
+ $ret =
$this->get_procedure_version($new_version_id, $valid_version_date);
+ }
+ else
+ {
+ $ret = $procedure_id;
+ }
+
+ return $ret;
+
+ }
+
+
+ function get_valid_version_date($check_list_id)
+ {
+ $sql = "SELECT completed_date FROM
controller_check_list"
+ . " {$this->join} controller_control ON
controller_control.id = controller_check_list.control_id"
+ . " WHERE controller_check_list.id= " . (int)
$check_list_id;
+ $this->db->query($sql, __LINE__, __FILE__);
+ $this->db->next_record();
+ $completed_date = $this->db->f('completed_date');
+ $valid_version_date = $completed_date ? $completed_date
: time();
+
+ return $valid_version_date;
+
+ }
+
+ function get_single_no_documents($procedure_id, $check_list_id )
+ {
+ $valid_version_date =
$this->get_valid_version_date($check_list_id);
+
+ $procedure_id =
$this->get_procedure_version((int)$procedure_id, $valid_version_date);
+
+ return $this->get_single($procedure_id);
+ }
+
+ function get_single_with_documents($procedure_id,
$check_list_id, $return_type = "return_object" )
+ {
+ $valid_version_date =
$this->get_valid_version_date($check_list_id);
+
+ $procedure_id =
$this->get_procedure_version((int)$procedure_id, $valid_version_date);
+
$counter = 0;
$documents = null;
- $joins .= " {$this->left_join} controller_document ON
(p.id = controller_document.procedure_id)";
- $sql = "SELECT p.*, controller_document.id AS
document_id, controller_document.title AS document_title,
controller_document.description as document_description FROM
controller_procedure p {$joins} WHERE p.id = " . $id;
+ $sql = "SELECT p.*, controller_document.id AS
document_id, controller_document.title AS document_title,"
+ . " controller_document.description as
document_description FROM controller_procedure p"
+ . " {$this->left_join} controller_document ON
(p.id = controller_document.procedure_id)"
+ . " WHERE p.id = {$procedure_id}";
//var_dump($sql);
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
@@ -270,6 +326,7 @@
$cat_id = (int)$control_area_id;
$cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
$cat_path = $cats->get_path($cat_id);
+ $cat_filter = array(-1);
foreach ($cat_path as $_category)
{
$cat_filter[] = $_category['id'];
@@ -277,9 +334,25 @@
$filter_control_area =
"controller_procedure.control_area_id IN (" . implode(',', $cat_filter) . ')';
+ $procedure_ids = array(-1);
+
+ $sql = "SELECT procedure_id FROM controller_procedure"
+ . " WHERE procedure_id IS NOT NULL";
+ $this->db->query($sql);
+
+ while ($this->db->next_record())
+ {
+ $procedure_ids[] = $this->db->f('procedure_id');
+
+ }
+ $filter_procedure = "AND controller_procedure.id NOT IN
(" . implode(',', $procedure_ids) . ')';
+
$results = array();
- $sql = "SELECT * FROM controller_procedure WHERE
{$filter_control_area} AND end_date IS NULL ORDER BY title ASC";
+ $sql = "SELECT * FROM controller_procedure"
+ . " WHERE {$filter_control_area}"
+ . " AND (end_date IS NULL OR procedure_id IS
NOT NULL)"
+ . " {$filter_procedure} ORDER BY title ASC";
$this->db->query($sql);
while ($this->db->next_record())
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2017-08-07 16:16:37 UTC
(rev 16956)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2017-08-08 13:35:18 UTC
(rev 16957)
@@ -184,7 +184,7 @@
public function edit()
{
- $procedure_id = phpgw::get_var('id');
+ $procedure_id = phpgw::get_var('id', 'int');
if (isset($procedure_id) && $procedure_id > 0)
{
$procedure =
$this->so->get_single($procedure_id);
@@ -275,45 +275,86 @@
'id' => $procedure_id));
}
+ //Sigurd 20170808: we are keeping the old one
as reference as is, and creating a new one for future checklists
$old_procedure =
$this->so->get_single($procedure_id);
if (isset($procedure)) // Edit procedure
{
+// $revision =
(int)$procedure->get_revision_no();
+// if ($revision && is_numeric($revision))
+// {
+// $revision++;
+//
$procedure->set_revision_no($revision);
+// }
+// else
+// {
+// $procedure->set_revision_no(2);
+// }
+
+ $description_txt =
phpgw::get_var('description', 'html');
+ $description_txt =
str_replace(" ", " ", $description_txt);
+ $purpose_txt =
phpgw::get_var('purpose', 'html');
+ $purpose_txt = str_replace(" ", "
", $purpose_txt);
+ $reference_txt =
phpgw::get_var('reference', 'html');
+ $reference_txt = str_replace(" ",
" ", $reference_txt);
+//
$procedure->set_title(phpgw::get_var('title'));
+// $procedure->set_purpose($purpose_txt);
+//
$procedure->set_responsibility(phpgw::get_var('responsibility'));
+//
$procedure->set_description($description_txt);
+//
$procedure->set_reference($reference_txt);
+//
$procedure->set_attachment(phpgw::get_var('attachment'));
+//
$procedure->set_start_date(strtotime(phpgw::get_var('start_date')));
+//
$procedure->set_end_date(strtotime(phpgw::get_var('end_date')));
+//
$procedure->set_control_area_id(phpgw::get_var('control_area'));
+//
+// if (isset($procedure_id) &&
$procedure_id > 0)
+// {
+// $proc_id = $procedure_id;
+// $old_procedure->set_id(null);
+//
$old_procedure->set_end_date(time());
+//
$old_procedure->set_procedure_id($proc_id);
+// if
($this->so->add($old_procedure)) //add old revision of procedure to history
+// {
+// if
($this->so->store($procedure))
+// {
+// $message =
lang('messages_saved_form');
+// }
+// else
+// {
+// $error =
lang('messages_form_error');
+// }
+// }
+// }
+
+ $new_procedure = new
controller_procedure();
$revision =
(int)$procedure->get_revision_no();
if ($revision && is_numeric($revision))
{
$revision++;
-
$procedure->set_revision_no($revision);
+
$new_procedure->set_revision_no($revision);
}
else
{
- $procedure->set_revision_no(2);
+
$new_procedure->set_revision_no(2);
}
+
$new_procedure->set_title(phpgw::get_var('title'));
+
$new_procedure->set_purpose($purpose_txt);
+
$new_procedure->set_responsibility(phpgw::get_var('responsibility'));
+
$new_procedure->set_description($description_txt);
+
$new_procedure->set_reference($reference_txt);
+
$new_procedure->set_attachment(phpgw::get_var('attachment'));
+
$new_procedure->set_start_date(strtotime(phpgw::get_var('start_date')));
+
$new_procedure->set_end_date(strtotime(phpgw::get_var('end_date')));
+
$new_procedure->set_revision_date(time());
+
$new_procedure->set_control_area_id(phpgw::get_var('control_area'));
- $description_txt =
phpgw::get_var('description', 'html');
- $description_txt =
str_replace(" ", " ", $description_txt);
- $purpose_txt =
phpgw::get_var('purpose', 'html');
- $purpose_txt = str_replace(" ", "
", $purpose_txt);
- $reference_txt =
phpgw::get_var('reference', 'html');
- $reference_txt = str_replace(" ",
" ", $reference_txt);
-
$procedure->set_title(phpgw::get_var('title'));
- $procedure->set_purpose($purpose_txt);
-
$procedure->set_responsibility(phpgw::get_var('responsibility'));
-
$procedure->set_description($description_txt);
-
$procedure->set_reference($reference_txt);
-
$procedure->set_attachment(phpgw::get_var('attachment'));
-
$procedure->set_start_date(strtotime(phpgw::get_var('start_date')));
-
$procedure->set_end_date(strtotime(phpgw::get_var('end_date')));
-
$procedure->set_control_area_id(phpgw::get_var('control_area'));
-
if (isset($procedure_id) &&
$procedure_id > 0)
{
- $proc_id = $procedure_id;
- $old_procedure->set_id(null);
-
$old_procedure->set_end_date(time());
-
$old_procedure->set_procedure_id($proc_id);
- if
($this->so->add($old_procedure)) //add old revision of procedure to history
+ if ($proc_id =
$this->so->add($new_procedure)) //add the revised prosedure as new
{
- if
($this->so->store($procedure))
+
$old_procedure->set_end_date(time());
+
$old_procedure->set_revision_date(time());
+
$old_procedure->set_procedure_id($proc_id);
+ if
($this->so->store($old_procedure)) //add revision of the old procedure to
history
{
$message =
lang('messages_saved_form');
}
@@ -590,14 +631,16 @@
public function view_procedures_for_control()
{
- $control_id = phpgw::get_var('control_id');
- $location_code = phpgw::get_var('location_code');
+ $check_list_id = phpgw::get_var('check_list_id', 'int');
+ $control_id = phpgw::get_var('control_id', 'int');
+ $location_code = phpgw::get_var('location_code',
'string');
+
$control = $this->so_control->get_single($control_id);
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
- $control_procedure =
$this->so->get_single_with_documents($control->get_procedure_id(),
"return_array");
+ $control_procedure =
$this->so->get_single_with_documents($control->get_procedure_id(),$check_list_id,
"return_array");
$control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
@@ -605,7 +648,7 @@
foreach ($control_groups as $control_group)
{
- $group_procedure =
$this->so->get_single($control_group->get_procedure_id());
+ $group_procedure =
$this->so->get_single_no_documents($control_group->get_procedure_id(),
$check_list_id );
if (isset($group_procedure))
{
$group_procedures_array[] =
array("control_group" => $control_group->toArray(),
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2017-08-07 16:16:37 UTC (rev 16956)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2017-08-08 13:35:18 UTC (rev 16957)
@@ -101,6 +101,8 @@
<a id="view_procedures">
<xsl:attribute name="value">
<xsl:text>index.php?menuaction=controller.uiprocedure.view_procedures_for_control</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&location_code=</xsl:text>
Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl
2017-08-07 16:16:37 UTC (rev 16956)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl
2017-08-08 13:35:18 UTC (rev 16957)
@@ -3,9 +3,11 @@
<xsl:template name="view_procedure" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+ <xsl:variable name="date_format">
+ <xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')" />
+ </xsl:variable>
-<div class="yui-content">
+ <div class="yui-content">
<div id="details">
<form action="#" method="post">
<input type="hidden" name="id" value =
"{value_id}">
@@ -12,132 +14,160 @@
</input>
<dl class="proplist-col">
<dt>
- <label
for="title"><xsl:value-of select="php:function('lang','Procedure title')"
/></label>
+ <label for="title">
+ <xsl:value-of
select="php:function('lang','Procedure title')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text"
name="title" id="title" value="{procedure/title}" size="100"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/title" />
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <input
type="text" name="title" id="title" value="{procedure/title}" size="100"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/title" />
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="revision_no"><xsl:value-of select="php:function('lang','Procedure
revision')" /></label>
+ <label for="revision_no">
+ <xsl:value-of
select="php:function('lang','Procedure revision')" />
+ </label>
</dt>
<dd>
<xsl:value-of
select="procedure/revision_no" />
</dd>
<dt>
- <label
for="control_area"><xsl:value-of select="php:function('lang','Control area')"
/></label>
+ <label for="control_area">
+ <xsl:value-of
select="php:function('lang','Control area')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select
id="control_area" name="control_area">
-
<xsl:apply-templates select="control_area/options"/>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/control_area_name" />
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <select
id="control_area" name="control_area">
+
<xsl:apply-templates select="control_area/options"/>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/control_area_name" />
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="start_date"><xsl:value-of select="php:function('lang','Procedure start
date')" /></label>
+ <label for="start_date">
+ <xsl:value-of
select="php:function('lang','Procedure start date')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text"
id="start_date" name="start_date" size="10" value="{start_date}"
readonly="readonly">
- </input>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/start_date" />
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <input
type="text" id="start_date" name="start_date" size="10" value="{start_date}"
readonly="readonly">
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/start_date" />
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="revision_date"><xsl:value-of select="php:function('lang','Procedure
revision date')" /></label>
+ <label for="revision_date">
+ <xsl:value-of
select="php:function('lang','Procedure revision date')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text"
id="revision_date" name="revision_date" size="10" value="{revision_date}"
readonly="readonly">
- </input>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/revision_date" />
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <input
type="text" id="revision_date" name="revision_date" size="10"
value="{revision_date}" readonly="readonly">
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/revision_date" />
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="end_date"><xsl:value-of select="php:function('lang','Procedure end date')"
/></label>
+ <label for="end_date">
+ <xsl:value-of
select="php:function('lang','Procedure end date')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text"
id="end_date" name="end_date" size="10" value="{end_date}" readonly="readonly">
- </input>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/end_date" />
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <input
type="text" id="end_date" name="end_date" size="10" value="{end_date}"
readonly="readonly">
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/end_date" />
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="purpose"><xsl:value-of select="php:function('lang','Procedure purpose')"
/></label>
+ <label for="purpose">
+ <xsl:value-of
select="php:function('lang','Procedure purpose')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea id="purpose"
name="purpose" rows="5" cols="60" style="width: 690px;"><xsl:value-of
select="procedure/purpose" disable-output-escaping="yes"/></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/purpose" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <textarea
id="purpose" name="purpose" rows="5" cols="60" style="width: 690px;">
+
<xsl:value-of select="procedure/purpose" disable-output-escaping="yes"/>
+ </textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/purpose" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="responsibility"><xsl:value-of select="php:function('lang','Procedure
responsibility')" /></label>
+ <label for="responsibility">
+ <xsl:value-of
select="php:function('lang','Procedure responsibility')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea
id="responsibility" name="responsibility" rows="5" cols="60"><xsl:value-of
select="procedure/responsibility" /></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/responsibility" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <textarea
id="responsibility" name="responsibility" rows="5" cols="60">
+
<xsl:value-of select="procedure/responsibility" />
+ </textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/responsibility" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="description"><xsl:value-of select="php:function('lang','Procedure
description')" /></label>
+ <label for="description">
+ <xsl:value-of
select="php:function('lang','Procedure description')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="procedure/description" disable-output-escaping="yes"/></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/description" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <textarea
id="description" name="description" rows="5" cols="60">
+
<xsl:value-of select="procedure/description" disable-output-escaping="yes"/>
+ </textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/description" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="reference"><xsl:value-of select="php:function('lang','Procedure
Reference')" /></label>
+ <label for="reference">
+ <xsl:value-of
select="php:function('lang','Procedure Reference')" />
+ </label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea
id="reference" name="reference" rows="5" cols="60"><xsl:value-of
select="procedure/reference" disable-output-escaping="yes"/></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="procedure/reference" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <textarea
id="reference" name="reference" rows="5" cols="60">
+
<xsl:value-of select="procedure/reference" disable-output-escaping="yes"/>
+ </textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/reference" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
</dl>
@@ -144,19 +174,29 @@
<div class="form-buttons">
<xsl:choose>
<xsl:when test="editable">
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <xsl:variable
name="lang_revisit"><xsl:value-of select="php:function('lang', 'revisit')"
/></xsl:variable>
- <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
+ <xsl:variable
name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'save')" />
+ </xsl:variable>
+ <xsl:variable
name="lang_revisit">
+ <xsl:value-of
select="php:function('lang', 'revisit')" />
+ </xsl:variable>
+ <xsl:variable
name="lang_cancel">
+ <xsl:value-of
select="php:function('lang', 'cancel')" />
+ </xsl:variable>
<input type="submit"
name="save_procedure" value="{$lang_save}" title = "{$lang_save}" />
<input type="submit"
name="revisit_procedure" value="{$lang_revisit}" title = "{$lang_revisit}" />
<input type="submit"
name="cancel_procedure" value="{$lang_cancel}" title = "{$lang_cancel}" />
</xsl:when>
<xsl:when test="inactive">
- <xsl:variable
name="lang_back"><xsl:value-of select="php:function('lang', 'back')"
/></xsl:variable>
+ <xsl:variable
name="lang_back">
+ <xsl:value-of
select="php:function('lang', 'back')" />
+ </xsl:variable>
<input type="button"
value="{$lang_back}" title="{$lang_back}" onclick="javascript: history.go(-1);"
class="btn"/>
</xsl:when>
<xsl:otherwise>
- <xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
+ <xsl:variable
name="lang_edit">
+ <xsl:value-of
select="php:function('lang', 'edit')" />
+ </xsl:variable>
<input type="submit"
name="edit_procedure" value="{$lang_edit}" title = "{$lang_edit}" />
</xsl:otherwise>
</xsl:choose>
@@ -164,9 +204,14 @@
</form>
<xsl:choose>
<xsl:when test="values != ''">
- <table>
- <xsl:call-template
name="table_header_history"/>
- <xsl:call-template
name="values_history"/>
+ <table class="pure-table">
+ <thead>
+
+ <xsl:call-template
name="table_header_history"/>
+ </thead>
+ <tbody>
+ <xsl:call-template
name="values_history"/>
+ </tbody>
</table>
</xsl:when>
</xsl:choose>
@@ -175,42 +220,47 @@
</xsl:template>
<xsl:template name="table_header_history">
- <th class="th">
- <xsl:for-each select="table_header" >
+ <tr>
+ <xsl:for-each select="table_header" >
+ <th>
+ <xsl:value-of select="header"/>
+ </th>
+ </xsl:for-each>
+ </tr>
+</xsl:template>
+
+<xsl:template name="values_history">
+
+ <xsl:for-each select="values" >
+ <tr>
+ <xsl:for-each select="row" >
+ <xsl:variable name="proc_link">
+ <xsl:value-of select='link'/>
+ </xsl:variable>
<td>
- <xsl:value-of select="header"/>
+ <a href="{$proc_link}">
+ <xsl:value-of
select="revision_no"/>
+ </a>
</td>
+ <td>
+ <xsl:value-of select="title"/>
+ </td>
+ <td>
+ <xsl:value-of select="start_date"/>
+ </td>
+ <td>
+ <xsl:value-of select="end_date"/>
+ </td>
</xsl:for-each>
- </th>
- </xsl:template>
-
- <xsl:template name="values_history">
- <xsl:for-each select="values" >
- <tr>
- <xsl:for-each select="row" >
- <xsl:variable
name="proc_link"><xsl:value-of select='link'/></xsl:variable>
- <td>
- <a
href="{$proc_link}"><xsl:value-of select="revision_no"/></a>
- </td>
- <td>
- <xsl:value-of select="title"/>
- </td>
- <td>
- <xsl:value-of
select="start_date"/>
- </td>
- <td>
- <xsl:value-of
select="end_date"/>
- </td>
- </xsl:for-each>
- </tr>
- </xsl:for-each>
- </xsl:template>
+ </tr>
+ </xsl:for-each>
+</xsl:template>
- <xsl:template match="options">
- <option value="{id}">
- <xsl:if test="selected">
- <xsl:attribute name="selected" value="selected"
/>
- </xsl:if>
- <xsl:value-of disable-output-escaping="yes"
select="name"/>
- </option>
- </xsl:template>
+<xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected">
+ <xsl:attribute name="selected" value="selected" />
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16957] controller: FDV-195,
sigurdne <=