projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed expense item control presentation as per Kim Keown's PR#22.
[timetracker.git]
/
mobile
/
time.php
diff --git
a/mobile/time.php
b/mobile/time.php
index
8b20cac
..
2dfe239
100644
(file)
--- a/
mobile/time.php
+++ b/
mobile/time.php
@@
-183,14
+183,6
@@
if ($custom_fields && $custom_fields->fields[0]) {
}
}
}
}
-// Determine lock date. Time entries earlier than lock date cannot be created or modified.
-$lock_interval = $user->lock_interval;
-$lockdate = 0;
-if ($lock_interval > 0) {
- $lockdate = new DateAndTime();
- $lockdate->decDay($lock_interval);
-}
-
// Submit.
if ($request->isPost()) {
if ($request->getParameter('btn_submit')) {
// Submit.
if ($request->isPost()) {
if ($request->getParameter('btn_submit')) {
@@
-207,10
+199,8
@@
if ($request->isPost()) {
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
if (!$cl_task) $err->add($i18n->getKey('error.task'));
}
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
if (!$cl_task) $err->add($i18n->getKey('error.task'));
}
- if (!$cl_duration) {
- if ('0' == $cl_duration)
- $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
- elseif ($cl_start || $cl_finish) {
+ if (strlen($cl_duration) == 0) {
+ if ($cl_start || $cl_finish) {
if (!ttTimeHelper::isValidTime($cl_start))
$err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
if ($cl_finish) {
if (!ttTimeHelper::isValidTime($cl_start))
$err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
if ($cl_finish) {
@@
-241,9
+231,9
@@
if ($request->isPost()) {
$err->add($i18n->getKey('error.future_date'));
}
$err->add($i18n->getKey('error.future_date'));
}
- // Prohibit creating
time entries in locked interval
.
- if
($lockdate && $selected_date->before($lock
date))
- $err->add($i18n->getKey('error.
period
_locked'));
+ // Prohibit creating
entries in locked range
.
+ if
($user->isDateLocked($selected_
date))
+ $err->add($i18n->getKey('error.
range
_locked'));
// Prohibit creating another uncompleted record.
if ($err->no()) {
// Prohibit creating another uncompleted record.
if ($err->no()) {