[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14240] Booking: more on reports
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14240] Booking: more on reports |
|
Date: |
Wed, 28 Oct 2015 14:09:59 +0000 |
Revision: 14240
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14240
Author: sigurdne
Date: 2015-10-28 14:09:58 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
Booking: more on reports
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uireports.inc.php
branches/dev-syncromind/booking/js/booking/report.js
branches/dev-syncromind/booking/templates/base/report_new.xsl
Modified: branches/dev-syncromind/booking/inc/class.uireports.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uireports.inc.php 2015-10-27
15:27:38 UTC (rev 14239)
+++ branches/dev-syncromind/booking/inc/class.uireports.inc.php 2015-10-28
14:09:58 UTC (rev 14240)
@@ -23,13 +23,12 @@
$this->building_bo = CreateObject('booking.bobuilding');
self::set_active_menu('booking::reportcenter');
- $this->activity_bo = CreateObject('booking.boactivity');
- $this->agegroup_bo = CreateObject('booking.boagegroup');
- $this->audience_bo = CreateObject('booking.boaudience');
+ $this->activity_bo =
CreateObject('booking.boactivity');
+ $this->agegroup_bo =
CreateObject('booking.boagegroup');
+ $this->audience_bo =
CreateObject('booking.boaudience');
//remove
- $this->organization_bo =
CreateObject('booking.boorganization');
- $this->resource_bo = CreateObject('booking.boresource');
-
+ $this->organization_bo =
CreateObject('booking.boorganization');
+ $this->resource_bo =
CreateObject('booking.boresource');
}
public function query()
@@ -39,16 +38,16 @@
public function index()
{
- $reports[] = array('name' => lang('Participants
Per Age Group Per Month'), 'url' => self::link(array(
+ $reports[] = array('name' => lang('Participants
Per Age Group Per Month'), 'url' => self::link(array(
'menuaction' =>
'booking.uireports.participants')));
$reports[] = array('name' => lang('Free time'),
'url' => self::link(array('menuaction' => 'booking.uireports.freetime')));
-
- $tabs = array();
+
+ $tabs = array();
$tabs['generic'] = array('label' => lang('Reports'),
'link' => '#reports');
- $active_tab = 'generic';
- $tabs = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
- self::render_template_xsl('report_index',
array('reports' => $reports, 'tabs' => $tabs));
+ $active_tab = 'generic';
+ $tabs =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+
+ self::render_template_xsl('report_index',
array('reports' => $reports, 'tabs' => $tabs));
}
public function add()
@@ -59,62 +58,77 @@
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
array_set_default($_POST, 'resources', array());
- $activity_id = phpgw::get_var('activity_id',
'int');
- $soactivity =
createObject('booking.soactivity');
- $children =
$soactivity->get_children($activity_id);
- $activity_ids =
array_merge(array($activity_id),$children);
- $report['activity_ids'] = $activity_ids;
+ $activity_id =
phpgw::get_var('activity_id', 'int');
+ $soactivity =
createObject('booking.soactivity');
+ $children =
$soactivity->get_children($activity_id);
+ $activity_ids =
array_merge(array($activity_id), $children);
+ $report['activity_ids'] = $activity_ids;
- $report['active'] = '1';
- $report['building_id'] =
phpgw::get_var('building_id', 'int');
- $report['building_name'] =
phpgw::get_var('building_name', 'string', 'POST');
- $report['activity_id'] =
phpgw::get_var('activity_id', 'int');
- $report['description'] =
phpgw::get_var('description');
- $report['resources'] =
phpgw::get_var('resources');
- $report['weekdays']
= phpgw::get_var('weekdays');
+ $report['active'] = '1';
+ $report['building_id'] =
phpgw::get_var('building_id', 'int');
+ $report['building_name'] =
phpgw::get_var('building_name', 'string', 'POST');
+ $report['activity_id'] =
phpgw::get_var('activity_id', 'int');
+ $report['description'] =
phpgw::get_var('description');
+ $report['resources'] =
phpgw::get_var('resources');
+ $report['weekdays'] =
phpgw::get_var('weekdays');
- $report['start_date'] =
phpgw::get_var('start_date');
- $report['end_date']
= phpgw::get_var('end_date');
- $report['start_hour'] =
phpgw::get_var('start_hour', 'int');
- $report['start_minute'] =
phpgw::get_var('start_minute', 'int');
- $report['end_hour']
= phpgw::get_var('end_hour', 'int');
- $report['end_minute'] =
phpgw::get_var('end_minute', 'int');
- $report['variable_horizontal'] =
phpgw::get_var('variable_horizontal');
- $report['variable_vertical'] =
phpgw::get_var('variable_vertical');
- $report['all_buildings'] =
phpgw::get_var('all_buildings', 'bool');
- // _debug_array($report);
+ $report['start_date'] =
phpgw::get_var('start_date');
+ $report['end_date']
= phpgw::get_var('end_date');
+ $report['start_hour'] =
phpgw::get_var('start_hour', 'int');
+ $report['start_minute'] =
phpgw::get_var('start_minute', 'int');
+ $report['end_hour']
= phpgw::get_var('end_hour', 'int');
+ $report['end_minute'] =
phpgw::get_var('end_minute', 'int');
+ $report['variable_horizontal'] =
phpgw::get_var('variable_horizontal');
+ $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']);
+ if($report['all_buildings'] && (($to_ - $from_)
> 24*3600*31))
+ {
+ $errors[] = lang('Maximum 1 month for
all buildings');
+ }
+
$report_type = phpgw::get_var('report_type');
- switch($report_type)
+
+ if(!$errors)
{
- case 'participants_per_resource':
-
$this->get_participants_per_resource($report);
- break;
- case 'cover_ratio':
- $this->get_cover_ratio($report);
- break;
- case 'freetime':
- $this->get_freetime($report);
- break;
+ switch($report_type)
+ {
+ case
'participants_per_resource':
+
$this->get_participants_per_resource($report);
+ break;
+ case 'cover_ratio':
+
$this->get_cover_ratio($report);
+ break;
+ case 'freetime':
+
$this->get_freetime($report);
+ break;
- default:
- break;
+ default:
+ break;
+ }
}
-
}
- if($errors['report'])
+ if($errors)
{
- $errors['warning'] = lang('NB! No data will be
saved, if you navigate away you will loose all.');
+ $errors[] = lang('NB! No data will be saved, if
you navigate away you will loose all.');
}
- $this->flash_form_errors($errors);
+
+ foreach($errors as $error)
+ {
+ phpgwapi_cache::message_set($error, 'error');
+ }
+
self::add_javascript('booking', 'booking', 'report.js');
array_set_default($report, 'resources', array());
- $report['resources_json'] =
json_encode(array_map('intval', $report['resources']));
- $report['cancel_link'] =
self::link(array('menuaction' => 'booking.uireports.index'));
+ $report['resources_json'] =
json_encode(array_map('intval', $report['resources']));
+ $report['cancel_link'] =
self::link(array('menuaction' => 'booking.uireports.index'));
array_set_default($report, 'cost', '0');
- $activities =
$this->activity_bo->get_top_level();
- $report['days'] = array(
+ $activities
= $this->activity_bo->get_top_level();
+ $report['days'] =
array(
array('id' => 1, 'name' => lang('Monday')),
array('id' => 2, 'name' => lang('Tuesday')),
array('id' => 3, 'name' => lang('Wednesday')),
@@ -123,25 +137,36 @@
array('id' => 6, 'name' => lang('Saturday')),
array('id' => 7, 'name' => lang('Sunday'))
);
- $report['variables_horizontal'] = array(
+ $report['variables_horizontal'] = array(
array('id' => 'agegroup', 'name' =>
lang('agegroup'), 'selected' => 1),
// array('id' => 'resource', 'name' =>
lang('resource')),
// array('id' => 'audience', 'name' =>
lang('audience')),
// array('id' => 'activity', 'name' =>
lang('activities')),
);
- $report['variables_vertical'] = array(
+ $report['variables_vertical'] = array(
// array('id' => 'agegroup', 'name' =>
lang('agegroup')),
array('id' => 'resource', 'name' =>
lang('resource')),
array('id' => 'audience', 'name' =>
lang('audience')),
array('id' => 'activity', 'name' =>
lang('activities')),
);
+ $report_types = array(
+ array(
+ 'id' => 'participants_per_resource',
+ 'name' =>
lang('participants_per_agegroupe'),
+ 'selected' => $report_type ==
'participants_per_resource' ? 1 : 0
+ ),
+ array(
+ 'id' => 'cover_ratio',
+ 'name' => lang('cover ratio'),
+ 'selected' => $report_type ==
'cover_ratio' ? 1 : 0
+ ),
+ );
foreach($report['variables_vertical'] as &$entry)
{
$entry['selected'] = $entry['id'] ==
$report['variable_vertical'] ? 1 : 0;
}
-
$GLOBALS['phpgw']->jqcal->add_listener('start_date');
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
@@ -151,11 +176,12 @@
$report['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::adddatetimepicker();
-
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
'file'), 'report_form');
+
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
+ 'file'), 'report_form');
$this->add_template_helpers();
- self::render_template_xsl('report_new', array('report'
=> $report, 'activities' => $activities,
- 'agegroups' => $agegroups, 'audience' =>
$audience));
+ self::render_template_xsl('report_new', array('report'
=> $report, 'activities' => $activities,
+ 'agegroups' => $agegroups, 'audience'
=> $audience, 'report_types' => $report_types));
}
/**
@@ -172,75 +198,75 @@
$sql = "SELECT DISTINCT bb_resource.id FROM
bb_building"
. " JOIN bb_resource ON bb_resource.building_id
= bb_building.id"
. " WHERE bb_building.active = 1"
- . " AND activity_id IN (" .implode(',',
$data['activity_ids']) . ')';
+ . " AND activity_id IN (" . implode(',',
$data['activity_ids']) . ')';
$db->query($sql);
- while ($db->next_record())
+ while($db->next_record())
{
$resources[] = $db->f('id');
}
-
}
else
{
$resources = $data['resources'];
}
- $db_dateformat = $db->date_format();
- $errors = array();
- $from_ = date($db_dateformat,
phpgwapi_datetime::date_to_timestamp($data['start_date']));
- $to_ = date($db_dateformat
,phpgwapi_datetime::date_to_timestamp($data['end_date']));
-
+ $db_dateformat = $db->date_format();
+ $errors = array();
+ $from_ = date($db_dateformat,
phpgwapi_datetime::date_to_timestamp($data['start_date']));
+ $to_ = date($db_dateformat,
phpgwapi_datetime::date_to_timestamp($data['end_date']));
+
/*
* Get availlable time
*/
- $begin = new DateTime( date('Y-m-d',
phpgwapi_datetime::date_to_timestamp($data['start_date']) ) );
- $end = new DateTime( date('Y-m-d',
phpgwapi_datetime::date_to_timestamp($data['end_date']) ) );
- $end = $end->modify( '+1 day' );
+ $begin = new DateTime(date('Y-m-d',
phpgwapi_datetime::date_to_timestamp($data['start_date'])));
+ $end = new DateTime(date('Y-m-d',
phpgwapi_datetime::date_to_timestamp($data['end_date'])));
+ $end = $end->modify('+1 day');
- $interval = DateInterval::createFromDateString('1 day');
- $period = new DatePeriod($begin, $interval, $end);
+ $interval =
DateInterval::createFromDateString('1 day');
+ $period = new DatePeriod($begin, $interval,
$end);
- $resources_string = $resources ? implode(",",
$resources) : -1;
- $weekdays_string = $data['weekdays'] ? implode(",",
$data['weekdays']) : -1;
-
- $candidates = array();
- foreach ( $period as $dt )
+ $resources_string = $resources ? implode(",",
$resources) : -1;
+ $weekdays_string = $data['weekdays'] ?
implode(",", $data['weekdays']) : -1;
+ $time_in =
mktime((int)$data['start_hour'], (int)$data['start_minute']);
+ $time_out =
mktime((int)$data['end_hour'], (int)$data['end_minute']);
+ $candidates = array();
+ foreach($period as $dt)
{
- $check_date = $dt->format( $db_dateformat );
- $weekday = $dt->format( 'N' );
- $sql = "SELECT sb.wday AS wday, sb.from_ as
boundary_from, sb.to_ as boundary_to,bu.id as building_id,"
- . " bu.name as building_name, re.id AS
resource_id, re.name AS resource_name, EXTRACT(EPOCH FROM (sb.to_ - sb.from_))
as timespan"
- . " FROM bb_building bu, bb_season se,
bb_season_boundary sb, bb_resource re, bb_season_resource sr"
- . " WHERE bu.id = se.building_id"
- . " AND bu.id = re.building_id"
- . " AND sr.season_id = se.id"
- . " AND sr.resource_id = re.id"
- . " AND sb.season_id = se.id"
- . " AND bu.active = 1"
- . " AND sb.wday = {$weekday}"
- . " AND date_trunc('day' ,se.to_) >=
to_date('{$check_date}' ,'YYYY-MM-DD')"
- . " AND date_trunc('day' ,se.from_) <=
to_date('{$check_date}', 'YYYY-MM-DD')"
- . " AND re.id = ANY
(string_to_array('{$resources_string}', ',')::int4[])"
- . " AND sb.wday = ANY
(string_to_array('{$weekdays_string}', ',')::int4[])";
+ $check_date = $dt->format($db_dateformat);
+ $weekday = $dt->format('N');
+ $sql = "SELECT sb.wday AS wday,
sb.from_ as boundary_from, sb.to_ as boundary_to,bu.id as building_id,"
+ . " bu.name as building_name, re.id AS
resource_id, re.name AS resource_name, EXTRACT(EPOCH FROM (sb.to_ - sb.from_))
as timespan"
+ . " FROM bb_building bu, bb_season se,
bb_season_boundary sb, bb_resource re, bb_season_resource sr"
+ . " WHERE bu.id = se.building_id"
+ . " AND bu.id = re.building_id"
+ . " AND sr.season_id = se.id"
+ . " AND sr.resource_id = re.id"
+ . " AND sb.season_id = se.id"
+ . " AND bu.active = 1"
+ . " AND sb.wday = {$weekday}"
+ . " AND date_trunc('day' ,se.to_) >=
to_date('{$check_date}' ,'YYYY-MM-DD')"
+ . " AND date_trunc('day' ,se.from_) <=
to_date('{$check_date}', 'YYYY-MM-DD')"
+ . " AND re.id = ANY
(string_to_array('{$resources_string}', ',')::int4[])"
+ . " AND sb.wday = ANY
(string_to_array('{$weekdays_string}', ',')::int4[])";
+
$db->query($sql);
while($db->next_record())
{
$candidates[$check_date][] = array(
- 'date'
=> $check_date,
- 'wday'
=> $db->f('wday'),
- 'timespan'
=> $db->f('timespan'),
- 'boundary_from' =>
$db->f('boundary_from'),
- 'boundary_to' =>
$db->f('boundary_to'),
- 'building_id' =>
$db->f('building_id'),
- 'building_name' =>
$db->f('building_name'),
- 'resource_id' =>
$db->f('resource_id'),
- 'resource_name' =>
$db->f('resource_name')
+ 'date' =>
$check_date,
+ 'wday' =>
$db->f('wday'),
+ 'timespan' =>
$db->f('timespan'),
+ 'boundary_from' =>
$db->f('boundary_from'),
+ 'boundary_to' =>
$db->f('boundary_to'),
+ 'building_id' =>
$db->f('building_id'),
+ 'building_name' =>
$db->f('building_name'),
+ 'resource_id' =>
$db->f('resource_id'),
+ 'resource_name' =>
$db->f('resource_name')
);
}
//_debug_array($sql);
-
}
unset($check_date);
@@ -250,7 +276,8 @@
foreach($data_set as &$entry)
{
- $sql = "SELECT bu.id as building_id,
bu.name, re.id AS resource_id, re.name AS resource_name, EXTRACT(EPOCH FROM
(bo.to_ - bo.from_)) as timespan
+ $sql = "SELECT bu.id as
building_id, bu.name, re.id AS resource_id, re.name AS resource_name,
EXTRACT(EPOCH FROM (bo.to_ - bo.from_)) as timespan,
+ EXTRACT(EPOCH FROM (bo.from_))
as from_, EXTRACT(EPOCH FROM (bo.to_)) as to_
FROM bb_agegroup ag,
bb_booking_agegroup ba, bb_booking bo, bb_allocation al, bb_season se,
bb_building bu, bb_booking_resource br, bb_resource re
WHERE ba.agegroup_id = ag.id
AND ba.booking_id = bo.id
@@ -266,7 +293,8 @@
AND EXTRACT(DOW FROM bo.from_) =
{$entry['wday']}
AND (ba.male > 0 OR ba.female > 0)
UNION
- SELECT bu.id as building_id, bu.name,
re.id AS resource_id, re.name AS resource_name, EXTRACT(EPOCH FROM (ev.to_ -
ev.from_)) as timespan
+ SELECT bu.id as building_id, bu.name,
re.id AS resource_id, re.name AS resource_name, EXTRACT(EPOCH FROM (ev.to_ -
ev.from_)) as timespan,
+ EXTRACT(EPOCH FROM (ev.from_))
as from_, EXTRACT(EPOCH FROM (ev.to_)) as to_
FROM bb_event ev
INNER JOIN bb_event_agegroup ea ON
ea.event_id = ev.id
INNER JOIN bb_agegroup ag ON ag.id =
ea.agegroup_id and ag.active = 1
@@ -280,34 +308,59 @@
AND (ea.male > 0 OR ea.female > 0)
ORDER BY resource_name ASC, timespan";
//_debug_array($sql);
- $timespan = 0;
+ $timespan = 0;
$db->query($sql);
+ if($data['start_hour'] &&
$data['end_hour'])
+ {
+ $Overlap = new
OverlapCalculator($time_in, $time_out);
+ $entry['boundary_from'] =
date('H:i', $time_in);
+ $entry['boundary_to'] =
date('H:i', $time_out);
+ }
+
while($db->next_record())
{
- $timespan += $db->f('timespan');
+ if($data['start_hour'] &&
$data['end_hour'])
+ {
+ $from_ =
$db->f('from_');
+ $to_ =
$db->f('to_');
+
+ $periodStart =
mktime(date('H', $from_), date('i', $from_));
+ $periodEnd =
mktime(date('H', $to_), date('i', $to_));
+
$Overlap->addOverlapFrom($periodStart, $periodEnd);
+ }
+ else
+ {
+ $timespan +=
$db->f('timespan');
+ }
}
-// _debug_array($timespan);
- $entry['cover_ratio'] =
round((($timespan/$entry['timespan']) * 100), 2, PHP_ROUND_HALF_UP);
+
+ if($data['start_hour'] &&
$data['end_hour'])
+ {
+ $timespan
= $Overlap->getOverlap();
+ $entry['cover_ratio'] =
round((($timespan / ($time_out - $time_in)) * 100), 2, PHP_ROUND_HALF_UP);
+ }
+ else
+ {
+ $entry['cover_ratio'] =
round((($timespan / $entry['timespan']) * 100), 2, PHP_ROUND_HALF_UP);
+ }
$ret[] = $entry;
-
}
}
-// _debug_array($ret);
if($ret)
{
$bocommon = CreateObject('property.bocommon');
$bocommon->download($ret, array_keys($ret[0]),
array_keys($ret[0]));
$GLOBALS['phpgw']->common->phpgw_exit();
}
-
}
+
public function get_participants_per_resource($data)
{
$output_type = 'XLS';//'XLS';
- $db = & $GLOBALS['phpgw']->db;
+ $db = & $GLOBALS['phpgw']->db;
$resources = array();
if($data['all_buildings'])
@@ -315,36 +368,35 @@
$sql = "SELECT DISTINCT bb_resource.id FROM
bb_building"
. " JOIN bb_resource ON bb_resource.building_id
= bb_building.id"
. " WHERE bb_building.active = 1"
- . " AND activity_id IN (" .implode(',',
$data['activity_ids']) . ')';
+ . " AND activity_id IN (" . implode(',',
$data['activity_ids']) . ')';
$db->query($sql);
- while ($db->next_record())
+ while($db->next_record())
{
$resources[] = $db->f('id');
}
-
}
else
{
$resources = $data['resources'];
}
- $errors = array();
- $from_ =
date($db->date_format(),phpgwapi_datetime::date_to_timestamp($data['start_date']));
- $to_ =
date($db->date_format(),phpgwapi_datetime::date_to_timestamp($data['end_date']));
+ $errors = array();
+ $from_ = date($db->date_format(),
phpgwapi_datetime::date_to_timestamp($data['start_date']));
+ $to_ = date($db->date_format(),
phpgwapi_datetime::date_to_timestamp($data['end_date']));
switch($data['variable_vertical'])
{
case 'resource':
- $jasper_parameters =
sprintf("'BK_DATE_FROM|%s;BK_DATE_TO|%s;BK_RESOURCES|%s;BK_WEEKDAYS|%s'",
$from_, $to_, implode(",", $resources), implode(',' ,$data['weekdays']));
- $report_source = PHPGW_SERVER_ROOT .
'/booking/jasper/templates/participants_per_resource.jrxml';
+ $jasper_parameters =
sprintf("'BK_DATE_FROM|%s;BK_DATE_TO|%s;BK_RESOURCES|%s;BK_WEEKDAYS|%s'",
$from_, $to_, implode(",", $resources), implode(',', $data['weekdays']));
+ $report_source =
PHPGW_SERVER_ROOT . '/booking/jasper/templates/participants_per_resource.jrxml';
break;
case 'audience':
- $jasper_parameters =
sprintf("'BK_DATE_FROM|%s;BK_DATE_TO|%s;BK_RESOURCES|%s;BK_WEEKDAYS|%s'",
$from_, $to_, implode(",", $resources), implode(',' ,$data['weekdays']));
- $report_source = PHPGW_SERVER_ROOT .
'/booking/jasper/templates/participants_per_audience.jrxml';
+ $jasper_parameters =
sprintf("'BK_DATE_FROM|%s;BK_DATE_TO|%s;BK_RESOURCES|%s;BK_WEEKDAYS|%s'",
$from_, $to_, implode(",", $resources), implode(',', $data['weekdays']));
+ $report_source =
PHPGW_SERVER_ROOT . '/booking/jasper/templates/participants_per_audience.jrxml';
break;
case 'activity':
- $jasper_parameters =
sprintf("'BK_DATE_FROM|%s;BK_DATE_TO|%s;BK_RESOURCES|%s;BK_WEEKDAYS|%s'",
$from_, $to_, implode(",", $resources), implode(',' ,$data['weekdays']));
- $report_source = PHPGW_SERVER_ROOT .
'/booking/jasper/templates/participants_per_activity.jrxml';
+ $jasper_parameters =
sprintf("'BK_DATE_FROM|%s;BK_DATE_TO|%s;BK_RESOURCES|%s;BK_WEEKDAYS|%s'",
$from_, $to_, implode(",", $resources), implode(',', $data['weekdays']));
+ $report_source =
PHPGW_SERVER_ROOT . '/booking/jasper/templates/participants_per_activity.jrxml';
break;
default:
@@ -356,7 +408,7 @@
if(!count($errors))
{
- $jasper_wrapper =
CreateObject('phpgwapi.jasper_wrapper');
+ $jasper_wrapper =
CreateObject('phpgwapi.jasper_wrapper');
try
{
$jasper_wrapper->execute($jasper_parameters, $output_type, $report_source);
@@ -372,6 +424,7 @@
phpgwapi_cache::message_set($error, 'error');
}
}
+
/**
* Testing
* @param type $data
@@ -386,7 +439,7 @@
{
$sql = "SELECT id FROM bb_building WHERE active
= 1";
$db->query($sql);
- while ($db->next_record())
+ while($db->next_record())
{
$buildings[] = $db->f('id');
}
@@ -396,12 +449,12 @@
$buildings[] = $data['building_id'];
}
- $buildings = implode(',' ,$buildings);
- $weekdays = implode(','
,$data['weekdays']);
- $activity_ids = implode(',' ,$data['activity_ids']);
+ $buildings = implode(',', $buildings);
+ $weekdays = implode(',',
$data['weekdays']);
+ $activity_ids = implode(',', $data['activity_ids']);
- $from =
$db->to_timestamp(phpgwapi_datetime::date_to_timestamp($data['start_date']));
- $to =
$db->to_timestamp(phpgwapi_datetime::date_to_timestamp($data['end_date']) + 24
* 3600 -1);
+ $from =
$db->to_timestamp(phpgwapi_datetime::date_to_timestamp($data['start_date']));
+ $to =
$db->to_timestamp(phpgwapi_datetime::date_to_timestamp($data['end_date']) + 24
* 3600 - 1);
$sql = "select distinct al.id, al.from_, al.to_,
EXTRACT(DOW FROM al.to_) as day_of_week, bu.id as building_id, bu.name as
building_name, br.id as resource_id, br.name as resource_name
@@ -413,7 +466,7 @@
WHERE bb.id is null
AND al.from_ >= '{$from}'
AND al.to_ <= '{$to}'"
- . " AND br.activity_id IN ({$activity_ids}) ";
+ . " AND br.activity_id IN ({$activity_ids}) ";
if($buildings)
{
@@ -436,22 +489,21 @@
$retval['start'] = 0;
$retval['sort'] = null;
$retval['dir'] = 'asc';
- _debug_array($sql);
- _debug_array($retval);
- die();
+// _debug_array($sql);
+// _debug_array($retval);
return $retval;
}
public function get_custom()
{
- $activity_id = phpgw::get_var('activity_id', 'int');
- $activity_path =
$this->activity_bo->get_path($activity_id);
- $top_level_activity = $activity_path ?
$activity_path[0]['id'] : 0;
+ $activity_id =
phpgw::get_var('activity_id', 'int');
+ $activity_path =
$this->activity_bo->get_path($activity_id);
+ $top_level_activity = $activity_path ?
$activity_path[0]['id'] : 0;
- $location = ".application.{$top_level_activity}";
- $organized_fields = $this->get_attributes($location);
- $variable_vertical = '';
+ $location =
".application.{$top_level_activity}";
+ $organized_fields =
$this->get_attributes($location);
+ $variable_vertical = '';
$variable_horizontal = '';
foreach($organized_fields as $group)
{
@@ -460,7 +512,7 @@
$header_level = $group['level'] + 2;
if(isset($group['attributes']) &&
is_array($group['attributes']))
{
- foreach ($group['attributes']
as $attribute)
+ foreach($group['attributes'] as
$attribute)
{
$variable_vertical .=
<<<HTML
@@ -480,17 +532,18 @@
$fields = print_r($organized_fields, true);
- // $path = print_r($activity_path, true);
+ // $path = print_r($activity_path, true);
-
+
return array
- (
- 'status' => 'ok',
- 'message' => 'melding',
- 'variable_vertical' => $variable_vertical,
- 'variable_horizontal' => $variable_horizontal
+ (
+ 'status' =>
'ok',
+ 'message' =>
'melding',
+ 'variable_vertical' =>
$variable_vertical,
+ 'variable_horizontal' => $variable_horizontal
);
}
+
/**
*
* @param type $location
@@ -498,8 +551,8 @@
*/
private function get_attributes($location)
{
- $appname = 'booking';
- $attributes =
$GLOBALS['phpgw']->custom_fields->find($appname, $location, 0, '', 'ASC',
'attrib_sort', true, true);
+ $appname = 'booking';
+ $attributes =
$GLOBALS['phpgw']->custom_fields->find($appname, $location, 0, '', 'ASC',
'attrib_sort', true, true);
return $this->get_attribute_groups($appname, $location,
$attributes);
}
@@ -511,13 +564,11 @@
*
* @return array the grouped attributes
*/
-
private function get_attribute_groups($appname, $location,
$attributes = array())
{
return
$GLOBALS['phpgw']->custom_fields->get_attribute_groups($appname, $location,
$attributes);
}
-
public function participants()
{
self::set_active_menu('booking::reportcenter::participants');
@@ -531,7 +582,7 @@
$to_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($to));
$from_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($from));
-
+
$output_type = phpgw::get_var('otype',
'POST');
$building_list = phpgw::get_var('building',
'POST');
@@ -564,10 +615,9 @@
$to = date($this->dateFormat,
time());
$from = date($this->dateFormat, time());
}
-
- phpgwapi_cache::message_set($errors, 'error');
- //$this->flash_form_errors($errors);
+ phpgwapi_cache::message_set($errors, 'error');
+
$GLOBALS['phpgw']->jqcal->add_listener('from', 'date');
$GLOBALS['phpgw']->jqcal->add_listener('to', 'date');
@@ -575,12 +625,13 @@
$tabs['generic'] = array('label' => lang('Report
Participants'), 'link' => '#report_part');
$active_tab = 'generic';
- $data = array();
- $data['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $data['validator'] =
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
'file'));
+ $data = array();
+ $data['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+ $data['validator'] =
phpgwapi_jquery::formvalidator_generate(array('location',
+ 'date', 'security', 'file'));
- self::render_template_xsl('report_participants',
array('data' => $data, 'from' => $from,
- 'to' => $to, 'buildings' =>
$buildings['results']));
+ self::render_template_xsl('report_participants',
array('data' => $data, 'from' => $from,
+ 'to' => $to, 'buildings' =>
$buildings['results']));
}
public function freetime()
@@ -597,7 +648,7 @@
$to_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($to));
$from_ = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($from));
-
+
$show = 'report';
$allocations = $this->get_free_allocations(
phpgw::get_var('building', 'POST'), $from_,
$to_, phpgw::get_var('weekdays', 'POST')
@@ -631,8 +682,8 @@
$from = date($this->dateFormat, time());
$show = 'gui';
}
-
- phpgwapi_cache::message_set($errors, 'error');
+
+ phpgwapi_cache::message_set($errors, 'error');
//$this->flash_form_errors($errors);
$GLOBALS['phpgw']->jqcal->add_listener('from', 'date');
@@ -645,8 +696,8 @@
$data = array();
$data['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- self::render_template_xsl('report_freetime',
array('data' => $data, 'show' => $show,
- 'from' => $from, 'to' => $to, 'buildings' =>
$buildings['results'], 'allocations' => $allocations['results']));
+ self::render_template_xsl('report_freetime',
array('data' => $data, 'show' =>
$show,
+ 'from' => $from, 'to'
=> $to, 'buildings' => $buildings['results'],
'allocations' => $allocations['results']));
}
private function get_free_allocations($buildings, $from, $to,
$weekdays)
@@ -686,4 +737,106 @@
return $retval;
}
+ }
+
+ class OverlapCalculator
+ {
+
+ /**
+ * @var int
+ */
+ private $timeIn;
+
+ /**
+ * @var int
+ */
+ private $timeOut;
+
+ /**
+ * @var int
+ */
+ private $totalOverlap = 0;
+
+ /**
+ * @param DateTime|int $timeIn
+ * @param DateTime|int $timeOut
+ */
+ public function __construct($timeIn, $timeOut)
+ {
+ if($timeIn instanceOf DateTime)
+ {
+ $this->timeIn = $timeIn->getTimestamp();
+ }
+ else
+ {
+ $this->timeIn = $timeIn;
+ }
+
+ if($timeOut instanceOf DateTime)
+ {
+ $this->timeOut = $timeOut->getTimestamp();
+ }
+ else
+ {
+ $this->timeOut = $timeOut;
+ }
+ }
+
+ /**
+ * @param DateTime|int $periodStart
+ * @param DateTime|int $periodEnd
+ */
+ public function addOverlapFrom($periodStart, $periodEnd)
+ {
+ if($periodStart instanceOf DateTime)
+ {
+ $periodStart = $periodStart->getTimestamp();
+ }
+
+ if($periodEnd instanceOf DateTime)
+ {
+ $periodEnd = $periodEnd->getTimestamp();
+ }
+
+ $this->totalOverlap +=
$this->calculateOverlap($periodStart, $periodEnd);
+ }
+
+ /**
+ * @param $periodStart
+ * @param $periodEnd
+ * @return int
+ */
+ private function calculateOverlap($periodStart, $periodEnd)
+ {
+ if($periodStart >= $this->timeIn && $periodEnd <=
$this->timeOut)
+ {
+ // The compared time range can be contained
within borders of the source time range, so the over lap is the entire compared
time range
+ return $periodEnd - $periodStart;
+ }
+ elseif($periodStart >= $this->timeIn && $periodStart <=
$this->timeOut)
+ {
+ // The compared time range starts after or at
the source time range but also ends after it because it failed the condition
above
+ return $this->timeOut - $periodStart;
+ }
+ elseif($periodEnd >= $this->timeIn && $periodEnd <=
$this->timeOut)
+ {
+ // The compared time range starts before the
source time range and ends before the source end time
+ return $periodEnd - $this->timeIn;
+ }
+ elseif($this->timeIn > $periodStart && $this->timeOut <
$periodEnd)
+ {
+ // The compared time range is actually wider
than the source time range, so the overlap is the entirety of the source range
+ return $this->timeOut - $this->timeIn;
+ }
+
+ return 0;
+ }
+
+ /**
+ * @return int
+ */
+ public function getOverlap()
+ {
+ return $this->totalOverlap;
+ }
}
\ No newline at end of file
Modified: branches/dev-syncromind/booking/js/booking/report.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/report.js 2015-10-27
15:27:38 UTC (rev 14239)
+++ branches/dev-syncromind/booking/js/booking/report.js 2015-10-28
14:09:58 UTC (rev 14240)
@@ -7,7 +7,7 @@
$(window).load(function () {
var building_id = $('#field_building_id').val();
- if (building_id) {
+ if (building_id > 0) {
populateTableChkResources(building_id, initialSelection);
building_id_selection = building_id;
}
Modified: branches/dev-syncromind/booking/templates/base/report_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/report_new.xsl
2015-10-27 15:27:38 UTC (rev 14239)
+++ branches/dev-syncromind/booking/templates/base/report_new.xsl
2015-10-28 14:09:58 UTC (rev 14240)
@@ -34,12 +34,17 @@
</h4>
</label>
<select
name="report_type" id="report_type" class="pure-u-1 pure-u-sm-1-2
pure-u-lg-1-3">
- <option
value="participants_per_resource">
-
<xsl:value-of select="php:function('lang', 'participants_per_resource')" />
-
</option>
- <option
value="cover_ratio">
-
<xsl:value-of select="php:function('lang', 'cover ratio')" />
-
</option>
+
<xsl:for-each select="report_types">
+
<option>
+
<xsl:if test="selected = 1">
+
<xsl:attribute name="selected">selected</xsl:attribute>
+
</xsl:if>
+
<xsl:attribute name="value">
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:for-each>
</select>
</div>
<div
class="pure-control-group">
@@ -173,25 +178,25 @@
<div class="pure-u-lg-5-5 pure-u-md-1-1 pure-u-sm-1-1" ><xsl:value-of
select="php:function('lang', 'start time')" /></div>
<div class="pure-u-lg-1-24 pure-u-md-1-12 pure-u-sm-1-12">
-
<input maxlength="2" size="2" id="start_hour" name="start_hour"
type="text" placeholder = "00"></input>
+
<input maxlength="2" size="2" id="start_hour" name="start_hour"
type="text" placeholder = "00" value="{report/start_hour}"></input>
</div>
<div class="pure-u-lg-1-24 pure-u-md-1-12 pure-u-sm-1-12"
style="text-align:center;">
:
</div>
<div class="pure-u-lg-1-24 pure-u-md-1-12 pure-u-sm-1-12" >
-
<input maxlength="2" size="2" id="start_minute" name="start_minute"
type="text" placeholder = "00"></input>
+
<input maxlength="2" size="2" id="start_minute" name="start_minute"
type="text" placeholder = "00" value="{report/start_minute}"></input>
</div>
<div class="pure-u-lg-5-5 pure-u-md-1-1 pure-u-sm-1-1"><xsl:value-of
select="php:function('lang', 'end time')" /></div>
<div class="pure-u-lg-1-24 pure-u-md-1-12 pure-u-sm-1-12" >
-
<input maxlength="2" size="2" class="pure-input" id="end_hour"
name="end_hour" type="text" placeholder = "00"></input>
+
<input maxlength="2" size="2" class="pure-input" id="end_hour"
name="end_hour" type="text" placeholder = "00"
value="{report/end_hour}"></input>
</div>
<div class="pure-u-lg-1-24 pure-u-md-1-12 pure-u-sm-1-12"
style="text-align:center;">
:
</div>
<div class="pure-u-lg-1-24 pure-u-md-1-12 pure-u-sm-1-12" >
-
<input maxlength="2" size="2" class="pure-input" id="end_minute"
name="end_minute" type="text" placeholder = "00"></input>
+
<input maxlength="2" size="2" class="pure-input" id="end_minute"
name="end_minute" type="text" placeholder = "00"
value="{report/end_minute}"></input>
</div>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14240] Booking: more on reports,
Sigurd Nes <=