return false;
}
+ // wvCanModify (weekViewCanModify) - determines if an already existing tt_log record
+ // can be modified with a new user-provided duration.
+ static function wvCanModify($tt_log_id, $new_duration, $err) {
+ global $i18n;
+ $mdb2 = getConnection();
+
+ // Determine if we have start time in record, as further checking does not makes sense otherwise.
+ $sql = "select user_id, date, start, duration from tt_log where id = $tt_log_id";
+ $res = $mdb2->query($sql);
+ if (!is_a($res, 'PEAR_Error')) {
+ if (!$res->numRows()) {
+ $err->add($i18n->getKey('error.db')); // This is not expected.
+ return false;
+ }
+ $val = $res->fetchRow();
+ $oldDuration = $val['duration'];
+ if (!$val['start'])
+ return true; // There is no start time in the record, therefore safe to modify.
+ }
+
+ // We do have start time.
+ // Quick test if new duration is less then already existing.
+ $newMinutes = ttTimeHelper::toMinutes($new_duration);
+ $oldMinutes = ttTimeHelper::toMinutes($oldDuration);
+ if ($newMinutes < $oldMinutes)
+ return true; // Safe to modify.
+
+ // Does the new duration put the record beyond 24:00 boundary?
+ $startMinutes = ttTimeHelper::toMinutes($val['start']);
+ $newEndMinutes = $startMinutes + $newMinutes;
+ if ($newEndMinutes > 1440) {
+ // Invalid duration, as new duration puts the record beyond current day.
+ $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+ return false;
+ }
+
+ // Does the new duration causes the record to overlap with others?
+ $user_id = $val['user_id'];
+ $date = $val['date'];
+ $startMinutes = ttTimeHelper::toMinutes($val['start']);
+ $start = ttTimeHelper::toAbsDuration($startMinutes);
+ $finish = ttTimeHelper::toAbsDuration($newEndMinutes);
+ if (ttTimeHelper::overlaps($user_id, $date, $start, $finish, $tt_log_id)) {
+ $err->add($i18n->getKey('error.overlap'));
+ return false;
+ }
+
+ return true; // There are no conflicts, safe to modify.
+ }
+
// getRecord - retrieves a time record identified by its id.
static function getRecord($id, $user_id) {
global $user;
}
// insertDurationFromWeekView - inserts a new record in log tables from a week view post.
- static function insertDurationFromWeekView($fields, $err) {
+ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
global $i18n;
global $user;
}
}
- // Temporary check for custom field and exit if one is found, as this is not yet implemented.
- $temp = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'cf_1');
- if ($temp) {
- $err->add("Week view is work in progress. Inserting records with custom fields is not yet implemented. Try again later.");
- return false;
- }
-
// Prepare an array of fields for regular insert function.
$fields4insert = array();
$fields4insert['user_id'] = $user->getActiveUser();
$id = ttTimeHelper::insert($fields4insert);
if (!$id) return false; // Something failed.
- // TODO: Deal with custom fieeld log here. Currently not implemented.
+ // Insert custom field if we have it.
+ $result = true;
+ $cf_1 = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'cf_1');
+ if ($custom_fields && $cf_1) {
+ if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
+ $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cf_1);
+ elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+ $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cf_1, null);
+ }
- return true; // Not implemented.
+ return $result;
}
// modifyFromWeekView - modifies a duration of an existing record from a week view post.
static function modifyDurationFromWeekView($fields, $err) {
- $err->add("Week view is work in progress. Editing records is not yet implemented. Try again later.");
- return false;
-
- // static function modifyDurationFromWeekView($tt_log_id, $new_duration, $user_id) {
-
- // TODO: handle overlaps and potential other error conditions such as going beyond 24 hr mark. Other errors?
- // If the entry has start time, check if new duration goes beyond the existing day.
-
- // Future entries. Possibly do this check out of this function.
- /*
- * // Prohibit creating entries in future.
- if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
- $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
- if ($selected_date->after($browser_today))
- $err->add($i18n->getKey('error.future_date'));
- }
- */
+ global $i18n;
+ global $user;
- /*
- * // Prohibit creating an overlapping record.
- if ($err->no()) {
- if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
- $err->add($i18n->getKey('error.overlap'));
+ // Possible errors: 1) Overlap if the existing record has start time. 2) Going beyond 24 hour boundary.
+ // TODO: rename this function.
+ // Handle different errors with specific error messages.
+ if (!ttTimeHelper::wvCanModify($fields['tt_log_id'], $fields['duration'], $err)) {
+ // $err->add($i18n->getKey('error.overlap'));
+ return false;
}
- */
$mdb2 = getConnection();
-
- $sql = "update tt_log set duration = '$new_duration' where id = $tt_log_id and user_id = $user_id";
+ $duration = $fields['duration'];
+ $tt_log_id = $fields['tt_log_id'];
+ $user_id = $user->getActiveUser();
+ $sql = "update tt_log set duration = '$duration' where id = $tt_log_id and user_id = $user_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
projects / timetracker.git / blobdiff