[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8498]
From: |
Torstein |
Subject: |
[Fmsystem-commits] [8498] |
Date: |
Thu, 05 Jan 2012 15:57:17 +0000 |
Revision: 8498
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8498
Author: vator
Date: 2012-01-05 15:57:17 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/controller/templates/base/check_list/
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/view_check_list.xsl
trunk/controller/templates/base/check_list/view_check_lists.xsl
trunk/controller/templates/base/check_list/view_control_info.xsl
Removed Paths:
-------------
trunk/controller/templates/base/edit_check_list.xsl
trunk/controller/templates/base/view_check_list.xsl
trunk/controller/templates/base/view_check_lists.xsl
trunk/controller/templates/base/view_control_info.xsl
Copied: trunk/controller/templates/base/check_list/edit_check_list.xsl (from
rev 8493, trunk/controller/templates/base/edit_check_list.xsl)
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-01-05 15:57:17 UTC (rev 8498)
@@ -0,0 +1,442 @@
+<!-- $Id$ -->
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl">
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div id="main_content">
+
+ <script>
+ $(function() {
+ $( "#planned_date" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
+ dateFormat: 'dd/mm-yy'
+ });
+ $( "#completed_date" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
+ dateFormat: 'dd/mm-yy'
+ });
+ $( "#deadline_date" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
+ dateFormat: 'dd/mm-yy'
+ });
+
+ $(".tab_menu a").click(function(){
+ var thisTabA = $(this);
+ var thisTabMenu = $(this).parent(".tab_menu");
+
+ var showId = $(thisTabA).attr("href");
+ var hideId =
$(thisTabMenu).find("a.active").attr("href");
+
+ $(thisTabMenu).find("a").removeClass("active");
+ $(thisTabA).addClass('active');
+
+ $(hideId).hide();
+ $(hideId).removeClass("active")
+ $(showId).fadeIn('10', function(){
+ $(showId).addClass('active');
+
+ });
+
+ return false;
+ });
+
+ $("#reg_errors").click(function(){
+ var thisA = $(this);
+ var showId = $(thisA).attr("href");
+ var hideId = "#view_errors";
+
+ $(hideId).hide();
+ $(showId).fadeIn('10');
+ $(thisA).hide();
+ $("a#view_errors_measurements").css("display",
"block");
+
+ return false;
+ });
+
+ $("#view_errors_measurements").click(function(){
+ var thisA = $(this);
+ var showId = $(thisA).attr("href");
+ var hideId = "#register_errors";
+
+ $(hideId).hide();
+ $(showId).fadeIn('10');
+ $(thisA).hide();
+ $("a#reg_errors").css("display", "block");
+
+ return false;
+ });
+
+ });
+ </script>
+
+ <h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+
+ <div id="edit_check_list_menu" class="hor_menu">
+ <a class="active" id="view_check_list"
href="#view_check_list">Vis info om sjekkliste</a>
+ <a id="view_control_details">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_info</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis info om kontroll
+ </a>
+ </div>
+
+
+ <div class="tab_menu"><a
class="active">Sjekklistedetaljer</a></div>
+
+ <fieldset class="check_list_details">
+ <form id="frm_update_check_list"
action="index.php?menuaction=controller.uicheck_list.update_check_list"
method="post">
+
+ <xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
+ <input type="hidden" name="check_list_id"
value="{$check_list_id}" />
+
+ <div>
+ <label>ID</label>
+ <input>
+ <xsl:attribute
name="name">check_list_id</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="check_list/id"/></xsl:attribute>
+ </input>
+ </div>
+ <div>
+ <label>Status</label>
+ <xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
+ <select name="status">
+ <xsl:choose>
+ <xsl:when
test="check_list/status = 0">
+ <option value="0"
SELECTED="SELECTED">Ikke utført</option>
+ <option value="1"
>Utført</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 1">
+ <option value="0">Ikke
utført</option>
+ <option value="1"
SELECTED="SELECTED">Utført</option>
+ </xsl:when>
+ </xsl:choose>
+ </select>
+ </div>
+ <div>
+ <label>Skal utføres innen</label>
+ <input>
+ <xsl:attribute
name="id">deadline_date</xsl:attribute>
+ <xsl:attribute
name="name">deadline_date</xsl:attribute>
+ <xsl:attribute name="type">text</xsl:attribute>
+ <xsl:if test="check_list/deadline != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/deadline))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <div>
+ <label>Planlagt dato</label>
+ <input>
+ <xsl:attribute
name="id">planned_date</xsl:attribute>
+ <xsl:attribute
name="name">planned_date</xsl:attribute>
+ <xsl:attribute name="type">text</xsl:attribute>
+ <xsl:if test="check_list/planned_date != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/planned_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <div>
+ <label>Utført dato</label>
+ <input>
+ <xsl:attribute
name="id">completed_date</xsl:attribute>
+ <xsl:attribute
name="name">completed_date</xsl:attribute>
+ <xsl:attribute name="type">text</xsl:attribute>
+ <xsl:if test="check_list/completed_date != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <div>
+ <label class="comment">Kommentar</label>
+ <textarea>
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of select="check_list/comment"/>
+ </textarea>
+ </div>
+
+ <div class="form-buttons">
+ <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
+ <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
+ </div>
+ </form>
+ </fieldset>
+
+ <div id="error_message_menu">
+ <a class="btn">
+ <xsl:attribute name="id">
+ <xsl:text>reg_errors</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="href">
+ <xsl:text>#register_errors</xsl:text>
+ </xsl:attribute>
+ Registrer sak/måling
+ </a>
+ <a class="btn">
+ <xsl:attribute name="id">
+
<xsl:text>view_errors_measurements</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="href">
+ <xsl:text>#view_errors</xsl:text>
+ </xsl:attribute>
+ Vis avvik/måling
+ </a>
+ <a class="btn">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Registrer avviksmelding
+ </a>
+ </div>
+
+ <div id="register_errors">
+ <div class="tab_menu"><a class="active">Registrer
sak/måling</a></div>
+
+ <div class="tab_item active">
+
+ <xsl:choose>
+ <xsl:when
test="control_items_not_registered/child::node()">
+
+ <ul id="control_items_list"
class="check_items expand_list">
+ <xsl:for-each
select="control_items_not_registered">
+ <li>
+ <h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="title"/></span></h4>
+ <form
class="frm_save_control_item"
action="index.php?menuaction=controller.uicheck_list.add_check_item_to_list"
method="post">
+
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <input
type="hidden" name="control_item_id" value="{$control_item_id}" />
+ <input
name="check_list_id" type="hidden">
+
<xsl:attribute name="value">
+
<xsl:value-of select="//check_list/id"/>
+
</xsl:attribute>
+ </input>
+ <input
name="status" type="hidden" value="0" />
+
+ <xsl:choose>
+
<xsl:when test="type = 'control_item_type_1'">
+
<input name="type" type="hidden" value="control_item_type_1" />
+
+
<div class="check_item">
+
<div>
+
<label class="comment">Kommentar</label>
+
<textarea name="comment">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<div class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
+
<input type="submit" name="save_control" value="{$lang_save}"
class="not_active" title="{$lang_save}" />
+
</div>
+
</div>
+
</xsl:when>
+
<xsl:when test="type = 'control_item_type_2'">
+
<input name="type" type="hidden" value="control_item_type_2" />
+
<div class="check_item">
+
<div>
+
<label class="comment">Registrer målingsverdi</label>
+
<input>
+
<xsl:attribute name="name">measurement</xsl:attribute>
+
<xsl:attribute name="type">text</xsl:attribute>
+
<xsl:attribute name="value">
+
<xsl:value-of select="measurement"/>
+
</xsl:attribute>
+
</input>
+
</div>
+
<div>
+
<label class="comment">Kommentar</label>
+
<textarea name="comment">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<div class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
+
<input type="submit" name="save_control" value="Registrer
avvik" class="not_active" title="{$lang_save}" />
+
</div>
+
</div>
+
</xsl:when>
+ </xsl:choose>
+
+ </form>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </xsl:when>
+ <xsl:otherwise>
+ Alle sjekkpunkter for kontroll
er registert som åpent/håndtert avvik eller måling
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </div>
+
+ <div id="view_errors">
+
+ <div class="tab_menu">
+ <a class="active" href="#view_open_errors">Vis åpne
saker</a>
+ <a href="#view_handled_errors">Vis lukkede saker</a>
+ <a href="#view_measurements">Vis målinger</a>
+ </div>
+
+ <div id="view_open_errors" class="tab_item active">
+ <xsl:choose>
+ <xsl:when test="open_check_items/child::node()">
+
+ <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
+
+ <ul id="check_list_not_fixed_list"
class="check_items expand_list">
+ <xsl:for-each
select="open_check_items">
+ <li>
+ <xsl:if
test="status = 0">
+
<h4><img src="controller/images/arrow_right.png"
width="14"/><span><xsl:value-of select="control_item/title"/></span></h4>
+ <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
+
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
+
<input type="hidden" name="check_item_id" value="{$check_item_id}" />
+
<div class="check_item">
+
<div>
+
<label>Status</label>
+
<select name="status">
+
<xsl:choose>
+
<xsl:when test="status = 0">
+
<option value="0" SELECTED="SELECTED">Avvik er
åpent</option>
+
<option value="1">Avvik er håndtert</option>
+
</xsl:when>
+
<xsl:when test="status = 1">
+
<option value="0">Avvik er åpent</option>
+
<option value="1" SELECTED="SELECTED">Avvik er
håndtert</option>
+
</xsl:when>
+
</xsl:choose>
+
</select>
+
</div>
+
<div>
+
<label class="comment">Kommentar</label>
+
<textarea name="comment">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<div class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_item')" /></xsl:variable>
+
<input style="width: 200px;" type="submit" name="save_control"
value="Oppdater registrert avvik" class="not_active" title="{$lang_save}" />
+
</div>
+
</div>
+ </form>
+ </xsl:if>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen registrerte åpne avvik
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div id="view_handled_errors" class="tab_item">
+ <xsl:choose>
+ <xsl:when
test="handled_check_items/child::node()">
+
+ <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
+
+ <ul id="check_list_fixed_list"
class="check_items expand_list">
+ <xsl:for-each
select="handled_check_items">
+ <xsl:if
test="status = 1">
+ <li>
+ <h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="control_item/title"/></span></h4>
+ <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
+
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
+
<input type="hidden" name="check_item_id" value="{$check_item_id}" />
+
<div class="check_item">
+
<div>
+
<label>Status</label>
+
<select name="status">
+
<xsl:choose>
+
<xsl:when test="status = 0">
+
<option value="0" SELECTED="SELECTED">Avvik er
åpent</option>
+
<option value="1">Avvik er håndtert</option>
+
</xsl:when>
+
<xsl:when test="status = 1">
+
<option value="0">Avvik er åpent</option>
+
<option value="1" SELECTED="SELECTED">Avvik er
lukket</option>
+
</xsl:when>
+
</xsl:choose>
+
</select>
+
</div>
+
<div>
+
<label class="comment">Kommentar</label>
+
<textarea name="comment">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<div class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_item')" /></xsl:variable>
+
<input type="submit" name="save_control" value="Oppdater
håndtert avvik" class="not_active" title="{$lang_save}" />
+
</div>
+
</div>
+ </form>
+ </li>
+ </xsl:if>
+ </xsl:for-each>
+ </ul>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen registrerte håndterte
avvik
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div id="view_measurements" class="tab_item">
+ <xsl:choose>
+ <xsl:when
test="measurement_check_items/child::node()">
+
+ <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
+
+ <ul id="check_list_not_fixed_list"
class="check_items expand_list">
+ <xsl:for-each
select="measurement_check_items">
+ <li>
+ <xsl:if
test="status = 0">
+
<h4><img src="controller/images/arrow_right.png"
width="14"/><span><xsl:value-of select="control_item/title"/></span></h4>
+ <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
+
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
+
<input type="hidden" name="check_item_id" value="{$check_item_id}" />
+
<input type="hidden" name="type" value="measurement" />
+
+
<div class="check_item">
+
<div>
+
<label>Målingsverdi</label>
+
<input>
+
<xsl:attribute name="name">measurement</xsl:attribute>
+
<xsl:attribute name="type">text</xsl:attribute>
+
<xsl:attribute name="value">
+
<xsl:value-of select="measurement"/>
+
</xsl:attribute>
+
</input>
+
</div>
+
+
<div>
+
<label class="comment">Kommentar</label>
+
<textarea name="comment">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<div class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_item')" /></xsl:variable>
+
<input type="submit" name="save_control" value="Oppdatert
registert måling" class="not_active" title="{$lang_save}" />
+
</div>
+
</div>
+ </form>
+ </xsl:if>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen registrerte målinger
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ </div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/check_list/edit_check_list.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Copied: trunk/controller/templates/base/check_list/view_check_list.xsl (from
rev 8489, trunk/controller/templates/base/view_check_list.xsl)
===================================================================
--- trunk/controller/templates/base/check_list/view_check_list.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/view_check_list.xsl
2012-01-05 15:57:17 UTC (rev 8498)
@@ -0,0 +1,64 @@
+<!-- $Id$ -->
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl">
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div id="main_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+
+ <h1>Sjekkliste</h1>
+ <fieldset class="control_details">
+ <label>Tittel</label><xsl:value-of
select="check_list/status"/><br/>
+ <label>Kommentar</label><xsl:value-of
select="check_list/comment"/><br/>
+ <label>Skal utføres innen</label>
+ <xsl:if test="check_list/deadline != ''">
+ <xsl:value-of select="php:function('date',
$date_format, number(check_list/deadline))"/><br/>
+ </xsl:if>
+ </fieldset>
+
+ <h2>Sjekkpunkter</h2>
+ <ul class="check_list">
+ <li class="heading">
+ <div class="status">Status</div>
+ <div class="title">Tittel for
kontrollpunkt</div>
+ <div>Kommentar</div>
+ </li>
+
+ <xsl:choose>
+ <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">
+ <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="status = 1">
+ <img
height="15" src="controller/images/status_icon_light_green.png" />
+ </xsl:when>
+ <xsl:otherwise>
+ <img
height="15" src="controller/images/status_icon_red.png" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ <div
class="title"><xsl:value-of select="control_item/title"/></div>
+ <div><xsl:value-of
select="comment"/></div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen sjekklister for denne kontrollen
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+
+ <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="check_list/id"/>
+ </xsl:attribute>
+ <div>Registrer sjekkliste</div>
+ </a>
+
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/check_list/view_check_list.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Copied: trunk/controller/templates/base/check_list/view_check_lists.xsl (from
rev 8489, trunk/controller/templates/base/view_check_lists.xsl)
===================================================================
--- trunk/controller/templates/base/check_list/view_check_lists.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/view_check_lists.xsl
2012-01-05 15:57:17 UTC (rev 8498)
@@ -0,0 +1,93 @@
+<!-- $Id$ -->
+<xsl:template match="data" name="view_check_lists"
xmlns:php="http://php.net/xsl">
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<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>Sjekklister for kontroll</h1>
+ <fieldset class="check_list_details">
+ <label>Tittel</label><xsl:value-of
select="control_as_array/title"/><br/>
+ <label>Startdato</label>
+ <xsl:if test="control_as_array/start_date != 0">
+ <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/start_date))"/><br/>
+ </xsl:if>
+ <label>Sluttdato</label>
+ <xsl:if test="control_as_array/end_date != 0">
+ <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/end_date))"/><br/>
+ </xsl:if>
+ <label>Frekvenstype</label><xsl:value-of
select="control_as_array/repeat_type"/><br/>
+ <label>Frekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
+ </fieldset>
+
+ <h2>Sjekklister</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>Kommentar</div>
+ </li>
+ <xsl:choose>
+ <xsl:when test="check_list_array/child::node()">
+ <xsl:for-each select="check_list_array">
+ <li>
+ <div
class="order_nr"><xsl:number/>.</div>
+ <div class="status">
+ <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="status = 1">
+ <img
height="15" src="controller/images/status_icon_light_green.png" />
+ </xsl:when>
+ <xsl:otherwise>
+ <img
height="15" src="controller/images/status_icon_red.png" />
+ </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:if
test="deadline != ''">
+
<xsl:value-of select="php:function('date', $date_format, number(deadline))"/>
+
</xsl:if>
+ </a>
+ </div>
+ <div>
+ <xsl:if
test="planned_date != ''">
+
<xsl:value-of select="php:function('date', $date_format,
number(planned_date))"/>
+ </xsl:if>
+ </div>
+ <div>
+ <xsl:if
test="completed_date != ''">
+
<xsl:value-of select="php:function('date', $date_format,
number(completed_date))"/>
+ </xsl:if>
+ </div>
+ <div><xsl:value-of
select="comment"/></div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen sjekklister for denne kontrollen
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.control_calendar_status_overview</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="control_as_array/id"/>
+ </xsl:attribute>
+ <div style="margin-top:30px">
+ Se kalenderoversikt for kontroll
+ </div>
+ </a>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/check_list/view_check_lists.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Copied: trunk/controller/templates/base/check_list/view_control_info.xsl (from
rev 8497, trunk/controller/templates/base/view_control_info.xsl)
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-05 15:57:17 UTC (rev 8498)
@@ -0,0 +1,282 @@
+<!-- $Id: edit_check_list.xsl 8478 2012-01-03 12:36:37Z vator $ -->
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl">
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div id="main_content">
+
+ <script>
+ $(function() {
+ $( "#planned_date" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
+ dateFormat: 'dd/mm-yy'
+ });
+ $( "#completed_date" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
+ dateFormat: 'dd/mm-yy'
+ });
+ $( "#deadline_date" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
+ dateFormat: 'dd/mm-yy'
+ });
+
+ $(".tab_menu a").click(function(){
+ var thisTabA = $(this);
+ var thisTabMenu = $(this).parent(".tab_menu");
+
+ var showId = $(thisTabA).attr("href");
+ var hideId =
$(thisTabMenu).find("a.active").attr("href");
+
+ $(thisTabMenu).find("a").removeClass("active");
+ $(thisTabA).addClass('active');
+
+ $(hideId).hide();
+ $(hideId).removeClass("active")
+ $(showId).fadeIn('10', function(){
+ $(showId).addClass('active');
+
+ });
+
+ return false;
+ });
+
+ $("#view_control_items").click(function(){
+ var requestUrl = $(this).attr("href");
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl,
+ success: function(data) {
+ $("#tab_content").html(data);
+ }
+ });
+
+ return false;
+ });
+
+ $("#view_procedures").click(function(){
+ var requestUrl = $(this).attr("href");
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl,
+ success: function(data) {
+ $("#tab_content").html(data);
+ }
+ });
+
+ return false;
+ });
+
+ });
+ </script>
+
+ <h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+
+ <div id="edit_check_list_menu" class="hor_menu">
+ <a id="view_check_list">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis info om sjekkliste
+ </a>
+
+ <a id="view_control_details" class="active">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_info</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis info om kontroll
+ </a>
+ </div>
+
+ <div class="tab_menu">
+ <a class="active">Kontrolldetaljer</a>
+ <a id="view_control_items">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="control/id"/>
+ </xsl:attribute>
+ Kontrollpunkter
+ </a>
+ <a id="view_procedures">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uiprocedure.view_procedures_for_control</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="control/id"/>
+ </xsl:attribute>
+ Prosedyrer
+ </a>
+ </div>
+
+ <div id="tab_content" class="content_wrp">
+
+ <fieldset>
+ <dl class="proplist-col">
+ <dt>
+ <label>Kontrollområde</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="control_area_id"
name="control_area_id">
+ <xsl:for-each
select="control_areas_array">
+ <xsl:choose>
+
<xsl:when test="id != $control_area_id">
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ <select id="control_area_id"
name="control_area_id">
+ <xsl:apply-templates
select="control_areas_array2/options"/>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/control_area_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label>Prosedyre</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="procedure_id"
name="procedure_id">
+ <xsl:for-each
select="procedures_array">
+ <xsl:choose>
+
<xsl:when test="id != $control_procedure_id">
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/procedure_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label for="title">Tittel</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <input type="text"
name="title" id="title" value="{control/title}" size="80"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/title" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="start_date">Startdato</label>
+ </dt>
+ <dd>
+ <input>
+ <xsl:attribute
name="id">start_date</xsl:attribute>
+ <xsl:attribute
name="name">start_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:if test="control/start_date != ''">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </dd>
+ <dt>
+ <label for="end_date">Sluttdato</label>
+ </dt>
+ <dd>
+ <input>
+ <xsl:attribute
name="id">end_date</xsl:attribute>
+ <xsl:attribute
name="name">end_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:if test="control/end_date != 0">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </dd>
+ <dt>
+ <label>Frekvenstype</label>
+ </dt>
+ <dd>
+ <select id="repeat_type"
name="repeat_type">
+ <option value="0">Ikke
angitt</option>
+ <option value="1">Dag</option>
+ <option value="2">Uke</option>
+ <option value="3">Måned</option>
+ <option value="5">År</option>
+ </select>
+ </dd>
+ <dt>
+ <label>Frekvens</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <input size="2" type="text"
name="repeat_interval" value="{control/repeat_interval}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/repeat_interval" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label>Rolle</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="responsibility_id"
name="responsibility_id">
+ <xsl:for-each
select="role_array">
+ <option
value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/role_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="description">Beskrivelse</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea cols="70" rows="5"
name="description" id="description"><xsl:value-of select="control/description"
/></textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/description" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ </dl>
+ </fieldset>
+
+ </div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/check_list/view_control_info.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/controller/templates/base/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/edit_check_list.xsl 2012-01-05 15:53:00 UTC
(rev 8497)
+++ trunk/controller/templates/base/edit_check_list.xsl 2012-01-05 15:57:17 UTC
(rev 8498)
@@ -1,442 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl">
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div id="main_content">
-
- <script>
- $(function() {
- $( "#planned_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
- });
- $( "#completed_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
- });
- $( "#deadline_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
- });
-
- $(".tab_menu a").click(function(){
- var thisTabA = $(this);
- var thisTabMenu = $(this).parent(".tab_menu");
-
- var showId = $(thisTabA).attr("href");
- var hideId =
$(thisTabMenu).find("a.active").attr("href");
-
- $(thisTabMenu).find("a").removeClass("active");
- $(thisTabA).addClass('active');
-
- $(hideId).hide();
- $(hideId).removeClass("active")
- $(showId).fadeIn('10', function(){
- $(showId).addClass('active');
-
- });
-
- return false;
- });
-
- $("#reg_errors").click(function(){
- var thisA = $(this);
- var showId = $(thisA).attr("href");
- var hideId = "#view_errors";
-
- $(hideId).hide();
- $(showId).fadeIn('10');
- $(thisA).hide();
- $("a#view_errors_measurements").css("display",
"block");
-
- return false;
- });
-
- $("#view_errors_measurements").click(function(){
- var thisA = $(this);
- var showId = $(thisA).attr("href");
- var hideId = "#register_errors";
-
- $(hideId).hide();
- $(showId).fadeIn('10');
- $(thisA).hide();
- $("a#reg_errors").css("display", "block");
-
- return false;
- });
-
- });
- </script>
-
- <h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
-
- <div id="edit_check_list_menu" class="hor_menu">
- <a class="active" id="view_check_list"
href="#view_check_list">Vis info om sjekkliste</a>
- <a id="view_control_details">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_info</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Vis info om kontroll
- </a>
- </div>
-
-
- <div class="tab_menu"><a
class="active">Sjekklistedetaljer</a></div>
-
- <fieldset class="check_list_details">
- <form id="frm_update_check_list"
action="index.php?menuaction=controller.uicheck_list.update_check_list"
method="post">
-
- <xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
- <input type="hidden" name="check_list_id"
value="{$check_list_id}" />
-
- <div>
- <label>ID</label>
- <input>
- <xsl:attribute
name="name">check_list_id</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of
select="check_list/id"/></xsl:attribute>
- </input>
- </div>
- <div>
- <label>Status</label>
- <xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
- <select name="status">
- <xsl:choose>
- <xsl:when
test="check_list/status = 0">
- <option value="0"
SELECTED="SELECTED">Ikke utført</option>
- <option value="1"
>Utført</option>
- </xsl:when>
- <xsl:when
test="check_list/status = 1">
- <option value="0">Ikke
utført</option>
- <option value="1"
SELECTED="SELECTED">Utført</option>
- </xsl:when>
- </xsl:choose>
- </select>
- </div>
- <div>
- <label>Skal utføres innen</label>
- <input>
- <xsl:attribute
name="id">deadline_date</xsl:attribute>
- <xsl:attribute
name="name">deadline_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/deadline != 0">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/deadline))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <div>
- <label>Planlagt dato</label>
- <input>
- <xsl:attribute
name="id">planned_date</xsl:attribute>
- <xsl:attribute
name="name">planned_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/planned_date != 0">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/planned_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <div>
- <label>Utført dato</label>
- <input>
- <xsl:attribute
name="id">completed_date</xsl:attribute>
- <xsl:attribute
name="name">completed_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/completed_date != 0">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <div>
- <label class="comment">Kommentar</label>
- <textarea>
- <xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of select="check_list/comment"/>
- </textarea>
- </div>
-
- <div class="form-buttons">
- <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
- </div>
- </form>
- </fieldset>
-
- <div id="error_message_menu">
- <a class="btn">
- <xsl:attribute name="id">
- <xsl:text>reg_errors</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="href">
- <xsl:text>#register_errors</xsl:text>
- </xsl:attribute>
- Registrer sak/måling
- </a>
- <a class="btn">
- <xsl:attribute name="id">
-
<xsl:text>view_errors_measurements</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="href">
- <xsl:text>#view_errors</xsl:text>
- </xsl:attribute>
- Vis avvik/måling
- </a>
- <a class="btn">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Registrer avviksmelding
- </a>
- </div>
-
- <div id="register_errors">
- <div class="tab_menu"><a class="active">Registrer
sak/måling</a></div>
-
- <div class="tab_item active">
-
- <xsl:choose>
- <xsl:when
test="control_items_not_registered/child::node()">
-
- <ul id="control_items_list"
class="check_items expand_list">
- <xsl:for-each
select="control_items_not_registered">
- <li>
- <h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="title"/></span></h4>
- <form
class="frm_save_control_item"
action="index.php?menuaction=controller.uicheck_list.add_check_item_to_list"
method="post">
-
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <input
type="hidden" name="control_item_id" value="{$control_item_id}" />
- <input
name="check_list_id" type="hidden">
-
<xsl:attribute name="value">
-
<xsl:value-of select="//check_list/id"/>
-
</xsl:attribute>
- </input>
- <input
name="status" type="hidden" value="0" />
-
- <xsl:choose>
-
<xsl:when test="type = 'control_item_type_1'">
-
<input name="type" type="hidden" value="control_item_type_1" />
-
-
<div class="check_item">
-
<div>
-
<label class="comment">Kommentar</label>
-
<textarea name="comment">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<div class="form-buttons">
-
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
-
<input type="submit" name="save_control" value="{$lang_save}"
class="not_active" title="{$lang_save}" />
-
</div>
-
</div>
-
</xsl:when>
-
<xsl:when test="type = 'control_item_type_2'">
-
<input name="type" type="hidden" value="control_item_type_2" />
-
<div class="check_item">
-
<div>
-
<label class="comment">Registrer målingsverdi</label>
-
<input>
-
<xsl:attribute name="name">measurement</xsl:attribute>
-
<xsl:attribute name="type">text</xsl:attribute>
-
<xsl:attribute name="value">
-
<xsl:value-of select="measurement"/>
-
</xsl:attribute>
-
</input>
-
</div>
-
<div>
-
<label class="comment">Kommentar</label>
-
<textarea name="comment">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<div class="form-buttons">
-
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
-
<input type="submit" name="save_control" value="Registrer
avvik" class="not_active" title="{$lang_save}" />
-
</div>
-
</div>
-
</xsl:when>
- </xsl:choose>
-
- </form>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:when>
- <xsl:otherwise>
- Alle sjekkpunkter for kontroll
er registert som åpent/håndtert avvik eller måling
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
-
- <div id="view_errors">
-
- <div class="tab_menu">
- <a class="active" href="#view_open_errors">Vis åpne
saker</a>
- <a href="#view_handled_errors">Vis lukkede saker</a>
- <a href="#view_measurements">Vis målinger</a>
- </div>
-
- <div id="view_open_errors" class="tab_item active">
- <xsl:choose>
- <xsl:when test="open_check_items/child::node()">
-
- <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
-
- <ul id="check_list_not_fixed_list"
class="check_items expand_list">
- <xsl:for-each
select="open_check_items">
- <li>
- <xsl:if
test="status = 0">
-
<h4><img src="controller/images/arrow_right.png"
width="14"/><span><xsl:value-of select="control_item/title"/></span></h4>
- <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
-
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
-
<input type="hidden" name="check_item_id" value="{$check_item_id}" />
-
<div class="check_item">
-
<div>
-
<label>Status</label>
-
<select name="status">
-
<xsl:choose>
-
<xsl:when test="status = 0">
-
<option value="0" SELECTED="SELECTED">Avvik er
åpent</option>
-
<option value="1">Avvik er håndtert</option>
-
</xsl:when>
-
<xsl:when test="status = 1">
-
<option value="0">Avvik er åpent</option>
-
<option value="1" SELECTED="SELECTED">Avvik er
håndtert</option>
-
</xsl:when>
-
</xsl:choose>
-
</select>
-
</div>
-
<div>
-
<label class="comment">Kommentar</label>
-
<textarea name="comment">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<div class="form-buttons">
-
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_item')" /></xsl:variable>
-
<input style="width: 200px;" type="submit" name="save_control"
value="Oppdater registrert avvik" class="not_active" title="{$lang_save}" />
-
</div>
-
</div>
- </form>
- </xsl:if>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:when>
- <xsl:otherwise>
- Ingen registrerte åpne avvik
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- <div id="view_handled_errors" class="tab_item">
- <xsl:choose>
- <xsl:when
test="handled_check_items/child::node()">
-
- <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
-
- <ul id="check_list_fixed_list"
class="check_items expand_list">
- <xsl:for-each
select="handled_check_items">
- <xsl:if
test="status = 1">
- <li>
- <h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="control_item/title"/></span></h4>
- <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
-
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
-
<input type="hidden" name="check_item_id" value="{$check_item_id}" />
-
<div class="check_item">
-
<div>
-
<label>Status</label>
-
<select name="status">
-
<xsl:choose>
-
<xsl:when test="status = 0">
-
<option value="0" SELECTED="SELECTED">Avvik er
åpent</option>
-
<option value="1">Avvik er håndtert</option>
-
</xsl:when>
-
<xsl:when test="status = 1">
-
<option value="0">Avvik er åpent</option>
-
<option value="1" SELECTED="SELECTED">Avvik er
lukket</option>
-
</xsl:when>
-
</xsl:choose>
-
</select>
-
</div>
-
<div>
-
<label class="comment">Kommentar</label>
-
<textarea name="comment">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<div class="form-buttons">
-
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_item')" /></xsl:variable>
-
<input type="submit" name="save_control" value="Oppdater
håndtert avvik" class="not_active" title="{$lang_save}" />
-
</div>
-
</div>
- </form>
- </li>
- </xsl:if>
- </xsl:for-each>
- </ul>
- </xsl:when>
- <xsl:otherwise>
- Ingen registrerte håndterte
avvik
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- <div id="view_measurements" class="tab_item">
- <xsl:choose>
- <xsl:when
test="measurement_check_items/child::node()">
-
- <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
-
- <ul id="check_list_not_fixed_list"
class="check_items expand_list">
- <xsl:for-each
select="measurement_check_items">
- <li>
- <xsl:if
test="status = 0">
-
<h4><img src="controller/images/arrow_right.png"
width="14"/><span><xsl:value-of select="control_item/title"/></span></h4>
- <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
-
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
-
<input type="hidden" name="check_item_id" value="{$check_item_id}" />
-
<input type="hidden" name="type" value="measurement" />
-
-
<div class="check_item">
-
<div>
-
<label>Målingsverdi</label>
-
<input>
-
<xsl:attribute name="name">measurement</xsl:attribute>
-
<xsl:attribute name="type">text</xsl:attribute>
-
<xsl:attribute name="value">
-
<xsl:value-of select="measurement"/>
-
</xsl:attribute>
-
</input>
-
</div>
-
-
<div>
-
<label class="comment">Kommentar</label>
-
<textarea name="comment">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<div class="form-buttons">
-
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_item')" /></xsl:variable>
-
<input type="submit" name="save_control" value="Oppdatert
registert måling" class="not_active" title="{$lang_save}" />
-
</div>
-
</div>
- </form>
- </xsl:if>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:when>
- <xsl:otherwise>
- Ingen registrerte målinger
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- </div>
-</div>
-</xsl:template>
Deleted: trunk/controller/templates/base/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/view_check_list.xsl 2012-01-05 15:53:00 UTC
(rev 8497)
+++ trunk/controller/templates/base/view_check_list.xsl 2012-01-05 15:57:17 UTC
(rev 8498)
@@ -1,64 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl">
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div id="main_content">
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
- <h1>Sjekkliste</h1>
- <fieldset class="control_details">
- <label>Tittel</label><xsl:value-of
select="check_list/status"/><br/>
- <label>Kommentar</label><xsl:value-of
select="check_list/comment"/><br/>
- <label>Skal utføres innen</label>
- <xsl:if test="check_list/deadline != ''">
- <xsl:value-of select="php:function('date',
$date_format, number(check_list/deadline))"/><br/>
- </xsl:if>
- </fieldset>
-
- <h2>Sjekkpunkter</h2>
- <ul class="check_list">
- <li class="heading">
- <div class="status">Status</div>
- <div class="title">Tittel for
kontrollpunkt</div>
- <div>Kommentar</div>
- </li>
-
- <xsl:choose>
- <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">
- <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
- <xsl:choose>
- <xsl:when
test="status = 1">
- <img
height="15" src="controller/images/status_icon_light_green.png" />
- </xsl:when>
- <xsl:otherwise>
- <img
height="15" src="controller/images/status_icon_red.png" />
- </xsl:otherwise>
- </xsl:choose>
- </div>
- <div
class="title"><xsl:value-of select="control_item/title"/></div>
- <div><xsl:value-of
select="comment"/></div>
- </li>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- Ingen sjekklister for denne kontrollen
- </xsl:otherwise>
- </xsl:choose>
- </ul>
-
- <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="check_list/id"/>
- </xsl:attribute>
- <div>Registrer sjekkliste</div>
- </a>
-
-</div>
-</xsl:template>
Deleted: trunk/controller/templates/base/view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/view_check_lists.xsl 2012-01-05
15:53:00 UTC (rev 8497)
+++ trunk/controller/templates/base/view_check_lists.xsl 2012-01-05
15:57:17 UTC (rev 8498)
@@ -1,93 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" name="view_check_lists"
xmlns:php="http://php.net/xsl">
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<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>Sjekklister for kontroll</h1>
- <fieldset class="check_list_details">
- <label>Tittel</label><xsl:value-of
select="control_as_array/title"/><br/>
- <label>Startdato</label>
- <xsl:if test="control_as_array/start_date != 0">
- <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/start_date))"/><br/>
- </xsl:if>
- <label>Sluttdato</label>
- <xsl:if test="control_as_array/end_date != 0">
- <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/end_date))"/><br/>
- </xsl:if>
- <label>Frekvenstype</label><xsl:value-of
select="control_as_array/repeat_type"/><br/>
- <label>Frekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
- </fieldset>
-
- <h2>Sjekklister</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>Kommentar</div>
- </li>
- <xsl:choose>
- <xsl:when test="check_list_array/child::node()">
- <xsl:for-each select="check_list_array">
- <li>
- <div
class="order_nr"><xsl:number/>.</div>
- <div class="status">
- <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
- <xsl:choose>
- <xsl:when
test="status = 1">
- <img
height="15" src="controller/images/status_icon_light_green.png" />
- </xsl:when>
- <xsl:otherwise>
- <img
height="15" src="controller/images/status_icon_red.png" />
- </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:if
test="deadline != ''">
-
<xsl:value-of select="php:function('date', $date_format, number(deadline))"/>
-
</xsl:if>
- </a>
- </div>
- <div>
- <xsl:if
test="planned_date != ''">
-
<xsl:value-of select="php:function('date', $date_format,
number(planned_date))"/>
- </xsl:if>
- </div>
- <div>
- <xsl:if
test="completed_date != ''">
-
<xsl:value-of select="php:function('date', $date_format,
number(completed_date))"/>
- </xsl:if>
- </div>
- <div><xsl:value-of
select="comment"/></div>
- </li>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- Ingen sjekklister for denne kontrollen
- </xsl:otherwise>
- </xsl:choose>
- </ul>
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.control_calendar_status_overview</xsl:text>
- <xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="control_as_array/id"/>
- </xsl:attribute>
- <div style="margin-top:30px">
- Se kalenderoversikt for kontroll
- </div>
- </a>
-</div>
-</xsl:template>
Deleted: trunk/controller/templates/base/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/view_control_info.xsl 2012-01-05
15:53:00 UTC (rev 8497)
+++ trunk/controller/templates/base/view_control_info.xsl 2012-01-05
15:57:17 UTC (rev 8498)
@@ -1,282 +0,0 @@
-<!-- $Id: edit_check_list.xsl 8478 2012-01-03 12:36:37Z vator $ -->
-<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl">
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div id="main_content">
-
- <script>
- $(function() {
- $( "#planned_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
- });
- $( "#completed_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
- });
- $( "#deadline_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
- });
-
- $(".tab_menu a").click(function(){
- var thisTabA = $(this);
- var thisTabMenu = $(this).parent(".tab_menu");
-
- var showId = $(thisTabA).attr("href");
- var hideId =
$(thisTabMenu).find("a.active").attr("href");
-
- $(thisTabMenu).find("a").removeClass("active");
- $(thisTabA).addClass('active');
-
- $(hideId).hide();
- $(hideId).removeClass("active")
- $(showId).fadeIn('10', function(){
- $(showId).addClass('active');
-
- });
-
- return false;
- });
-
- $("#view_control_items").click(function(){
- var requestUrl = $(this).attr("href");
-
- $.ajax({
- type: 'POST',
- url: requestUrl,
- success: function(data) {
- $("#tab_content").html(data);
- }
- });
-
- return false;
- });
-
- $("#view_procedures").click(function(){
- var requestUrl = $(this).attr("href");
-
- $.ajax({
- type: 'POST',
- url: requestUrl,
- success: function(data) {
- $("#tab_content").html(data);
- }
- });
-
- return false;
- });
-
- });
- </script>
-
- <h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
-
- <div id="edit_check_list_menu" class="hor_menu">
- <a id="view_check_list">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Vis info om sjekkliste
- </a>
-
- <a id="view_control_details" class="active">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_info</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Vis info om kontroll
- </a>
- </div>
-
- <div class="tab_menu">
- <a class="active">Kontrolldetaljer</a>
- <a id="view_control_items">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
- <xsl:text>&control_id=</xsl:text>
- <xsl:value-of select="control/id"/>
- </xsl:attribute>
- Kontrollpunkter
- </a>
- <a id="view_procedures">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uiprocedure.view_procedures_for_control</xsl:text>
- <xsl:text>&control_id=</xsl:text>
- <xsl:value-of select="control/id"/>
- </xsl:attribute>
- Prosedyrer
- </a>
- </div>
-
- <div id="tab_content" class="content_wrp">
-
- <fieldset>
- <dl class="proplist-col">
- <dt>
- <label>Kontrollområde</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="control_area_id"
name="control_area_id">
- <xsl:for-each
select="control_areas_array">
- <xsl:choose>
-
<xsl:when test="id != $control_area_id">
-
<option value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{id}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
-
</option>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- <select id="control_area_id"
name="control_area_id">
- <xsl:apply-templates
select="control_areas_array2/options"/>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/control_area_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label>Prosedyre</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="procedure_id"
name="procedure_id">
- <xsl:for-each
select="procedures_array">
- <xsl:choose>
-
<xsl:when test="id != $control_procedure_id">
-
<option value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{id}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
-
</option>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/procedure_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label for="title">Tittel</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text"
name="title" id="title" value="{control/title}" size="80"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/title" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="start_date">Startdato</label>
- </dt>
- <dd>
- <input>
- <xsl:attribute
name="id">start_date</xsl:attribute>
- <xsl:attribute
name="name">start_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- <xsl:if test="control/start_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </dd>
- <dt>
- <label for="end_date">Sluttdato</label>
- </dt>
- <dd>
- <input>
- <xsl:attribute
name="id">end_date</xsl:attribute>
- <xsl:attribute
name="name">end_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- <xsl:if test="control/end_date != 0">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </dd>
- <dt>
- <label>Frekvenstype</label>
- </dt>
- <dd>
- <select id="repeat_type"
name="repeat_type">
- <option value="0">Ikke
angitt</option>
- <option value="1">Dag</option>
- <option value="2">Uke</option>
- <option value="3">Måned</option>
- <option value="5">År</option>
- </select>
- </dd>
- <dt>
- <label>Frekvens</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input size="2" type="text"
name="repeat_interval" value="{control/repeat_interval}" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/repeat_interval" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label>Rolle</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="responsibility_id"
name="responsibility_id">
- <xsl:for-each
select="role_array">
- <option
value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/role_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="description">Beskrivelse</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea cols="70" rows="5"
name="description" id="description"><xsl:value-of select="control/description"
/></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/description" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- </dl>
- </fieldset>
-
- </div>
-</div>
-</xsl:template>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8498],
Torstein <=