|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [11281] more on logistic |
| Date: | Fri, 06 Sep 2013 13:22:40 +0000 |
Revision: 11281
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11281
Author: sigurdne
Date: 2013-09-06 13:22:39 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
more on logistic
Modified Paths:
--------------
trunk/logistic/inc/class.uirequirement.inc.php
trunk/logistic/templates/base/allocation/assign_job.xsl
Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php 2013-09-06 13:20:36 UTC
(rev 11280)
+++ trunk/logistic/inc/class.uirequirement.inc.php 2013-09-06 13:22:39 UTC
(rev 11281)
@@ -1053,7 +1053,8 @@
'categories' =>
$categories,
'assign_requirement_json' =>
$assign_requirement_json,
'requirement_descr' =>
$requirement_descr,
- 'message'
=> $message
+ 'message'
=> $message,
+ 'priority_list' =>
array('options' => execMethod('property.botts.get_priority_list'))
);
if(count( $buildings_array ) > 0)
@@ -1117,7 +1118,7 @@
'origin_item_id' =>
$requirement->get_activity_id(),
'location_code' => $location_code,
'cat_id' =>
phpgw::get_var('message_cat_id', 'int'),
- 'priority' =>
3,//$priority, //valgfri (1-3)
+ 'priority' =>
phpgw::get_var('priority', 'int'),
'title' =>
phpgw::get_var('message_title', 'string'),
'details' =>
phpgw::get_var('message', 'string'),
'file_input_name' => 'file' // navn på
felt som inneholder fil
@@ -1153,8 +1154,7 @@
execMethod('property.interlink.add',
$interlink_data);
$allocation =
$this->so_resource_allocation->get_single($allocation_id);
-
$allocation->set_ext_location_id($location_id_ticket);
-
$allocation->set_ext_location_item_id($message_ticket_id);
+ $allocation->set_ticket_id($message_ticket_id);
$this->so_resource_allocation->store($allocation);
}
Modified: trunk/logistic/templates/base/allocation/assign_job.xsl
===================================================================
--- trunk/logistic/templates/base/allocation/assign_job.xsl 2013-09-06
13:20:36 UTC (rev 11280)
+++ trunk/logistic/templates/base/allocation/assign_job.xsl 2013-09-06
13:22:39 UTC (rev 11281)
@@ -34,57 +34,68 @@
<table>
<tr>
<td>
- <div class="row">
- <label>
- <xsl:value-of
select="php:function('lang', 'title')" />
- </label>
- <input name="message_title"
type="text" class="required" value = '{title}' size= '{title_size}'/>
- </div>
+ <div
class="row">
+ <label>
+
<xsl:value-of select="php:function('lang', 'title')" />
+ </label>
+ <input
name="message_title" type="text" class="required" value = '{title}' size=
'{title_size}'/>
+ </div>
</td>
</tr>
<tr>
<td>
-
- <!-- === CATEGORY === -->
- <div class="row">
- <label>
- <xsl:value-of
select="php:function('lang', 'category')" />
- </label>
- <select name="message_cat_id"
class="required">
- <option
value="0"><xsl:value-of select="php:function('lang', 'select')" /></option>
- <xsl:for-each
select="categories/cat_list">
- <xsl:variable
name="cat_id"><xsl:value-of select="./cat_id"/></xsl:variable>
- <option
value="{$cat_id}">
-
<xsl:value-of select="./name"/>
- </option>
- </xsl:for-each>
- </select>
- </div>
+ <!-- ===
CATEGORY === -->
+ <div
class="row">
+ <label>
+
<xsl:value-of select="php:function('lang', 'category')" />
+ </label>
+
<select name="message_cat_id" class="required">
+
<option value="0"><xsl:value-of select="php:function('lang', 'select')"
/></option>
+
<xsl:for-each select="categories/cat_list">
+
<xsl:variable name="cat_id"><xsl:value-of
select="./cat_id"/></xsl:variable>
+
<option value="{$cat_id}">
+
<xsl:value-of select="./name"/>
+
</option>
+
</xsl:for-each>
+
</select>
+ </div>
</td>
</tr>
+ <tr>
+ <td>
+ <div
class="row">
+ <label>
+
<xsl:value-of select="php:function('lang', 'Priority')"/>
+ </label>
+ <select
name="priority" >
+
<xsl:attribute name="title"><xsl:value-of select="php:function('lang',
'select')"/></xsl:attribute>
+
<xsl:apply-templates select="priority_list/options"/>
+
</select>
+ </div>
+ </td>
+ </tr>
<tr>
<td>
- <div class="row">
- <label>
- <xsl:value-of
select="php:function('lang', 'message')" />
- </label>
- <textarea name="message"
cols="60" rows="10">
- <xsl:value-of
select="message"/>
- </textarea>
- </div>
+ <div
class="row">
+ <label>
+
<xsl:value-of select="php:function('lang', 'message')" />
+ </label>
+
<textarea name="message" cols="60" rows="10">
+
<xsl:value-of select="message"/>
+
</textarea>
+ </div>
<!-- === UPLOAD FILE === -->
</td>
</tr>
<tr>
<td>
-
- <div class="row">
- <label>Filvedlegg:</label>
- <input type="file" id="file"
name="file" >
- <xsl:attribute
name="accept">image/*</xsl:attribute>
- <xsl:attribute
name="capture">camera</xsl:attribute>
- </input>
- </div>
+ <div
class="row">
+
<label>Filvedlegg:</label>
+ <input
type="file" id="file" name="file" >
+
<xsl:attribute name="accept">image/*</xsl:attribute>
+
<xsl:attribute name="capture">camera</xsl:attribute>
+ </input>
+ </div>
</td>
</tr>
</table>
@@ -99,6 +110,15 @@
</xsl:otherwise>
</xsl:choose>
</div>
-
</div>
</xsl:template>
+
+ <xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected"
value="selected"/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes"
select="name"/>
+ </option>
+ </xsl:template>
+
| [Prev in Thread] | Current Thread | [Next in Thread] |