|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [10228] Logistic: Register requirement value |
| Date: | Tue, 16 Oct 2012 09:09:50 +0000 |
Revision: 10228
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10228
Author: vator
Date: 2012-10-16 09:09:49 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Logistic: Register requirement value
Modified Paths:
--------------
trunk/logistic/templates/base/requirement/requirement_item.xsl
trunk/logistic/templates/base/requirement/requirement_tabs.xsl
Added Paths:
-----------
trunk/logistic/templates/base/requirement/requirement_values.xsl
Modified: trunk/logistic/templates/base/requirement/requirement_item.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_item.xsl
2012-10-16 07:07:10 UTC (rev 10227)
+++ trunk/logistic/templates/base/requirement/requirement_item.xsl
2012-10-16 09:09:49 UTC (rev 10228)
@@ -1,10 +1,9 @@
<!-- $Id: activity_item.xsl 10096 2012-10-03 07:10:49Z vator $ -->
<!-- item -->
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:template name="requirement_details" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')"/></xsl:variable>
-<xsl:call-template name="yui_phpgw_i18n"/>
<div class="yui-navset yui-navset-top">
<div style="clear: both;margin-bottom: 0;overflow: hidden;padding:
1em;" class="identifier-header">
<xsl:choose>
@@ -30,7 +29,7 @@
<div id="details">
<form action="#" method="post">
<input type="hidden" name="id" value =
"{requirement/id}" />
- <input type="hidden" name="activity_id" value =
"{activity/id}" />
+ <input type="hidden" id="activity_id"
name="activity_id" value="{activity/id}" />
<dl class="proplist-col">
<dt>
@@ -67,32 +66,8 @@
</xsl:otherwise>
</xsl:choose>
</dd>
- <xsl:choose>
- <xsl:when test="editable">
- <dt>
-
<label>BIM</label>
- </dt>
- <dd>
- <select
name="entity_id" id="entity_id">
-
<xsl:for-each select="entity_list">
-
<option value="{id}">
-
<xsl:value-of select="name"/>
-
</option>
-
</xsl:for-each>
- </select>
- </dd>
- <dt>
-
<label>BIM2</label>
- </dt>
- <dd>
- <select
name="category_id" id="category_id">
- </select>
- </dd>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location/descr" />
- </xsl:otherwise>
- </xsl:choose>
+
+
<dt>
<label
for="no_of_items">Antall</label>
</dt>
@@ -106,6 +81,28 @@
</xsl:otherwise>
</xsl:choose>
</dd>
+
+ <xsl:choose>
+ <xsl:when test="editable">
+ <dt>
+ <label>Velg hvilken
kategori behovet gjelder</label>
+ </dt>
+ <dd>
+ <select
name="location_id" id="location_id">
+ <option
value="">Velg kategori</option>
+
<xsl:for-each select="distict_locations">
+
<option value="{location_id}">
+
<xsl:value-of select="descr"/>
+
</option>
+
</xsl:for-each>
+ </select>
+ <div
id="attributes"></div>
+ </dd>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="location/descr" />
+ </xsl:otherwise>
+ </xsl:choose>
</dl>
<div class="form-buttons">
Modified: trunk/logistic/templates/base/requirement/requirement_tabs.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_tabs.xsl
2012-10-16 07:07:10 UTC (rev 10227)
+++ trunk/logistic/templates/base/requirement/requirement_tabs.xsl
2012-10-16 09:09:49 UTC (rev 10228)
@@ -3,18 +3,19 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div class="yui-navset yui-navset-top" id="requirement_tabview">
+
<xsl:choose>
<xsl:when test="view = 'requirement_details'">
<xsl:call-template name="yui_phpgw_i18n"/>
<div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Control')"/></h1>
+ <h1><xsl:value-of select="php:function('lang',
'Requirement')"/></h1>
</div>
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="requirement_details" />
</xsl:when>
<xsl:when test="view = 'requirement_values'">
<div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Requirement_values')"/></h1>
+ <h1><xsl:value-of select="php:function('lang',
'Requirement values')"/></h1>
</div>
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="requirement_values" />
Added: trunk/logistic/templates/base/requirement/requirement_values.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_values.xsl
(rev 0)
+++ trunk/logistic/templates/base/requirement/requirement_values.xsl
2012-10-16 09:09:49 UTC (rev 10228)
@@ -0,0 +1,92 @@
+<!-- $Id: activity_item.xsl 10096 2012-10-03 07:10:49Z vator $ -->
+<!-- item -->
+
+<xsl:template name="requirement_values" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')"/></xsl:variable>
+
+<div class="yui-navset yui-navset-top">
+ <div class="yui-content" style="padding: 20px;">
+ <div id="details">
+ <form id="frm-requirement-values" action="#"
method="post">
+ <input type="hidden" name="requirement_id"
value = "{requirement/id}" />
+
+ <dl class="proplist-col">
+ <xsl:choose>
+ <xsl:when test="editable">
+ <dt>
+ <label>Legg til
behov</label>
+ </dt>
+ <dd>
+ <div id="attributes">
+ <xsl:for-each
select="custom_attributes_array">
+ <div
class="attribute">
+
<xsl:choose>
+
<xsl:when test="column_info/type = 'T'">
+
<label><xsl:value-of select="input_text"/></label>
+
<input class="operator" type='hidden' name="operator"
value='eq' />
+
<input class="info" type='text' name="{column_name}" value='' />
+
</xsl:when>
+
<xsl:when test="column_info/type = 'V'">
+
<label><xsl:value-of select="input_text"/></label>
+
<select class="operator" name="operator">
+
<option value="eq"><xsl:text>Lik</xsl:text></option>
+
<option value="lt"><xsl:text>Mindre enn</xsl:text></option>
+
<option value="gt"><xsl:text>Større enn</xsl:text></option>
+
<option value="btw"><xsl:text>Mellom</xsl:text></option>
+
</select>
+
<input class="info" style="margin-left: 10px;" type='text'
name="{column_name}" value='' />
+
</xsl:when>
+
<xsl:when test="column_info/type = 'LB'">
+
<label><xsl:value-of select="input_text"/></label>
+
<input class="operator" type='hidden' name="operator"
value='eq' />
+
<select class="info" name="{column_name}">
+
<xsl:for-each select="choice">
+
<option value="{value}">
+
<xsl:value-of select="value"/>
+
</option>
+
</xsl:for-each>
+
</select>
+
</xsl:when>
+
</xsl:choose>
+ <input
type="hidden" class="cust_attribute_id" name="cust_attribute_id" value="{id}" />
+ <input
type="hidden" class="location_id" name="location_id" value="{location_id}" />
+ <input
type="hidden" class="cust_attributes" name="cust_attributes[]" value="" />
+ </div>
+ </xsl:for-each>
+ </div>
+ </dd>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="location/descr" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dl>
+
+ <div class="form-buttons">
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
+ <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
+ <input type="submit"
name="save_requirement_values" value="{$lang_save}" title = "{$lang_save}" />
+ <input type="submit"
name="cancel_requirement" value="{$lang_cancel}" title = "{$lang_cancel}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
+ <input type="submit"
name="edit_requirement" value="{$lang_edit}" title = "{$lang_edit}" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
+</xsl:template>
+
+<xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected">
+ <xsl:attribute name="selected" value="selected" />
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
Property changes on:
trunk/logistic/templates/base/requirement/requirement_values.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
| [Prev in Thread] | Current Thread | [Next in Thread] |