[Fmsystem-commits] [14600] tts

[Sigurd Nes]

Revision: 14600
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14600
Author:   sigurdne
Date:     2015-12-14 16:05:40 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
tts

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.botts.inc.php
    branches/dev-syncromind/property/inc/class.sotts.inc.php
    branches/dev-syncromind/property/inc/class.uitts.inc.php

Modified: branches/dev-syncromind/property/inc/class.botts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.botts.inc.php    2015-12-14 
16:05:19 UTC (rev 14599)
+++ branches/dev-syncromind/property/inc/class.botts.inc.php    2015-12-14 
16:05:40 UTC (rev 14600)
@@ -548,8 +548,8 @@
                        static $vendor_cache     = array();
 
                        $interlink       = CreateObject('property.interlink');
-                       $start_date      = 
$this->bocommon->date_to_timestamp($start_date);
-                       $end_date        = 
$this->bocommon->date_to_timestamp($end_date);
+                       $data['start_date']      = 
$this->bocommon->date_to_timestamp($data['start_date']);
+                       $data['end_date']        = 
$this->bocommon->date_to_timestamp($data['end_date']);
 
                        $custom_filtermethod = array();
                        foreach($this->get_custom_filters() as $custom_filter)

Modified: branches/dev-syncromind/property/inc/class.sotts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.sotts.inc.php    2015-12-14 
16:05:19 UTC (rev 14599)
+++ branches/dev-syncromind/property/inc/class.sotts.inc.php    2015-12-14 
16:05:40 UTC (rev 14600)
@@ -400,7 +400,7 @@
                                $order_edit      = 
$GLOBALS['phpgw']->acl->check('.ticket.order', PHPGW_ACL_EDIT, 'property');
                                $_end_date       = $end_date + 3600 * 16 + 
phpgwapi_datetime::user_timezone();
                                $_start_date = $start_date - 3600 * 8 + 
phpgwapi_datetime::user_timezone();
-                               $filtermethod .= " $where 
fm_tts_tickets.modified_date >= $_start_date AND fm_tts_tickets.modified_date 
<= $_end_date ";
+//                             $filtermethod .= " $where 
fm_tts_tickets.modified_date >= $_start_date AND fm_tts_tickets.modified_date 
<= $_end_date ";
 
                                if($order_add || $order_edit)
                                {

Modified: branches/dev-syncromind/property/inc/class.uitts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitts.inc.php    2015-12-14 
16:05:19 UTC (rev 14599)
+++ branches/dev-syncromind/property/inc/class.uitts.inc.php    2015-12-14 
16:05:40 UTC (rev 14600)
@@ -811,6 +811,12 @@
                        self::add_javascript('phpgwapi', 'jquery', 
'editable/jquery.dataTables.editable.js');
                        self::add_javascript('property', 'portico', 
'tts.index.js');
 
+                       $start_date      = urldecode($this->start_date);
+                       $end_date        = urldecode($this->end_date);
+
+                       
$GLOBALS['phpgw']->jqcal->add_listener('filter_start_date');
+                       
$GLOBALS['phpgw']->jqcal->add_listener('filter_end_date');
+
                        $appname                 = lang('helpdesk');
                        $function_msg    = lang('list ticket');
 
@@ -831,12 +837,31 @@
                                                                'href'          
 => '#',
                                                                'class'         
 => '',
                                                                'onclick'       
 => "JqueryPortico.openPopup({menuaction:'property.uitts.columns'}, 
{closeAction:'reload'})"
+                                                       ),
+                                                       array
+                                                               (
+                                                               'type'   => 
'date-picker',
+                                                               'id'     => 
'start_date',
+                                                               'name'   => 
'start_date',
+                                                               'value'  => 
$start_date,
+                                                               'text'   => 
lang('from')
+                                                       ),
+                                                       array
+                                                               (
+                                                               'type'   => 
'date-picker',
+                                                               'id'     => 
'end_date',
+                                                               'name'   => 
'end_date',
+                                                               'value'  => 
$end_date,
+                                                               'text'   => 
lang('to')
                                                        )
                                                ),
                                        ),
                                ),
                                'datatable'              => array(
-                                       'source'                 => 
self::link(array('menuaction' => 'property.uitts.index', 'phpgw_return_as' => 
'json')),
+                                       'source'                 => 
self::link(array('menuaction' => 'property.uitts.index',
+                                               'start_date'             => 
$start_date,
+                                               'end_date'                      
 => $end_date,
+                                               'phpgw_return_as' => 'json')),
                                        'download'               => 
self::link(array('menuaction' => 'property.uitts.download',
                                                'export' => true, 'allrows' => 
true)),
                                        'allrows'                => true,