projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished integrating improvements for Danish language file.
[timetracker.git]
/
WEB-INF
/
lib
/
ttTeamHelper.class.php
diff --git
a/WEB-INF/lib/ttTeamHelper.class.php
b/WEB-INF/lib/ttTeamHelper.class.php
index
3dba92a
..
febf075
100644
(file)
--- a/
WEB-INF/lib/ttTeamHelper.class.php
+++ b/
WEB-INF/lib/ttTeamHelper.class.php
@@
-520,9
+520,9
@@
class ttTeamHelper {
$mdb2 = getConnection();
$result = array();
$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)
left join tt_fav_reports fr on (fr.id = c.report_id)
- where c.team_id = $team_id and c.status
is not null
";
+ where c.team_id = $team_id and c.status
= 1 and fr.status = 1
";
$res = $mdb2->query($sql);
$result = array();
if (!is_a($res, 'PEAR_Error')) {
$res = $mdb2->query($sql);
$result = array();
if (!is_a($res, 'PEAR_Error')) {
@@
-709,6
+709,15
@@
class ttTeamHelper {
$tracking_mode_v = '';
}
$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';
$record_type = $fields['record_type'];
if ($record_type !== null) {
$record_type_f = ', record_type';
@@
-736,11
+745,11
@@
class ttTeamHelper {
$workday_hours_v = '';
}
$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).
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')) {
$affected = $mdb2->exec($sql);
if (!is_a($affected, 'PEAR_Error')) {
@@
-764,6
+773,7
@@
class ttTeamHelper {
$time_format_part = '';
$week_start_part = '';
$tracking_mode_part = '';
$time_format_part = '';
$week_start_part = '';
$tracking_mode_part = '';
+ $task_required_part = ' , task_required = '.intval($fields['task_required']);
$record_type_part = '';
$uncompleted_indicators_part = '';
$plugins_part = '';
$record_type_part = '';
$uncompleted_indicators_part = '';
$plugins_part = '';
@@
-785,7
+795,7
@@
class ttTeamHelper {
if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);
$sql = "update tt_teams set $name_part $addr_part $currency_part $lang_part $decimal_mark_part
if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);
$sql = "update tt_teams set $name_part $addr_part $currency_part $lang_part $decimal_mark_part
- $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part
+ $date_format_part $time_format_part $week_start_part $tracking_mode_part $
task_required_part $
record_type_part
$uncompleted_indicators_part $plugins_part $lock_spec_part $workday_hours_part where id = $team_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
$uncompleted_indicators_part $plugins_part $lock_spec_part $workday_hours_part where id = $team_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;