X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTeamHelper.class.php;h=46a65e0de10db6d748490d51098319fb5f33abb5;hb=4af7dd7e10968588fe4c2828be5402f41d53ebc5;hp=2f0c7ccd119e68e316ae2a46e3aaf618e9d86d4f;hpb=c51ac80bc7cbb4b2f77b75cd4120b62675aa7014;p=timetracker.git diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 2f0c7ccd..46a65e0d 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -520,7 +520,7 @@ class ttTeamHelper { $mdb2 = getConnection(); $result = array(); - $sql = "select c.id, c.cron_spec, c.email, fr.name from tt_cron c + $sql = "select c.id, c.cron_spec, c.email, c.report_condition, fr.name from tt_cron c left join tt_fav_reports fr on (fr.id = c.report_id) where c.team_id = $team_id and c.status is not null"; $res = $mdb2->query($sql); @@ -709,6 +709,15 @@ class ttTeamHelper { $tracking_mode_v = ''; } + $task_required = $fields['task_required']; + if ($task_required !== null) { + $task_required_f = ', task_required'; + $task_required_v = ', ' . (int)$task_required; + } else { + $task_required_f = ''; + $task_required_v = ''; + } + $record_type = $fields['record_type']; if ($record_type !== null) { $record_type_f = ', record_type'; @@ -736,11 +745,11 @@ class ttTeamHelper { $workday_hours_v = ''; } - $sql = "insert into tt_teams (name, address, currency $lockspec_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $record_type_f $uncompleted_indicators_f $workday_hours_f) + $sql = "insert into tt_teams (name, address, currency $lockspec_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $task_required_f $record_type_f $uncompleted_indicators_f $workday_hours_f) values(".$mdb2->quote(trim($fields['name'])). ", ".$mdb2->quote(trim($fields['address'])). ", ".$mdb2->quote(trim($fields['currency']))." $lockspec_v, ".$mdb2->quote($lang). - "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $record_type_v $uncompleted_indicators_v $workday_hours_v)"; + "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $task_required_v $record_type_v $uncompleted_indicators_v $workday_hours_v)"; $affected = $mdb2->exec($sql); if (!is_a($affected, 'PEAR_Error')) { @@ -764,7 +773,7 @@ class ttTeamHelper { $time_format_part = ''; $week_start_part = ''; $tracking_mode_part = ''; - $task_required_part = ' , task_required = '.$mdb2->quote($fields['task_required']); + $task_required_part = ' , task_required = '.intval($fields['task_required']); $record_type_part = ''; $uncompleted_indicators_part = ''; $plugins_part = '';