[Fmsystem-commits] [8047]

[Torstein]

Revision: 8047
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8047
Author:   vator
Date:     2011-11-08 08:33:42 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/view_check_list.xsl
    trunk/controller/templates/base/view_check_lists.xsl

Modified: trunk/controller/templates/base/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/view_check_list.xsl 2011-11-08 08:31:55 UTC 
(rev 8046)
+++ trunk/controller/templates/base/view_check_list.xsl 2011-11-08 08:33:42 UTC 
(rev 8047)
@@ -1,4 +1,5 @@
 <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">
                
@@ -7,8 +8,11 @@
                <h1>Sjekkliste</h1>
                <fieldset class="control_details">
                        <label>Tittel</label><xsl:value-of 
select="check_list/status"/><br/>
-                       <label>Startdato</label><xsl:value-of 
select="check_list/comment"/><br/>
-                       <label>Sluttdato</label><xsl:value-of 
select="check_list/deadline"/><br/>
+                       <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>
@@ -30,6 +34,9 @@
                                                                <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>
@@ -42,5 +49,15 @@
                                </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>&amp;check_list_id=</xsl:text>
+                               <xsl:value-of select="check_list/id"/>
+                       </xsl:attribute>
+                       <div>Registrer sjekkliste</div>
+               </a>
+               
 </div>
 </xsl:template>
\ No newline at end of file

Modified: trunk/controller/templates/base/view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/view_check_lists.xsl        2011-11-08 
08:31:55 UTC (rev 8046)
+++ trunk/controller/templates/base/view_check_lists.xsl        2011-11-08 
08:33:42 UTC (rev 8047)
@@ -1,4 +1,5 @@
 <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">
                
@@ -9,8 +10,14 @@
                <h1>Sjekklister for kontroll</h1>
                <fieldset class="control_details">
                        <label>Tittel</label><xsl:value-of 
select="control_as_array/title"/><br/>
-                       <label>Startdato</label><xsl:value-of 
select="control_as_array/start_date"/><br/>
-                       <label>Sluttdato</label><xsl:value-of 
select="control_as_array/end_date"/><br/>
+                       <label>Startdato</label>
+                       <xsl:if test="control_as_array/start_date != ''">
+                               <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 != ''">
+                               <xsl:value-of select="php:function('date', 
$date_format, number(control_as_array/end_date))"/><br/>
+                       </xsl:if>
                        <label>Syklustype</label><xsl:value-of 
select="control_as_array/repeat_type"/><br/>
                        <label>Syklusfrekvens</label><xsl:value-of 
select="control_as_array/repeat_interval"/><br/>
                </fieldset>
@@ -36,7 +43,7 @@
                                                                        <img 
height="15" src="controller/images/status_icon_light_green.png" /> 
                                                                </xsl:when>
                                                                <xsl:otherwise>
-                                                                       Ingen 
sjekklister for denne kontrollen
+                                                                       <img 
height="15" src="controller/images/status_icon_red.png" />
                                                                </xsl:otherwise>
                                                        </xsl:choose>
                                               </div>
@@ -47,11 +54,21 @@
                                                                                
<xsl:text>&amp;check_list_id=</xsl:text>
                                                                                
        <xsl:value-of select="id"/>
                                                                        
</xsl:attribute>
-                                                                       
<xsl:value-of select="deadline"/>
+                                                                       <xsl:if 
test="deadline != ''">
+                                                                       
<xsl:value-of select="php:function('date', $date_format, number(deadline))"/>
+                                                               </xsl:if>
                                                                </a>    
                                                        </div>
-                                              <div><xsl:value-of 
select="planned_date"/></div>
-                                              <div><xsl:value-of 
select="completed_date"/></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>