From: anuko Date: Thu, 28 Dec 2017 21:36:07 +0000 (+0000) Subject: More progress on week view. Implemented adding records to existing rows without custo... X-Git-Tag: timetracker_1.19-1~1421 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=88134e6891875e698d71e06806e9c0ddde5c03bd;p=timetracker.git More progress on week view. Implemented adding records to existing rows without custom fields. --- diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index 0e27c729..c88ed6a9 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -832,7 +832,7 @@ class ttTimeHelper { global $user; // Start with client. if ($user->isPluginEnabled('cl')) - $record_identifier = $record['client_id'] ? 'cl'.$record['client_id'] : ''; + $record_identifier = $record['client_id'] ? 'cl:'.$record['client_id'] : ''; // Add billable flag. if (!empty($record_identifier)) $record_identifier .= ','; $record_identifier .= 'bl:'.$record['billable']; @@ -851,6 +851,28 @@ class ttTimeHelper { return $record_identifier; } + // parseFromWeekViewRow - obtains field value encoded in row identifier. + // For example, for a row id like "cl:546,bl:0,pr:23456,ts:27464,cf_1:example text" + // requesting a client "cl" should return 546. + static function parseFromWeekViewRow($row_id, $field_label) { + // Find beginning of label. + $pos = strpos($row_id, $field_label); + if ($pos === false) return null; // Not found. + + // Strip suffix from row id. + $suffixPos = strrpos($row_id, '_'); + if ($suffixPos) + $remaninder = substr($row_id, 0, $suffixPos); + + // Find beginning of value. + $posBegin = 1 + strpos($remaninder, ':', $pos); + // Find end of value. + $posEnd = strpos($remaninder, ',', $posBegin); + if ($posEnd === false) $posEnd = strlen($remaninder); + // Return value. + return substr($remaninder, $posBegin, $posEnd - $posBegin); + } + // makeRecordLabel - builds a human readable label for a row in week view, // which is a combination ot record properties. // Client - Project - Task - Custom field 1. @@ -902,24 +924,15 @@ class ttTimeHelper { return $dayHeaders; } - // getLockedDaysForWeek - builds an arrays of locked days in week. + // getLockedDaysForWeek - builds an array 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); + for ($i = 0; $i < 7; $i++) { + $lockedDays[] = $user->isDateLocked($objDate); + $objDate->incDay(); + } unset($objDate); return $lockedDays; } @@ -947,12 +960,64 @@ class ttTimeHelper { return $dayTotals; } + // dateFromDayHeader calculates date from start date and day header in week view. + static function dateFromDayHeader($start_date, $day_header) { + $objDate = new DateAndTime(DB_DATEFORMAT, $start_date); + $currentDayHeader = (string) $objDate->getDate(); // It returns an int on first call. + if (strlen($currentDayHeader) == 1) // Which is an implementation detail of DateAndTime class. + $currentDayHeader = '0'.$currentDayHeader; // Add a 0 for single digit day. + $i = 1; + while ($currentDayHeader != $day_header && $i < 7) { + // Iterate through remaining days to find a match. + $objDate->incDay(); + $currentDayHeader = $objDate->getDate(); // After incDay it returns a string with leading 0, when necessary. + $i++; + } + return $objDate->toString(DB_DATEFORMAT); + } + // 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? + global $i18n; + global $user; + + // Determine date for a new entry. + $entry_date = ttTimeHelper::dateFromDayHeader($fields['start_date'], $fields['day_header']); + $objEntryDate = new DateAndTime(DB_DATEFORMAT, $entry_date); + + // Prohibit creating entries in future. + if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES) && $fields['browser_today']) { + $objBrowserToday = new DateAndTime(DB_DATEFORMAT, $fields['browser_today']); + if ($objEntryDate->after($objBrowserToday)) { + $err->add($i18n->getKey('error.future_date')); + return false; + } + } + + // 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(); + $fields4insert['date'] = $entry_date; + $fields4insert['duration'] = $fields['duration']; + $fields4insert['client'] = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'cl'); + $fields4insert['billable'] = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'bl'); + $fields4insert['project'] = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'pr'); + $fields4insert['task'] = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'ts'); + + // Try to insert a record. + $id = ttTimeHelper::insert($fields4insert); + if (!$id) return false; // Something failed. + + // TODO: Deal with custom fieeld log here. Currently not implemented. - return false; // Not implemented. + return true; // Not implemented. } diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 7ace196a..20efe259 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -196,7 +196,7 @@ class ttUser { require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php'); // Calculate the last occurrence of a lock. - $last = tdCron::getLastOccurrence($this->lock_spec, mktime()); + $last = tdCron::getLastOccurrence($this->lock_spec, time()); $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last)); if ($date->before($lockdate)) { return true; diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index ab87268a..5b00397a 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.13.0.3703| Copyright © Anuko | +  Anuko Time Tracker 1.13.0.3704| Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/week.php b/week.php index d6fb6a3b..34efd56e 100644 --- a/week.php +++ b/week.php @@ -272,7 +272,7 @@ $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar if ($user->isPluginEnabled('iv')) $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable)); -$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click. +$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click. $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit'))); // If we have custom fields - add controls for them. @@ -389,11 +389,12 @@ if ($request->isPost()) { if ($existingDuration == null) { // Insert a new record here. $fields = array(); + $fields['row_id'] = $dataArray[$rowNumber]['row_id']; + $fields['day_header'] = $dayHeader; + $fields['start_date'] = $startDate->toString(DB_DATEFORMAT); // To be able to determine date for the entry using $dayHeader. + $fields['duration'] = $postedDuration; + $fields['browser_today'] = $request->getParameter('browser_today', null); $result = ttTimeHelper::insertDurationFromWeekView($fields, $err); - //$dataArray[$rowNumber]['row_id'], - //$dayHeader, - //$postedDuration, - //$startDate->toString(DB_DATEFORMAT)); } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) { // Delete an already existing record here. $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getActiveUser());