[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10189]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10189] |
|
Date: |
Wed, 10 Oct 2012 07:32:06 +0000 |
Revision: 10189
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10189
Author: vator
Date: 2012-10-10 07:32:05 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/inc/class.uirequirement.inc.php
trunk/logistic/js/logistic/resource_type_requirement.js
Added Paths:
-----------
trunk/logistic/templates/base/requirement/requirement_item.xsl
Removed Paths:
-------------
trunk/logistic/templates/base/requirement/requirement.xsl
Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php 2012-10-10 07:02:09 UTC
(rev 10188)
+++ trunk/logistic/inc/class.uirequirement.inc.php 2012-10-10 07:32:05 UTC
(rev 10189)
@@ -257,32 +257,33 @@
if (isset($_POST['save_requirement']))
{
$requirement->set_id( phpgw::get_var('id') );
- $requirement->set_resource_type_id(
phpgw::get_var('categories') );
+ $requirement->set_location_id(
phpgw::get_var('location_id') );
$requirement->set_no_of_elements(
phpgw::get_var('no_of_elements') );
if(phpgw::get_var('start_date','string') != '')
{
- $start_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('start_date','string') );
-
$requirement->set_start_date($start_date_ts);
+ $start_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('date_from','string') );
+
$requirement->set_date_from($start_date_ts);
}
else
{
- $requirement->set_start_date(0);
+ $requirement->set_date_from(0);
}
if( phpgw::get_var('end_date','string') != '')
{
- $end_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('end_date','string') );
-
$requirement->set_end_date($end_date_ts);
+ $end_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('date_to','string') );
+ $requirement->set_date_to($end_date_ts);
}
else
{
- $requirement->set_end_date(0);
+ $requirement->set_date_to(0);
}
+ print_r($requirement);
$requirement_id =
$this->so->store($requirement);
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id));
+
//$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'logistic.uirequirement.view', 'id' => $requirement_id));
}
else if (isset($_POST['cancel_requirement']))
{
@@ -309,7 +310,7 @@
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
self::add_javascript('logistic', 'logistic',
'resource_type_requirement.js');
-
self::render_template_xsl(array('requirement/requirement'), $data);
+
self::render_template_xsl(array('requirement/requirement_item'), $data);
}
}
}
Modified: trunk/logistic/js/logistic/resource_type_requirement.js
===================================================================
--- trunk/logistic/js/logistic/resource_type_requirement.js 2012-10-10
07:02:09 UTC (rev 10188)
+++ trunk/logistic/js/logistic/resource_type_requirement.js 2012-10-10
07:32:05 UTC (rev 10189)
@@ -1,7 +1,7 @@
$(document).ready(function(){
$("#entity_id").change(function () {
- var oArgs =
{menuaction:'logistic.uibim_type_requirement.get_bim_level1', entity_id:
$(this).val()};
+ var oArgs =
{menuaction:'logistic.uiresource_type_requirement.get_bim_level1', entity_id:
$(this).val()};
var requestUrl = phpGWLink('index.php', oArgs, true);
var htmlString = "";
Deleted: trunk/logistic/templates/base/requirement/requirement.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement.xsl 2012-10-10
07:02:09 UTC (rev 10188)
+++ trunk/logistic/templates/base/requirement/requirement.xsl 2012-10-10
07:32:05 UTC (rev 10189)
@@ -1,141 +0,0 @@
-<!-- $Id: activity_item.xsl 10096 2012-10-03 07:10:49Z vator $ -->
-<!-- item -->
-
-<xsl:template match="data" 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>
- <xsl:when test="activity/id != '' or activity/id != 0">
- <h1 style="float:left;">
- <span>
- <xsl:value-of
select="php:function('lang', 'Add requirement to activity')" />
- </span>
- <span>
- {activity/name}
- </span>
- </h1>
- </xsl:when>
- <xsl:otherwise>
- <h1 style="float:left;">
- <xsl:value-of
select="php:function('lang', 'Add requirement')" />
- </h1>
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- <div class="yui-content" style="padding: 20px;">
- <div id="details">
- <form action="#" method="post">
- <input type="hidden" name="id" value =
"{activity/id}" />
-
- <dl class="proplist-col">
- <dt>
- <label
for="start_date">Startdato</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <input
class="date" id="start_date" name="start_date" type="text">
- <xsl:if
test="requirement/start_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(requirement/start_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="php:function('date', $date_format,
number(requirement/start_date))"/></span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="end_date">Sluttdato</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <input
class="date" id="end_date" name="end_date" type="text">
- <xsl:if
test="requirement/end_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(requirement/end_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="php:function('date', $date_format,
number(requirement/end_date))"/></span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <xsl:choose>
- <xsl:when test="editable">
- <dt>
-
<label>BIM</label>
- </dt>
- <dd>
- <select
name="location_id" id="location_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="categories" id="categories">
- </select>
- </dd>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="entity/name" />
- <xsl:value-of
select="category/name" />
- <xsl:for-each
select="attributes">
- <xsl:value-of
select="name" /><br/>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
- <dt>
- <label
for="no_of_items">Antall</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <input
style="width: 20px;" id="no_of_items" name="no_of_items" type="text" />
- </xsl:when>
- <xsl:otherwise>
-
<span>{requirement/no_of_items}</span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- </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_activity" value="{$lang_save}" title = "{$lang_save}" />
- <input type="submit"
name="cancel_activity" 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_activity" 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>
Copied: trunk/logistic/templates/base/requirement/requirement_item.xsl (from
rev 10181, trunk/logistic/templates/base/requirement/requirement.xsl)
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_item.xsl
(rev 0)
+++ trunk/logistic/templates/base/requirement/requirement_item.xsl
2012-10-10 07:32:05 UTC (rev 10189)
@@ -0,0 +1,141 @@
+<!-- $Id: activity_item.xsl 10096 2012-10-03 07:10:49Z vator $ -->
+<!-- item -->
+
+<xsl:template match="data" 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>
+ <xsl:when test="activity/id != '' or activity/id != 0">
+ <h1 style="float:left;">
+ <span>
+ <xsl:value-of
select="php:function('lang', 'Add requirement to activity')" />
+ </span>
+ <span>
+ {activity/name}
+ </span>
+ </h1>
+ </xsl:when>
+ <xsl:otherwise>
+ <h1 style="float:left;">
+ <xsl:value-of
select="php:function('lang', 'Add requirement')" />
+ </h1>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="yui-content" style="padding: 20px;">
+ <div id="details">
+ <form action="#" method="post">
+ <input type="hidden" name="id" value =
"{activity/id}" />
+
+ <dl class="proplist-col">
+ <dt>
+ <label
for="start_date">Startdato</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <input
class="date" id="start_date" name="start_date" type="text">
+ <xsl:if
test="requirement/start_date != ''">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(requirement/start_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="php:function('date', $date_format,
number(requirement/start_date))"/></span>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="end_date">Sluttdato</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <input
class="date" id="end_date" name="end_date" type="text">
+ <xsl:if
test="requirement/end_date != ''">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(requirement/end_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="php:function('date', $date_format,
number(requirement/end_date))"/></span>
+ </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="entity/name" />
+ <xsl:value-of
select="category/name" />
+ <xsl:for-each
select="attributes">
+ <xsl:value-of
select="name" /><br/>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ <dt>
+ <label
for="no_of_items">Antall</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <input
style="width: 20px;" id="no_of_items" name="no_of_items" type="text" />
+ </xsl:when>
+ <xsl:otherwise>
+
<span>{requirement/no_of_items}</span>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ </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" 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_activity" 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_item.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10189],
Torstein <=