From: anuko <support@anuko.com>
Date: Fri, 29 Dec 2017 02:04:47 +0000 (+0000)
Subject: A bit more progress with week view - some editing now works.
X-Git-Tag: timetracker_1.19-1~1419
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=90bad70543aac26a31b913c0c81d54433c125559;p=timetracker.git

A bit more progress with week view - some editing now works.
---

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 81a5ccf7..8f20f373 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -587,6 +587,39 @@ class ttTimeHelper {
     return false;
   }
 
+  // ovelapsWithNewDuration - determines if an already existing tt_log record will overlap others
+  // if we were to change its duration to a new value.
+  //
+  // Another error condition we check for is whether new duration puts the existing record beyond the 24:00 day boundary.
+  static function ovelapsWithNewDuration($tt_log_id, $new_duration, $err) {
+    global $i18n;
+    $mdb2 = getConnection();
+
+    // Determine if we have start time in record, as checking does not makes sense otherwise.
+    $sql = "select start 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 true;
+      }
+      $val = $res->fetchRow();
+      if (!$val['start'])
+        return false; // No start time, therefore no overlap.
+    }
+
+    // TODO: Determine finish based on the existing record start and $new_duration.
+    // By probably using PHP time functions or toMinutes().
+
+    // Then check whether new duration puts the existing records beyond 24:00 boundary.
+    // and call the existing overlaps function.
+
+    // For now return an error, until we implement the above.
+
+    $err->add("Week view is work in progress. Editing records with existing start times is currently not supported in week view. Try day view instead.");
+    return true;
+  }
+
   // getRecord - retrieves a time record identified by its id.
   static function getRecord($id, $user_id) {
     global $user;
@@ -1024,38 +1057,22 @@ class ttTimeHelper {
 
   // modifyFromWeekView - modifies a duration of an existing record from a week view post.
   static function modifyDurationFromWeekView($fields, $err) {
+    global $i18n;
+    global $user;
 
-    // Possible error conditions. Overlap? What else?
-
-    $err->add("Week view is work in progress. Editing records is not yet implemented. Try deleting and then inserting a record instead.");
-    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'));
+    // 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::ovelapsWithNewDuration($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;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 825f144b..74654c2d 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.13.0.3705| Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.13.0.3706| Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>