projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed holidays display for subgroups.
[timetracker.git]
/
WEB-INF
/
lib
/
ttWeekViewHelper.class.php
diff --git
a/WEB-INF/lib/ttWeekViewHelper.class.php
b/WEB-INF/lib/ttWeekViewHelper.class.php
index
a790268
..
1144cea
100644
(file)
--- a/
WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/
WEB-INF/lib/ttWeekViewHelper.class.php
@@
-354,7
+354,7
@@
class ttWeekViewHelper {
}
// Convert minutes to hh:mm for display.
foreach($dayHeaders as $dayHeader) {
}
// Convert minutes to hh:mm for display.
foreach($dayHeaders as $dayHeader) {
- $dayTotals[$dayHeader] = ttTimeHelper::minutesToDuration($dayTotals[$dayHeader]);
// This breaks for negative hours.
+ $dayTotals[$dayHeader] = ttTimeHelper::minutesToDuration($dayTotals[$dayHeader]);
}
return $dayTotals;
}
}
return $dayTotals;
}
@@
-579,8
+579,14
@@
class ttWeekViewHelper {
}
// We do have start time.
}
// We do have start time.
- // Quick test if new duration is less then already existing.
$newMinutes = ttTimeHelper::toMinutes($new_duration);
$newMinutes = ttTimeHelper::toMinutes($new_duration);
+ if ($newMinutes < 0) {
+ // Negative durations are not supported when start time is defined.
+ $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
+ return false;
+ }
+
+ // Quick test if new duration is less than already existing.
$oldMinutes = ttTimeHelper::toMinutes($oldDuration);
if ($newMinutes < $oldMinutes)
return true; // Safe to modify.
$oldMinutes = ttTimeHelper::toMinutes($oldDuration);
if ($newMinutes < $oldMinutes)
return true; // Safe to modify.