[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8487]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8487] |
|
Date: |
Thu, 05 Jan 2012 08:22:34 +0000 |
Revision: 8487
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8487
Author: vator
Date: 2012-01-05 08:22:34 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/add_check_list_for_location.xsl
trunk/controller/templates/base/create_error_report_message.xsl
trunk/controller/templates/base/edit_check_list.xsl
trunk/controller/templates/base/view_calendar_month.xsl
Added Paths:
-----------
trunk/controller/templates/base/view_control_info.xsl
trunk/controller/templates/base/view_control_items.xsl
Modified: trunk/controller/templates/base/add_check_list_for_location.xsl
===================================================================
--- trunk/controller/templates/base/add_check_list_for_location.xsl
2012-01-05 08:22:16 UTC (rev 8486)
+++ trunk/controller/templates/base/add_check_list_for_location.xsl
2012-01-05 08:22:34 UTC (rev 8487)
@@ -23,6 +23,7 @@
<h1>Registrere sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+ <div class="tab_menu"><a class="active">Sjekklistedetaljer</a></div>
<fieldset class="check_list_details">
<form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_list_for_location"
method="post">
@@ -79,9 +80,9 @@
</div>
<div><label>Utstyr</label><input
name="equipment_id" /></div>
</fieldset>
- <div>
- <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
- <input type="submit" name="save"
value="{$lang_save}" title = "{$lang_save}" />
+ <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>
Modified: trunk/controller/templates/base/create_error_report_message.xsl
===================================================================
--- trunk/controller/templates/base/create_error_report_message.xsl
2012-01-05 08:22:16 UTC (rev 8486)
+++ trunk/controller/templates/base/create_error_report_message.xsl
2012-01-05 08:22:34 UTC (rev 8487)
@@ -75,7 +75,7 @@
<div class="form-buttons">
<xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <input class="btn"
type="submit" name="save_control" value="{$lang_save}" title="{$lang_save}" />
+ <input class="btn"
type="submit" name="save_control" value="Registrer avviksmelding"
title="{$lang_save}" />
</div>
</form>
</xsl:when>
Modified: trunk/controller/templates/base/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/edit_check_list.xsl 2012-01-05 08:22:16 UTC
(rev 8486)
+++ trunk/controller/templates/base/edit_check_list.xsl 2012-01-05 08:22:34 UTC
(rev 8487)
@@ -73,10 +73,23 @@
<h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
- <div class="tab_menu"><a class="active">Detaljer</a></div>
+ <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">
+ <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}" />
@@ -177,12 +190,12 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
- Send avviksmelding
+ Registrer avviksmelding
</a>
</div>
<div id="register_errors">
- <div class="tab_menu"><a class="active">Registrer
avvik/måling</a></div>
+ <div class="tab_menu"><a class="active">Registrer
sak/måling</a></div>
<div class="tab_item active">
@@ -262,8 +275,8 @@
<div id="view_errors">
<div class="tab_menu">
- <a class="active" href="#view_open_errors">Vis åpne
avvik</a>
- <a href="#view_handled_errors">Vis håndterte avvik</a>
+ <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>
@@ -340,12 +353,12 @@
<select name="status">
<xsl:choose>
<xsl:when test="status = 0">
-
<option value="0" SELECTED="SELECTED">Feil på
sjekkpunkt</option>
-
<option value="1">Feil fikset</option>
+
<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">Feil på sjekkpunkt</option>
-
<option value="1" SELECTED="SELECTED">Feil
fikset</option>
+
<option value="0">Avvik er åpent</option>
+
<option value="1" SELECTED="SELECTED">Avvik er
lukket</option>
</xsl:when>
</xsl:choose>
</select>
Modified: trunk/controller/templates/base/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/view_calendar_month.xsl 2012-01-05
08:22:16 UTC (rev 8486)
+++ trunk/controller/templates/base/view_calendar_month.xsl 2012-01-05
08:22:34 UTC (rev 8487)
@@ -67,8 +67,8 @@
<li class="heading">
<div class="id">ID</div>
<div class="title">Tittel</div>
- <div class="date">Start dato</div>
- <div class="date">Slutt dato</div>
+ <div class="date">Startdato</div>
+ <div class="date">Sluttdato</div>
<div
class="frequency">Frekvenstype</div>
<div
class="frequency">Frekvensintervall</div>
</li>
Added: trunk/controller/templates/base/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/view_control_info.xsl
(rev 0)
+++ trunk/controller/templates/base/view_control_info.xsl 2012-01-05
08:22:34 UTC (rev 8487)
@@ -0,0 +1,263 @@
+<!-- $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").replaceWith(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_procedure" href="#view_procedure">Prosedyre</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/view_control_info.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/controller/templates/base/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/view_control_items.xsl
(rev 0)
+++ trunk/controller/templates/base/view_control_items.xsl 2012-01-05
08:22:34 UTC (rev 8487)
@@ -0,0 +1,16 @@
+<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
+<xsl:template name="view_control_items" xmlns:php="http://php.net/xsl";>
+<div>
+ <ul class="control_items">
+ <xsl:for-each select="control_items_array">
+ <li>
+ <h4><xsl:value-of
select="control_item/title"/></h4>
+ </li>
+ </xsl:for-each>
+ </ul>
+
+ <div>
+ <input class="btn" type="submit" name="save_control_items"
value="Print" title = "{$lang_save}" />
+ </div>
+</div>
+</xsl:template>
Property changes on: trunk/controller/templates/base/view_control_items.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8487],
Torstein <=