X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttFavReportHelper.class.php;h=36600e2194685d7a501eb5843e1b5d50aecd9279;hb=a106b7a2db73b3e1fdab428b218212f6f38d7623;hp=60acc12c98b0dd761e7f32ee7df538161ac57382;hpb=ab67dc53bc95c2e4c74dc492b6b9210514d0c732;p=timetracker.git diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php index 60acc12c..36600e21 100644 --- a/WEB-INF/lib/ttFavReportHelper.class.php +++ b/WEB-INF/lib/ttFavReportHelper.class.php @@ -77,16 +77,21 @@ class ttFavReportHelper { // insertReport - stores reports settings in database. static function insertReport($fields) { + global $user; $mdb2 = getConnection(); - $sql = "insert into tt_fav_reports (name, user_id, client_id, cf_1_option_id, project_id, task_id, - 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, - group_by, show_totals_only) - values(". - $mdb2->quote($fields['name']).", ".$fields['user_id'].", ". + $group_id = $user->getGroup(); + $org_id = $user->org_id; + + $sql = "insert into tt_fav_reports". + " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,". + " 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_work_units,". + " group_by1, group_by2, group_by3, show_totals_only)". + " values(". + $mdb2->quote($fields['name']).", ".$fields['user_id'].", $group_id, $org_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']).", ". @@ -95,19 +100,15 @@ class ttFavReportHelper { $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ". $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'].", ". - $mdb2->quote($fields['group_by']).", ".$fields['chtotalsonly'].")"; + $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ". + $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ". + $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; - $sql = "select last_insert_id() as last_id"; - $res = $mdb2->query($sql); - if (is_a($res, 'PEAR_Error')) - return false; - - $val = $res->fetchRow(); - return $val['last_id']; + $last_id = $mdb2->lastInsertID('tt_fav_reports', 'id'); + return $last_id; } // updateReport - updates report options in the database. @@ -138,7 +139,10 @@ class ttFavReportHelper { "show_end = ".$fields['chfinish'].", ". "show_note = ".$fields['chnote'].", ". "show_custom_field_1 = ".$fields['chcf_1'].", ". - "group_by = ".$mdb2->quote($fields['group_by']).", ". + "show_work_units = ".$fields['chunits'].", ". + "group_by1 = ".$mdb2->quote($fields['group_by1']).", ". + "group_by2 = ".$mdb2->quote($fields['group_by2']).", ". + "group_by3 = ".$mdb2->quote($fields['group_by3']).", ". "show_totals_only = ".$fields['chtotalsonly']. " where id = ".$fields['id']; $affected = $mdb2->exec($sql); @@ -166,26 +170,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->can('view_reports')) { - $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')); @@ -221,7 +211,10 @@ class ttFavReportHelper { 'chfinish'=>$bean->getAttribute('chfinish'), 'chnote'=>$bean->getAttribute('chnote'), 'chcf_1'=>$bean->getAttribute('chcf_1'), - 'group_by'=>$bean->getAttribute('group_by'), + 'chunits'=>$bean->getAttribute('chunits'), + 'group_by1'=>$bean->getAttribute('group_by1'), + 'group_by2'=>$bean->getAttribute('group_by2'), + 'group_by3'=>$bean->getAttribute('group_by3'), 'chtotalsonly'=>$bean->getAttribute('chtotalsonly')); $id = false; @@ -259,18 +252,7 @@ class ttFavReportHelper { $bean->setAttribute('include_records', $val['billable']); $bean->setAttribute('invoice', $val['invoice']); $bean->setAttribute('paid_status', $val['paid_status']); - if ($val['users']) - $bean->setAttribute('users', explode(',', $val['users'])); - else { - // Null users value means "all users". Add them to the bean. - if ($user->can('view_reports')) { - $all = ttTeamHelper::getActiveUsers(); - foreach ($all as $one) { - $all_user_ids[] = $one['id']; - } - $bean->setAttribute('users', $all_user_ids); - } - } + $bean->setAttribute('users', explode(',', $val['users'])); $bean->setAttribute('period', $val['period']); if ($val['period_start']) { $dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']); @@ -292,7 +274,10 @@ 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('group_by', $val['group_by']); + $bean->setAttribute('chunits', $val['show_work_units']); + $bean->setAttribute('group_by1', $val['group_by1']); + $bean->setAttribute('group_by2', $val['group_by2']); + $bean->setAttribute('group_by3', $val['group_by3']); $bean->setAttribute('chtotalsonly', $val['show_totals_only']); $bean->setAttribute('new_fav_report', $val['name']); } else { @@ -316,10 +301,83 @@ class ttFavReportHelper { 'chfinish'=>'1', 'chnote'=>'1', 'chcf_1'=>'', - 'group_by'=>'', + 'chunits'=>'', + 'group_by1'=>'', + 'group_by2'=>'', + 'group_by3'=>'', '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; + } + + // adjustOptions takes and array or report options and adjusts them for current user + // (and group) settings. This is needed in situations when a fav report is stored in db + // long ago, but user or group attributes are now changed, so we have to adjust. + static function adjustOptions($options) { + global $user; + + // Check and optionally adjust users. + // Special handling of the NULL $options['users'] field (this used to mean "all users"). + if (!$options['users']) { + if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) { + if ($user->can('view_reports') || $user->can('view_all_reports')) { + $max_rank = $user->rank-1; + if ($user->can('view_all_reports')) $max_rank = 512; + if ($user->can('view_own_reports')) + $user_options = array('max_rank'=>$max_rank,'include_self'=>true); + else + $user_options = array('max_rank'=>$max_rank); + $users = $user->getUsers($user_options); // Active and inactive users. + } elseif ($user->isClient()) { + $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients. + } + foreach ($users as $single_user) { + $user_ids[] = $single_user['id']; + } + $options['users'] = implode(',', $user_ids); + } + } else { + $users_to_adjust = explode(',', $options['users']); // Users to adjust. + if ($user->isClient()) { + $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients. + foreach ($users as $single_user) { + $user_ids[] = $single_user['id']; + } + foreach ($users_to_adjust as $user_to_adjust) { + if (in_array($user_to_adjust['id'], $user_ids)) { + $adjusted_user_ids[] = $user_to_adjust['id']; + } + } + $options['users'] = implode(',', $adjusted_user_ids); + } + // TODO: add checking the existing user list for potentially changed access rights for user. + } + + return $options; + } }