[Fmsystem-commits] [8539] added date-search on activities

[Erik Holm-Larsen]

Revision: 8539
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8539
Author:   erikhl
Date:     2012-01-09 11:26:11 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
added date-search on activities

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendar/setup/phpgw_no.lang
    trunk/activitycalendar/templates/base/activity_list_partial.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-01-09 10:22:51 UTC 
(rev 8538)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-01-09 11:26:11 UTC 
(rev 8539)
@@ -175,6 +175,11 @@
                                $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(count($filter_clauses))
                {

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-01-09 
10:22:51 UTC (rev 8538)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-01-09 
11:26:11 UTC (rev 8539)
@@ -331,7 +331,7 @@
                                break;
                        case 'all_activities':
                        default:
-                               $filters = array('activity_state' => 
phpgw::get_var('activity_state'), 'activity_category' => 
phpgw::get_var('activity_category'), 'activity_district' => 
phpgw::get_var('activity_district'), 'user_id' => $uid);
+                               $filters = array('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/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang  2012-01-09 10:22:51 UTC (rev 
8538)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2012-01-09 11:26:11 UTC (rev 
8539)
@@ -46,7 +46,10 @@
 building schedule      activitycalendar        no      Kalender
 buildings      activitycalendar        no      Bygg/anlegg
 bygning        activitycalendar        no      Bygg/anlegg
+calendar_months        activitycalendar        no      
["Januar","Februar","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"]
+calendar_weekdays      activitycalendar        no      
["Sø","Ma","Ti","On","To","Fr","Lø"]
 cancel activitycalendar        no      Avbryt
+clear  activitycalendar        no      Nullstill
 cancelled      activitycalendar        no      Avbestilt
 case officer   activitycalendar        no      Saksbehandler
 category       activitycalendar        no      Kategori
@@ -183,6 +186,7 @@
 season name    activitycalendar        no      Sesong
 seasons        activitycalendar        no      Sesonger
 secondary admin        activitycalendar        no      Kontaktperson 2
+select_date    activitycalendar        no      Velg dato
 select a building first        activitycalendar        no      Velg 
bygg/anlegg først
 select a grooup        activitycalendar        no      Velg en Gruppe
 select category...     activitycalendar        no      Velg en kategori...

Modified: trunk/activitycalendar/templates/base/activity_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/activity_list_partial.php     
2012-01-09 10:22:51 UTC (rev 8538)
+++ trunk/activitycalendar/templates/base/activity_list_partial.php     
2012-01-09 11:26:11 UTC (rev 8539)
@@ -114,7 +114,7 @@
                
'index.php?menuaction=activitycalendar.uiactivities.query&amp;phpgw_return_as=json<?php
 echo $url_add_on; ?>&amp;editable=<?php echo $editable ? "true" : "false"; ?>',
                columnDefs,
                '<?php echo $list_id ?>_form',
-               ['<?php echo $list_id ?>_ctrl_toggle_activity_state', '<?php 
echo $list_id ?>_ctrl_toggle_activity_district', '<?php echo $list_id 
?>_ctrl_toggle_activity_category', '<?php echo $list_id ?>_ctrl_search_query'],
+               ['<?php echo $list_id ?>_ctrl_toggle_activity_state', '<?php 
echo $list_id ?>_ctrl_toggle_activity_district', '<?php echo $list_id 
?>_ctrl_toggle_activity_category', '<?php echo $list_id ?>_ctrl_search_query', 
'date_updated'],
                '<?php echo $list_id ?>_container',
                '<?php echo $list_id ?>_paginator',
                '<?php echo $list_id ?>',
@@ -133,6 +133,7 @@
         var office = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_district').value;
         var state = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_state').value;
         var category = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_category').value;
+        var updatedDate = document.getElementById('date_change').value;
         <?php
         /* FIXME Search queries will affect ALL data tables listed on one page 
(of that type) when exporting
          * even though the search only affects one of the data tables.
@@ -146,18 +147,20 @@
             '&amp;activity_district='+office+
             '&amp;activity_state='+state+
             '&amp;activity_category='+category+
+            '&amp;activity_updated='+updatedDate+
                '&amp;export=true';
     }
 
     function activity_email(ptype) {
 
-       var confirm_res = confirm("Du er i ferd med å sende e-post til flere 
mottakere.\n\nVil du gjøre dette?");
+       var confirm_res = confirm("Du er i ferd med å sende e-post til utvalget 
under.\n\nVil du gjøre dette?");
         if(confirm_res==true)
         {      
                var query = document.getElementById('<?php echo $list_id 
?>_ctrl_search_query').value;
                var office = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_district').value;
                var state = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_state').value;
                var category = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_category').value;
+               var updatedDate = document.getElementById('date_change').value;
                <?php
                /* FIXME Search queries will affect ALL data tables listed on 
one page (of that type) when exporting
                 * even though the search only affects one of the data tables.
@@ -171,6 +174,7 @@
                    '&amp;activity_district='+office+
                    '&amp;activity_state='+state+
                    '&amp;activity_category='+category+
+                   '&amp;activity_updated='+updatedDate+
                        '&amp;email=true';
         }
     }
@@ -228,6 +232,8 @@
                        }
                        ?>
                </select>
+               <label class="toolbar_element_label" for="date_change" 
id="label_date_change"><?php echo lang('date') ?></label>
+               <?php echo 
$GLOBALS['phpgw']->yuical->add_listener('date_change'); ?>
        </fieldset>