[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9305]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9305] |
|
Date: |
Tue, 08 May 2012 06:44:41 +0000 |
Revision: 9305
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9305
Author: vator
Date: 2012-05-08 06:44:41 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/calendar/check_list_status_checker.xsl
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
Added Paths:
-----------
trunk/controller/templates/base/calendar/icon_color_map.xsl
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
Modified: trunk/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-08 06:44:13 UTC (rev 9304)
+++ trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-08 06:44:41 UTC (rev 9305)
@@ -33,6 +33,22 @@
</a>
</div>
</xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE'">
+ <div>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+
<xsl:text>&date=</xsl:text>
+ <xsl:value-of
select="info/date"/>
+
<xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="info/control_id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="$location_code"/>
+ </xsl:attribute>
+ <img height="15"
src="controller/images/status_icon_red_cross.png" />
+ </a>
+ </div>
+ </xsl:when>
<xsl:when test="status =
'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
<div>
<a>
@@ -72,7 +88,7 @@
</a>
</div>
</xsl:when>
- <xsl:when test="status =
'control_accomplished_with_errors'">
+ <xsl:when test="status = 'CONTROL_DONE_WITH_ERRORS'">
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
<div id="info_box"></div>
<a class="view_info_box">
@@ -89,37 +105,24 @@
</a>
</div>
</xsl:when>
- <xsl:when test="status =
'control_not_accomplished_with_info'">
- <div style="position:relative;">
- <div id="info_box"></div>
- <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="info/check_list_id"/>
- </xsl:attribute>
- <span
style="display:none"><xsl:value-of select="info/id"/></span>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </a>
- </div>
- </xsl:when>
- <xsl:when test="status = 'control_not_accomplished'">
- <div>
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-
<xsl:text>&date=</xsl:text>
- <xsl:value-of
select="info/date"/>
-
<xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="info/control_id"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="$location_code"/>
+ <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
+ <div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <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="info/check_list_id"/>
</xsl:attribute>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
+ <span style="display:none">
+
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+ </span>
+ <xsl:value-of select="info"/>
</a>
</div>
</xsl:when>
- <xsl:when test="status = 'control_canceled'">
+ <xsl:when test="status = 'CONTROL_CANCELED'">
<div>
<img height="15"
src="controller/images/status_icon_red_cross.png" />
</div>
Added: trunk/controller/templates/base/calendar/icon_color_map.xsl
===================================================================
--- trunk/controller/templates/base/calendar/icon_color_map.xsl
(rev 0)
+++ trunk/controller/templates/base/calendar/icon_color_map.xsl 2012-05-08
06:44:41 UTC (rev 9305)
@@ -0,0 +1,13 @@
+<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
+<xsl:template name="icon_color_map" xmlns:php="http://php.net/xsl";>
+
+ <ul id="icon_color_map">
+ <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="15" src="controller/images/status_icon_yellow.png"
/><span>Kontroll har planlagt dato</span></li>
+ <li><img height="15" src="controller/images/status_icon_dark_green.png"
/><span>Kontroll gjennomført uten åpne saker før frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten åpne saker etter frist</span></li>
+ <li><img height="15" src="controller/images/status_icon_red_empty.png"
/><span>Kontroll gjennomført med åpne saker</span></li>
+ <li><img height="15" src="controller/images/status_icon_red_cross.png"
/><span>Kontroll ikke gjennomført</span></li>
+</ul>
+
+</xsl:template>
Property changes on: trunk/controller/templates/base/calendar/icon_color_map.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-08 06:44:13 UTC (rev 9304)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-08 06:44:41 UTC (rev 9305)
@@ -8,7 +8,7 @@
<div id="control_plan">
<div class="top">
<h1><xsl:value-of
select="location_array/loc1_name"/></h1>
- <h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/><span style="margin-left:5px;"><xsl:value-of
select="year"/></span></h3>
+ <h3>Kalenderoversikt for <xsl:value-of
select="period"/><span class="year"><xsl:value-of select="year"/></span></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -39,15 +39,9 @@
</div>
<div class="middle">
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten åpne saker før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten åpne saker etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med åpne saker</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
+ <xsl:call-template name="icon_color_map" />
+
<a style="display:block;font-weight: bold;font-size:
14px;float:left;">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
@@ -81,7 +75,6 @@
<div id="cal_wrp">
-
<ul class="calendar month">
<li class="heading">
<div class="control_details_wrp">
@@ -117,7 +110,7 @@
<xsl:value-of
select="control/responsibility_name"/>
</div>
<div class="frequency">
- <xsl:value-of
select="control/repeat_type"/>
+ <xsl:value-of
select="control/repeat_type_label"/>
<xsl:value-of
select="control/repeat_interval"/>
</div>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-08 06:44:13 UTC (rev 9304)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-08 06:44:41 UTC (rev 9305)
@@ -3,68 +3,47 @@
<xsl:variable name="date_format">d/m-Y</xsl:variable>
<xsl:variable name="year"><xsl:value-of select="year"/></xsl:variable>
<xsl:variable name="view_location_code"><xsl:value-of
select="view_location_code"/></xsl:variable>
-
+
<div id="main_content">
<div id="control_plan">
<div class="top">
- <xsl:choose>
- <xsl:when test="show_location">
- <h1><xsl:value-of
select="control_name"/></h1>
- </xsl:when>
- <xsl:otherwise>
- <h1><xsl:value-of
select="location_array/loc1_name"/></h1>
- </xsl:otherwise>
- </xsl:choose>
- <h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
- <xsl:choose>
- <xsl:when test="show_location"> </xsl:when>
- <xsl:otherwise>
- <form action="#">
- <input type="hidden"
name="period_type" value="view_year" />
- <input type="hidden"
name="year">
- <xsl:attribute name="value">
- <xsl:value-of select="year"/>
- </xsl:attribute>
- </input>
-
- <select id="choose_my_location">
- <xsl:for-each
select="my_locations">
- <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
- <xsl:choose>
-
<xsl:when test="location_code = $view_location_code">
-
<option value="{$loc_code}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{$loc_code}">
-
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
-
</option>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- </form>
- </xsl:otherwise>
- </xsl:choose>
- </div>
+ <h1>Kontrollplan for <xsl:value-of
select="location_array/loc1_name"/></h1>
+ <h3 style="margin:0;font-size:19px;">Periode:
<xsl:value-of select="period"/></h3>
+
+ <form action="#">
+ <input type="hidden" name="period_type"
value="view_year" />
+ <input type="hidden" name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of select="year"/>
+ </xsl:attribute>
+ </input>
+ <select id="choose_my_location">
+ <xsl:for-each select="my_locations">
+ <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="location_code = $view_location_code">
+ <option
value="{$loc_code}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="{$loc_code}">
+
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </form>
+ </div>
<div class="middle">
-
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten åpne saker før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten åpne saker etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med åpne saker</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
+ <xsl:call-template name="icon_color_map" />
-
-
</div>
+
<div id="cal_wrp">
<ul class="calendar">
<li class="heading">
@@ -103,41 +82,37 @@
<xsl:variable
name="control_id"><xsl:value-of select="control/id"/></xsl:variable>
<li>
- <xsl:choose>
- <xsl:when test="(position() mod 2) !=
1">
- <xsl:attribute
name="class">odd</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute
name="class">even</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="(position() mod
2) != 1">
+ <xsl:attribute
name="class">odd</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">even</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
- <div class="control_details_wrp">
- <xsl:if test="//show_location">
- <div class="location">
- <xsl:value-of
select="control/location_name"/>
+ <div class="control_details_wrp">
+ <xsl:if
test="//show_location">
+ <div
class="location">
+
<xsl:value-of select="control/location_name"/>
+ </div>
+ </xsl:if>
+ <div class="title">
+ <xsl:value-of
select="control/title"/>
</div>
- </xsl:if>
- <div class="title">
- <xsl:value-of
select="control/title"/>
- </div>
- <div class="assigned">
- <xsl:value-of
select="control/responsibility_name"/>
- </div>
-
- <div class="frequency">
- <xsl:value-of
select="control/repeat_type_label"/>
- </div>
+ <div class="assigned">
+ <xsl:value-of
select="control/responsibility_name"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_type_label"/>
+ </div>
</div>
<div class="months_wrp">
-
- <xsl:for-each
select="calendar_array">
-
-
- <xsl:call-template
name="check_list_status_checker" >
- <xsl:with-param
name="location_code"><xsl:value-of
select="$view_location_code"/></xsl:with-param>
- </xsl:call-template>
- </xsl:for-each>
+ <xsl:for-each
select="calendar_array">
+
<xsl:call-template name="check_list_status_checker" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="$view_location_code"/></xsl:with-param>
+
</xsl:call-template>
+ </xsl:for-each>
</div>
</li>
</xsl:for-each>
Added:
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
(rev 0)
+++
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-08 06:44:41 UTC (rev 9305)
@@ -0,0 +1,95 @@
+<!-- $Id: view_calendar_year.xsl 9206 2012-04-23 06:21:38Z vator $ -->
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="year"><xsl:value-of select="year"/></xsl:variable>
+
+<div id="main_content">
+
+ <div id="control_plan">
+ <div class="top">
+ <h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
+ <h3>Periode: <xsl:value-of select="period"/></h3>
+
+ <form action="#">
+ <input type="hidden" name="period_type"
value="view_year" />
+ <input type="hidden" name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of select="year"/>
+ </xsl:attribute>
+ </input>
+
+ <select id="choose_my_location">
+ <xsl:for-each select="my_locations">
+ <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
+ <option value="{$loc_code}">
+ <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </form>
+ </div>
+ <div class="middle">
+ <xsl:call-template name="icon_color_map" />
+ </div>
+ <div id="cal_wrp">
+ <ul class="calendar">
+ <li class="heading">
+ <div class="control_details_wrp">
+ <div
class="location">Lokasjon</div>
+ </div>
+ <div class="months_wrp">
+ <xsl:for-each
select="heading_array">
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+
<xsl:text>&year=</xsl:text>
+
<xsl:value-of select="$year"/>
+
<xsl:text>&month=</xsl:text>
+
<xsl:number/>
+
</xsl:attribute>
+
<xsl:value-of select="."/>
+ </a>
+ </div>
+ </xsl:for-each>
+ </div>
+ </li>
+
+ <xsl:choose>
+ <xsl:when
test="locations_with_calendar_array/child::node()">
+
+ <xsl:for-each
select="locations_with_calendar_array">
+ <li>
+ <xsl:choose>
+ <xsl:when test="(position() mod
2) != 1">
+ <xsl:attribute
name="class">odd</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">even</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <div class="control_details_wrp">
+ <div class="location">
+ <xsl:value-of
select="location"/>
+ </div>
+ </div>
+ <div class="months_wrp">
+ <xsl:for-each
select="calendar_array">
+
<xsl:call-template name="check_list_status_checker" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
+
</xsl:call-template>
+ </xsl:for-each>
+ </div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <div class="cal_info_msg">Ingen sjekklister for
bygg i angitt periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+ </div>
+</div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9305],
Torstein <=