|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [8307] |
| Date: | Thu, 15 Dec 2011 08:59:28 +0000 |
Revision: 8307
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8307
Author: vator
Date: 2011-12-15 08:59:28 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/common.xsl
trunk/controller/templates/base/edit_check_list.xsl
Added Paths:
-----------
trunk/controller/templates/base/view_calendar_month.xsl
trunk/controller/templates/base/view_calendar_year.xsl
Modified: trunk/controller/templates/base/common.xsl
===================================================================
--- trunk/controller/templates/base/common.xsl 2011-12-15 08:58:17 UTC (rev
8306)
+++ trunk/controller/templates/base/common.xsl 2011-12-15 08:59:28 UTC (rev
8307)
@@ -222,7 +222,15 @@
//... retrieve the record based on the selected
table row
var row =
table.getTrEl(this.contextEventTarget);
var record = table.getRecord(row);
-
+ var requestUrl = "";
+
+ if(record.getData().parameters[task.index]){
+ var parameter_id =
record.getData().parameters[0];
+
+ var parameter_value =
YAHOO.util.Dom.get(parameter_id).value;
+ requestUrl = record.getData().actions[
task.index ] + "&" + parameter_id + "=" + parameter_value;
+ }
+
//... check whether this action should be an
AJAX call
if( record.getData().ajax[task.index] ) {
@@ -243,16 +251,6 @@
}
}
- if(record.getData().labels[task.index]
== "Legg enhet til kontrollen"){
- var control_id =
YAHOO.util.Dom.get("control_id").value;
-
- if(control_id > 0){
- var requestUrl =
record.getData().actions[ task.index ] + "&control_id=" + control_id;
- }
- }else{
- var requestUrl =
record.getData().actions[ task.index ];
- }
-
if(requestUrl){
var request =
YAHOO.util.Connect.asyncRequest(
'GET',
@@ -264,7 +262,8 @@
});
}
} else {
- window.location =
record.getData().actions[task.index];
+
+ window.location = requestUrl;
}
}
};
Modified: trunk/controller/templates/base/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/edit_check_list.xsl 2011-12-15 08:58:17 UTC
(rev 8306)
+++ trunk/controller/templates/base/edit_check_list.xsl 2011-12-15 08:59:28 UTC
(rev 8307)
@@ -4,29 +4,81 @@
<div id="main_content">
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+ <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: 'd/m-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: 'd/m-yy'
+ });
+ $( "#deadline" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To',
'Fr', 'Lø'],
+ dateFormat: 'd/m-yy'
+ });
+ });
+ </script>
<form id="frm_save_check_items"
action="index.php?menuaction=controller.uicheck_list.save_check_items"
method="post">
<h1>Sjekkliste</h1>
<div class="form-buttons-top">
- <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
- <input type="submit" name="save_control"
value="{$lang_save}" title = "{$lang_save}" />
+ <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
+ <input type="submit" name="save_control"
value="{$lang_save}" title = "{$lang_save}" />
</div>
<fieldset class="check_list_details">
<div>
- <label>Tittel</label>
+ <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>
+ <input>
<xsl:attribute
name="name">check_list_status</xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="check_list/status"/></xsl:attribute>
</input>
</div>
<div>
<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>
- </div>
- <div>
+ <input>
+ <xsl:attribute name="id">deadline</xsl:attribute>
+ <xsl:attribute
name="name">deadline</xsl:attribute>
+ <xsl:attribute name="type">text</xsl:attribute>
+ <xsl:if test="check_list/deadline != ''">
+ <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 != ''">
+ <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 !=
''">
+ <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>Kommentar</label>
<textarea>
<xsl:attribute
name="name">check_list_comment</xsl:attribute>
@@ -38,6 +90,95 @@
<h2 class="check_item_details">Sjekkpunkter</h2>
+
+ <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}" />
+
+ <xsl:for-each select="check_list/check_item_array">
+ <xsl:variable name="check_item_id"><xsl:value-of
select="id"/></xsl:variable>
+ <input type="hidden" name="check_item_ids[]"
value="{$check_item_id}" />
+ </xsl:for-each>
+
+ <h4 class="expand_header"><div class="expand_all">Vis
alle</div><div class="collapse_all">Skjul alle</div></h4>
+
+ <ul class="check_items">
+ <xsl:choose>
+ <xsl:when
test="check_list/check_item_array/child::node()">
+ <xsl:for-each
select="check_list/check_item_array">
+ <xsl:variable
name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <li>
+ <h4 class="itemlist
expand_list"><xsl:number/>. <img src="controller/images/arrow_left.png"
width="14"/><span><xsl:value-of select="control_item/title"/></span></h4>
+ <div
class="check_item">
+ <div>
+
<label>Status</label>
+ <span>
+
<select name="status_{$check_item_id}">
+
<option value="true">Utført</option>
+
<option value="false">Ikke utført</option>
+
</select>
+
</span>
+ </div>
+ <div>
+
<label>Kommentar</label>
+ <span>
+
<textarea name="comment_{$check_item_id}">
+
<xsl:value-of select="comment"/>
+
</textarea>
+ </span>
+ </div>
+ <div>
+ <label>Hva
skal gjøres</label><span><xsl:value-of select="control_item/what_to_do"/></span>
+ </div>
+ <div>
+
<label>Utførelsesbeskrivelse</label><span><xsl:value-of
select="control_item/what_to_do"/></span>
+ </div>
+ </div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </ul>
+ <!--
+ <ul class="check_items">
+ <xsl:for-each
select="groups_with_control_items">
+ <ul class="itemlist expand_list">
+ <li>
+ <xsl:choose>
+ <xsl:when
test="group_control_items/child::node()">
+ <h4><img
src="controller/images/arrow_left.png" width="14"/><span><xsl:value-of
select="control_group/group_name"/></span></h4>
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <ul>
+
<xsl:for-each select="group_control_items">
+
<xsl:variable name="control_item_id"><xsl:value-of
select="control_item/id"/></xsl:variable>
+
<xsl:choose>
+
<xsl:when test="checked = 1">
+
<li><xsl:number/>. <input type="checkbox" checked="checked"
id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="control_item/title"/></li>
+
</xsl:when>
+
<xsl:otherwise>
+
<li><xsl:number/>. <input type="checkbox"
id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="control_item/title"/></li>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:for-each>
+ </ul>
+ </xsl:when>
+ <xsl:otherwise>
+ <div
class="empty_list"><span><xsl:value-of
select="control_group/group_name"/></span></div>
+ <div>Ingen
kontrollpunkt</div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </li>
+ </ul>
+ </xsl:for-each>
+ </ul>
+ -->
+ <div class="form-buttons">
+ <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
+ <input type="submit" name="save_control"
value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+
+ </form>
+
+ <!--
<fieldset class="check_item_details">
<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}" />
@@ -87,6 +228,9 @@
<input type="submit" name="save_control"
value="{$lang_save}" title = "{$lang_save}" />
</div>
</fieldset>
- </form>
+ </form>
+ -->
+
+
</div>
</xsl:template>
Copied: trunk/controller/templates/base/view_calendar_month.xsl (from rev 8246,
trunk/controller/templates/base/view_agg_check_lists_for_location_month.xsl)
===================================================================
--- trunk/controller/templates/base/view_calendar_month.xsl
(rev 0)
+++ trunk/controller/templates/base/view_calendar_month.xsl 2011-12-15
08:59:28 UTC (rev 8307)
@@ -0,0 +1,154 @@
+<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">
+
+ <h1>Kalenderoversikt</h1>
+ <fieldset class="check_list_details">
+ <div><xsl:value-of
select="location_array/loc1_name"/></div>
+ <div>Periode: <xsl:value-of select="period"/></div>
+ </fieldset>
+
+ <h2 style="float:left;">Sjekklister</h2>
+ <div style="float:left;margin-top: 30px;margin-left: 585px;"><a
class="move_cal_right" href="#"><<</a></div>
+ <div style="float:left;margin-top: 30px;margin-left: 95px;"><a
class="move_cal_left" href="#">>></a></div>
+
+ <script>
+
+ $(document).ready(function() {
+
+ $(".move_cal_left").click(function(){
+ var leftStrVal = $("#days_view").css("left");
+ var leftNumVal = leftStrVal.substring(0,
leftStrVal.indexOf('px'));
+
+ if(leftNumVal == -502){
+ $("#days_view").animate({
+ left: '-=118'
+ }, 800);
+ }else if(leftNumVal > -502){
+ $("#days_view").animate({
+ left: '-=502'
+ }, 800);
+ }
+ });
+
+
+ $(".move_cal_right").click(function(){
+
+ var leftStrVal = $("#days_view").css("left");
+ var leftNumVal = leftStrVal.substring(0,
leftStrVal.indexOf('px'));
+
+ if(leftNumVal == -118){
+ $("#days_view").animate({
+ left: '+=118'
+ }, 800);
+ }else if(-502 > leftNumVal){
+ $("#days_view").animate({
+ left: '+=502'
+ }, 800);
+ }
+ });
+
+
+
+ });
+
+ </script>
+ <xsl:choose>
+ <xsl:when test="controls_calendar_array/child::node()">
+
+ <ul style="clear:left;" class="calendar info">
+ <li class="heading">
+ <div class="id">ID</div>
+ <div class="title">Tittel</div>
+ <div
class="frequency">Frekvenstype</div>
+ <div
class="frequency">Frekvensintervall</div>
+ </li>
+
+ <xsl:for-each select="controls_calendar_array">
+ <li>
+ <div class="id">
+ <xsl:value-of
select="control/id"/>
+ </div>
+ <div class="title">
+ <xsl:value-of
select="control/title"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_type"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_interval"/>
+ </div>
+ </li>
+ </xsl:for-each>
+ </ul>
+
+ <div id="days_wrp">
+
+ <ul id="days_view" class="calendar days">
+ <li>
+ <xsl:for-each
select="heading_array">
+ <div><xsl:value-of
select="."/></div>
+ </xsl:for-each>
+ </li>
+ <li>
+ <xsl:for-each
select="controls_calendar_array/calendar_array">
+ <div>
+ <xsl:choose>
+ <xsl:when
test="calendar_array/child::node() = 1">
+
<xsl:value-of select="." />
+ </xsl:when>
+ <xsl:otherwise>
+ <div
style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;"></div>
+
<xsl:choose>
+
<xsl:when test="id">
+
<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>
+
<a class="view_check_list">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<span
style="display:none"><xsl:value-of select="id"/></span>
+
<img height="15"
src="controller/images/status_icon_red.png" />
+
</a>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:when>
+
<xsl:when test="date">
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list_for_location</xsl:text>
+
<xsl:text>&date=</xsl:text>
+
<xsl:value-of select="date"/>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="//control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of
select="//location_array/location_code"/>
+
</xsl:attribute>
+
<img height="15"
src="controller/images/status_icon_yellow.png" />
+
</a>
+
</xsl:when>
+
</xsl:choose>
+
</div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </xsl:for-each>
+ </li>
+ </ul>
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <div>Ingen sjekklister for bygg i angitt periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
+</div>
+</xsl:template>
\ No newline at end of file
Property changes on: trunk/controller/templates/base/view_calendar_month.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/controller/templates/base/view_calendar_year.xsl (from rev 8246,
trunk/controller/templates/base/view_agg_check_lists_for_location_year.xsl)
===================================================================
--- trunk/controller/templates/base/view_calendar_year.xsl
(rev 0)
+++ trunk/controller/templates/base/view_calendar_year.xsl 2011-12-15
08:59:28 UTC (rev 8307)
@@ -0,0 +1,109 @@
+<xsl:template match="data" name="view_check_lists"
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">
+
+ <h1>Kalenderoversikt</h1>
+ <fieldset class="check_list_details">
+ <div><xsl:value-of
select="location_array/loc1_name"/></div>
+ <div>Periode: <xsl:value-of select="period"/></div>
+ </fieldset>
+
+ <h2>Sjekklister</h2>
+
+ <ul class="calendar">
+ <xsl:choose>
+ <xsl:when
test="controls_calendar_array/child::node()">
+
+ <li class="heading">
+ <div class="id">ID</div><div
class="title">Tittel</div><div class="frequency">Frekvenstype</div><div
class="frequency">Frekvensintervall</div>
+ <xsl:for-each select="heading_array">
+ <div>
+ <a>
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uilocation_check_list.view_agg_check_lists_for_location</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>
+ </li>
+
+ <xsl:for-each select="controls_calendar_array">
+ <xsl:variable
name="repeat_type"><xsl:value-of select="control/repeat_type"/></xsl:variable>
+ <li>
+ <div class="id">
+ <xsl:value-of
select="control/id"/>
+ </div>
+ <div class="title">
+ <xsl:value-of
select="control/title"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_type"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_interval"/>
+ </div>
+ <xsl:for-each
select="calendar_array">
+ <div>
+ <xsl:choose>
+ <xsl:when
test="$repeat_type = 0">
+ <xsl:value-of
select="." />
+ </xsl:when>
+ <xsl:otherwise>
+ <div
style="position:relative;">
+ <div
id="info_box" style="position:absolute;display:none;">
+ </div>
+
<xsl:choose>
+
<xsl:when test="id">
+
<xsl:variable name="status"><xsl:value-of
select="status"/></xsl:variable>
+
<xsl:choose>
+
<xsl:when test="status = 0">
+
<img height="15"
src="controller/images/status_icon_red_cross.png" />
+
</xsl:when>
+
<xsl:when test="status = 1">
+
<img height="15"
src="controller/images/status_icon_dark_green.png" />
+
</xsl:when>
+
<xsl:when test="status = 2">
+
<img height="15"
src="controller/images/status_icon_blue.png" />
+
</xsl:when>
+
<xsl:when test="status = 3">
+
<img height="15"
src="controller/images/status_icon_light_green.png" />
+
</xsl:when>
+
<xsl:otherwise>
+
<a class="view_check_list">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<img height="15"
src="controller/images/status_icon_red.png" />
+
</a>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:when>
+
<xsl:otherwise>
+
<img height="15"
src="controller/images/status_icon_yellow.png" />
+
</xsl:otherwise>
+
</xsl:choose>
+
</div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </xsl:for-each>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <div>Ingen sjekklister for bygg i angitt
periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+</div>
+</xsl:template>
\ No newline at end of file
Property changes on: trunk/controller/templates/base/view_calendar_year.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
| [Prev in Thread] | Current Thread | [Next in Thread] |