X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttFavReportHelper.class.php;h=0a21f7c94e6cd593615aeb886e799b205c28ecca;hb=22f23eb8f2f79853e18a4e4e5ded5c4db66cc5f8;hp=e181b5c52784075899c3bd92010ca3cf23ea61a5;hpb=18299d2390af7c3ecf03be779e24c28fbace3672;p=timetracker.git diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php index e181b5c5..0a21f7c9 100644 --- a/WEB-INF/lib/ttFavReportHelper.class.php +++ b/WEB-INF/lib/ttFavReportHelper.class.php @@ -36,7 +36,7 @@ class ttFavReportHelper { $mdb2 = getConnection(); $result = array(); - $sql = "select * from tt_fav_reports where user_id = $user_id"; + $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { while ($val = $res->fetchRow()) { @@ -51,7 +51,7 @@ class ttFavReportHelper { static function getReport($id) { $mdb2 = getConnection(); - $sql = "select * from tt_fav_reports where id = $id"; + $sql = "select * from tt_fav_reports where id = $id and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if ($val = $res->fetchRow()) { @@ -65,7 +65,7 @@ class ttFavReportHelper { static function getReportByName($user_id, $report_name) { $mdb2 = getConnection(); - $sql = "select * from tt_fav_reports where user_id = $user_id and name = ".$mdb2->quote($report_name); + $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1 and name = ".$mdb2->quote($report_name); $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if ($val = $res->fetchRow()) { @@ -80,21 +80,22 @@ class ttFavReportHelper { $mdb2 = getConnection(); $sql = "insert into tt_fav_reports (name, user_id, client_id, cf_1_option_id, project_id, task_id, - billable, invoice, users, period, period_start, period_end, - show_client, show_invoice, + billable, invoice, paid_status, users, period, period_start, period_end, + show_client, show_invoice, show_paid, show_ip, show_project, show_start, show_duration, show_cost, - show_task, show_end, show_note, show_custom_field_1, + show_task, show_end, show_note, show_custom_field_1, show_work_units, group_by, show_totals_only) values(". $mdb2->quote($fields['name']).", ".$fields['user_id'].", ". $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ". $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ". $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ". + $mdb2->quote($fields['paid_status']).", ". $mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ". $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ". - $fields['chclient'].", ".$fields['chinvoice'].", ". + $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ". $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ". - $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ". + $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ". $mdb2->quote($fields['group_by']).", ".$fields['chtotalsonly'].")"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) @@ -120,12 +121,15 @@ class ttFavReportHelper { "task_id = ".$mdb2->quote($fields['task']).", ". "billable = ".$mdb2->quote($fields['billable']).", ". "invoice = ".$mdb2->quote($fields['invoice']).", ". + "paid_status = ".$mdb2->quote($fields['paid_status']).", ". "users = ".$mdb2->quote($fields['users']).", ". "period = ".$mdb2->quote($fields['period']).", ". "period_start = ".$mdb2->quote($fields['from']).", ". "period_end = ".$mdb2->quote($fields['to']).", ". "show_client = ".$fields['chclient'].", ". "show_invoice = ".$fields['chinvoice'].", ". + "show_paid = ".$fields['chpaid'].", ". + "show_ip = ".$fields['chip'].", ". "show_project = ".$fields['chproject'].", ". "show_start = ".$fields['chstart'].", ". "show_duration = ".$fields['chduration'].", ". @@ -134,6 +138,7 @@ class ttFavReportHelper { "show_end = ".$fields['chfinish'].", ". "show_note = ".$fields['chnote'].", ". "show_custom_field_1 = ".$fields['chcf_1'].", ". + "show_work_units = ".$fields['chunits'].", ". "group_by = ".$mdb2->quote($fields['group_by']).", ". "show_totals_only = ".$fields['chtotalsonly']. " where id = ".$fields['id']; @@ -152,6 +157,8 @@ class ttFavReportHelper { // Later in this function we use it to construct $fields array to update database. if (!$bean->getAttribute('chclient')) $bean->setAttribute('chclient', 0); if (!$bean->getAttribute('chinvoice')) $bean->setAttribute('chinvoice', 0); + if (!$bean->getAttribute('chpaid')) $bean->setAttribute('chpaid', 0); + if (!$bean->getAttribute('chip')) $bean->setAttribute('chip', 0); if (!$bean->getAttribute('chproject')) $bean->setAttribute('chproject', 0); if (!$bean->getAttribute('chstart')) $bean->setAttribute('chstart', 0); if (!$bean->getAttribute('chduration')) $bean->setAttribute('chduration', 0); @@ -160,26 +167,12 @@ class ttFavReportHelper { if (!$bean->getAttribute('chfinish')) $bean->setAttribute('chfinish', 0); if (!$bean->getAttribute('chnote')) $bean->setAttribute('chnote', 0); if (!$bean->getAttribute('chcf_1')) $bean->setAttribute('chcf_1', 0); + if (!$bean->getAttribute('chunits')) $bean->setAttribute('chunits', 0); if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0); - if ($bean->getAttribute('users') && is_array($bean->getAttribute('users'))) { - $users_in_bean = $bean->getAttribute('users'); - - // If all users are selected - use a null value (which means "all users"). - $all_users_selected = true; - if ($user->canManageTeam()) { - $all = ttTeamHelper::getActiveUsers(); - foreach ($all as $one) { - if (!in_array($one['id'], $users_in_bean)) { - $all_users_selected = false; - break; - } - } - } - if ($all_users_selected) - $users = null; - else - $users = join(',', $users_in_bean); + $users_in_bean = $bean->getAttribute('users'); + if ($users_in_bean && is_array($users_in_bean)) { + $users = join(',', $users_in_bean); } if ($bean->getAttribute('start_date')) { $dt = new DateAndTime($user->date_format, $bean->getAttribute('start_date')); @@ -198,12 +191,15 @@ class ttFavReportHelper { 'task'=>$bean->getAttribute('task'), 'billable'=>$bean->getAttribute('include_records'), 'invoice'=>$bean->getAttribute('invoice'), + 'paid_status'=>$bean->getAttribute('paid_status'), 'users'=>$users, 'period'=>$bean->getAttribute('period'), 'from'=>$from, 'to'=>$to, 'chclient'=>$bean->getAttribute('chclient'), 'chinvoice'=>$bean->getAttribute('chinvoice'), + 'chpaid'=>$bean->getAttribute('chpaid'), + 'chip'=>$bean->getAttribute('chip'), 'chproject'=>$bean->getAttribute('chproject'), 'chstart'=>$bean->getAttribute('chstart'), 'chduration'=>$bean->getAttribute('chduration'), @@ -212,6 +208,7 @@ class ttFavReportHelper { 'chfinish'=>$bean->getAttribute('chfinish'), 'chnote'=>$bean->getAttribute('chnote'), 'chcf_1'=>$bean->getAttribute('chcf_1'), + 'chunits'=>$bean->getAttribute('chunits'), 'group_by'=>$bean->getAttribute('group_by'), 'chtotalsonly'=>$bean->getAttribute('chtotalsonly')); @@ -249,18 +246,8 @@ class ttFavReportHelper { $bean->setAttribute('task', $val['task_id']); $bean->setAttribute('include_records', $val['billable']); $bean->setAttribute('invoice', $val['invoice']); - if ($val['users']) - $bean->setAttribute('users', explode(',', $val['users'])); - else { - // Null users value means "all users". Add them to the bean. - if ($user->canManageTeam()) { - $all = ttTeamHelper::getActiveUsers(); - foreach ($all as $one) { - $all_user_ids[] = $one['id']; - } - $bean->setAttribute('users', $all_user_ids); - } - } + $bean->setAttribute('paid_status', $val['paid_status']); + $bean->setAttribute('users', explode(',', $val['users'])); $bean->setAttribute('period', $val['period']); if ($val['period_start']) { $dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']); @@ -272,6 +259,8 @@ class ttFavReportHelper { } $bean->setAttribute('chclient', $val['show_client']); $bean->setAttribute('chinvoice', $val['show_invoice']); + $bean->setAttribute('chpaid', $val['show_paid']); + $bean->setAttribute('chip', $val['show_ip']); $bean->setAttribute('chproject', $val['show_project']); $bean->setAttribute('chstart', $val['show_start']); $bean->setAttribute('chduration', $val['show_duration']); @@ -280,6 +269,7 @@ class ttFavReportHelper { $bean->setAttribute('chfinish', $val['show_end']); $bean->setAttribute('chnote', $val['show_note']); $bean->setAttribute('chcf_1', $val['show_custom_field_1']); + $bean->setAttribute('chunits', $val['show_work_units']); $bean->setAttribute('group_by', $val['group_by']); $bean->setAttribute('chtotalsonly', $val['show_totals_only']); $bean->setAttribute('new_fav_report', $val['name']); @@ -304,10 +294,35 @@ class ttFavReportHelper { 'chfinish'=>'1', 'chnote'=>'1', 'chcf_1'=>'', + 'chunits'=>'', 'group_by'=>'', 'chtotalsonly'=>'', 'new_fav_report'=>'')); $bean->setAttributes($attrs); } } + + // getReportOptions - returns an array of fav report options from database data. + // Note: this function is a part of refactoring to simplify maintenance of report + // generating functions, as we currently have 2 sets: normal reporting (from bean), + // and fav report emailing (from db fields). Using options obtained from either db or bean + // shall allow us to use only one set of functions. + static function getReportOptions($id) { + + // Start with getting the fields from the database. + $db_fields = ttFavReportHelper::getReport($id); + if (!$db_fields) return false; + + // Prepare an array of report options. + $options = $db_fields; // For now, use db field names as options. + // Drop things we don't need in reports. + unset($options['id']); + unset($options['report_spec']); // Currently not used. + unset($options['status']); + + // Note: special handling for NULL users field is done in cron.php + + // $options now is a subset of db fields from tt_fav_reports table. + return $options; + } }