[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9039] added filter on dashboard
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [9039] added filter on dashboard |
Date: |
Tue, 27 Mar 2012 08:04:57 +0000 |
Revision: 9039
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9039
Author: erikhl
Date: 2012-03-27 08:04:56 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
added filter on dashboard
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/activitycalendar/templates/base/activity_list_partial.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-03-27 07:37:16 UTC
(rev 9038)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-03-27 08:04:56 UTC
(rev 9039)
@@ -161,40 +161,77 @@
}
if(isset($filters['new_activities']))
{
- $filter_clauses[] = "activity.state=1 OR
activity.state=2";
- }
- if(isset($filters['activity_state']) &&
$filters['activity_state'] != 'all'){
- $activity_state =
$this->marshal($filters['activity_state'],'int');
- $filter_clauses[] = "activity.state =
{$activity_state}";
- }
- if(isset($filters['activity_org']) && $filters['activity_org']
!= '0'){
- $activity_org =
$this->marshal($filters['activity_org'],'int');
- $filter_clauses[] = "activity.organization_id =
{$activity_org}";
- }
- if(isset($filters['activity_category']) &&
$filters['activity_category'] != 'all'){
- $activity_category =
$this->marshal($filters['activity_category'],'int');
- $filter_clauses[] = "activity.category =
{$activity_category}";
- }
- if(isset($filters['activity_district'])){
- if($filters['activity_district'] != 'all')
+ if(!isset($filters['activity_state']) ||
(isset($filters['activity_state']) && $filters['activity_state'] == 'all')){
+ $filter_clauses[] = "activity.state=1 OR
activity.state=2";
+ }
+ if(isset($filters['activity_state']) &&
$filters['activity_state'] != 'all'){
+ $activity_state =
$this->marshal($filters['activity_state'],'int');
+ $filter_clauses[] = "activity.state =
{$activity_state}";
+ }
+ if(isset($filters['activity_org']) &&
$filters['activity_org'] != '0'){
+ $activity_org =
$this->marshal($filters['activity_org'],'int');
+ $filter_clauses[] = "activity.organization_id =
{$activity_org}";
+ }
+ if(isset($filters['activity_category']) &&
$filters['activity_category'] != 'all'){
+ $activity_category =
$this->marshal($filters['activity_category'],'int');
+ $filter_clauses[] = "activity.category =
{$activity_category}";
+ }
+ if(isset($filters['activity_district'])){
+ if($filters['activity_district'] != 'all')
+ {
+ $activity_district =
$this->marshal($filters['activity_district'],'int');
+ $filter_clauses[] = "activity.office =
'{$activity_district}'";
+ }
+ }
+ else
{
- $activity_district =
$this->marshal($filters['activity_district'],'int');
- $filter_clauses[] = "activity.office =
'{$activity_district}'";
+ $activity_district =
$this->get_office_from_user($filters['user_id']);
+ if($activity_district && $activity_district !=
'')
+ {
+ $filter_clauses[] = "activity.office =
'{$activity_district}'";
+ }
}
+ if(isset($filters['updated_date_hidden']) &&
$filters['updated_date_hidden'] != "")
+ {
+ $ts_query =
strtotime($filters['updated_date_hidden']); // target timestamp specified by
user
+ $filter_clauses[] = "activity.last_change_date
< {$ts_query}";
+ }
}
else
{
- $activity_district =
$this->get_office_from_user($filters['user_id']);
- if($activity_district && $activity_district != '')
+ if(isset($filters['activity_state']) &&
$filters['activity_state'] != 'all'){
+ $activity_state =
$this->marshal($filters['activity_state'],'int');
+ $filter_clauses[] = "activity.state =
{$activity_state}";
+ }
+ if(isset($filters['activity_org']) &&
$filters['activity_org'] != '0'){
+ $activity_org =
$this->marshal($filters['activity_org'],'int');
+ $filter_clauses[] = "activity.organization_id =
{$activity_org}";
+ }
+ if(isset($filters['activity_category']) &&
$filters['activity_category'] != 'all'){
+ $activity_category =
$this->marshal($filters['activity_category'],'int');
+ $filter_clauses[] = "activity.category =
{$activity_category}";
+ }
+ if(isset($filters['activity_district'])){
+ if($filters['activity_district'] != 'all')
+ {
+ $activity_district =
$this->marshal($filters['activity_district'],'int');
+ $filter_clauses[] = "activity.office =
'{$activity_district}'";
+ }
+ }
+ else
{
- $filter_clauses[] = "activity.office =
'{$activity_district}'";
+ $activity_district =
$this->get_office_from_user($filters['user_id']);
+ if($activity_district && $activity_district !=
'')
+ {
+ $filter_clauses[] = "activity.office =
'{$activity_district}'";
+ }
}
+ if(isset($filters['updated_date_hidden']) &&
$filters['updated_date_hidden'] != "")
+ {
+ $ts_query =
strtotime($filters['updated_date_hidden']); // target timestamp specified by
user
+ $filter_clauses[] = "activity.last_change_date
< {$ts_query}";
+ }
}
- if(isset($filters['updated_date_hidden']) &&
$filters['updated_date_hidden'] != "")
- {
- $ts_query = strtotime($filters['updated_date_hidden']);
// target timestamp specified by user
- $filter_clauses[] = "activity.last_change_date <
{$ts_query}";
- }
if(count($filter_clauses))
{
Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php 2012-03-27
07:37:16 UTC (rev 9038)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2012-03-27
08:04:56 UTC (rev 9039)
@@ -325,7 +325,7 @@
switch($query_type)
{
case 'new_activities':
- $filters = array('new_activities' => 'yes',
'activity_district' => phpgw::get_var('activity_district'), 'user_id' => $uid);
+ $filters = array('new_activities' => 'yes',
'activity_state' => phpgw::get_var('activity_state'), 'activity_category' =>
phpgw::get_var('activity_category'), 'activity_district' =>
phpgw::get_var('activity_district'), 'user_id' => $uid, 'updated_date_hidden'
=> phpgw::get_var('date_change_hidden'));
$result_objects =
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
$object_count =
activitycalendar_soactivity::get_instance()->get_count($search_for,
$search_type, $filters);
break;
Modified: trunk/activitycalendar/templates/base/activity_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/activity_list_partial.php
2012-03-27 07:37:16 UTC (rev 9038)
+++ trunk/activitycalendar/templates/base/activity_list_partial.php
2012-03-27 08:04:56 UTC (rev 9039)
@@ -198,14 +198,14 @@
<fieldset>
<!-- Filters -->
- <label class="toolbar_element_label"
for="ctrl_toggle_activity_state"><?php echo lang('activity_state') ?></label>
- <select name="activity_state" id="<?php echo $list_id
?>_ctrl_toggle_activity_state">
- <option value="all"><?php echo lang('all') ?></option>
- <option value="1" <?php if($list_id ==
'new_activities'){ echo 'selected="selected"';}?>><?php echo lang('new')
?></option>
- <option value="2" ><?php echo lang('change') ?></option>
- <option value="3" ><?php echo lang('published')
?></option>
- <option value="5" ><?php echo lang('rejected')
?></option>
- </select>
+ <label class="toolbar_element_label"
for="ctrl_toggle_activity_state"><?php echo lang('activity_state') ?></label>
+ <select name="activity_state" id="<?php echo $list_id
?>_ctrl_toggle_activity_state">
+ <option value="all"><?php echo lang('all')
?></option>
+ <option value="1"><?php echo lang('new')
?></option>
+ <option value="2"><?php echo lang('change')
?></option>
+ <?php if(!$nofilter){ //remove state if on dashboard
?><option value="3" ><?php echo lang('published') ?></option><?php }?>
+ <?php if(!$nofilter){ //remove state if on dashboard
?><option value="5" ><?php echo lang('rejected') ?></option><?php }?>
+ </select>
<label class="toolbar_element_label"
for="ctrl_toggle_activity_district"><?php echo lang('office') ?></label>
<?php
$districts =
activitycalendar_soactivity::get_instance()->select_district_list();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9039] added filter on dashboard,
Erik Holm-Larsen <=