X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/a0b1d0a4dfd23d96f60c2fe03c9b3682df2fe88f..6c92bed7b97ace08101baa84c8aa171e5d127c28:/WEB-INF/lib/ttTeamHelper.class.php diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 61271237..15bb3d6d 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -28,6 +28,7 @@ import('ttUserHelper'); import('DateAndTime'); +import('ttInvoiceHelper'); // Class ttTeamHelper - contains helper functions that operate with teams. class ttTeamHelper { @@ -328,6 +329,7 @@ class ttTeamHelper { static function getActiveInvoices($localizeDates = true) { global $user; + $addPaidStatus = $user->isPluginEnabled('ps'); $result = array(); $mdb2 = getConnection(); @@ -347,6 +349,8 @@ class ttTeamHelper { $dt->parseVal($val['date']); $val['date'] = $dt->toString($user->date_format); } + if ($addPaidStatus) + $val['paid'] = ttInvoiceHelper::isPaid($val['id']); $result[] = $val; } } @@ -544,7 +548,7 @@ class ttTeamHelper { $mdb2 = getConnection(); $result = array(); - $sql = "select year, month, quota from tt_monthly_quotas where team_id = $team_id"; + $sql = "select year, month, minutes from tt_monthly_quotas where team_id = $team_id"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -636,13 +640,13 @@ class ttTeamHelper { $mdb2 = getConnection(); - $decimal_mark = $fields['decimal_mark']; - if ($decimal_mark !== null) { - $decimal_mark_f = ', decimal_mark'; - $decimal_mark_v = ', ' . $mdb2->quote($decimal_mark); - } else { - $decimal_mark_f = ''; - $decimal_mark_v = ''; + // Start with team name and currency. + $columns = 'name, currency'; + $values = $mdb2->quote(trim($fields['name'])).', '.$mdb2->quote(trim($fields['currency'])); + + if ($fields['decimal_mark']) { + $columns .= ', decimal_mark'; + $values .= ', '.$mdb2->quote($fields['decimal_mark']); } $lang = $fields['lang']; @@ -650,17 +654,13 @@ class ttTeamHelper { global $i18n; $lang = $i18n->lang; } + $columns .= ', lang'; + $values .= ', '.$mdb2->quote($lang); - $date_format = $fields['date_format']; - if ($date_format !== null) { - $date_format_f = ', date_format'; - $date_format_v = ', ' . $mdb2->quote($date_format); - } elseif (defined('DATE_FORMAT_DEFAULT')) { - $date_format_f = ', date_format'; - $date_format_v = ', ' . $mdb2->quote(DATE_FORMAT_DEFAULT); - } else { - $date_format_f = ''; - $date_format_v = ''; + if ($fields['date_format'] || defined('DATE_FORMAT_DEFAULT')) { + $date_format = $fields['date_format'] ? $fields['date_format'] : DATE_FORMAT_DEFAULT; + $columns .= ', date_format'; + $values .= ', '.$mdb2->quote($date_format); } $time_format = $fields['time_format']; @@ -723,15 +723,6 @@ class ttTeamHelper { $record_type_v = ''; } - $uncompleted_indicators = $fields['uncompleted_indicators']; - if ($uncompleted_indicators !== null) { - $uncompleted_indicators_f = ', uncompleted_indicators'; - $uncompleted_indicators_v = ', ' . (int)$uncompleted_indicators; - } else { - $uncompleted_indicators_f = ''; - $uncompleted_indicators_v = ''; - } - $bcc_email = $fields['bcc_email']; if ($bcc_email !== null) { $bcc_email_f = ', bcc_email'; @@ -759,19 +750,26 @@ class ttTeamHelper { $lockspec_v = ''; } - $workday_hours = $fields['workday_hours']; - if ($workday_hours !== null) { - $workday_hours_f = ', workday_hours'; - $workday_hours_v = ', ' . (int)$workday_hours; + $workday_minutes = $fields['workday_minutes']; + if ($workday_minutes !== null) { + $workday_minutes_f = ', workday_minutes'; + $workday_minutes_v = ', ' . (int)$workday_minutes; } else { - $workday_hours_f = ''; - $workday_hours_v = ''; + $workday_minutes_f = ''; + $workday_minutes_v = ''; } - $sql = "insert into tt_teams (name, currency $decimal_mark_f, lang $date_format_f $time_format_f $week_start_f $tracking_mode_f $project_required_f $task_required_f $record_type_f $uncompleted_indicators_f $bcc_email_f $plugins_f $lockspec_f $workday_hours_f) - values(".$mdb2->quote(trim($fields['name'])). - ", ".$mdb2->quote(trim($fields['currency']))." $decimal_mark_v, ".$mdb2->quote($lang). - "$date_format_v $time_format_v $week_start_v $tracking_mode_v $project_required_v $task_required_v $record_type_v $uncompleted_indicators_v $bcc_email_v $plugins_v $lockspec_v $workday_hours_v)"; + $config = $fields['config']; + if ($config !== null) { + $config_f = ', config'; + $config_v = ', ' . $mdb2->quote($config); + } else { + $config_f = ''; + $config_f = ''; + } + + $sql = "insert into tt_teams ($columns $time_format_f $week_start_f $tracking_mode_f $project_required_f $task_required_f $record_type_f $bcc_email_f $plugins_f $lockspec_f $workday_minutes_f $config_f) + values($values $time_format_v $week_start_v $tracking_mode_v $project_required_v $task_required_v $record_type_v $bcc_email_v $plugins_v $lockspec_v $workday_minutes_v $config_v)"; $affected = $mdb2->exec($sql); if (!is_a($affected, 'PEAR_Error')) { @@ -794,31 +792,31 @@ class ttTeamHelper { $time_format_part = ''; $week_start_part = ''; $tracking_mode_part = ''; - $task_required_part = ' , task_required = '.intval($fields['task_required']); + $task_required_part = ' , task_required = '.(int) $fields['task_required']; $record_type_part = ''; - $uncompleted_indicators_part = ''; $bcc_email_part = ''; $plugins_part = ''; + $config_part = ''; $lock_spec_part = ''; - $workday_hours_part = ''; + $workday_minutes_part = ''; if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']); if (isset($fields['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']); if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']); if (isset($fields['date_format'])) $date_format_part = ', date_format = '.$mdb2->quote($fields['date_format']); if (isset($fields['time_format'])) $time_format_part = ', time_format = '.$mdb2->quote($fields['time_format']); - if (isset($fields['week_start'])) $week_start_part = ', week_start = '.intval($fields['week_start']); - if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.intval($fields['tracking_mode']); - if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']); - if (isset($fields['uncompleted_indicators'])) $uncompleted_indicators_part = ', uncompleted_indicators = '.intval($fields['uncompleted_indicators']); - if (!empty($fields['bcc_email'])) $bcc_email_part = ', bcc_email = '.$mdb2->quote($fields['bcc_email']); + if (isset($fields['week_start'])) $week_start_part = ', week_start = '.(int) $fields['week_start']; + if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.(int) $fields['tracking_mode']; + if (isset($fields['record_type'])) $record_type_part = ', record_type = '.(int) $fields['record_type']; + if (isset($fields['bcc_email'])) $bcc_email_part = ', bcc_email = '.$mdb2->quote($fields['bcc_email']); if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']); + if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']); if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']); - if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']); + if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']); $sql = "update tt_teams set $name_part $currency_part $lang_part $decimal_mark_part $date_format_part $time_format_part $week_start_part $tracking_mode_part $task_required_part $record_type_part - $uncompleted_indicators_part $bcc_email_part $plugins_part $lock_spec_part $workday_hours_part where id = $team_id"; + $bcc_email_part $plugins_part $config_part $lock_spec_part $workday_minutes_part where id = $team_id"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; @@ -1020,4 +1018,31 @@ class ttTeamHelper { return true; } + + // enablePlugin either enables or disables a specific plugin for team. + static function enablePlugin($plugin, $enable = true) + { + global $user; + if (!$user->canManageTeam()) + return false; + + $plugin_array = explode(',', $user->plugins); + if ($enable && !in_array($plugin, $plugin_array)) + $plugin_array[] = $plugin; // Add plugin to array. + + if (!$enable && in_array($plugin, $plugin_array)) { + $key = array_search($plugin, $plugin_array); + if ($key !== false) + unset($plugin_array[$key]); // Remove plugin from array. + } + + $plugins = implode(',', $plugin_array); + if ($plugins != $user->plugins) { + if (!ttTeamHelper::update($user->team_id, array('name' => $user->team,'plugins' => $plugins))) + return false; + $user->plugins = $plugins; + } + + return true; + } }