[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15460] controller: more on status components
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15460] controller: more on status components |
|
Date: |
Sun, 14 Aug 2016 13:09:06 +0000 (UTC) |
Revision: 15460
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15460
Author: sigurdne
Date: 2016-08-14 13:09:06 +0000 (Sun, 14 Aug 2016)
Log Message:
-----------
controller: more on status components
Modified Paths:
--------------
trunk/controller/inc/class.uicomponent.inc.php
trunk/controller/templates/base/component.xsl
trunk/property/inc/class.soentity.inc.php
Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php 2016-08-13 02:00:01 UTC
(rev 15459)
+++ trunk/controller/inc/class.uicomponent.inc.php 2016-08-14 13:09:06 UTC
(rev 15460)
@@ -302,12 +302,18 @@
'text' =>
lang('User'),
'list' =>
$user_list,
'onchange' =>
'update_table();'
- ),
+ ),/*
array('type' =>
'checkbox',
'name' =>
'user_only',
'text' =>
'Filtrer bruker',
'value' => 1,
'onclick' =>
'update_table();'
+ ),*/
+ array('type' =>
'checkbox',
+ 'name' =>
'all_users',
+ 'text' => 'Vis
totale timer',
+ 'value' => 1,
+ 'onclick' =>
'update_table();'
),
array('type' =>
'filter',
'name' =>
'district_id',
@@ -469,7 +475,9 @@
$query = phpgw::get_var('query', 'string');
$year = phpgw::get_var('year', 'int');
$all_items = phpgw::get_var('all_items', 'bool');
- $user_only = phpgw::get_var('user_only', 'bool');
+ $all_users = phpgw::get_var('all_users', 'bool');
+// $user_only = phpgw::get_var('user_only', 'bool');
+ $user_only = $all_users ? false : true;
$filter_status = phpgw::get_var('status', 'string');
$report_type = phpgw::get_var('report_type', 'string');
if ($filter_component_str =
phpgw::get_var('filter_component', 'string'))
@@ -837,6 +845,11 @@
if ($report_type == 'summary')
{
+ if($all_users)
+ {
+ $user_id = 0;
+ }
+
return array(
'components' => null,
'summary' =>
$this->get_summary($values, $user_id),
Modified: trunk/controller/templates/base/component.xsl
===================================================================
--- trunk/controller/templates/base/component.xsl 2016-08-13 02:00:01 UTC
(rev 15459)
+++ trunk/controller/templates/base/component.xsl 2016-08-14 13:09:06 UTC
(rev 15460)
@@ -313,13 +313,14 @@
var report_type = $("#report_type").val();
var user_id = $("#user_id").val();
var custom_frontend =
$("[name='custom_frontend']").val();
+ var hide_all_users = false;
if(custom_frontend ==1)
{
$( "#user_id" ).hide();
$("[for='user_id']").hide();
}
-
+//console.log(user_id);
if(user_id < 0 || custom_frontend ==1)
{
$( "#entity_group_id" ).hide();
@@ -330,8 +331,9 @@
$("[for='all_items']").hide();
$( "#org_unit_id" ).hide();
$("[for='org_unit_id']").hide();
- $("[name='user_only']").hide();
- $("[for='user_only']").hide();
+ $("[name='all_users']").hide();
+ $("[for='all_users']").hide();
+ hide_all_users = true;
}
else
{
@@ -343,21 +345,30 @@
$("[for='all_items']").show();
$( "#org_unit_id" ).show();
$("[for='org_unit_id']").show();
- $("[name='user_only']").show();
- $("[for='user_only']").show();
+ $("[name='all_users']").show();
+ $("[for='all_users']").show();
}
- if(report_type == 'summary')
+ if(report_type != 'summary' && hide_all_users == false)
{
- $("[name='user_only']").hide();
- $("[for='user_only']").hide();
+ $("[name='all_users']").show();
+ $("[for='all_users']").show();
}
- else
+
+ if(user_id == '')
{
- $("[name='user_only']").show();
- $("[for='user_only']").show();
+ $("[name='all_users']").hide();
+ $("[for='all_users']").hide();
}
+ if(report_type == 'summary')
+ {
+ $("[name='all_items']").hide();
+ $("[for='all_items']").hide();
+ $("[name='status']").hide();
+ $("[for='status']").hide();
+ }
+
var requestUrl = $("#queryForm").attr("action");
requestUrl += '&phpgw_return_as=json' + "&" +
$("#queryForm").serialize();
Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php 2016-08-13 02:00:01 UTC (rev
15459)
+++ trunk/property/inc/class.soentity.inc.php 2016-08-14 13:09:06 UTC (rev
15460)
@@ -925,6 +925,14 @@
$sql = str_replace('__XML-ORDER__', $xml_order, $sql);
+ $group_method='';
+ if ($sql_custom_field)
+ {
+ $group_method .= " GROUP BY
fm_bim_item.location_id,fm_bim_item.id,fm_bim_item.type{$sql_custom_group}";
+ $sql = str_replace("SELECT fm_bim_item.*",
"SELECT fm_bim_item.* {$sql_custom_field}", $sql);
+ $sql .= $group_method;
+ }
+
$sql_pre_run = str_replace("SELECT fm_bim_item.*",
"SELECT DISTINCT fm_bim_item.id,fm_bim_item.type {$sql_custom_field}", $sql);
// _debug_array($sql_pre_run);
if (!$allrows)
@@ -949,11 +957,6 @@
return array();
}
- if ($sql_custom_field)
- {
- $sql = str_replace("SELECT fm_bim_item.*",
"SELECT fm_bim_item.* {$sql_custom_field}", $sql);
- $sql .= " GROUP BY
fm_bim_item.location_id,fm_bim_item.id,fm_bim_item.type{$sql_custom_group}";
- }
static $cache_attributes = array();
@@ -964,7 +967,7 @@
}
$sql = str_replace($acl_group_join,'', $sql);
$sql_arr = explode('WHERE', $sql);
- $this->db->query("{$sql_arr[0]} WHERE fm_bim_item.id IN
(" . implode(', ',$ids) . ") AND fm_bim_item.type IN ({$types[0]})" .
$ordermethod, __LINE__, __FILE__);
+ $this->db->query("{$sql_arr[0]} WHERE fm_bim_item.id IN
(" . implode(', ',$ids) . ") AND fm_bim_item.type IN ({$types[0]})" .
$group_method . $ordermethod, __LINE__, __FILE__);
$j = 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15460] controller: more on status components,
sigurdne <=