[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11309] property: more on request
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11309] property: more on request |
Date: |
Fri, 20 Sep 2013 11:28:28 +0000 |
Revision: 11309
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11309
Author: sigurdne
Date: 2013-09-20 11:28:27 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
property: more on request
Modified Paths:
--------------
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/hook_config.inc.php
trunk/property/js/yahoo/project.edit.js
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/config.tpl
trunk/property/templates/base/project.xsl
trunk/property/templates/base/request.xsl
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2013-09-19 17:21:30 UTC (rev
11308)
+++ trunk/property/inc/class.soproject.inc.php 2013-09-20 11:28:27 UTC (rev
11309)
@@ -1729,7 +1729,7 @@
{
$this->db->query("UPDATE fm_request set
project_id = NULL where id='{$request_id}'",__LINE__,__FILE__);
$this->interlink->delete_at_origin('property',
'.project.request', '.project', $request_id, $this->db);
- $receipt['message'][] =
array('msg'=>lang('Request %1 has been deleted from project
%2',$request_id,$project_id));
+ $receipt['message'][] =
array('msg'=>lang('request %1 has been deleted from project
%2',$request_id,$project_id));
}
return $receipt;
}
@@ -2423,6 +2423,13 @@
$this->db->query("UPDATE fm_request SET
project_id='$id' WHERE id='". $add_request['request_id'][$i] .
"'",__LINE__,__FILE__);
+ $request_project_hookup_status =
isset($this->config->config_data['request_project_hookup_status']) &&
$this->config->config_data['request_project_hookup_status'] ?
$this->config->config_data['request_project_hookup_status'] : false;
+
+ if($request_project_hookup_status)
+ {
+ $this->db->query("UPDATE
fm_request SET status='{$request_project_hookup_status}' WHERE id='".
$add_request['request_id'][$i] . "'",__LINE__,__FILE__);
+ }
+
$receipt['message'][] =
array('msg'=>lang('request %1 has been added',$add_request['request_id'][$i]));
}
else
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2013-09-19 17:21:30 UTC (rev
11308)
+++ trunk/property/inc/class.uiproject.inc.php 2013-09-20 11:28:27 UTC (rev
11309)
@@ -2081,7 +2081,8 @@
'values' =>
json_encode($content_files),
'total_records' =>
count($content_files),
'edit_action' => "''",
- 'is_paginator' => 0,
+ 'is_paginator' => 1,
+ 'rows_per_page' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
'footer' => 0
);
@@ -2094,7 +2095,63 @@
//--------------files
+ $lang_delete_request_statustext = lang('Check to delete
this request from this project');
+ $_origin = array();
+ if(isset($values['origin']) && $values['origin'] )
+ {
+ foreach($values['origin'] as $__origin)
+ {
+ foreach ($__origin['data'] as
$_origin_data)
+ {
+ $_select = '';
+ if($__origin['location'] ==
'.project.request')
+ {
+ $_select = "<input
type=\"checkbox\" name=\"values[delete_request][]\"
value=\"{$_origin_data['id']}\" title=\"{$lang_delete_request_statustext}\">";
+ }
+ $_origin[] = array
+ (
+ 'url'
=> "<a href='{$_origin_data['link']}'>{$_origin_data['id']} </a>",
+ 'type'
=> $__origin['descr'],
+ 'title'
=> $_origin_data['title'],
+ 'status'
=> $_origin_data['statustext'],
+ // 'user'
=> $GLOBALS['phpgw']->accounts->get($_origin_data['account_id'])->__toString(),
+ // 'entry_date' =>
$GLOBALS['phpgw']->common->show_date($_origin_data['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
+ 'select'
=> $_select
+ );
+ }
+ }
+ }
+
+
+ $datavalues[6] = array
+ (
+ 'name' => "6",
+ 'values' =>
json_encode($_origin),
+ 'total_records' =>
count($_origin),
+ 'edit_action' => "''",
+ 'is_paginator' => 1,
+ 'rows_per_page' =>
5,//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+ 'footer' => 0
+ );
+
+ $myColumnDefs[6] = array
+ (
+ 'name' => "6",
+ 'values' => json_encode(array(
+ array('key' =>
'url','label'=>lang('id'),'sortable'=>true,'resizeable'=>true),
+ array('key' =>
'type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
+ array('key' =>
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'status','label'=>lang('status'),'sortable'=>false,'resizeable'=>true),
+ // array('key' =>
'user','label'=>lang('user'),'sortable'=>false,'resizeable'=>true),
+ // array('key' =>
'entry_date','label'=>lang('entry date'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'select','label'=>lang('select'),'sortable'=>false,'resizeable'=>true),
+ )
+ )
+ );
+
+
+
// _debug_array($myButtons);die();
//----------------------------------------------datatable settings--------
@@ -2156,6 +2213,7 @@
$property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
}
+
$data = array
(
'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js),
@@ -2181,12 +2239,9 @@
'year_list'
=> array('options' => $year_list),
'order_time_span'
=> array('options' => $this->bo->get_order_time_span($id)),
'periodization_list'
=> array('options' => $periodization_list),
- 'lang_select_request'
=> lang('Select request'),
'lang_select_request_statustext'
=> lang('Add request for this project'),
'lang_request_statustext'
=> lang('Link to the request for this project'),
- 'lang_delete_request_statustext'
=> lang('Check to delete this request from this project'),
'link_select_request'
=> $GLOBALS['phpgw']->link('/index.php',$link_request_data),
- 'link_request'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uirequest.view')),
'add_sub_entry_action'
=> $GLOBALS['phpgw']->link('/index.php', $sub_entry_action_data ),
Modified: trunk/property/inc/hook_config.inc.php
===================================================================
--- trunk/property/inc/hook_config.inc.php 2013-09-19 17:21:30 UTC (rev
11308)
+++ trunk/property/inc/hook_config.inc.php 2013-09-20 11:28:27 UTC (rev
11309)
@@ -197,7 +197,32 @@
return $out;
}
+
/**
+ * Get HTML listbox with request status that are to be set when request
is added to a project
+ *
+ * @param $config
+ * @return string HTML checkboxes to be placed in a table
+ */
+ function request_project_hookup_status($config)
+ {
+ $status_assigned =
isset($config['request_project_hookup_status']) ?
$config['request_project_hookup_status'] : '';
+ $status_entries =
execMethod('property.bogeneric.get_list',array('type' => 'request_status',
'selected' => $status_assigned));
+
+ $out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ foreach ( $status_entries as $status)
+ {
+ $selected = $status['selected'] ? 'selected =
"selected"' : '';
+
+ $out .= <<<HTML
+ <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
+HTML;
+ }
+
+ return $out;
+ }
+
+ /**
* Get HTML listbox with workorder status that are to be set when
invoice is processed
*
* @param $config
Modified: trunk/property/js/yahoo/project.edit.js
===================================================================
--- trunk/property/js/yahoo/project.edit.js 2013-09-19 17:21:30 UTC (rev
11308)
+++ trunk/property/js/yahoo/project.edit.js 2013-09-20 11:28:27 UTC (rev
11309)
@@ -148,7 +148,7 @@
if(typeof(tableYUI0)=='undefined')
{
- tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
+ tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[1].parentNode;//
because:table 6 in front of 0
tableYUI0.setAttribute("id","tableYUI0");
}
else
@@ -184,7 +184,7 @@
if(typeof(tableYUI0)=='undefined')
{
- tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
+ tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[1].parentNode;//
because:table 6 in front of 0
tableYUI0.setAttribute("id","tableYUI0");
}
else
@@ -226,7 +226,7 @@
if(typeof(tableYUI1)=='undefined')
{
- tableYUI1 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[1].parentNode;
+ tableYUI1 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[2].parentNode;//
because:table 6 in front of 0
tableYUI1.setAttribute("id","tableYUI1");
}
else
@@ -263,7 +263,7 @@
if(typeof(tableYUI2)=='undefined')
{
- tableYUI2 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[2].parentNode;
+ tableYUI2 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[3].parentNode;//
because:table 6 in front of 0
tableYUI2.setAttribute("id","tableYUI2");
}
else
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2013-09-19 17:21:30 UTC (rev 11308)
+++ trunk/property/setup/phpgw_no.lang 2013-09-20 11:28:27 UTC (rev 11309)
@@ -1386,6 +1386,9 @@
request a confirmation email when your email is opened by the recipient
property no Be om epost som kvittering når mottaker åpner eposten.
request %1 has been edited property no Behov %1 er oppdatert
request %1 has been saved property no Behov %1 er lagret
+request %1 has been deleted from project %2 property no Behov
%1 er koplet fra prosjekt %2
+request %1 has been added property no Behov %1 er lagt til
+request %1 has already been added to project %2 property no
Behov %1 er allerede koplet til prosjekt %2
request budget property no Budsjett for tiltak
request condition type property no Behov::konsekvenstype
request descr property no Beskrivelse av tiltak
Modified: trunk/property/templates/base/config.tpl
===================================================================
--- trunk/property/templates/base/config.tpl 2013-09-19 17:21:30 UTC (rev
11308)
+++ trunk/property/templates/base/config.tpl 2013-09-20 11:28:27 UTC (rev
11309)
@@ -114,7 +114,16 @@
</td>
</tr>
+ <tr class="row_on">
+ <td>{lang_request_status_on_project_hookup}:</td>
+ <td>
+ <select
name="newsettings[request_project_hookup_status]">
+ {hook_request_project_hookup_status}
+ </select>
+ </td>
+ </tr>
+
<tr class="row_off">
<td>{lang_workorder_status_that_are_to_be_set_when_invoice_is_processed}:</td>
<td>
Modified: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl 2013-09-19 17:21:30 UTC (rev
11308)
+++ trunk/property/templates/base/project.xsl 2013-09-20 11:28:27 UTC (rev
11309)
@@ -111,13 +111,23 @@
<tr>
<td valign="top">
<a href="{link_select_request}"
title="{lang_select_request_statustext}">
-
<xsl:value-of select="lang_select_request"/>
+
<xsl:value-of select="php:function('lang',
'select request')"/>
</a>
</td>
</tr>
</xsl:when>
</xsl:choose>
-
<xsl:for-each select="value_origin">
+ <tr>
+
<td width="19%" align="left" valign="top">
+
<xsl:value-of select="php:function('lang', 'related')"/>
+
</td>
+
<td>
+
<div id="paging_6"> </div>
+
<div id="datatable-container_6"/>
+
</td>
+ </tr>
+
+ <!--
<xsl:for-each select="value_origin">
<xsl:variable name="origin_location">
<xsl:value-of select="location"/>
</xsl:variable>
@@ -150,6 +160,7 @@
</td>
</tr>
</xsl:for-each>
+ -->
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="value_origin">
@@ -779,6 +790,7 @@
<xsl:value-of select="php:function('lang', 'files')"/>
</td>
<td>
+
<div id="paging_5"> </div>
<div id="datatable-container_5"/>
</td>
</tr>
Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl 2013-09-19 17:21:30 UTC (rev
11308)
+++ trunk/property/templates/base/request.xsl 2013-09-20 11:28:27 UTC (rev
11309)
@@ -218,19 +218,31 @@
<xsl:value-of select="id"/>
</a>
<xsl:text> </xsl:text>
-
<xsl:choose>
-
<xsl:when test="location
='.project.request'">
-
<input type="checkbox"
name="values[delete_request][]" value="{id}">
-
<xsl:attribute
name="title">
-
<xsl:value-of
select="//lang_delete_request_statustext"/>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
</xsl:choose>
</td>
</xsl:for-each>
</table>
</xsl:for-each>
+
<xsl:choose>
+
<xsl:when test="value_target!=''">
+
<br/>
+
</xsl:when>
+
</xsl:choose>
+
<xsl:for-each select="value_target">
+
<label>
+
<xsl:value-of select="descr"/>
+
</label>
+
<table name="msg_table">
+
<xsl:for-each select="data">
+
<td class="th_text" align="left">
+
<a href="{link}" title="{statustext}">
+
<xsl:value-of select="id"/>
+
</a>
+
<xsl:text> </xsl:text>
+
</td>
+
</xsl:for-each>
+
</table>
+
</xsl:for-each>
+
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="value_origin">
@@ -324,21 +336,6 @@
<dl class="proplist-col">
<input type="hidden" name="values[origin]"
value="{value_origin_type}"/>
<input type="hidden" name="values[origin_id]"
value="{value_origin_id}"/>
-
<xsl:for-each select="value_target">
-
<dt>
-
<label>
-
<xsl:value-of select="descr"/>
-
</label>
-
</dt>
-
<dd>
-
<xsl:for-each select="data">
-
<a href="{link}"
title="{statustext}">
-
<xsl:value-of
select="id"/>
-
</a>
-
<xsl:text> </xsl:text>
-
</xsl:for-each>
-
</dd>
-
</xsl:for-each>
<xsl:choose>
<xsl:when test="mode ='edit'">
<xsl:call-template
name="location_form2"/>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11309] property: more on request,
Sigurd Nes <=