fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16302] booking report


From: sigurdne
Subject: [Fmsystem-commits] [16302] booking report
Date: Mon, 13 Feb 2017 12:58:24 -0500 (EST)

Revision: 16302
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16302
Author:   sigurdne
Date:     2017-02-13 12:58:23 -0500 (Mon, 13 Feb 2017)
Log Message:
-----------
booking report

Modified Paths:
--------------
    trunk/booking/inc/class.uireports.inc.php

Modified: trunk/booking/inc/class.uireports.inc.php
===================================================================
--- trunk/booking/inc/class.uireports.inc.php   2017-02-13 15:36:34 UTC (rev 
16301)
+++ trunk/booking/inc/class.uireports.inc.php   2017-02-13 17:58:23 UTC (rev 
16302)
@@ -82,8 +82,8 @@
                                $report['variable_vertical'] = 
phpgw::get_var('variable_vertical');
                                $report['all_buildings'] = 
phpgw::get_var('all_buildings', 'bool');
                                //                      _debug_array($report);
-                               $from_ = 
phpgwapi_datetime::date_to_timestamp($report['start_date']);
-                               $to_ = 
phpgwapi_datetime::date_to_timestamp($report['end_date']);
+                               $from_ = phpgw::get_var('start_date', 'date');
+                               $to_ = phpgw::get_var('end_date', 'date');
 
                                if ($report['all_buildings'] && (($to_ - 
$from_) > 24 * 3600 * 31))
                                {
@@ -167,8 +167,8 @@
                                $entry['selected'] = $entry['id'] == 
$report['variable_vertical'] ? 1 : 0;
                        }
 
-                       $GLOBALS['phpgw']->jqcal2->add_listener('start_date');
-                       $GLOBALS['phpgw']->jqcal2->add_listener('end_date');
+                       $GLOBALS['phpgw']->jqcal->add_listener('start_date');
+                       $GLOBALS['phpgw']->jqcal->add_listener('end_date');
 
                        $tabs = array();
                        $tabs['generic'] = array('label' => lang('Report New'), 
'link' => '#report_new');
@@ -175,7 +175,7 @@
                        $active_tab = 'generic';
 
                        $report['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-                       self::adddatetimepicker();
+//                     self::adddatetimepicker();
                        
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
                                'file'), 'report_form');
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]