X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/7e9b290b40c6f9f2efe6a7e28fae630bdffeca1e..532ab62cfa2895753eb599ab3b35c104ca344602:/WEB-INF/lib/ttTimeHelper.class.php diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index 60ebe446..0e27c729 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -103,7 +103,7 @@ class ttTimeHelper { } // normalizeDuration - converts a valid time duration string to format 00:00. - static function normalizeDuration($value) { + static function normalizeDuration($value, $leadingZero = true) { $time_value = $value; // If we have a decimal format - convert to time format 00:00. @@ -116,7 +116,7 @@ class ttTimeHelper { $mins = round($val * 60); $hours = (string)((int)($mins / 60)); $mins = (string)($mins % 60); - if (strlen($hours) == 1) + if ($leadingZero && strlen($hours) == 1) $hours = '0'.$hours; if (strlen($mins) == 1) $mins = '0' . $mins; @@ -129,7 +129,7 @@ class ttTimeHelper { // 0-99 if ((strlen($time_value) >= 1) && (strlen($time_value) <= 2) && !isset($time_a[1])) { $hours = $time_a[0]; - if (strlen($hours) == 1) + if ($leadingZero && strlen($hours) == 1) $hours = '0'.$hours; return $hours.':00'; } @@ -138,7 +138,7 @@ class ttTimeHelper { if ((strlen($time_value) >= 3) && (strlen($time_value) <= 4) && !isset($time_a[1])) { if (strlen($time_value)==3) $time_value = '0'.$time_value; $hours = substr($time_value,0,2); - if (strlen($hours) == 1) + if ($leadingZero && strlen($hours) == 1) $hours = '0'.$hours; return $hours.':'.substr($time_value,2,2); } @@ -146,7 +146,7 @@ class ttTimeHelper { // 0:00-23:59 (24:00) if ((strlen($time_value) >= 4) && (strlen($time_value) <= 5) && isset($time_a[1])) { $hours = $time_a[0]; - if (strlen($hours) == 1) + if ($leadingZero && strlen($hours) == 1) $hours = '0'.$hours; return $hours.':'.$time_a[1]; } @@ -747,24 +747,24 @@ class ttTimeHelper { // array( // Row 0. // 'row_id' => 'cl:546,bl:1,pr:23456,ts:27464,cf_1:7623_0', // Row identifier. See ttTimeHelper::makeRecordIdentifier(). // 'label' => 'Anuko - Time Tracker - Coding', // Human readable label for the row describing what this time entry is for. - // 'day_0' => array('control_id' => '0_day_0', 'duration' => '00:00'), // control_id is row_id plus day header for column. - // 'day_1' => array('control_id' => '0_day_1', 'duration' => '01:00'), - // 'day_2' => array('control_id' => '0_day_2', 'duration' => '02:00'), - // 'day_3' => array('control_id' => '0_day_3', 'duration' => null), - // 'day_4' => array('control_id' => '0_day_4', 'duration' => '04:00'), - // 'day_5' => array('control_id' => '0_day_5', 'duration' => '04:00'), - // 'day_6' => array('control_id' => '0_day_6', 'duration' => null) + // 'day_0' => array('control_id' => '0_day_0', 'tt_log_id' => 12345, 'duration' => '00:00'), // control_id is row_id plus day header for column. + // 'day_1' => array('control_id' => '0_day_1', 'tt_log_id' => 12346, 'duration' => '01:00'), + // 'day_2' => array('control_id' => '0_day_2', 'tt_log_id' => 12347, 'duration' => '02:00'), + // 'day_3' => array('control_id' => '0_day_3', 'tt_log_id' => null, 'duration' => null), + // 'day_4' => array('control_id' => '0_day_4', 'tt_log_id' => 12348, 'duration' => '04:00'), + // 'day_5' => array('control_id' => '0_day_5', 'tt_log_id' => 12349, 'duration' => '04:00'), + // 'day_6' => array('control_id' => '0_day_6', 'tt_log_id' => null, 'duration' => null) // ), // array( // Row 1. // 'row_id' => 'bl:0_0', // 'label' => '', // In this case the label is empty as we don't have anything to put into it, as we only have billable flag. - // 'day_0' => array('control_id' => '1_day_0', 'duration' => null), - // 'day_1' => array('control_id' => '1_day_1', 'duration' => '01:30'), - // 'day_2' => array('control_id' => '1_day_2', 'duration' => null), - // 'day_3' => array('control_id' => '1_day_3', 'duration' => '02:30'), - // 'day_4' => array('control_id' => '1_day_4', 'duration' => '04:00'), - // 'day_5' => array('control_id' => '1_day_5', 'duration' => null), - // 'day_6' => array('control_id' => '1_day_6', 'duration' => null) + // 'day_0' => array('control_id' => '1_day_0', 'tt_log_id' => null, 'duration' => null), + // 'day_1' => array('control_id' => '1_day_1', 'tt_log_id' => 12350, 'duration' => '01:30'), + // 'day_2' => array('control_id' => '1_day_2', 'tt_log_id' => null, 'duration' => null), + // 'day_3' => array('control_id' => '1_day_3', 'tt_log_id' => 12351,'duration' => '02:30'), + // 'day_4' => array('control_id' => '1_day_4', 'tt_log_id' => 12352, 'duration' => '04:00'), + // 'day_5' => array('control_id' => '1_day_5', 'tt_log_id' => null, 'duration' => null), + // 'day_6' => array('control_id' => '1_day_6', 'tt_log_id' => null, 'duration' => null) // ) // ); static function getDataForWeekView($user_id, $start_date, $end_date, $dayHeaders) { @@ -902,6 +902,28 @@ class ttTimeHelper { return $dayHeaders; } + // getLockedDaysForWeek - builds an arrays of locked days in week. + static function getLockedDaysForWeek($start_date) { + global $user; + $lockedDays = array(); + $objDate = new DateAndTime(DB_DATEFORMAT, $start_date); + $lockedDays[] = $user->isDateLocked($objDate); + $objDate->incDay(); + $lockedDays[] = $user->isDateLocked($objDate); + $objDate->incDay(); + $lockedDays[] = $user->isDateLocked($objDate); + $objDate->incDay(); + $lockedDays[] = $user->isDateLocked($objDate); + $objDate->incDay(); + $lockedDays[] = $user->isDateLocked($objDate); + $objDate->incDay(); + $lockedDays[] = $user->isDateLocked($objDate); + $objDate->incDay(); + $lockedDays[] = $user->isDateLocked($objDate); + unset($objDate); + return $lockedDays; + } + // getDayTotals calculates total durations for each day from the existing data in $dataArray. static function getDayTotals($dataArray, $dayHeaders) { $dayTotals = array(); @@ -924,5 +946,52 @@ class ttTimeHelper { } return $dayTotals; } + + // insertDurationFromWeekView - inserts a new record in log tables from a week view post. + static function insertDurationFromWeekView($fields, $err) { + $err->add("Week view is work in progress. Inserting records is not yet implemented. Try again later."); + // $row_id, $day_header, $posted_duration, $start_date) { // TODO: potential fields? + + return false; // Not implemented. + } + + + // 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')); + } + */ + + /* + * // 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')); + } + */ + + $mdb2 = getConnection(); + + $sql = "update tt_log set duration = '$new_duration' where id = $tt_log_id and user_id = $user_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) + return false; + + return true; + } }