[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10379] Merge 10372:10378 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10379] Merge 10372:10378 from trunk |
|
Date: |
Tue, 30 Oct 2012 08:14:38 +0000 |
Revision: 10379
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10379
Author: sigurdne
Date: 2012-10-30 08:14:38 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
Merge 10372:10378 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/bim/setup/tables_update.inc.php
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
Added Paths:
-----------
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item_2.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10372
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378
Modified: branches/Version-1_0-branch/bim/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/bim/setup/tables_update.inc.php 2012-10-30
08:13:09 UTC (rev 10378)
+++ branches/Version-1_0-branch/bim/setup/tables_update.inc.php 2012-10-30
08:14:38 UTC (rev 10379)
@@ -95,7 +95,7 @@
$GLOBALS['phpgw_setup']->oProc->query("SELECT * FROM
fm_bim_type",__LINE__,__FILE__);
- $values = array();
+ $types = array();
while ($GLOBALS['phpgw_setup']->oProc->next_record())
{
$types[] = array
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-10-30 08:13:09 UTC (rev 10378)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-10-30 08:14:38 UTC (rev 10379)
@@ -759,13 +759,6 @@
margin: 20px 0 0 20px;
}
-#toolbar {
- display: inline-block;
- padding: 10px;
- background-color: #DEEAF8;
- border: 1px solid #CEE3F9;
-}
-
#toolbar input[type="text"] {
font-size: 100%;
padding: 3px;
Modified: branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-10-30 08:13:09 UTC (rev 10378)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-10-30 08:14:38 UTC (rev 10379)
@@ -224,20 +224,22 @@
{
$user_rows_per_page = 10;
}
+
// YUI variables for paging and sorting
$start_index = phpgw::get_var('startIndex', 'int');
$num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
$sort_field = phpgw::get_var('sort');
$sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
+
// Form variables
$search_for = phpgw::get_var('query');
$search_type = phpgw::get_var('search_option');
+
// Create an empty result set
$result_objects = array();
$result_count = 0;
//Retrieve a contract identifier and load corresponding
contract
-
$exp_param = phpgw::get_var('export');
$export = false;
if (isset($exp_param))
@@ -248,7 +250,7 @@
//Retrieve the type of query and perform type specific
logic
$query_type = phpgw::get_var('type');
- //var_dump($query_type);
+
switch ($query_type)
{
default: // ... all activities, filters (active
and vacant)
@@ -361,6 +363,33 @@
public function view()
{
$activity_id = phpgw::get_var('id');
+
+ if ($activity_id && is_numeric($activity_id))
+ {
+ $activity = $this->so->get_single( $activity_id
);
+
+ $responsible_user =
$this->so->get_responsible_user( $activity->get_responsible_user_id() );
+
+ $activity->set_responsible_user_name(
$responsible_user );
+ }
+
+ $data = array
+ (
+ 'activity' => $activity
+ );
+
+ if($activity->get_parent_id() > 0)
+ {
+ $parent_activity =
$this->so->get_single($activity->get_parent_id());
+ $data['parent_activity'] = $parent_activity;
+ }
+
+
self::render_template_xsl(array('activity/activity_item'), $data);
+ }
+
+ public function view_2()
+ {
+ $activity_id = phpgw::get_var('id');
$project_id = phpgw::get_var('project_id');
if (isset($_POST['edit_activity']))
{
@@ -400,8 +429,12 @@
$data['parent_activity'] =
$parent_activity->toArray();
}
+ echo $activity->get_id();
+
+ $activity_children =
$this->so->get($activity->get_id());
+
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Project');
-
self::render_template_xsl(array('activity/activity_item'), $data);
+
self::render_template_xsl(array('activity/activity_item_2'), $data);
}
}
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2012-10-30 08:13:09 UTC (rev 10378)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2012-10-30 08:14:38 UTC (rev 10379)
@@ -170,7 +170,6 @@
return $this->query();
}
- self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
$activity_id = phpgw::get_var('activity_id');
Copied:
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item_2.xsl
(from rev 10378, trunk/logistic/templates/base/activity/activity_item_2.xsl)
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item_2.xsl
(rev 0)
+++
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item_2.xsl
2012-10-30 08:14:38 UTC (rev 10379)
@@ -0,0 +1,209 @@
+<!-- $Id: activity_item.xsl 10305 2012-10-23 09:08:34Z 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">
+
+ <xsl:choose>
+ <xsl:when test="parent_activity/id > 0">
+ <h1>
+ <xsl:value-of select="parent_activity/name"
disable-output-escaping="yes"/>::<xsl:value-of select="php:function('lang',
'Add sub activity')" />
+ </h1>
+ </xsl:when>
+ <xsl:otherwise>
+ <h1>
+ <xsl:value-of select="php:function('lang', 'Add
activity')" />
+ </h1>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <div class="content-wrp">
+ <div id="details">
+ <xsl:variable name="action_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uiactivity.save')" />
+ </xsl:variable>
+ <form action="{$action_url}" method="post">
+ <input type="hidden" name="id" value =
"{activity/id}" />
+ <input type="hidden" name="project_id"
value="{activity/project_id}" />
+ <input type="hidden" name="parent_id"
value="{parent_activity/id}" />
+
+ <dl class="proplist-col">
+ <xsl:if test="parent_activity/id >
0">
+ <dt>
+ <xsl:if test="editable">
+ <div
style="margin-bottom: 1em;width: 88%;" class="select-box">
+ <label>Velg en
annen hovedaktivitet</label>
+ <select
id="select_activity" name="parent_activity_id" class="selectLocation">
+
<option>Velg aktivitet</option>
+
<xsl:for-each select="activities">
+ <option value="{id}">
+ <xsl:if
test="activity/parent_id = id">
+
<xsl:attribute name="selected">
+
selected
+
</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
+
</xsl:for-each>
+ </select>
+ </div>
+ </xsl:if>
+ </dt>
+ </xsl:if>
+ <dt>
+ <label for="name"><xsl:value-of
select="php:function('lang','Activity name')" /></label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:if
test="activity/error_msg_array/name != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="activity/error_msg_array/name"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <input type="text"
name="name" id="name" value="{activity/name}" size="100"/>
+ <span class="help_text
line">Angi startdato for aktiviteten</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="activity/name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="description"><xsl:value-of select="php:function('lang', 'Description')"
/></label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:if
test="activity/error_msg_array/description != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="activity/error_msg_array/description"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="activity/description" disable-output-escaping="yes"/></textarea>
+ <span class="help_text
line">Angi startdato for aktiviteten</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="activity/description" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="start_date">Startdato</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <xsl:if
test="activity/error_msg_array/start_date != ''">
+
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/start_date" /></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <input
class="date" id="start_date" name="start_date" type="text">
+ <xsl:if
test="activity/start_date != ''">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/start_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ <span class="help_text
line">Angi startdato for aktiviteten</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="php:function('date', $date_format,
number(activity/start_date))"/></span>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="end_date">Sluttdato</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <xsl:if
test="activity/error_msg_array/end_date != ''">
+
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/end_date" /></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <input
class="date" id="end_date" name="end_date" type="text">
+ <xsl:if
test="activity/end_date != ''">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/end_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ <span class="help_text
line">Angi startdato for aktiviteten</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="php:function('date', $date_format, number(activity/end_date))"/></span>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="end_date">Ansvarlig</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <xsl:if
test="activity/error_msg_array/responsible_user_id != ''">
+
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/responsible_user_id" /></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <select
name="responsible_user_id">
+ <option
value="">Velg ansvarlig bruker</option>
+ <xsl:for-each
select="responsible_users">
+ <xsl:variable
name="full_name">
+ <xsl:value-of
disable-output-escaping="yes" select="account_firstname"/><xsl:text> </xsl:text>
+ <xsl:value-of
disable-output-escaping="yes" select="account_lastname"/>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="//activity/responsible_user_id = account_id">
+
<option selected="selected" value="{account_id}">
+
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
+
</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="{account_id}">
+
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
+
</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ <span class="help_text line">Angi
startdato for aktiviteten</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="activity/responsible_user_name"/></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="params">
+
<xsl:text>menuaction:logistic.uiactivity.edit, id:</xsl:text>
+ <xsl:value-of
select="activity/id" />
+ </xsl:variable>
+ <xsl:variable
name="edit_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $params )" />
+ </xsl:variable>
+ <a class="btn"
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
+ </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>
Modified:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
2012-10-30 08:13:09 UTC (rev 10378)
+++
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
2012-10-30 08:14:38 UTC (rev 10379)
@@ -1,8 +1,24 @@
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<func:function name="phpgw:conditional">
+ <xsl:param name="test"/>
+ <xsl:param name="true"/>
+ <xsl:param name="false"/>
+
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$test">
+ <xsl:value-of select="$true"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$false"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
+</func:function>
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="yui_phpgw_i18n"/>
- <div class="content-wrp">
-
+ <div style="margin: 20px; padding: 20px;" class="content-wrp">
<form action="" name="acl_form" id="acl_form" method="post">
<div id="paging"></div>
@@ -10,15 +26,36 @@
<div id="allocation-container"></div>
</form>
-
- <xsl:apply-templates select="datasource-definition"/>
</div>
+ <xsl:call-template name="datasource-definition" />
</xsl:template>
-<xsl:template match="datasource-definition">
+<xsl:template name="datasource-definition">
+
<script>
-
- YAHOO.portico.columnDefs = [
+ YAHOO.util.Event.onDOMReady(function(){
+
+ <xsl:choose>
+ <xsl:when test="//datatable/actions">
+ YAHOO.portico.actions = [
+ <xsl:for-each
select="//datatable/actions">
+ {
+ my_name: "<xsl:value-of
select="my_name"/>",
+ text: "<xsl:value-of
select="text"/>",
+ <xsl:if
test="parameters">
+ parameters:
<xsl:value-of select="parameters"/>,
+ </xsl:if>
+ action: "<xsl:value-of
select="action"/>"
+ }<xsl:value-of
select="phpgw:conditional(not(position() = last()), ',', '')"/>
+ </xsl:for-each>
+ ];
+ </xsl:when>
+ <xsl:otherwise>
+ YAHOO.portico.actions = [];
+ </xsl:otherwise>
+ </xsl:choose>
+
+ YAHOO.portico.columnDefs = [
<xsl:for-each select="//datatable/field">
{
resizeable: true,
@@ -41,15 +78,26 @@
</xsl:for-each>
];
- YAHOO.portico.dataSourceUrl = '<xsl:value-of
select="source"/>';
+ var reqUrl = '<xsl:value-of
select="//datatable/source"/>';
-
- YAHOO.portico.inlineTableHelper('requirement-container',
YAHOO.portico.dataSourceUrl, YAHOO.portico.columnDefs, null, null);
+
YAHOO.portico.inlineTableHelper('requirement-container', reqUrl,
YAHOO.portico.columnDefs);
+
+ var oArgs = {
+
menuaction:'logistic.uirequirement_resource_allocation.index',
+ requirement_id: '2',
+ phpgw_return_as: 'json'
+ };
+
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+ var myColumnDefs = [
+ {key:"id", sortable:true},
+ {key:"requirement_id", sortable:true},
+ {key:"location_id", sortable:true},
+ {key:"resource_id", sortable:true}
+ ];
- YAHOO.portico.inlineTableHelper('allocation-container',
YAHOO.portico.dataSourceUrl, YAHOO.portico.columnDefs, null, null);
-
-
-
- </script>
+ YAHOO.portico.inlineTableHelper('allocation-container',
requestUrl, myColumnDefs);
+ });
+ </script>
</xsl:template>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10379] Merge 10372:10378 from trunk,
Sigurd Nes <=